ransack 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dc4a8f835fc26d7d315572626021b65eb52c4ed
-  data.tar.gz: 79a2066b2c62fa03718561266d7b9a9219f31b96
+  metadata.gz: 9bf018bef97fde714331b98465544735b3cdd23c
+  data.tar.gz: 3f5e4cae6c7bcf4f09eb6aa3851b521b18150569
 SHA512:
-  metadata.gz: e315ac655c3acd20683166b2444d535abeaeeefb525af68740235fff805483ce230d483fe968ace4432141aa47fbb38d413b906dccaeff9c8e50b39e30347567
-  data.tar.gz: a4de93cc2211f753183182645ce5f8c8810af8b60d3687d3b9bccb07e303c63dd50296a9e61ba8b2cce04efa8fe91c2d1b6303551869a2870fe3abed3e2391b3
+  metadata.gz: e6b753315240e2e974e82e2542d3b0dfbd90c6fdb1718d02e917b6ff348764fefb5d87fbbc14d15f400026d9303c71013dca5e9194432e7716f9b81342c54f54
+  data.tar.gz: e17e95e45672c4feb667f9a1a940cac994b43a8844cd5606f5a53d6e25e8284fb55b5a6ddfa8119d74dacfa8b58bb9a8198ebcc540e4be3e83ab1887e4ccce24

data/.travis.yml

@@ -45,6 +45,13 @@ matrix:
       env: RAILS=master DB=mysql
     - rvm: 2.2
       env: RAILS=master DB=postgres
+  exclude:
+    - rvm: 2.2
+      env: RAILS=3-1-stable DB=sqlite
+    - rvm: 2.2
+      env: RAILS=3-1-stable DB=mysql
+    - rvm: 2.2
+      env: RAILS=3-1-stable DB=postgres
   exclude:
     - rvm: 2.2
       env: RAILS=3-0-stable DB=sqlite
@@ -52,24 +59,16 @@ matrix:
       env: RAILS=3-0-stable DB=mysql
     - rvm: 2.2
       env: RAILS=3-0-stable DB=postgres
-
   allow_failures:
     - env: RAILS=master DB=sqlite3
     - env: RAILS=master DB=mysql
     - env: RAILS=master DB=postgres
-
     - rvm: 2.2
       env: RAILS=3-2-stable DB=sqlite
     - rvm: 2.2
       env: RAILS=3-2-stable DB=mysql
     - rvm: 2.2
       env: RAILS=3-2-stable DB=postgres
-    - rvm: 2.2
-      env: RAILS=3-1-stable DB=sqlite
-    - rvm: 2.2
-      env: RAILS=3-1-stable DB=mysql
-    - rvm: 2.2
-      env: RAILS=3-1-stable DB=postgres
 
 before_script:
   - mysql -e 'create database ransack collate utf8_general_ci;'

data/CHANGELOG.md

@@ -1,10 +1,22 @@
 # Change Log
 
+## Version 1.6.3 - 2015-01-21
+
+*   Fix a regression
+    ([#496](https://github.com/activerecord-hackery/ransack/issues/496)) caused
+    by [ee571fe](https://github.com/activerecord-hackery/ransack/commit/ee571fe)
+    where passing a multi-parameter attribute (like `date_select`) raised
+    `RuntimeError: can't add a new key into hash during iteration`, and add a
+    regression spec for the issue.
+
+    *Nate Berkopec*, *Jon Atack*
+
+
 ## Version 1.6.2 - 2015-01-14
 
 *   Fix a regression
     ([#494](https://github.com/activerecord-hackery/ransack/issues/494))
-    where passing an array of routes of `search_form_for` no longer worked,
+    where passing an array of routes to `search_form_for` no longer worked,
     and add a failing/passing test that would have caught the issue.
 
     *Daniel Rikowski*, *Jon Atack*

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

@@ -3,45 +3,58 @@ module Ransack
     class Condition
 
       def arel_predicate
-        predicates = attributes.map do |attr|
-          attr.attr.send(
-            arel_predicate_for_attribute(attr),
-            formatted_values_for_attribute(attr)
-          )
+        arel_predicate_for(attributes_array)
+      end
+
+      private
+
+        def attributes_array
+          attributes.map do |a|
+            a.attr.send(
+              arel_predicate_for_attribute(a), formatted_values_for_attribute(a)
+            )
+          end
+        end
+
+        def arel_predicate_for(predicates)
+          if predicates.size > 1
+            combinator_for(predicates)
+          else
+            format_predicate(predicates.first)
+          end
         end
 
-        if predicates.size > 1
-          case combinator
-          when Constants::AND
+        def combinator_for(predicates)
+          if combinator === Constants::AND
             Arel::Nodes::Grouping.new(Arel::Nodes::And.new(predicates))
-          when Constants::OR
+          elsif combinator === Constants::OR
             predicates.inject(&:or)
           end
-        else
-          return_predicate(predicates.first)
         end
-      end
-
-      private
 
-        # TODO: Improve this edge case patch for Arel >= 6.0 (Rails >= 4.2)
-        #        that adds several conditionals to handle changing Arel API.
-        #        Related to Ransack issue #472 and pull requests #486-488.
-        #
-        def return_predicate(predicate)
-          if casted_array_with_in_predicate?(predicate)
-            predicate.right[0] = predicate.right[0].val
-            .map { |v| v.is_a?(String) ? Arel::Nodes.build_quoted(v) : v }
+        def format_predicate(predicate)
+          predicate.tap do
+            if casted_array_with_in_predicate?(predicate)
+              predicate.right[0] = predicate.right[0].val.map { |v| format(v) }
+            end
           end
-          predicate
         end
-        #
+
         def casted_array_with_in_predicate?(predicate)
           return unless defined?(Arel::Nodes::Casted)
           predicate.class == Arel::Nodes::In &&
           predicate.right[0].val.is_a?(Array)
         end
 
+        # Necessary for Arel >= 6.0 (Rails >= 4.2)
+        def format(value)
+          if value.is_a?(String)
+            Arel::Nodes.build_quoted(value)
+          else
+            value
+          end
+        end
+
     end
   end
 end

data/lib/ransack/nodes/condition.rb

@@ -123,9 +123,11 @@ module Ransack
       end
 
       def value
-        predicate.wants_array ?
-          values.map { |v| v.cast(default_type) } :
+        if predicate.wants_array
+          values.map { |v| v.cast(default_type) }
+        else
           values.first.cast(default_type)
+        end
       end
 
       def build(params)
@@ -184,8 +186,9 @@ module Ransack
 
       def formatted_values_for_attribute(attr)
         formatted = casted_values_for_attribute(attr).map do |val|
-          val = attr.ransacker.formatter.call(val) if
-            attr.ransacker && attr.ransacker.formatter
+          if attr.ransacker && attr.ransacker.formatter
+            val = attr.ransacker.formatter.call(val)
+          end
           val = predicate.format(val)
           val
         end

data/lib/ransack/search.rb

@@ -153,7 +153,7 @@ module Ransack
     end
 
     def collapse_multiparameter_attributes!(attrs)
-      attrs.each_key do |k|
+      attrs.keys.each do |k|
         if k.include?(Constants::LEFT_PARENTHESIS)
           real_attribute, position = k.split(/\(|\)/)
           cast =

data/lib/ransack/version.rb

@@ -1,3 +1,3 @@
 module Ransack
-  VERSION = "1.6.2"
+  VERSION = "1.6.3"
 end

data/spec/ransack/adapters/active_record/base_spec.rb

@@ -152,6 +152,18 @@ module Ransack
             s = Person.ransack('')
           end
 
+          it "should function correctly with a multi-parameter attribute" do
+            date = Date.current
+            s = Person.ransack(
+              { "created_at_gteq(1i)" => date.year,
+                "created_at_gteq(2i)" => date.month,
+                "created_at_gteq(3i)" => date.day
+              }
+            )
+            expect(s.result.to_sql).to match />=/
+            expect(s.result.to_sql).to match date.to_s
+          end
+
           it "should function correctly when using fields with dots in them" do
             s = Person.ransack(:email_cont => "example.com")
             expect(s.result.exists?).to be true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Ernie Miller
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack