diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e43ace9..eccb5ee 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,25 +11,8 @@ 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] - 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 + 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 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: '../' 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/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 diff --git a/ransacker_translator.gemspec b/ransacker_translator.gemspec index 226db1f..6c513f0 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,13 +24,19 @@ 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 "ransack" - spec.add_dependency "pg" + 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", '~> 1.2' + 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" + spec.add_development_dependency "drb" + spec.add_development_dependency "concurrent-ruby", '1.3.4' end 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