Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 2 additions & 19 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
9 changes: 0 additions & 9 deletions gemfiles/rails_5.0.gemfile

This file was deleted.

9 changes: 0 additions & 9 deletions gemfiles/rails_5.1.gemfile

This file was deleted.

9 changes: 0 additions & 9 deletions gemfiles/rails_5.2.gemfile

This file was deleted.

9 changes: 0 additions & 9 deletions gemfiles/rails_6.0.gemfile

This file was deleted.

1 change: 0 additions & 1 deletion gemfiles/rails_6.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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: '../'
2 changes: 0 additions & 2 deletions gemfiles/rails_7.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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: '../'
8 changes: 8 additions & 0 deletions gemfiles/rails_7.1.gemfile
Original file line number Diff line number Diff line change
@@ -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: '../'
2 changes: 1 addition & 1 deletion lib/ransacker_translator/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module RansackerTranslator
VERSION = "0.1.4"
VERSION = "0.1.5"
end
22 changes: 14 additions & 8 deletions ransacker_translator.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand All @@ -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
6 changes: 5 additions & 1 deletion test/internal/app/models/post.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,8 @@ class Post < ActiveRecord::Base
ransacker_translate :title, :content

validates :title, presence: true
end

def self.ransackable_attributes(auth_object = nil)
["title_translate"]
end
end