ransack 2.3.0 → 2.4.2

data/spec/spec_helper.rb

@@ -1,7 +1,10 @@
 require 'machinist/active_record'
+require 'polyamorous/polyamorous'
 require 'sham'
 require 'faker'
 require 'ransack'
+require 'action_controller'
+require 'ransack/helpers'
 require 'pry'
 require 'simplecov'
 require 'byebug'
@@ -14,16 +17,17 @@ I18n.load_path += Dir[File.join(File.dirname(__FILE__), 'support', '*.yml')]
 Dir[File.expand_path('../{helpers,support,blueprints}/*.rb', __FILE__)]
 .each { |f| require f }
 
+Faker::Config.random = Random.new(0)
 Sham.define do
   name        { Faker::Name.name }
   title       { Faker::Lorem.sentence }
   body        { Faker::Lorem.paragraph }
   salary      { |index| 30000 + (index * 1000) }
-  tag_name    { Faker::Lorem.words(3).join(' ') }
-  note        { Faker::Lorem.words(7).join(' ') }
-  only_admin  { Faker::Lorem.words(3).join(' ') }
-  only_search { Faker::Lorem.words(3).join(' ') }
-  only_sort   { Faker::Lorem.words(3).join(' ') }
+  tag_name    { Faker::Lorem.words(number: 3).join(' ') }
+  note        { Faker::Lorem.words(number: 7).join(' ') }
+  only_admin  { Faker::Lorem.words(number: 3).join(' ') }
+  only_search { Faker::Lorem.words(number: 3).join(' ') }
+  only_sort   { Faker::Lorem.words(number: 3).join(' ') }
   notable_id  { |id| id }
 end
 

data/spec/support/schema.rb

@@ -6,6 +6,8 @@ when 'mysql', 'mysql2'
   ActiveRecord::Base.establish_connection(
     adapter:  'mysql2',
     database: 'ransack',
+    username: ENV.fetch("MYSQL_USERNAME") { "root" },
+    password: ENV.fetch("MYSQL_PASSWORD") { "" },
     encoding: 'utf8'
   )
 when 'pg', 'postgres', 'postgresql'
@@ -13,7 +15,9 @@ when 'pg', 'postgres', 'postgresql'
   ActiveRecord::Base.establish_connection(
     adapter: 'postgresql',
     database: 'ransack',
-  # username: 'postgres', # Uncomment the username option if you have set one
+    username: ENV.fetch("DATABASE_USERNAME") { "postgres" },
+    password: ENV.fetch("DATABASE_PASSWORD") { "" },
+    host: ENV.fetch("DATABASE_HOST") { "localhost" },
     min_messages: 'warning'
   )
 else
@@ -83,7 +87,6 @@ class Person < ActiveRecord::Base
       )
   end
 
-
   ransacker :sql_literal_id do
     Arel.sql('people.id')
   end
@@ -106,7 +109,6 @@ class Person < ActiveRecord::Base
     Arel.sql(query)
   end
 
-
   def self.ransackable_attributes(auth_object = nil)
     if auth_object == :admin
       super - ['only_sort']
@@ -162,6 +164,8 @@ end
 class Comment < ActiveRecord::Base
   belongs_to :article
   belongs_to :person
+
+  default_scope { where(disabled: false) }
 end
 
 class Tag < ActiveRecord::Base
@@ -207,6 +211,7 @@ module Schema
         t.integer  :article_id
         t.integer  :person_id
         t.text     :body
+        t.boolean  :disabled, default: false
       end
 
       create_table :tags, force: true do |t|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.2
 platform: ruby
 authors:
 - Ernie Miller
@@ -11,50 +11,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-18 00:00:00.000000000 Z
+date: 2021-01-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.2.4
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.2.4
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -69,132 +55,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: polyamorous
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: machinist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.6
-- !ruby/object:Gem::Dependency
-  name: faker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.5
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.4.1
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.21'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.21'
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.3.20
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.3.20
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '0.10'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Ransack is the successor to the MetaSearch gem. It improves and expands
   upon MetaSearch's functionality, but does not have a 100%-compatible API.
 email:
@@ -206,14 +66,39 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
+- ".github/SECURITY.md"
+- ".github/workflows/cronjob.yml"
+- ".github/workflows/rubocop.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".travis.yml"
+- ".rubocop.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- bug_report_templates/test-ransack-scope-and-column-same-name.rb
+- bug_report_templates/test-ransacker-arel-present-predicate.rb
+- docs/img/create_release.png
+- docs/release_process.md
+- lib/polyamorous/activerecord_5.2_ruby_2/join_association.rb
+- lib/polyamorous/activerecord_5.2_ruby_2/join_dependency.rb
+- lib/polyamorous/activerecord_5.2_ruby_2/reflection.rb
+- lib/polyamorous/activerecord_6.0_ruby_2/join_association.rb
+- lib/polyamorous/activerecord_6.0_ruby_2/join_dependency.rb
+- lib/polyamorous/activerecord_6.0_ruby_2/reflection.rb
+- lib/polyamorous/activerecord_6.1_ruby_2/join_association.rb
+- lib/polyamorous/activerecord_6.1_ruby_2/join_dependency.rb
+- lib/polyamorous/activerecord_6.1_ruby_2/reflection.rb
+- lib/polyamorous/activerecord_6.2_ruby_2/join_association.rb
+- lib/polyamorous/activerecord_6.2_ruby_2/join_dependency.rb
+- lib/polyamorous/activerecord_6.2_ruby_2/reflection.rb
+- lib/polyamorous/join.rb
+- lib/polyamorous/polyamorous.rb
+- lib/polyamorous/swapping_reflection_class.rb
+- lib/polyamorous/tree_node.rb
 - lib/ransack.rb
 - lib/ransack/adapters.rb
 - lib/ransack/adapters/active_record.rb
@@ -251,6 +136,7 @@ files:
 - lib/ransack/locale/pt-BR.yml
 - lib/ransack/locale/ro.yml
 - lib/ransack/locale/ru.yml
+- lib/ransack/locale/sk.yml
 - lib/ransack/locale/tr.yml
 - lib/ransack/locale/zh-CN.yml
 - lib/ransack/locale/zh-TW.yml
@@ -275,28 +161,6 @@ files:
 - logo/ransack-v.svg
 - logo/ransack.png
 - logo/ransack.svg
-- polyamorous/lib/polyamorous.rb
-- polyamorous/lib/polyamorous/activerecord_5.0_ruby_2/join_association.rb
-- polyamorous/lib/polyamorous/activerecord_5.0_ruby_2/join_dependency.rb
-- polyamorous/lib/polyamorous/activerecord_5.1_ruby_2/join_association.rb
-- polyamorous/lib/polyamorous/activerecord_5.1_ruby_2/join_dependency.rb
-- polyamorous/lib/polyamorous/activerecord_5.2.0_ruby_2/join_association.rb
-- polyamorous/lib/polyamorous/activerecord_5.2.0_ruby_2/join_dependency.rb
-- polyamorous/lib/polyamorous/activerecord_5.2.0_ruby_2/reflection.rb
-- polyamorous/lib/polyamorous/activerecord_5.2.1_ruby_2/join_association.rb
-- polyamorous/lib/polyamorous/activerecord_5.2.1_ruby_2/join_dependency.rb
-- polyamorous/lib/polyamorous/activerecord_5.2.1_ruby_2/reflection.rb
-- polyamorous/lib/polyamorous/activerecord_6.0_ruby_2/join_association.rb
-- polyamorous/lib/polyamorous/activerecord_6.0_ruby_2/join_dependency.rb
-- polyamorous/lib/polyamorous/activerecord_6.0_ruby_2/reflection.rb
-- polyamorous/lib/polyamorous/activerecord_6.1_ruby_2/join_association.rb
-- polyamorous/lib/polyamorous/activerecord_6.1_ruby_2/join_dependency.rb
-- polyamorous/lib/polyamorous/activerecord_6.1_ruby_2/reflection.rb
-- polyamorous/lib/polyamorous/join.rb
-- polyamorous/lib/polyamorous/swapping_reflection_class.rb
-- polyamorous/lib/polyamorous/tree_node.rb
-- polyamorous/lib/polyamorous/version.rb
-- polyamorous/polyamorous.gemspec
 - ransack.gemspec
 - spec/blueprints/articles.rb
 - spec/blueprints/comments.rb
@@ -306,14 +170,14 @@ files:
 - spec/console.rb
 - spec/helpers/polyamorous_helper.rb
 - spec/helpers/ransack_helper.rb
+- spec/polyamorous/join_association_spec.rb
+- spec/polyamorous/join_dependency_spec.rb
+- spec/polyamorous/join_spec.rb
 - spec/ransack/adapters/active_record/base_spec.rb
 - spec/ransack/adapters/active_record/context_spec.rb
 - spec/ransack/configuration_spec.rb
 - spec/ransack/helpers/form_builder_spec.rb
 - spec/ransack/helpers/form_helper_spec.rb
-- spec/ransack/join_association_spec.rb
-- spec/ransack/join_dependency_spec.rb
-- spec/ransack/join_spec.rb
 - spec/ransack/nodes/condition_spec.rb
 - spec/ransack/nodes/grouping_spec.rb
 - spec/ransack/predicate_spec.rb
@@ -334,14 +198,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Object-based searching for Active Record and Mongoid (currently).
@@ -354,14 +218,14 @@ test_files:
 - spec/console.rb
 - spec/helpers/polyamorous_helper.rb
 - spec/helpers/ransack_helper.rb
+- spec/polyamorous/join_association_spec.rb
+- spec/polyamorous/join_dependency_spec.rb
+- spec/polyamorous/join_spec.rb
 - spec/ransack/adapters/active_record/base_spec.rb
 - spec/ransack/adapters/active_record/context_spec.rb
 - spec/ransack/configuration_spec.rb
 - spec/ransack/helpers/form_builder_spec.rb
 - spec/ransack/helpers/form_helper_spec.rb
-- spec/ransack/join_association_spec.rb
-- spec/ransack/join_dependency_spec.rb
-- spec/ransack/join_spec.rb
 - spec/ransack/nodes/condition_spec.rb
 - spec/ransack/nodes/grouping_spec.rb
 - spec/ransack/predicate_spec.rb

data/.travis.yml

@@ -1,49 +0,0 @@
-language: ruby
-
-sudo: false
-
-rvm:
-  - 2.6.0
-
-services:
-  - mysql
-
-env:
-  - RAILS=6-0-stable DB=sqlite3
-  - RAILS=6-0-stable DB=mysql
-  - RAILS=6-0-stable DB=postgres
-
-  - RAILS=v6.0.0 DB=sqlite3
-  - RAILS=v6.0.0 DB=mysql
-  - RAILS=v6.0.0 DB=postgres
-
-  - RAILS=5-2-stable DB=sqlite3
-  - RAILS=5-2-stable DB=mysql
-  - RAILS=5-2-stable DB=postgres
-
-  - RAILS=v5.2.1 DB=sqlite3
-  - RAILS=v5.2.1 DB=mysql
-  - RAILS=v5.2.1 DB=postgres
-
-  - RAILS=v5.2.0 DB=sqlite3
-  - RAILS=v5.2.0 DB=mysql
-  - RAILS=v5.2.0 DB=postgres
-
-  - RAILS=5-1-stable DB=sqlite3
-  - RAILS=5-1-stable DB=mysql
-  - RAILS=5-1-stable DB=postgres
-
-matrix:
-  allow_failures:
-    - env: RAILS=5-2-stable DB=sqlite3
-    - env: RAILS=5-2-stable DB=mysql
-    - env: RAILS=5-2-stable DB=postgres
-before_script:
-  - mysql -e 'create database ransack collate utf8_general_ci;'
-  - mysql -e 'use ransack;show variables like "%character%";show variables like "%collation%";'
-  - psql -c 'create database ransack;' -U postgres
-
-addons:
-  code_climate:
-    repo_token: 8b701c4364d51a0217105e08c06922d600cec3d9e60d546a89e3ddfe46e0664e
-  postgresql: "9.6"