From 552312e571078912cf55a8e26e67ab457f5ab3aa Mon Sep 17 00:00:00 2001 From: shino Date: Wed, 11 Jun 2025 11:21:35 +0900 Subject: [PATCH 01/10] =?UTF-8?q?chore:=20Rails7.1=E3=81=AB=E5=AF=BE?= =?UTF-8?q?=E5=BF=9C=E3=81=95=E3=81=9B=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ransacker_translator.gemspec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ransacker_translator.gemspec b/ransacker_translator.gemspec index 226db1f..74972f6 100644 --- a/ransacker_translator.gemspec +++ b/ransacker_translator.gemspec @@ -24,10 +24,10 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ['lib'] - spec.add_dependency "activerecord", '< 7.1.0', '>= 5.0.0' - spec.add_dependency "activesupport", '< 7.1.0', '>= 5.0.0' - spec.add_dependency "actionview", '< 7.1.0', '>= 5.0.0' - spec.add_dependency "railties", '< 7.1.0', '>= 5.0.0' + spec.add_dependency "activerecord", '< 7.2.0', '>= 5.0.0' + spec.add_dependency "activesupport", '< 7.2.0', '>= 5.0.0' + spec.add_dependency "actionview", '< 7.2.0', '>= 5.0.0' + spec.add_dependency "railties", '< 7.2.0', '>= 5.0.0' spec.add_dependency "ransack" spec.add_dependency "pg" From 8efc80c2ba5b0c7b379595b907722061c680fbee Mon Sep 17 00:00:00 2001 From: shino Date: Wed, 11 Jun 2025 11:26:07 +0900 Subject: [PATCH 02/10] =?UTF-8?q?test:=20ransack4.0.0=E4=BB=A5=E9=99=8D?= =?UTF-8?q?=E3=80=81=E6=A4=9C=E7=B4=A2=E3=81=AB=E4=BD=BF=E7=94=A8=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=82=AB=E3=83=A9=E3=83=A0=E3=81=AF=E6=98=8E=E7=A4=BA?= =?UTF-8?q?=E7=9A=84=E3=81=AB=E6=8C=87=E5=AE=9A=E3=81=99=E3=82=8B=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E3=81=8C=E3=81=82=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/internal/app/models/post.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/internal/app/models/post.rb b/test/internal/app/models/post.rb index 433de4b..52558da 100644 --- a/test/internal/app/models/post.rb +++ b/test/internal/app/models/post.rb @@ -4,4 +4,8 @@ class Post < ActiveRecord::Base ransacker_translate :title, :content validates :title, presence: true -end \ No newline at end of file + + def self.ransackable_attributes(auth_object = nil) + ["title_translate"] + end +end From 4eafdb4dfd79f11bb72d13dac1512588d11cae59 Mon Sep 17 00:00:00 2001 From: shino Date: Wed, 11 Jun 2025 11:27:03 +0900 Subject: [PATCH 03/10] =?UTF-8?q?chore:=20ransack4.1.0=E4=BB=A5=E9=99=8D?= =?UTF-8?q?=E3=80=81Ruby3.0=E3=80=81Rails6.1=E3=81=8C=E5=BF=85=E8=A6=81?= =?UTF-8?q?=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=9F=E3=81=9F=E3=82=81=E3=80=81?= =?UTF-8?q?Ruby2.6~2.7=E3=80=81Rail5.0~6.0=E3=82=92=E3=82=B5=E3=83=9D?= =?UTF-8?q?=E3=83=BC=E3=83=88=E5=AF=BE=E8=B1=A1=E5=A4=96=E3=81=A8=E3=81=97?= =?UTF-8?q?=E3=81=9F=20=E3=83=BBransack4.1.0=E3=81=AB=E6=BA=96=E3=81=98?= =?UTF-8?q?=E3=81=9F=E5=A4=89=E6=9B=B4=E3=82=92=E3=81=97=E3=81=9F=E3=81=9F?= =?UTF-8?q?=E3=82=81=E3=80=814.1.0=E4=BB=A5=E4=B8=8A=E3=82=92=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ransacker_translator.gemspec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ransacker_translator.gemspec b/ransacker_translator.gemspec index 74972f6..eb45b48 100644 --- a/ransacker_translator.gemspec +++ b/ransacker_translator.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |spec| spec.summary = "expand search by ransack" spec.description = "expand search by ransack" spec.license = "MIT" - spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0") + spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0") # s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"] spec.files = Dir["{lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"] @@ -24,11 +24,11 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ['lib'] - spec.add_dependency "activerecord", '< 7.2.0', '>= 5.0.0' - spec.add_dependency "activesupport", '< 7.2.0', '>= 5.0.0' - spec.add_dependency "actionview", '< 7.2.0', '>= 5.0.0' - spec.add_dependency "railties", '< 7.2.0', '>= 5.0.0' - spec.add_dependency "ransack" + spec.add_dependency "activerecord", '< 7.2.0', '>= 6.1.0' + spec.add_dependency "activesupport", '< 7.2.0', '>= 6.1.0' + spec.add_dependency "actionview", '< 7.2.0', '>= 6.1.0' + spec.add_dependency "railties", '< 7.2.0', '>= 6.1.0' + spec.add_dependency "ransack", '>= 4.1.0' spec.add_dependency "pg" spec.add_development_dependency 'pry', '~> 0.14' From c8aebafbe0b2858294055c86461d061925e5da5f Mon Sep 17 00:00:00 2001 From: shino Date: Wed, 11 Jun 2025 11:30:57 +0900 Subject: [PATCH 04/10] =?UTF-8?q?chore:=20Ruby3.4=E4=BB=A5=E9=99=8Dbundled?= =?UTF-8?q?=20gem=E3=81=A7=E3=81=AF=E3=81=AA=E3=81=8F=E3=81=AA=E3=81=A3?= =?UTF-8?q?=E3=81=9Fgem=E3=82=92=E6=98=8E=E7=A4=BA=E7=9A=84=E3=81=AB?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ransacker_translator.gemspec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ransacker_translator.gemspec b/ransacker_translator.gemspec index eb45b48..0ff5ee3 100644 --- a/ransacker_translator.gemspec +++ b/ransacker_translator.gemspec @@ -30,7 +30,12 @@ Gem::Specification.new do |spec| spec.add_dependency "railties", '< 7.2.0', '>= 6.1.0' spec.add_dependency "ransack", '>= 4.1.0' spec.add_dependency "pg" + spec.add_dependency "nkf" spec.add_development_dependency 'pry', '~> 0.14' spec.add_development_dependency 'database_cleaner', '~> 1.7' + spec.add_development_dependency "mutex_m" + spec.add_development_dependency "bigdecimal" + spec.add_development_dependency "base64" + spec.add_development_dependency "drb" end From 7242435dda1468edc75faa426d16591f2b48ccb8 Mon Sep 17 00:00:00 2001 From: shino Date: Wed, 11 Jun 2025 11:31:56 +0900 Subject: [PATCH 05/10] =?UTF-8?q?chore:=20concurrent-ruby1.3.5=E3=81=A7?= =?UTF-8?q?=E3=81=AFLogger=E9=96=A2=E9=80=A3=E3=81=AE=E5=87=A6=E7=90=86?= =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4=E3=81=8C=E5=85=A5=E3=81=A3=E3=81=9F?= =?UTF-8?q?=E3=81=93=E3=81=A8=E3=81=A7=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=AB?= =?UTF-8?q?=E3=81=AA=E3=81=A3=E3=81=9F=E3=81=AE=E3=81=A7=E3=80=811.3.4?= =?UTF-8?q?=E3=81=AB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ransacker_translator.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/ransacker_translator.gemspec b/ransacker_translator.gemspec index 0ff5ee3..7b27c5c 100644 --- a/ransacker_translator.gemspec +++ b/ransacker_translator.gemspec @@ -38,4 +38,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bigdecimal" spec.add_development_dependency "base64" spec.add_development_dependency "drb" + spec.add_development_dependency "concurrent-ruby", '1.3.4' end From 3831d3b712ff43069f63c1351db4f2b361dff10a Mon Sep 17 00:00:00 2001 From: shino Date: Wed, 11 Jun 2025 11:32:32 +0900 Subject: [PATCH 06/10] =?UTF-8?q?chore:=20database-cleaner=20gem=E3=81=AF2?= =?UTF-8?q?.1=E4=BB=A5=E4=B8=8A=E3=81=A7Rails7.1=E3=82=B5=E3=83=9D?= =?UTF-8?q?=E3=83=BC=E3=83=88=E3=81=8C=E8=BF=BD=E5=8A=A0=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=82=8B=E3=81=AE=E3=81=A7=E3=80=81=E5=88=A9=E7=94=A8=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92?= =?UTF-8?q?2.1=E3=81=AB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ransacker_translator.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ransacker_translator.gemspec b/ransacker_translator.gemspec index 7b27c5c..97d2346 100644 --- a/ransacker_translator.gemspec +++ b/ransacker_translator.gemspec @@ -33,7 +33,7 @@ Gem::Specification.new do |spec| spec.add_dependency "nkf" spec.add_development_dependency 'pry', '~> 0.14' - spec.add_development_dependency 'database_cleaner', '~> 1.7' + spec.add_development_dependency 'database_cleaner', '~> 2.1' spec.add_development_dependency "mutex_m" spec.add_development_dependency "bigdecimal" spec.add_development_dependency "base64" From 9c26e5df5675bc5b502a8559ea93e2c4fe74876a Mon Sep 17 00:00:00 2001 From: shino Date: Wed, 11 Jun 2025 11:38:07 +0900 Subject: [PATCH 07/10] =?UTF-8?q?ci:chore:=20Ruby2.6~2.7=E3=80=81Rails5.0~?= =?UTF-8?q?6.0=E3=82=92=E3=82=B5=E3=83=9D=E3=83=BC=E3=83=88=E5=AF=BE?= =?UTF-8?q?=E8=B1=A1=E5=A4=96=E3=81=A8=E3=81=97=E3=81=9F=E3=81=9F=E3=82=81?= =?UTF-8?q?=E3=80=81=E5=AF=BE=E8=B1=A1=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?= =?UTF-8?q?=E3=83=B3gemfile=E3=81=A8=E3=83=86=E3=82=B9=E3=83=88=E3=83=91?= =?UTF-8?q?=E3=82=BF=E3=83=BC=E3=83=B3=E3=81=8B=E3=82=89=E5=89=8A=E9=99=A4?= =?UTF-8?q?=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test.yml | 18 ++---------------- gemfiles/rails_5.0.gemfile | 9 --------- gemfiles/rails_5.1.gemfile | 9 --------- gemfiles/rails_5.2.gemfile | 9 --------- gemfiles/rails_6.0.gemfile | 9 --------- 5 files changed, 2 insertions(+), 52 deletions(-) delete mode 100644 gemfiles/rails_5.0.gemfile delete mode 100644 gemfiles/rails_5.1.gemfile delete mode 100644 gemfiles/rails_5.2.gemfile delete mode 100644 gemfiles/rails_6.0.gemfile diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e43ace9..90fb697 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,23 +11,9 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby: ['2.6', '2.7', '3.0', '3.1'] - gemfile: [rails_5.0, rails_5.1, rails_5.2, rails_6.0, rails_6.1, rails_7.0] + ruby: ['3.0', '3.1'] + gemfile: [rails_6.1, rails_7.0] exclude: - - ruby: '2.6' - gemfile: rails_7.0 - - ruby: '3.0' - gemfile: rails_5.0 - - ruby: '3.0' - gemfile: rails_5.1 - - ruby: '3.0' - gemfile: rails_5.2 - - ruby: '3.1' - gemfile: rails_5.0 - - ruby: '3.1' - gemfile: rails_5.1 - - ruby: '3.1' - gemfile: rails_5.2 - ruby: '3.1' gemfile: rails_7.0 env: diff --git a/gemfiles/rails_5.0.gemfile b/gemfiles/rails_5.0.gemfile deleted file mode 100644 index 3826767..0000000 --- a/gemfiles/rails_5.0.gemfile +++ /dev/null @@ -1,9 +0,0 @@ -source 'https://rubygems.org' - -gem 'activerecord', '~> 5.0.0' -gem 'activesupport', '~> 5.0.0' -gem 'actionview', '~> 5.0.0' -gem 'railties', '~> 5.0.0' -gem 'pg', '~> 0.21' - -gemspec path: '../' diff --git a/gemfiles/rails_5.1.gemfile b/gemfiles/rails_5.1.gemfile deleted file mode 100644 index 41adbc6..0000000 --- a/gemfiles/rails_5.1.gemfile +++ /dev/null @@ -1,9 +0,0 @@ -source 'https://rubygems.org' - -gem 'activerecord', '~> 5.1.0' -gem 'activesupport', '~> 5.1.0' -gem 'actionview', '~> 5.1.0' -gem 'railties', '~> 5.1.0' -gem 'pg', '~> 0.21' - -gemspec path: '../' diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile deleted file mode 100644 index 27eced2..0000000 --- a/gemfiles/rails_5.2.gemfile +++ /dev/null @@ -1,9 +0,0 @@ -source 'https://rubygems.org' - -gem 'activerecord', '~> 5.2.0' -gem 'activesupport', '~> 5.2.0' -gem 'actionview', '~> 5.2.0' -gem 'railties', '~> 5.2.0' -gem 'pg', '~> 1.2' - -gemspec path: '../' diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile deleted file mode 100644 index 5ab3658..0000000 --- a/gemfiles/rails_6.0.gemfile +++ /dev/null @@ -1,9 +0,0 @@ -source 'https://rubygems.org' - -gem 'activerecord', '~> 6.0.0' -gem 'activesupport', '~> 6.0.0' -gem 'actionview', '~> 6.0.0' -gem 'railties', '~> 6.0.0' -gem 'pg', '~> 1.2' - -gemspec path: '../' From 6b16bb2d56b4d46c4c097cabcb96ad619636b931 Mon Sep 17 00:00:00 2001 From: shino Date: Wed, 11 Jun 2025 11:38:35 +0900 Subject: [PATCH 08/10] =?UTF-8?q?chore:=20=E3=83=90=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=83=A7=E3=83=B3gemfile=E3=81=A7=E4=B8=8D=E8=A6=81=E3=81=AA?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E3=82=92=E5=89=8A=E9=99=A4=E3=81=97=E3=80=81?= =?UTF-8?q?Rails7.1gemfile=E3=82=92=E4=BD=9C=E6=88=90=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gemfiles/rails_6.1.gemfile | 1 - gemfiles/rails_7.0.gemfile | 2 -- gemfiles/rails_7.1.gemfile | 8 ++++++++ ransacker_translator.gemspec | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 gemfiles/rails_7.1.gemfile diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index 7805e77..73ee9b0 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -4,6 +4,5 @@ gem 'activerecord', '~> 6.1.0' gem 'activesupport', '~> 6.1.0' gem 'actionview', '~> 6.1.0' gem 'railties', '~> 6.1.0' -gem 'pg', '~> 1.2' gemspec path: '../' \ No newline at end of file diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile index 96a0e8b..5419b80 100644 --- a/gemfiles/rails_7.0.gemfile +++ b/gemfiles/rails_7.0.gemfile @@ -4,7 +4,5 @@ gem 'activerecord', '~> 7.0.0' gem 'activesupport', '~> 7.0.0' gem 'actionview', '~> 7.0.0' gem 'railties', '~> 7.0.0' -gem 'pg', '~> 1.2' -gem 'ransack', github: 'activerecord-hackery/ransack' gemspec path: '../' \ No newline at end of file diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile new file mode 100644 index 0000000..e213fe8 --- /dev/null +++ b/gemfiles/rails_7.1.gemfile @@ -0,0 +1,8 @@ +source 'https://rubygems.org' + +gem 'activerecord', '~> 7.1.0' +gem 'activesupport', '~> 7.1.0' +gem 'actionview', '~> 7.1.0' +gem 'railties', '~> 7.1.0' + +gemspec path: '../' \ No newline at end of file diff --git a/ransacker_translator.gemspec b/ransacker_translator.gemspec index 97d2346..6c513f0 100644 --- a/ransacker_translator.gemspec +++ b/ransacker_translator.gemspec @@ -29,7 +29,7 @@ Gem::Specification.new do |spec| spec.add_dependency "actionview", '< 7.2.0', '>= 6.1.0' spec.add_dependency "railties", '< 7.2.0', '>= 6.1.0' spec.add_dependency "ransack", '>= 4.1.0' - spec.add_dependency "pg" + spec.add_dependency "pg", '~> 1.2' spec.add_dependency "nkf" spec.add_development_dependency 'pry', '~> 0.14' From f63086fd23c721ced1dec5053478e349602a7959 Mon Sep 17 00:00:00 2001 From: shino Date: Wed, 11 Jun 2025 11:41:14 +0900 Subject: [PATCH 09/10] =?UTF-8?q?ci:=20Ruby3.4=E3=80=81Rails7.1=E3=81=BE?= =?UTF-8?q?=E3=81=A7=E3=81=AE=E3=83=86=E3=82=B9=E3=83=88=E3=83=91=E3=82=BF?= =?UTF-8?q?=E3=83=BC=E3=83=B3=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=9F?= =?UTF-8?q?=20=E3=83=BBRuby3.1,Rails7.0=E3=83=91=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=B3=E3=81=AE=E9=99=A4=E5=A4=96=E3=82=92=E5=89=8A=E9=99=A4?= =?UTF-8?q?=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 90fb697..eccb5ee 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,11 +11,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby: ['3.0', '3.1'] - gemfile: [rails_6.1, rails_7.0] - exclude: - - ruby: '3.1' - gemfile: rails_7.0 + ruby: ['3.0', '3.1', '3.2', '3.3', '3.4'] + gemfile: [rails_6.1, rails_7.0, rails_7.1] env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile From 56684736fc375675eeae77f862a307ee995c9b42 Mon Sep 17 00:00:00 2001 From: shino Date: Wed, 11 Jun 2025 11:42:05 +0900 Subject: [PATCH 10/10] =?UTF-8?q?chore:=20=E3=83=90=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=82=920.1.5=E3=81=AB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/ransacker_translator/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ransacker_translator/version.rb b/lib/ransacker_translator/version.rb index 146fa7d..e699f50 100644 --- a/lib/ransacker_translator/version.rb +++ b/lib/ransacker_translator/version.rb @@ -1,3 +1,3 @@ module RansackerTranslator - VERSION = "0.1.4" + VERSION = "0.1.5" end