ransack 2.1.1 → 2.3.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
@@ -381,6 +381,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

@@ -227,13 +227,37 @@ module Ransack
           children_people_name_field} = 'Ernie'/
       end
 
+      it 'use appropriate table alias' do
+        skip "Make this spec pass for Rails <5.2" if ::ActiveRecord::VERSION::STRING < '5.2.0'
+        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
+
       # 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"
+        skip "Make this spec pass for Rails <5.2" if ::ActiveRecord::VERSION::STRING < '5.2.0'
         s = Search.new(
           Recommendation,
           person_name_eq: 'Ernie',
@@ -248,7 +272,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

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require 'faker'
 require 'ransack'
 require 'pry'
 require 'simplecov'
+require 'byebug'
 
 SimpleCov.start
 I18n.enforce_available_locales = false

data/spec/support/schema.rb

@@ -29,6 +29,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
@@ -136,6 +138,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'
@@ -194,6 +199,7 @@ module Schema
         t.string   :title
         t.text     :subject_header
         t.text     :body
+        t.string   :type
         t.boolean  :published, default: true
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Ernie Miller
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-05 00:00:00.000000000 Z
+date: 2019-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -69,6 +69,20 @@ 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
@@ -117,14 +131,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -167,6 +181,20 @@ dependencies:
     - - '='
       - !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:
@@ -186,18 +214,6 @@ 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/join.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
@@ -217,12 +233,15 @@ files:
 - 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
@@ -256,6 +275,28 @@ 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
@@ -300,8 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: ransack
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Object-based searching for Active Record and Mongoid (currently).