ransack 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ed8cd2219b1b16fb129d708c135405bcc3cd1e1
-  data.tar.gz: 08ee652b2fcbbf30f40ee7d7370d9d3fb4a97207
+  metadata.gz: 8dc4a8f835fc26d7d315572626021b65eb52c4ed
+  data.tar.gz: 79a2066b2c62fa03718561266d7b9a9219f31b96
 SHA512:
-  metadata.gz: 3e1fb6f045a7f24db09af20e541d502f70793adea5f1ae5518f5ebdac9f22e8d60c884693a2858c35bf08b577ef32f6fafd412d046c2450d7b5b23935088bdd5
-  data.tar.gz: c4886f5a0a91bd50df8336eb7cbe971ffdeae7cd36b4a3441d509676267f7236c1c3d10602c8fb7cd780ff0873216566240b27001012a77beecaca1cd21c0d27
+  metadata.gz: e315ac655c3acd20683166b2444d535abeaeeefb525af68740235fff805483ce230d483fe968ace4432141aa47fbb38d413b906dccaeff9c8e50b39e30347567
+  data.tar.gz: a4de93cc2211f753183182645ce5f8c8810af8b60d3687d3b9bccb07e303c63dd50296a9e61ba8b2cce04efa8fe91c2d1b6303551869a2870fe3abed3e2391b3

data/CHANGELOG.md

@@ -1,8 +1,18 @@
 # Change Log
 
+## 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,
+    and add a failing/passing test that would have caught the issue.
+
+    *Daniel Rikowski*, *Jon Atack*
+
+
 ## Version 1.6.1 - 2015-01-14
 
-*   Fix a regression with using `in` predicates caused by PR [#488](https://github.com/activerecord-hackery/ransack/pull/488)). Add a test.
+*   Fix a regression with using `in` predicates caused by PR [#488](https://github.com/activerecord-hackery/ransack/pull/488)) and add a test.
 
 *   README improvements to clarify `sort_link` syntax with associations and
     Ransack#search vs #ransack.

data/README.md

@@ -27,7 +27,8 @@ instead.
 If you're viewing this at
 [github.com/activerecord-hackery/ransack](https://github.com/activerecord-hackery/ransack),
 you're reading the documentation for the master branch with the latest features.
-[View documentation for the last release (1.6.0).](https://github.com/activerecord-hackery/ransack/tree/v1.6.1)
+[View documentation for the last release (1.6.2).]
+(https://github.com/activerecord-hackery/ransack/tree/v1.6.2)
 
 ## Getting started
 

data/lib/ransack/helpers/form_helper.rb

@@ -12,15 +12,15 @@ module Ransack
           options[:url] ||= polymorphic_path(
             search.klass, format: options.delete(:format)
             )
-        elsif record.is_a? Array &&
-            (search = record.detect { |o| o.is_a? Ransack::Search })
+        elsif record.is_a?(Array) &&
+        (search = record.detect { |o| o.is_a?(Ransack::Search) })
           options[:url] ||= polymorphic_path(
-            record.map { |o| o.is_a? Ransack::Search ? o.klass : o },
+            record.map { |o| o.is_a?(Ransack::Search) ? o.klass : o },
             format: options.delete(:format)
             )
         else
           raise ArgumentError,
-            'No Ransack::Search object was provided to search_form_for!'
+          'No Ransack::Search object was provided to search_form_for!'
         end
         options[:html] ||= {}
         html_options = {

data/lib/ransack/version.rb

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

data/spec/ransack/helpers/form_helper_spec.rb

@@ -6,8 +6,10 @@ module Ransack
 
       router = ActionDispatch::Routing::RouteSet.new
       router.draw do
-        resources :people
-        resources :notes
+        resources :people, :notes
+        namespace :admin do
+          resources :comments
+        end
         get ':controller(/:action(/:id(.:format)))'
       end
 
@@ -372,6 +374,13 @@ module Ransack
         it { should match /action="\/people.json"/ }
       end
 
+      describe '#search_form_for with an array of routes' do
+        subject {
+          @controller.view_context.search_form_for([:admin, Comment.search]) {}
+        }
+        it { should match /action="\/admin\/comments"/ }
+      end
+
       describe '#search_form_for with custom default search key' do
         before do
           Ransack.configure { |c| c.search_key = :example }

data/spec/support/schema.rb

@@ -39,17 +39,21 @@ class Person < ActiveRecord::Base
   scope :restricted,  lambda { where("restricted = 1") }
   scope :active,      lambda { where("active = 1") }
   scope :over_age,    lambda { |y| where(["age > ?", y]) }
-  scope :of_age,      lambda { |of_age| of_age ? where("age >= ?", 18) : where("age < ?", 18) }
+  scope :of_age,      lambda { |of_age|
+    of_age ? where("age >= ?", 18) : where("age < ?", 18)
+  }
 
   ransacker :reversed_name, :formatter => proc { |v| v.reverse } do |parent|
     parent.table[:name]
   end
 
-  ransacker :array_users, formatter: proc { |v| Person.first(2).map(&:id) } do |parent|
+  ransacker :array_users,
+    formatter: proc { |v| Person.first(2).map(&:id) } do |parent|
     parent.table[:id]
   end
 
-  ransacker :array_names, formatter: proc { |v| Person.first(2).map {|p| p.id.to_s } } do |parent|
+  ransacker :array_names,
+    formatter: proc { |v| Person.first(2).map { |p| p.id.to_s } } do |parent|
     parent.table[:name]
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Ernie Miller