ransack 2.1.0 → 2.4.0

data/spec/ransack/predicate_spec.rb

@@ -126,7 +126,7 @@ module Ransack
         (if ActiveRecord::Base.connection.adapter_name == "PostgreSQL"
           /"people"."name" ILIKE '%\\%\\.\\_\\\\%'/
         elsif ActiveRecord::Base.connection.adapter_name == "Mysql2"
-          /`people`.`name` LIKE '%\\\\%\\\\.\\\\_\\\\\\\\%'/
+          /`people`.`name` LIKE '%\\\\%.\\\\_\\\\\\\\%'/
         else
          /"people"."name" LIKE '%%._\\%'/
         end) do
@@ -145,7 +145,7 @@ module Ransack
         (if ActiveRecord::Base.connection.adapter_name == "PostgreSQL"
           /"people"."name" NOT ILIKE '%\\%\\.\\_\\\\%'/
         elsif ActiveRecord::Base.connection.adapter_name == "Mysql2"
-          /`people`.`name` NOT LIKE '%\\\\%\\\\.\\\\_\\\\\\\\%'/
+          /`people`.`name` NOT LIKE '%\\\\%.\\\\_\\\\\\\\%'/
         else
          /"people"."name" NOT LIKE '%%._\\%'/
         end) do
@@ -159,6 +159,44 @@ module Ransack
       end
     end
 
+    describe 'i_cont' do
+      it_has_behavior 'wildcard escaping', :name_i_cont,
+        (if ActiveRecord::Base.connection.adapter_name == "PostgreSQL"
+          /"people"."name" ILIKE '%\\%\\.\\_\\\\%'/
+        elsif ActiveRecord::Base.connection.adapter_name == "Mysql2"
+          /LOWER\(`people`.`name`\) LIKE '%\\\\%.\\\\_\\\\\\\\%'/
+        else
+         /LOWER\("people"."name"\) LIKE '%%._\\%'/
+        end) do
+        subject { @s }
+      end
+
+      it 'generates a LIKE query with LOWER(column) and value surrounded by %' do
+        @s.name_i_cont = 'Ric'
+        field = "#{quote_table_name("people")}.#{quote_column_name("name")}"
+        expect(@s.result.to_sql).to match /[LOWER\(]?#{field}\)? I?LIKE '%ric%'/
+      end
+    end
+
+    describe 'not_i_cont' do
+      it_has_behavior 'wildcard escaping', :name_not_i_cont,
+        (if ActiveRecord::Base.connection.adapter_name == "PostgreSQL"
+          /"people"."name" NOT ILIKE '%\\%\\.\\_\\\\%'/
+        elsif ActiveRecord::Base.connection.adapter_name == "Mysql2"
+          /LOWER\(`people`.`name`\) NOT LIKE '%\\\\%.\\\\_\\\\\\\\%'/
+        else
+         /LOWER\("people"."name"\) NOT LIKE '%%._\\%'/
+        end) do
+        subject { @s }
+      end
+
+      it 'generates a NOT LIKE query with LOWER(column) and value surrounded by %' do
+        @s.name_not_i_cont = 'Ric'
+        field = "#{quote_table_name("people")}.#{quote_column_name("name")}"
+        expect(@s.result.to_sql).to match /[LOWER\(]?#{field}\)? NOT I?LIKE '%ric%'/
+      end
+    end
+
     describe 'start' do
       it 'generates a LIKE query with value followed by %' do
         @s.name_start = 'Er'
@@ -381,6 +419,20 @@ module Ransack
       end
     end
 
+    context "defining custom predicates" do
+      describe "with 'not_in' arel predicate" do
+        before do
+          Ransack.configure {|c| c.add_predicate "not_in_csv", arel_predicate: "not_in", formatter: proc { |v| v.split(",") } }
+        end
+
+        it 'generates a value IS NOT NULL query' do
+          @s.name_not_in_csv = ["a", "b"]
+          field = "#{quote_table_name("people")}.#{quote_column_name("name")}"
+          expect(@s.result.to_sql).to match /#{field} NOT IN \('a', 'b'\)/
+        end
+      end
+    end
+
     private
 
       def test_boolean_equality_for(boolean_value)

data/spec/ransack/search_spec.rb

@@ -20,6 +20,12 @@ module Ransack
         Search.new(Person, name_eq: 'foobar')
       end
 
+      it 'strip leading & trailing whitespace before building' do
+        expect_any_instance_of(Search).to receive(:build)
+        .with({ 'name_eq' => 'foobar' })
+        Search.new(Person, name_eq: '   foobar     ')
+      end
+
       it 'removes empty suffixed conditions before building' do
         expect_any_instance_of(Search).to receive(:build).with({})
         Search.new(Person, name_eq_any: [''])
@@ -109,6 +115,43 @@ module Ransack
         expect(s.result.to_sql).to include 'published'
       end
 
+      # The failure/oversight in Ransack::Nodes::Condition#arel_predicate or deeper is beyond my understanding of the structures
+      it 'preserves (inverts) default scope and conditions for negative subqueries' do
+        # the positive case (published_articles_title_eq) is
+        # SELECT "people".* FROM "people"
+        # LEFT OUTER JOIN "articles" ON "articles"."person_id" = "people"."id"
+        #   AND "articles"."published" = 't'
+        #   AND ('default_scope' = 'default_scope')
+        # WHERE "articles"."title" = 'Test' ORDER BY "people"."id" DESC
+        #
+        # negative case was
+        # SELECT "people".* FROM "people" WHERE "people"."id" NOT IN (
+        #   SELECT "articles"."person_id" FROM "articles"
+        #   WHERE "articles"."person_id" = "people"."id"
+        #     AND NOT ("articles"."title" != 'Test')
+        # ) ORDER BY "people"."id" DESC
+        #
+        # Should have been like
+        # SELECT "people".* FROM "people" WHERE "people"."id" NOT IN (
+        #   SELECT "articles"."person_id" FROM "articles"
+        #   WHERE "articles"."person_id" = "people"."id"
+        #     AND "articles"."title" = 'Test' AND "articles"."published" = 't' AND ('default_scope' = 'default_scope')
+        # ) ORDER BY "people"."id" DESC
+        #
+        # With tenanting (eg default_scope with column reference), NOT IN should be like
+        # SELECT "people".* FROM "people" WHERE "people"."tenant_id" = 'tenant_id' AND "people"."id" NOT IN (
+        #   SELECT "articles"."person_id" FROM "articles"
+        #   WHERE "articles"."person_id" = "people"."id"
+        #     AND "articles"."tenant_id" = 'tenant_id'
+        #     AND "articles"."title" = 'Test' AND "articles"."published" = 't' AND ('default_scope' = 'default_scope')
+        # ) ORDER BY "people"."id" DESC
+
+        pending("spec should pass, but I do not know how/where to fix lib code")
+        s = Search.new(Person, published_articles_title_not_eq: 'Test')
+        expect(s.result.to_sql).to include 'default_scope'
+        expect(s.result.to_sql).to include 'published'
+      end
+
       it 'discards empty conditions' do
         s = Search.new(Person, children_name_eq: '')
         condition = s.base[:children_name_eq]
@@ -220,6 +263,9 @@ module Ransack
       let(:children_people_name_field) {
         "#{quote_table_name("children_people")}.#{quote_column_name("name")}"
       }
+      let(:notable_type_field) {
+        "#{quote_table_name("notes")}.#{quote_column_name("notable_type")}"
+      }
       it 'evaluates conditions contextually' do
         s = Search.new(Person, children_name_eq: 'Ernie')
         expect(s.result).to be_an ActiveRecord::Relation
@@ -227,13 +273,34 @@ module Ransack
           children_people_name_field} = 'Ernie'/
       end
 
-      # FIXME: Make this spec pass for Rails 4.1 / 4.2 / 5.0 and not just 4.0 by
-      # commenting out lines 221 and 242 to run the test. Addresses issue #374.
-      # https://github.com/activerecord-hackery/ransack/issues/374
-      #
-      it 'evaluates conditions for multiple `belongs_to` associations to the
-      same table contextually' do
-        skip "Make this spec pass for Rails >5.0"
+      it 'use appropriate table alias' do
+        skip "Rails 6 regressed here, but it's fixed in 6-0-stable since https://github.com/rails/rails/commit/f9ba52477ca288e7effa5f6794ae3df3f4e982bc" if ENV["RAILS"] == "v6.0.3"
+
+        s = Search.new(Person, {
+          name_eq: "person_name_query",
+          articles_title_eq: "person_article_title_query",
+          parent_name_eq: "parent_name_query",
+          parent_articles_title_eq: 'parents_article_title_query'
+        }).result
+
+        real_query = remove_quotes_and_backticks(s.to_sql)
+
+        expect(real_query)
+                .to match(%r{LEFT OUTER JOIN articles ON (\('default_scope' = 'default_scope'\) AND )?articles.person_id = people.id})
+        expect(real_query)
+                .to match(%r{LEFT OUTER JOIN articles articles_people ON (\('default_scope' = 'default_scope'\) AND )?articles_people.person_id = parents_people.id})
+
+        expect(real_query)
+          .to include "people.name = 'person_name_query'"
+        expect(real_query)
+          .to include "articles.title = 'person_article_title_query'"
+        expect(real_query)
+          .to include "parents_people.name = 'parent_name_query'"
+        expect(real_query)
+          .to include "articles_people.title = 'parents_article_title_query'"
+      end
+
+      it 'evaluates conditions for multiple `belongs_to` associations to the same table contextually' do
         s = Search.new(
           Recommendation,
           person_name_eq: 'Ernie',
@@ -248,7 +315,7 @@ module Ransack
             ON target_people_recommendations.id = recommendations.target_person_id
           LEFT OUTER JOIN people parents_people
             ON parents_people.id = target_people_recommendations.parent_id
-          WHERE ((people.name = 'Ernie' AND parents_people.name = 'Test'))
+          WHERE (people.name = 'Ernie' AND parents_people.name = 'Test')
         SQL
         .squish
         expect(real_query).to eq expected_query
@@ -265,6 +332,7 @@ module Ransack
         s = Search.new(Note, notable_of_Person_type_name_eq: 'Ernie').result
         expect(s).to be_an ActiveRecord::Relation
         expect(s.to_sql).to match /#{people_name_field} = 'Ernie'/
+        expect(s.to_sql).to match /#{notable_type_field} = 'Person'/
       end
 
       it 'evaluates nested conditions' do
@@ -303,11 +371,8 @@ module Ransack
             { m: 'or', comments_body_cont: 'e', articles_comments_body_cont: 'e' }
           ]
         )
-        if ActiveRecord::VERSION::MAJOR == 3
-          all_or_load, uniq_or_distinct = :all, :uniq
-        else
-          all_or_load, uniq_or_distinct = :load, :distinct
-        end
+
+        all_or_load, uniq_or_distinct = :load, :distinct
         expect(s.result.send(all_or_load).size)
         .to eq(9000)
         expect(s.result(distinct: true).size)

data/spec/spec_helper.rb

@@ -1,9 +1,13 @@
 require 'machinist/active_record'
+require 'polyamorous/polyamorous.rb'
 require 'sham'
 require 'faker'
 require 'ransack'
+require 'action_controller'
+require 'ransack/helpers'
 require 'pry'
 require 'simplecov'
+require 'byebug'
 
 SimpleCov.start
 I18n.enforce_available_locales = false

data/spec/support/schema.rb

@@ -13,7 +13,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
@@ -29,6 +31,8 @@ class Person < ActiveRecord::Base
   belongs_to :parent, class_name: 'Person', foreign_key: :parent_id
   has_many   :children, class_name: 'Person', foreign_key: :parent_id
   has_many   :articles
+  has_many   :story_articles
+
   has_many :published_articles, ->{ where(published: true) },
       class_name: "Article"
   has_many   :comments
@@ -43,7 +47,7 @@ class Person < ActiveRecord::Base
     of_age ? where("age >= ?", 18) : where("age < ?", 18)
   }
 
-  scope :sort_by_reverse_name_asc, lambda { order("REVERSE(name) ASC") }
+  scope :sort_by_reverse_name_asc, lambda { order(Arel.sql("REVERSE(name) ASC")) }
   scope :sort_by_reverse_name_desc, lambda { order("REVERSE(name) DESC") }
 
   alias_attribute :full_name, :name
@@ -136,6 +140,9 @@ class Article < ActiveRecord::Base
   default_scope { where("'default_scope' = 'default_scope'") }
 end
 
+class StoryArticle < Article
+end
+
 class Recommendation < ActiveRecord::Base
   belongs_to :person
   belongs_to :target_person, class_name: 'Person'
@@ -157,6 +164,8 @@ end
 class Comment < ActiveRecord::Base
   belongs_to :article
   belongs_to :person
+
+  default_scope { where(disabled: false) }
 end
 
 class Tag < ActiveRecord::Base
@@ -194,6 +203,7 @@ module Schema
         t.string   :title
         t.text     :subject_header
         t.text     :body
+        t.string   :type
         t.boolean  :published, default: true
       end
 
@@ -201,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.1.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Ernie Miller
@@ -11,50 +11,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-26 00:00:00.000000000 Z
+date: 2020-11-27 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,104 +55,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '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.3.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.3
-- !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'
 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:
@@ -186,16 +74,17 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- lib/polyamorous.rb
-- lib/polyamorous/activerecord_5.0_ruby_2/join_association.rb
-- lib/polyamorous/activerecord_5.0_ruby_2/join_dependency.rb
-- lib/polyamorous/activerecord_5.1_ruby_2/join_association.rb
-- lib/polyamorous/activerecord_5.1_ruby_2/join_dependency.rb
-- lib/polyamorous/activerecord_5.2.0_ruby_2/join_association.rb
-- lib/polyamorous/activerecord_5.2.0_ruby_2/join_dependency.rb
-- lib/polyamorous/activerecord_5.2.1_ruby_2/join_association.rb
-- lib/polyamorous/activerecord_5.2.1_ruby_2/join_dependency.rb
+- 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/join.rb
+- lib/polyamorous/polyamorous.rb
 - lib/polyamorous/swapping_reflection_class.rb
 - lib/polyamorous/tree_node.rb
 - lib/ransack.rb
@@ -214,14 +103,18 @@ files:
 - lib/ransack/helpers.rb
 - lib/ransack/helpers/form_builder.rb
 - lib/ransack/helpers/form_helper.rb
+- lib/ransack/locale/ar.yml
 - lib/ransack/locale/az.yml
 - lib/ransack/locale/bg.yml
+- lib/ransack/locale/ca.yml
 - lib/ransack/locale/cs.yml
 - lib/ransack/locale/da.yml
 - lib/ransack/locale/de.yml
 - lib/ransack/locale/el.yml
 - lib/ransack/locale/en.yml
 - lib/ransack/locale/es.yml
+- lib/ransack/locale/fa.yml
+- lib/ransack/locale/fi.yml
 - lib/ransack/locale/fr.yml
 - lib/ransack/locale/hu.yml
 - lib/ransack/locale/id.yml
@@ -231,6 +124,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
@@ -264,14 +158,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
@@ -292,15 +186,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: ransack
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Object-based searching for Active Record and Mongoid (currently).
@@ -313,14 +206,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