From 88c3d1b1c672802961c66fcf1142813d8a9c602e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Stefa=C5=84ski?= Date: Thu, 3 Apr 2025 15:47:04 +0200 Subject: [PATCH 1/5] [INF-4795] Remove nokogiri dev deps --- Gemfile.lock | 54 ++++++--------------------------------- Rakefile | 16 ------------ spec/validate_url_spec.rb | 6 ++--- validate_url.gemspec | 2 +- 4 files changed, 12 insertions(+), 66 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d7c2fa4..4790d95 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -22,56 +22,19 @@ GEM zeitwerk (~> 2.3) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) - base64 (0.2.0) - builder (3.3.0) concurrent-ruby (1.3.4) - descendants_tracker (0.0.4) - thread_safe (~> 0.3, >= 0.3.1) + date (3.4.1) diff-lcs (1.3) - faraday (0.9.2) - multipart-post (>= 1.2, < 3) - git (1.5.0) - github_api (0.18.1) - addressable (~> 2.4) - descendants_tracker (~> 0.0.4) - faraday (~> 0.8) - hashie (>= 3.4) - oauth2 (~> 1.0) - hashie (5.0.0) - highline (2.0.0) i18n (1.14.7) concurrent-ruby (~> 1.0) - jeweler (2.1.1) - builder - bundler (>= 1.0) - git (>= 1.2.5) - github_api - highline (>= 1.6.15) - nokogiri (>= 1.5.10) - rake - rdoc - semver - jwt (2.10.1) - base64 - mini_portile2 (2.8.8) minitest (5.25.4) - multi_json (1.15.0) - multi_xml (0.6.0) - multipart-post (2.4.1) - nokogiri (1.15.7) - mini_portile2 (~> 2.8.2) - racc (~> 1.4) - oauth2 (1.4.8) - faraday (>= 0.8, < 3.0) - jwt (>= 1.0, < 3.0) - multi_json (~> 1.3) - multi_xml (~> 0.5) - rack (>= 1.2, < 3) + psych (5.2.3) + date + stringio public_suffix (4.0.7) - racc (1.8.1) - rack (2.2.10) rake (12.3.0) - rdoc (6.0.4) + rdoc (6.13.1) + psych (>= 4.0.0) rspec (3.8.0) rspec-core (~> 3.8.0) rspec-expectations (~> 3.8.0) @@ -85,9 +48,8 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.8.0) rspec-support (3.8.0) - semver (1.0.1) sqlite3 (1.6.9) - thread_safe (0.3.6) + stringio (3.1.6) tzinfo (2.0.6) concurrent-ruby (~> 1.0) zeitwerk (2.6.18) @@ -99,8 +61,8 @@ DEPENDENCIES activerecord (< 7.0) concurrent-ruby (= 1.3.4) diff-lcs (>= 1.1.2) - jeweler rake + rdoc rspec (>= 3.0.0) sqlite3 (= 1.6.9) validate_url! diff --git a/Rakefile b/Rakefile index 747c70d..1220361 100644 --- a/Rakefile +++ b/Rakefile @@ -2,26 +2,10 @@ require 'rake' require 'rdoc/task' require 'rake/clean' require 'rspec/core/rake_task' -require 'jeweler' desc 'Default: run unit tests.' task :default => :test -Jeweler::Tasks.new do |jewel| - jewel.name = 'validate_url' - jewel.summary = 'Library for validating urls in Rails.' - jewel.email = ['tanel.suurhans@perfectline.co', 'tarmo.lehtpuu@perfectline.co', 'vladimir.krylov@perfectline.co'] - jewel.homepage = 'http://github.com/perfectline/validates_url/tree/master' - jewel.description = 'Library for validating urls in Rails.' - jewel.authors = ["Tanel Suurhans", "Tarmo Lehtpuu", "Vladimir Krylov"] - jewel.files = FileList["lib/**/*.rb", "lib/locale/*.yml", "*.rb", "MIT-LICENCE", "README.markdown"] - - jewel.add_dependency 'activemodel', '>= 3.0.0' - jewel.add_dependency 'addressable' - jewel.add_development_dependency 'rspec' - jewel.add_development_dependency 'diff-lcs', '>= 1.1.2' -end - desc 'Generate documentation plugin.' RDoc::Task.new(:rdoc) do |rdoc| rdoc.rdoc_dir = 'rdoc' diff --git a/spec/validate_url_spec.rb b/spec/validate_url_spec.rb index 4aa687b..a3c5fce 100644 --- a/spec/validate_url_spec.rb +++ b/spec/validate_url_spec.rb @@ -178,17 +178,17 @@ it 'allows a valid public suffix' do @user.homepage = 'http://www.example.com' - @user.should be_valid + expect(@user).to be_valid end it 'does not allow a local hostname' do @user.homepage = 'http://localhost' - @user.should_not be_valid + expect(@user).not_to be_valid end it 'does not allow non public hosts suffixes' do @user.homepage = 'http://example.not_a_valid_tld' - @user.should_not be_valid + expect(@user).not_to be_valid end end diff --git a/validate_url.gemspec b/validate_url.gemspec index fe3f10c..bf430d6 100644 --- a/validate_url.gemspec +++ b/validate_url.gemspec @@ -41,8 +41,8 @@ Gem::Specification.new do |s| s.add_development_dependency('activerecord', ['< 7.0']) s.add_development_dependency('concurrent-ruby', ['= 1.3.4']) s.add_development_dependency('diff-lcs', ['>= 1.1.2']) - s.add_development_dependency('jeweler') s.add_development_dependency('rake') + s.add_development_dependency('rdoc') s.add_development_dependency('rspec', ['>= 3.0.0']) s.add_development_dependency('sqlite3', ['= 1.6.9']) end From bd2dc0b278aa602f6507b13b222e57938b7e72fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Stefa=C5=84ski?= Date: Thu, 3 Apr 2025 15:47:54 +0200 Subject: [PATCH 2/5] [INF-4795] bump all gems --- Gemfile.lock | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4790d95..6a92752 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -24,31 +24,33 @@ GEM public_suffix (>= 2.0.2, < 7.0) concurrent-ruby (1.3.4) date (3.4.1) - diff-lcs (1.3) + diff-lcs (1.6.1) i18n (1.14.7) concurrent-ruby (~> 1.0) - minitest (5.25.4) + mini_portile2 (2.8.8) + minitest (5.25.5) psych (5.2.3) date stringio public_suffix (4.0.7) - rake (12.3.0) + rake (13.2.1) rdoc (6.13.1) psych (>= 4.0.0) - rspec (3.8.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.2) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.3) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-support (~> 3.13.0) + rspec-support (3.13.2) sqlite3 (1.6.9) + mini_portile2 (~> 2.8.0) stringio (3.1.6) tzinfo (2.0.6) concurrent-ruby (~> 1.0) From b43d96f90671eb21aeed700022ba68ae8685f864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Stefa=C5=84ski?= Date: Thu, 3 Apr 2025 15:53:34 +0200 Subject: [PATCH 3/5] [INF-4795] bump version --- VERSION.yml | 2 +- validate_url.gemspec | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/VERSION.yml b/VERSION.yml index c9986fd..9511f8a 100644 --- a/VERSION.yml +++ b/VERSION.yml @@ -1,5 +1,5 @@ --- :major: 1 :minor: 0 -:patch: 4 +:patch: 5 :build: diff --git a/validate_url.gemspec b/validate_url.gemspec index bf430d6..a29532e 100644 --- a/validate_url.gemspec +++ b/validate_url.gemspec @@ -1,13 +1,6 @@ -# Generated by jeweler -# DO NOT EDIT THIS FILE DIRECTLY -# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec' -# -*- encoding: utf-8 -*- - -# stub: validate_url 1.0.3 ruby lib - Gem::Specification.new do |s| s.name = 'validate_url' - s.version = '1.0.4' + s.version = '1.0.5' s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version= s.require_paths = ['lib'] From f35dfda7dfdc60e2d6cbf065e2724a7270dda02a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Stefa=C5=84ski?= Date: Thu, 3 Apr 2025 15:58:34 +0200 Subject: [PATCH 4/5] [INF-4795] fix --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f2c9bc7..3a13af1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: cache-version: 1 - name: rubocop - uses: reviewdog/action-rubocop@v2.3.0 + uses: reviewdog/action-rubocop@fcb74ba274da10b18d038d0bcddaae3518739634 with: rubocop_version: ${{ env.RUBOCOP_VERSION }} rubocop_extensions: rubocop-performance rubocop-rake rubocop-i18n From 2dc6273eb95e451324874a4f701a61ce17ff0a8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Stefa=C5=84ski?= Date: Thu, 3 Apr 2025 16:00:24 +0200 Subject: [PATCH 5/5] [INF-4795] fix --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6a92752..595d21d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - validate_url (1.0.4) + validate_url (1.0.5) activemodel (>= 3.0.0, < 7.0) addressable public_suffix (~> 4.0.0)