ransack 1.8.6 → 1.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f251a5a3d39a780d575f8f18abd01de4a9096caa
-  data.tar.gz: 8846114332ef60596d2fc18b52cdb5715928e425
+  metadata.gz: a68f79e9c101613e0af4423267942f4d38007d19
+  data.tar.gz: ae51bdebc41d71f0902c29aeafd570e8057ad59b
 SHA512:
-  metadata.gz: 86d509ea419bfe2bb1d43096e670f0736826c996a36f5fac74c650eaeb081a77832f8ff7edba63beaae0ad17ae2d4d8211aa99e5d003d259dff5fcb127187514
-  data.tar.gz: 705778bb578589bd055606eedfbe1ec10fdc01ab26508695fc0386d276f233c0bcdb767220331cf2b6b6b8b352d8b9c60edd9ef1c303e66ea4ea6cdb86725cb5
+  metadata.gz: 39361cd28cb1002386b506a28c4a4065448bb82c23bb3d989c7038ffa33dba628d170f8a2daca58ed3665707de833fe9f8d325884be8a1812dbc07c6e7abce8a
+  data.tar.gz: 1d71cb39bd5524cb9c53313cbd6abf971f248b0c5978b376d3049bfb5ab684e7b6937c7785d0033ba534c52e700559c1c3faa093f368952743e5dd7d41db4f87

data/.travis.yml

@@ -9,6 +9,10 @@ rvm:
   - 2.0
 
 env:
+  - RAILS=5-2-stable DB=sqlite3
+  - RAILS=5-2-stable DB=mysql
+  - RAILS=5-2-stable DB=postgres
+
   - RAILS=5-0-stable DB=sqlite3
   - RAILS=5-0-stable DB=mysql
   - RAILS=5-0-stable DB=postgres
@@ -35,6 +39,13 @@ env:
 
 matrix:
   exclude:
+    - rvm: 2.1.10
+      env: RAILS=5-2-stable DB=sqlite3
+    - rvm: 2.1.10
+      env: RAILS=5-2-stable DB=mysql
+    - rvm: 2.1.10
+      env: RAILS=5-2-stable DB=postgres
+
     - rvm: 2.1.10
       env: RAILS=5-0-stable DB=sqlite3
     - rvm: 2.1.10
@@ -42,6 +53,13 @@ matrix:
     - rvm: 2.1.10
       env: RAILS=5-0-stable DB=postgres
 
+    - rvm: 2.0
+      env: RAILS=5-2-stable DB=sqlite3
+    - rvm: 2.0
+      env: RAILS=5-2-stable DB=mysql
+    - rvm: 2.0
+      env: RAILS=5-2-stable DB=postgres
+
     - rvm: 2.0
       env: RAILS=5-0-stable DB=sqlite3
     - rvm: 2.0

data/Gemfile

@@ -38,6 +38,9 @@ else
   if rails == '3-0-stable'
     gem 'mysql2', '< 0.3'
   end
+  if rails == '5-2-stable'
+    gem 'mysql2', '~> 0.4.4'
+  end
 end
 
 if ENV['DB'] =~ /mongoid4/

data/lib/ransack.rb

@@ -14,7 +14,7 @@ Ransack.configure do |config|
     config.add_predicate name, :arel_predicate => name
   end
   Ransack::Constants::DERIVED_PREDICATES.each do |args|
-    config.add_predicate *args
+    config.add_predicate(*args)
   end
 end
 

data/lib/ransack/adapters/active_record/context.rb

@@ -14,7 +14,9 @@ module Ransack
 
         def initialize(object, options = {})
           super
-          @arel_visitor = @engine.connection.visitor
+          if ::ActiveRecord::VERSION::STRING < Constants::RAILS_5_2
+            @arel_visitor = @engine.connection.visitor
+          end
         end
 
         def relation_for(object)
@@ -25,7 +27,7 @@ module Ransack
           return nil unless attr && attr.valid?
           name         = attr.arel_attribute.name.to_s
           table        = attr.arel_attribute.relation.table_name
-          schema_cache = @engine.connection.schema_cache
+          schema_cache = ::ActiveRecord::Base.connection.schema_cache
           unless schema_cache.send(database_table_exists?, table)
             raise "No table named #{table} exists."
           end
@@ -135,7 +137,7 @@ module Ransack
         end
 
         def alias_tracker
-          @join_dependency.alias_tracker
+          @join_dependency.send(:alias_tracker)
         end
 
         def lock_association(association)
@@ -145,11 +147,11 @@ module Ransack
         if ::ActiveRecord::VERSION::STRING >= Constants::RAILS_4_1
           def remove_association(association)
             return if @lock_associations.include?(association)
-            @join_dependency.join_root.children.delete_if { |stashed|
+            @join_dependency.instance_variable_get(:@join_root).children.delete_if { |stashed|
               stashed.eql?(association)
             }
             @object.joins_values.delete_if { |jd|
-              jd.join_root.children.map(&:object_id) == [association.object_id]
+              jd.instance_variable_get(:@join_root).children.map(&:object_id) == [association.object_id]
             }
           end
         else
@@ -181,7 +183,6 @@ module Ransack
         def build_correlated_subquery(association)
           join_constraints = extract_joins(association)
           join_root = join_constraints.shift
-          join_table = join_root.left
           correlated_key = join_root.right.expr.left
           subquery = Arel::SelectManager.new(association.base_klass)
           subquery.from(join_root.left)
@@ -280,12 +281,17 @@ module Ransack
                 relation.table.from(relation.table), string_joins
             end
 
-          join_dependency = JoinDependency.new(
-            relation.klass, association_joins, join_list
-          )
-
-          join_nodes.each do |join|
-            join_dependency.alias_tracker.aliases[join.left.name.downcase] = 1
+          if ::ActiveRecord::VERSION::STRING < Constants::RAILS_5_2
+            join_dependency = JoinDependency.new(relation.klass, association_joins, join_list)
+            join_nodes.each do |join|
+              join_dependency.send(:alias_tracker).aliases[join.left.name.downcase] = 1
+            end
+          else
+            alias_tracker = ::ActiveRecord::Associations::AliasTracker.create(::ActiveRecord::Base.connection, relation.table.name, join_list)
+            join_dependency = JoinDependency.new(relation.klass, relation.table, association_joins, alias_tracker)
+            join_nodes.each do |join|
+              join_dependency.alias_tracker.aliases[join.left.name.downcase] = 1
+            end
           end
 
           if ::ActiveRecord::VERSION::STRING >= Constants::RAILS_4_1
@@ -308,7 +314,7 @@ module Ransack
         if ::ActiveRecord::VERSION::STRING >= Constants::RAILS_4_1
 
           def find_association(name, parent = @base, klass = nil)
-            @join_dependency.join_root.children.detect do |assoc|
+            @join_dependency.instance_variable_get(:@join_root).children.detect do |assoc|
               assoc.reflection.name == name &&
               (@associations_pot.empty? || @associations_pot[assoc] == parent) &&
               (!klass || assoc.reflection.klass == klass)
@@ -316,21 +322,34 @@ module Ransack
           end
 
           def build_association(name, parent = @base, klass = nil)
-            jd = JoinDependency.new(
-              parent.base_klass,
-              Polyamorous::Join.new(name, @join_type, klass),
-              []
-            )
-            found_association = jd.join_root.children.last
+            if ::ActiveRecord::VERSION::STRING < Constants::RAILS_5_2
+              jd = JoinDependency.new(
+                parent.base_klass,
+                Polyamorous::Join.new(name, @join_type, klass),
+                []
+              )
+              found_association = jd.join_root.children.last
+            else
+              alias_tracker = ::ActiveRecord::Associations::AliasTracker.create(::ActiveRecord::Base.connection, parent.table.name, [])
+              jd = JoinDependency.new(
+                parent.base_klass,
+                parent.base_klass.arel_table,
+                Polyamorous::Join.new(name, @join_type, klass),
+                alias_tracker
+              )
+              found_association = jd.instance_variable_get(:@join_root).children.last
+            end
+
+
             @associations_pot[found_association] = parent
 
             # TODO maybe we dont need to push associations here, we could loop
             # through the @associations_pot instead
-            @join_dependency.join_root.children.push found_association
+            @join_dependency.instance_variable_get(:@join_root).children.push found_association
 
             # Builds the arel nodes properly for this association
             @join_dependency.send(
-              :construct_tables!, jd.join_root, found_association
+              :construct_tables!, jd.instance_variable_get(:@join_root), found_association
               )
 
             # Leverage the stashed association functionality in AR
@@ -340,7 +359,7 @@ module Ransack
           end
 
           def extract_joins(association)
-            parent = @join_dependency.join_root
+            parent = @join_dependency.instance_variable_get(:@join_root)
             reflection = association.reflection
             join_constraints = if ::ActiveRecord::VERSION::STRING < Constants::RAILS_5_1
                                  association.join_constraints(
@@ -385,7 +404,7 @@ module Ransack
           end
 
           def find_association(name, parent = @base, klass = nil)
-            found_association = @join_dependency.join_associations
+            @join_dependency.join_associations
             .detect do |assoc|
               assoc.reflection.name == name &&
               assoc.parent == parent &&

data/lib/ransack/adapters/active_record/ransack/constants.rb

@@ -104,7 +104,7 @@ module Ransack
       case ActiveRecord::Base.connection.adapter_name
       when "Mysql2".freeze, "PostgreSQL".freeze
         # Necessary for PostgreSQL and MySQL
-        unescaped.to_s.gsub(/([\\|\%|_|.])/, '\\\\\\1')
+        unescaped.to_s.gsub(/([\\%_.])/, '\\\\\\1')
       else
         unescaped
       end

data/lib/ransack/adapters/active_record/ransack/context.rb

@@ -30,7 +30,9 @@ module Ransack
       @associations_pot = {}
       @lock_associations = []
 
-      if ::ActiveRecord::VERSION::STRING >= Constants::RAILS_4_1
+      if ::ActiveRecord::VERSION::STRING >= Constants::RAILS_5_2
+        @base = @join_dependency.instance_variable_get(:@join_root)
+      elsif ::ActiveRecord::VERSION::STRING >= Constants::RAILS_4_1
         @base = @join_dependency.join_root
         @engine = @base.base_klass.arel_engine
       else

data/lib/ransack/adapters/active_record/ransack/nodes/condition.rb

@@ -33,8 +33,8 @@ module Ransack
           predicate = attribute.attr.public_send(arel_pred, arel_values)
 
           if in_predicate?(predicate)
-            predicate.right = predicate.right.map do |predicate|
-              casted_array?(predicate) ? format_values_for(predicate) : predicate
+            predicate.right = predicate.right.map do |pr|
+              casted_array?(pr) ? format_values_for(pr) : pr
             end
           end
 

data/lib/ransack/constants.rb

@@ -47,6 +47,7 @@ module Ransack
 
     RAILS_4_1           = '4.1'.freeze
     RAILS_5_1           = '5.1'.freeze
+    RAILS_5_2           = '5.2'.freeze
 
     RANSACK_SLASH_SEARCHES = 'ransack/searches'.freeze
     RANSACK_SLASH_SEARCHES_SLASH_SEARCH = 'ransack/searches/search'.freeze

data/lib/ransack/helpers/form_builder.rb

@@ -6,9 +6,15 @@ module ActionView::Helpers::Tags
   # https://github.com/rails/rails/commit/c1a118a
   class Base
     private
-    def value(object)
-      object.send @method_name if object # use send instead of public_send
-    end
+    if ::ActiveRecord::VERSION::STRING < '5.2'
+      def value(object)
+        object.send @method_name if object # use send instead of public_send
+      end
+    else # rails/rails#29791
+      def value
+        @object.send @method_name if @object
+      end
+    end      
   end
 end
 
@@ -237,7 +243,7 @@ module Ransack
             Translate.association(base, :context => object.context),
             collection_for_base(action, base)
           ]
-        rescue UntraversableAssociationError => e
+        rescue UntraversableAssociationError
           nil
         end
       end

data/lib/ransack/nodes/attribute.rb

@@ -5,7 +5,7 @@ module Ransack
 
       attr_reader :name, :ransacker_args
 
-      delegate :blank?, :present?, :==, :to => :name
+      delegate :blank?, :present?, :to => :name
       delegate :engine, :to => :context
 
       def initialize(context, name = nil, ransacker_args = [])

data/lib/ransack/nodes/grouping.rb

@@ -68,7 +68,6 @@ module Ransack
       def respond_to?(method_id)
         super or begin
           method_name = method_id.to_s
-          writer = method_name.sub!(/\=$/, ''.freeze)
           attribute_method?(method_name) ? true : false
         end
       end

data/lib/ransack/version.rb

@@ -1,3 +1,3 @@
 module Ransack
-  VERSION = '1.8.6'
+  VERSION = '1.8.7'
 end

data/ransack.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'machinist', '~> 1.0.6'
   s.add_development_dependency 'faker', '~> 0.9.5'
   s.add_development_dependency 'sqlite3', '~> 1.3.3'
-  s.add_development_dependency 'pg'
+  s.add_development_dependency 'pg', '~> 0.21'
   s.add_development_dependency 'mysql2', '0.3.20'
   s.add_development_dependency 'pry', '0.10'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 1.8.6
+  version: 1.8.7
 platform: ruby
 authors:
 - Ernie Miller
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -143,16 +143,16 @@ dependencies:
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement