ransack 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16c52e19f1e9a6d5c37117a93d4a6f09a4bb552e
-  data.tar.gz: 998d5acad6ac6a2d09b9aaa30e445f5ace6a7f23
+  metadata.gz: 5aa40c542dc092988fc46513f6f30ea6ccef3ca6
+  data.tar.gz: 22a6a9efcafac2879f41cbaa5f90fdac6d9d85f8
 SHA512:
-  metadata.gz: 15b51c18470cfd6bd5582eb53b0a508025be5ce0416a6e23c6b912e5316e7a33cf3dffa3bcb806322e0f2187a9a2ea7d20c1ff4c5399f6e8394a0916099ea89a
-  data.tar.gz: 2c812ed0979b364d2f0ebedd8377a0fa92b5c49316b0ac963852a172e59970a053eb175f7949993756249cdb3046ad44a9047a95f5212c80fd0f576c0bcac1f5
+  metadata.gz: f31218e27e2a9aae5cd2bbaf5588627872338c4f5fcb6babb8f2dc4b81abf0c645ea3edb84ee514aaa2d946621c54cbba835400b9389ad8f61bd68356e6c2890
+  data.tar.gz: 117c2bf5a8f01b1461a03073c335dcb544ccf6b09187517123c90235efac7465cf4c9bde21d6f3e75880e3a032b0bc9b4e04a9c006cb7a15111fbadfd6486ed7

data/.travis.yml

@@ -4,7 +4,9 @@ before_install:
   - travis_retry gem install bundler
 
 rvm:
+  - 1.9.3
   - 2.0.0
+  - 2.1.1
 
 env:
   - RAILS=4-1-stable DB=sqlite3

data/Gemfile

@@ -3,9 +3,9 @@ gemspec
 
 gem 'rake'
 
-rails = ENV['RAILS'] || 'master'
+rails = ENV['RAILS'] || '4-1-stable'
 
-gem 'polyamorous', github: 'activerecord-hackery/polyamorous'
+gem 'polyamorous', '~> 1.0.0'
 
 case rails
 when /\// # A path

data/README.md

@@ -1,42 +1,52 @@
 # Ransack
 
-[![Build Status](https://travis-ci.org/activerecord-hackery/ransack.svg)](https://travis-ci.org/activerecord-hackery/ransack)
-
-Ransack is a rewrite of [MetaSearch](https://github.com/activerecord-hackery/meta_search) created by [Ernie Miller](http://twitter.com/erniemiller) and maintained by [Ryan Bigg](http://twitter.com/ryanbigg), [Jon Atack](http://twitter.com/jonatack) and a great group of [contributors](https://github.com/activerecord-hackery/ransack/graphs/contributors). While it
-supports many of the same features as MetaSearch, its underlying implementation differs
-greatly from MetaSearch, and _backwards compatibility is not a design goal._
-
-Ransack enables the creation of both simple and [advanced](http://ransack-demo.herokuapp.com/users/advanced_search)
-search forms against your application's models (demo source code [here](https://github.com/activerecord-hackery/ransack_demo)). If you're looking for something that
-simplifies query generation at the model or controller layer, you're probably not looking
-for Ransack (or MetaSearch, for that matter). Try
-[Squeel](https://github.com/activerecord-hackery/squeel) instead.
+[![Build Status](https://travis-ci.org/activerecord-hackery/ransack.svg)]
+(https://travis-ci.org/activerecord-hackery/ransack)
+[![Gem Version](https://badge.fury.io/rb/ransack.svg)]
+(http://badge.fury.io/rb/ransack)
+
+Ransack is a rewrite of [MetaSearch]
+(https://github.com/activerecord-hackery/meta_search)
+created by [Ernie Miller](http://twitter.com/erniemiller)
+and maintained by [Ryan Bigg](http://twitter.com/ryanbigg),
+[Jon Atack](http://twitter.com/jonatack) and a great group of [contributors](https://github.com/activerecord-hackery/ransack/graphs/contributors).
+While it supports many of the same features as MetaSearch, its underlying
+implementation differs greatly from MetaSearch,
+and _backwards compatibility is not a design goal._
+
+Ransack enables the creation of both simple and
+[advanced](http://ransack-demo.herokuapp.com/users/advanced_search)
+search forms against your application's models (demo source code
+[here](https://github.com/activerecord-hackery/ransack_demo)).
+If you're looking for something that simplifies query generation at the model
+or controller layer, you're probably not looking for Ransack (or MetaSearch,
+for that matter). Try [Squeel](https://github.com/activerecord-hackery/squeel)
+instead.
 
 ## Getting started
 
 In your Gemfile:
 
 ```ruby
-gem "ransack"  # Last officially released gem (compatible Rails 3.x and 4.0, but not 4.1)
+gem "ransack"  # Last officially released gem (compatible with Rails 3, 4.0 and 4.1!)
 ```
 
-Or if you want to use the latest updates (Rails 3.x and 4.0, but not 4.1):
+Or if you want to use the latest updates on the master branch:
 
 ```ruby
-gem "ransack", github: "activerecord-hackery/ransack"  # Track git repo 
+gem "ransack", github: "activerecord-hackery/ransack"  # Track git repo
 ```
 
-If you are on Rails 4.0, you may prefer to use the streamlined, legacy code-free, latest-updates version of Ransack on the [Rails 4 branch](https://github.com/activerecord-hackery/ransack/tree/rails-4):
+If you are on Rails 4.1 (or 4.2.0.alpha or master), you may prefer to use the dedicated [Rails 4.1 branch](https://github.com/activerecord-hackery/ransack/tree/rails-4.1) which contains the latest updates, supports only 4.1 and up, and is lighter and somewhat faster:
 
 ```ruby
-gem "ransack", github: "activerecord-hackery/ransack", branch: "rails-4"
+gem "ransack", github: "activerecord-hackery/ransack", branch: "rails-4.1"
 ```
 
-Finally, if you are on Rails 4.1 (or 4.2.0.alpha), use the [Rails 4.1 branch](https://github.com/activerecord-hackery/ransack/tree/rails-4.1) which contains the latest updates also on master and rails-4. In your Gemfile you'll need to include (for the moment) both Ransack and Polyamorous as follows:
+Similarly, if you are on Rails 4.0, you may prefer to use the dedicated [Rails 4 branch](https://github.com/activerecord-hackery/ransack/tree/rails-4) for the same reasons:
 
 ```ruby
-gem "ransack", github: "activerecord-hackery/ransack", branch: "rails-4.1"
-gem "polyamorous", github: "activerecord-hackery/polyamorous"
+gem "ransack", github: "activerecord-hackery/ransack", branch: "rails-4"
 ```
 
 ## Usage
@@ -95,6 +105,17 @@ In your view:
 `cont` (contains) and `start` (starts with) are just two of the available search predicates.
 See [Constants](https://github.com/activerecord-hackery/ransack/blob/master/lib/ransack/constants.rb) for a full list and the [wiki](https://github.com/activerecord-hackery/ransack/wiki/Basic-Searching) for more description.
 
+You can also set the `search_form_for` answer format, like this:
+```erb
+<%= search_form_for(@q, format: :pdf) do |f| %>
+  ...
+<% end %>
+
+<%= search_form_for(@q, format: :json) do |f| %>
+  ...
+<% end %>
+```
+
 ### Advanced Mode
 
 "Advanced" searches (ab)use Rails' nested attributes functionality in order to generate
@@ -129,7 +150,7 @@ end
                         html: { method: :post } do |f| %>
 ```
 
-Once you've done so, you can make use of the helpers in Ransack::Helpers::FormBuilder to
+Once you've done so, you can make use of the helpers in [Ransack::Helpers::FormBuilder](lib/ransack/helpers/form_builder.rb) to
 construct much more complex search forms, such as the one on the
 [demo page](http://ransack-demo.heroku.com) (source code [here](https://github.com/activerecord-hackery/ransack_demo)).
 
@@ -137,7 +158,7 @@ construct much more complex search forms, such as the one on the
 
 Ransack will try to to make `#search` available in your models, but in the case that `#search` has already been defined, you can use `#ransack` instead. For example the following would be equivalent:
 
-```
+```ruby
 Article.search(params[:q])
 Article.ransack(params[:q])
 ```
@@ -210,18 +231,14 @@ require 'rails/all'
 
 ## I18n
 
-Take a look at our locale file on ``lib/ransack/locale/en.yml`` to check all available messages. You may also be interested in one of the many translations that are available on:
-
-http://www.localeapp.com/projects/2999
+Ransack translation files are available in [Ransack::Locale](lib/ransack/locale). You may also be interested in one of the many translations for Ransack available at http://www.localeapp.com/projects/2999.
 
 ## Contributions
 
 To support the project:
 
-* Use Ransack in your apps, and let us know if you encounter anything that's broken or missing.
-  A failing spec is awesome. A pull request is even better!
-* Spread the word on Twitter, Facebook, and elsewhere if Ransack's been useful to you. The more
-  people who are using the project, the quicker we can find and fix bugs!
+* Use Ransack in your apps, and let us know if you encounter anything that's broken or missing. A failing spec is awesome. A pull request with tests that pass is even better! Before filing an issue or pull request, be sure to read the [Contributing Guide](CONTRIBUTING.md).
+* Spread the word on Twitter, Facebook, and elsewhere if Ransack's been useful to you. The more people who are using the project, the quicker we can find and fix bugs!
 
 ## Copyright
 

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

@@ -156,25 +156,20 @@ module Ransack
             join_dependency.alias_tracker.aliases[join.left.name.downcase] = 1
           end
 
-          if ::ActiveRecord::VERSION::STRING >= "4.1"
+          if ::ActiveRecord::VERSION::STRING >= '4.1'
             join_dependency
           else
             join_dependency.graft(*stashed_association_joins)
           end
         end
 
-        if ::ActiveRecord::VERSION::STRING >= "4.1"
+        if ::ActiveRecord::VERSION::STRING >= '4.1'
 
           def build_or_find_association(name, parent = @base, klass = nil)
-            list = if ::ActiveRecord::VERSION::STRING >= "4.1"
-                     @join_dependency.join_root.children.detect
-                   else
-                     @join_dependency.join_associations
-                   end
-
-            found_association = list.detect do |assoc|
+            found_association = @join_dependency.join_root.children
+            .detect do |assoc|
               assoc.reflection.name == name &&
-              @associations_pot[assoc] == parent &&
+              (@associations_pot.nil? || @associations_pot[assoc] == parent) &&
               (!klass || assoc.reflection.klass == klass)
             end
 
@@ -199,7 +194,6 @@ module Ransack
               # Leverage the stashed association functionality in AR
               @object = @object.joins(jd)
             end
-
             found_association
           end
 
@@ -207,6 +201,7 @@ module Ransack
             @associations_pot ||= {}
             @associations_pot[assoc] = parent
           end
+
         else
 
           def build_or_find_association(name, parent = @base, klass = nil)
@@ -217,16 +212,20 @@ module Ransack
               (!klass || assoc.reflection.klass == klass)
             end
             unless found_association
-              @join_dependency.send(:build, Polyamorous::Join.new(
-                name, @join_type, klass), parent)
+              @join_dependency.send(
+                :build,
+                Polyamorous::Join.new(name, @join_type, klass),
+                parent
+               )
               found_association = @join_dependency.join_associations.last
               # Leverage the stashed association functionality in AR
               @object = @object.joins(found_association)
             end
-
             found_association
           end
+
         end
+
       end
     end
   end

data/lib/ransack/helpers/form_builder.rb

@@ -107,13 +107,9 @@ module Ransack
 
       def predicate_select(options = {}, html_options = {})
         options[:compounds] = true if options[:compounds].nil?
-        if ::ActiveRecord::VERSION::STRING >= "4"
-          default = options.delete(:default) || 'cont'
-        else
-          default = options.delete(:default) || 'eq'
-        end
+        default = options.delete(:default) || 'cont'
 
-        keys = options[:compounds] ? Predicate.names : 
+        keys = options[:compounds] ? Predicate.names :
           Predicate.names.reject { |k| k.match(/_(any|all)$/) }
         if only = options[:only]
           if only.respond_to? :call

data/lib/ransack/helpers/form_helper.rb

@@ -5,11 +5,14 @@ module Ransack
       def search_form_for(record, options = {}, &proc)
         if record.is_a?(Ransack::Search)
           search = record
-          options[:url] ||= polymorphic_path(search.klass)
+          options[:url] ||= polymorphic_path(
+            search.klass, format: options.delete(:format)
+            )
         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,

data/lib/ransack/locale/cs.yml

@@ -0,0 +1,70 @@
+cs:
+  ransack:
+    search: "vyhledávání"
+    predicate: "predikát"
+    and: "a"
+    or: "nebo"
+    any: "kteroukoliv"
+    all: "každou"
+    combinator: "kombinátor"
+    attribute: "atribut"
+    value: "hodnota"
+    condition: "podmínka"
+    sort: "řazení"
+    asc: "vzestupné"
+    desc: "sestupné"
+    predicates:
+      eq: "rovno"
+      eq_any: "rovno kterékoliv"
+      eq_all: "rovno všem"
+      not_eq: "nerovno"
+      not_eq_any: "nerovno kterékoliv"
+      not_eq_all: "nerovno všem"
+      matches: "odpovídá"
+      matches_any: "odpovídá kterékoliv"
+      matches_all: "odpovídá všem"
+      does_not_match: "neodpovídá"
+      does_not_match_any: "neodpovídá kterékoliv"
+      does_not_match_all: "neodpovídá všem"
+      lt: "menší než"
+      lt_any: "menší než kterákoliv"
+      lt_all: "menší než všechny"
+      lteq: "menší nebo rovno než"
+      lteq_any: "menší nebo rovno než kterákoliv"
+      lteq_all: "menší nebo rovno než všechny"
+      gt: "větší než"
+      gt_any: "větší než kterákoliv"
+      gt_all: "větší než všechny"
+      gteq: "větší nebo rovno než"
+      gteq_any: "větší nebo rovno než kterákoliv"
+      gteq_all: "větší nebo rovno než všechny"
+      in: "v"
+      in_any: "v kterékoliv"
+      in_all: "ve všech"
+      not_in: "není v"
+      not_in_any: "není v kterékoliv"
+      not_in_all: "není ve všech"
+      cont: "obsahuje"
+      cont_any: "obsahuje kterékoliv"
+      cont_all: "obsahuje všechny"
+      not_cont: "neobsahuje"
+      not_cont_any: "neobsahuje kteroukoliv"
+      not_cont_all: "neobsahuje všechny"
+      start: "začíná s"
+      start_any: "začíná s kteroukoliv"
+      start_all: "začíná se všemi"
+      not_start: "nezačíná s"
+      not_start_any: "nezačíná s kteroukoliv"
+      not_start_all: "nezačíná se všemi"
+      end: "končí s"
+      end_any: "končí s kteroukoliv"
+      end_all: "končí se všemi"
+      not_end: "nekončí s"
+      not_end_any: "nekončí s kteroukoliv"
+      not_end_all: "nekončí se všemi"
+      'true': "je pravdivé"
+      'false': "není pravdivé"
+      present: "je vyplněné"
+      blank: "je prázdné"
+      'null': "je null"
+      not_null: "není null"

data/lib/ransack/locale/es.yml

@@ -0,0 +1,70 @@
+es:
+  ransack:
+    search: "buscar"
+    predicate: "predicado"
+    and: "y"
+    or: "o"
+    any: "cualquier"
+    all: "todos"
+    combinator: "combinado"
+    attribute: "atributo"
+    value: "valor"
+    condition: "condición"
+    sort: "ordernar"
+    asc: "ascendente"
+    desc: "descendente"
+    predicates:
+      eq: "es igual a"
+      eq_any: "es igual a cualquier"
+      eq_all: "es igual a todos"
+      not_eq: "no es igual a"
+      not_eq_any: "no es igual a cualquier"
+      not_eq_all: "no es iguala todos"
+      matches: "coincidir"
+      matches_any: "coincidir a cualquier"
+      matches_all: "coincidir a todos"
+      does_not_match: "no coincide"
+      does_not_match_any: "no coincide con ninguna"
+      does_not_match_all: "no coincide con todos"
+      lt: "menor que"
+      lt_any: "menor que cualquier"
+      lt_all: "menor o igual a"
+      lteq: "menor que o igual a"
+      lteq_any: "menor o igual a cualquier"
+      lteq_all: "menor o igual a todos"
+      gt: "mayor que"
+      gt_any: "mayor que cualquier"
+      gt_all: "mayor que todos"
+      gteq: "mayor que o igual a"
+      gteq_any: "mayor que o igual a cualquier"
+      gteq_all: "mayor que o igual a todos"
+      in: "en"
+      in_any: "en cualquier"
+      in_all: "en todos"
+      not_in: "no en"
+      not_in_any: "no en cualquier"
+      not_in_all: "no en todos"
+      cont: "contiene"
+      cont_any: "contiene cualquier"
+      cont_all: "contiene todos"
+      not_cont: "no contiene"
+      not_cont_any: "no contiene ninguna"
+      not_cont_all: "no contiene toda"
+      start: "comienza con"
+      start_any: "comienza con cualquier"
+      start_all: "comienza con toda"
+      not_start: "no inicia con"
+      not_start_any: "no comienza con cualquier"
+      not_start_all: "no inicia con toda"
+      end: "termina con"
+      end_any: "termina con cualquier"
+      end_all: "termina con todo"
+      not_end: "no termina con"
+      not_end_any: "no termina con cualquier"
+      not_end_all: "no termina con todo"
+      'true': "es verdadero"
+      'false': "es falso"
+      present: "es presente"
+      blank: "está en blanco"
+      'null': "es nula"
+      not_null: "no es nula"

data/lib/ransack/locale/fr.yml

@@ -0,0 +1,70 @@
+fr:
+  ransack:
+    search: "recherche"
+    predicate: "prédicat"
+    and: "et"
+    or: "ou"
+    any: "au moins un"
+    all: "tous"
+    combinator: "combinateur"
+    attribute: "attribut"
+    value: "valeur"
+    condition: "condition"
+    sort: "tri"
+    asc: "ascendant"
+    desc: "descendant"
+    predicates:
+      eq: "égal à"
+      eq_any: "égal à au moins un"
+      eq_all: "égal à tous"
+      not_eq: "différent de"
+      not_eq_any: "différent d'au moins un"
+      not_eq_all: "différent de tous"
+      matches: "correspond à"
+      matches_any: "correspond à au moins un"
+      matches_all: "correspond à tous"
+      does_not_match: "ne correspond pas à"
+      does_not_match_any: "ne correspond pas à au moins un"
+      does_not_match_all: "ne correspond à aucun"
+      lt: "inférieur à"
+      lt_any: "inférieur à au moins un"
+      lt_all: "inférieur à tous"
+      lteq: "inférieur ou égal à"
+      lteq_any: "inférieur ou égal à au moins un"
+      lteq_all: "inférieur ou égal à tous"
+      gt: "supérieur à"
+      gt_any: "supérieur à au moins un"
+      gt_all: "supérieur à tous"
+      gteq: "supérieur ou égal à"
+      gteq_any: "supérieur ou égal à au moins un"
+      gteq_all: "supérieur ou égal à tous"
+      in: "inclus dans"
+      in_any: "inclus dans au moins un"
+      in_all: "inclus dans tous"
+      not_in: "non inclus dans"
+      not_in_any: "non inclus dans au moins un"
+      not_in_all: "non inclus dans tous"
+      cont: "contient"
+      cont_any: "contient au moins un"
+      cont_all: "contient tous"
+      not_cont: "ne contient pas"
+      not_cont_any: "ne contient pas au moins un"
+      not_cont_all: "ne contient pas tous"
+      start: "commence par"
+      start_any: "commence par au moins un"
+      start_all: "commence par tous"
+      not_start: "ne commence pas par"
+      not_start_any: "ne commence pas par au moins un"
+      not_start_all: "ne commence pas par tous"
+      end: "finit par"
+      end_any: "finit par au moins un"
+      end_all: "finit par tous"
+      not_end: "ne finit pas par"
+      not_end_any: "ne finit pas par au moins un"
+      not_end_all: "ne finit pas par tous"
+      'true': "est vrai"
+      'false': "est faux"
+      present: "est présent"
+      blank: "est blanc"
+      'null': "est null"
+      not_null: "n'est pas null"

data/lib/ransack/locale/zh.yml

@@ -67,4 +67,4 @@ zh:
       present: "有值"
       blank: "为空"
       'null': "是null"
-      not_null: "不是null"  
+      not_null: "不是null"

data/lib/ransack/search.rb

@@ -15,7 +15,7 @@ module Ransack
 
     def initialize(object, params = {}, options = {})
       params = {} unless params.is_a?(Hash)
-      params.delete_if { |k, v| v.blank? && v != false }
+      (params ||= {}).delete_if { |k, v| [*v].all?{|i| i.blank? && i != false } }
       @context = Context.for(object, options)
       @context.auth_object = options[:auth_object]
       @base = Nodes::Grouping.new(@context, 'and')

data/lib/ransack/version.rb

@@ -1,3 +1,3 @@
 module Ransack
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

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

@@ -35,34 +35,29 @@ module Ransack
           # end
           #
           # ransacker :doubled_name do |parent|
-          #   Arel::Nodes::InfixOperation.new('||', parent.table[:name], parent.table[:name])
+          #   Arel::Nodes::InfixOperation.new(
+          #     '||', parent.table[:name], parent.table[:name]
+          #   )
           # end
 
           it 'creates ransack attributes' do
             s = Person.search(reversed_name_eq: 'htimS cirA')
             s.result.should have(1).person
 
-            if ::ActiveRecord::VERSION::STRING >= "4"
-              s.result.first.should eq Person.find_by(name: 'Aric Smith')
-            else
-              s.result.first.should eq Person.find_by_name('Aric Smith')
-            end
+            s.result.first.should eq Person.where(name: 'Aric Smith').first
           end
 
           it 'can be accessed through associations' do
             s = Person.search(children_reversed_name_eq: 'htimS cirA')
             s.result.to_sql.should match(
-              /#{quote_table_name("children_people")}.#{quote_column_name("name")} = 'Aric Smith'/
+              /#{quote_table_name("children_people")}.#{
+                 quote_column_name("name")} = 'Aric Smith'/
             )
           end
 
           it 'allows an "attribute" to be an InfixOperation' do
             s = Person.search(doubled_name_eq: 'Aric SmithAric Smith')
-            if ::ActiveRecord::VERSION::STRING >= "4"
-              s.result.first.should eq Person.find_by(name: 'Aric Smith')
-            else
-              s.result.first.should eq Person.find_by_name('Aric Smith')
-            end
+            s.result.first.should eq Person.where(name: 'Aric Smith').first
           end if defined?(Arel::Nodes::InfixOperation) && sane_adapter?
 
           it "doesn't break #count if using InfixOperations" do
@@ -70,20 +65,18 @@ module Ransack
             s.result.count.should eq 1
           end if defined?(Arel::Nodes::InfixOperation) && sane_adapter?
 
-          if ::ActiveRecord::VERSION::STRING >= "4"
-            it "should remove empty key value pairs from the params hash" do
-              s = Person.search(children_reversed_name_eq: '')
-              s.result.to_sql.should_not match /LEFT OUTER JOIN/
-            end
+          it "should remove empty key value pairs from the params hash" do
+            s = Person.search(children_reversed_name_eq: '')
+            s.result.to_sql.should_not match /LEFT OUTER JOIN/
+          end
 
-            it "should keep proper key value pairs in the params hash" do
-              s = Person.search(children_reversed_name_eq: 'Testing')
-              s.result.to_sql.should match /LEFT OUTER JOIN/
-            end
+          it "should keep proper key value pairs in the params hash" do
+            s = Person.search(children_reversed_name_eq: 'Testing')
+            s.result.to_sql.should match /LEFT OUTER JOIN/
+          end
 
-            it "should function correctly when nil is passed in" do
-              s = Person.search(nil)
-            end
+          it "should function correctly when nil is passed in" do
+            s = Person.search(nil)
           end
 
           it "should function correctly when using fields with dots in them" do
@@ -108,7 +101,8 @@ module Ransack
               "s" => { "0" => { "dir" => "asc", "name" => "only_sort" } }
             )
             s.result.to_sql.should match(
-              /ORDER BY #{quote_table_name("people")}.#{quote_column_name("only_sort")} ASC/
+              /ORDER BY #{quote_table_name("people")}.#{
+                quote_column_name("only_sort")} ASC/
             )
           end
 
@@ -117,21 +111,24 @@ module Ransack
               "s" => { "0" => { "dir" => "asc", "name" => "only_search" } }
             )
             s.result.to_sql.should_not match(
-              /ORDER BY #{quote_table_name("people")}.#{quote_column_name("only_search")} ASC/
+              /ORDER BY #{quote_table_name("people")}.#{
+                quote_column_name("only_search")} ASC/
             )
           end
 
           it 'allows search by "only_search" field' do
             s = Person.search(only_search_eq: 'htimS cirA')
             s.result.to_sql.should match(
-              /WHERE #{quote_table_name("people")}.#{quote_column_name("only_search")} = 'htimS cirA'/
+              /WHERE #{quote_table_name("people")}.#{
+                quote_column_name("only_search")} = 'htimS cirA'/
             )
           end
 
           it "can't be searched by 'only_sort'" do
             s = Person.search(only_sort_eq: 'htimS cirA')
             s.result.to_sql.should_not match(
-              /WHERE #{quote_table_name("people")}.#{quote_column_name("only_sort")} = 'htimS cirA'/
+              /WHERE #{quote_table_name("people")}.#{
+                quote_column_name("only_sort")} = 'htimS cirA'/
             )
           end
 
@@ -141,7 +138,8 @@ module Ransack
               { auth_object: :admin }
             )
             s.result.to_sql.should match(
-              /ORDER BY #{quote_table_name("people")}.#{quote_column_name("only_admin")} ASC/
+              /ORDER BY #{quote_table_name("people")}.#{
+                quote_column_name("only_admin")} ASC/
             )
           end
 
@@ -150,7 +148,8 @@ module Ransack
               "s" => { "0" => { "dir" => "asc", "name" => "only_admin" } }
             )
             s.result.to_sql.should_not match(
-              /ORDER BY #{quote_table_name("people")}.#{quote_column_name("only_admin")} ASC/
+              /ORDER BY #{quote_table_name("people")}.#{
+                quote_column_name("only_admin")} ASC/
             )
           end
 
@@ -160,14 +159,16 @@ module Ransack
               { auth_object: :admin }
             )
             s.result.to_sql.should match(
-              /WHERE #{quote_table_name("people")}.#{quote_column_name("only_admin")} = 'htimS cirA'/
+              /WHERE #{quote_table_name("people")}.#{
+                quote_column_name("only_admin")} = 'htimS cirA'/
             )
           end
 
           it "can't be searched by 'only_admin', if auth_object: nil" do
             s = Person.search(only_admin_eq: 'htimS cirA')
             s.result.to_sql.should_not match(
-              /WHERE #{quote_table_name("people")}.#{quote_column_name("only_admin")} = 'htimS cirA'/
+              /WHERE #{quote_table_name("people")}.#{
+                quote_column_name("only_admin")} = 'htimS cirA'/
             )
           end
         end

data/spec/ransack/dependencies_spec.rb

@@ -1,4 +1,4 @@
-unless ::ActiveRecord::VERSION::STRING >= "4"
+unless ::ActiveRecord::VERSION::STRING >= '4'
   describe 'Ransack' do
     it 'can be required without errors' do
       output = `bundle exec ruby -e "require 'ransack'" 2>&1`

data/spec/ransack/helpers/form_helper_spec.rb

@@ -26,54 +26,70 @@ module Ransack
       end
 
       describe '#sort_link with default search_key' do
-        subject { @controller.view_context.
-          sort_link(
-            [:main_app, Person.search(sorts: ['name desc'])],
+        subject { @controller.view_context
+          .sort_link(
+            [:main_app, Person.search(:sorts => ['name desc'])],
             :name,
-            controller: 'people'
+            :controller => 'people'
           )
         }
-        it { should match(
-          if ActiveRecord::VERSION::STRING =~ /^3\.[1-2]\./
-            /people\?q%5Bs%5D=name\+asc/
-          else
-            /people\?q(%5B|\[)s(%5D|\])=name\+asc/
-          end)
-        } 
-        it { should match /sort_link desc/ }
-        it { should match /Full Name ▼/ }
+        it {
+          should match(
+            if ActiveRecord::VERSION::STRING =~ /^3\.[1-2]\./
+              /people\?q%5Bs%5D=name\+asc/
+            else
+              /people\?q(%5B|\[)s(%5D|\])=name\+asc/
+            end
+          )
+        }
+        it {
+          should match /sort_link desc/
+        }
+        it {
+          should match /Full Name ▼/
+        }
       end
 
       describe '#sort_link with default search_key defined as symbol' do
         subject { @controller.
           view_context.sort_link(
-            Person.search({ :sorts => ['name desc'] }, :search_key => :people_search),
-            :name, :controller => 'people'
+            Person.search(
+              { :sorts => ['name desc'] }, :search_key => :people_search
+              ),
+            :name,
+            :controller => 'people'
+          )
+        }
+        it {
+          should match(
+            if ActiveRecord::VERSION::STRING =~ /^3\.[1-2]\./
+              /people\?people_search%5Bs%5D=name\+asc/
+            else
+              /people\?people_search(%5B|\[)s(%5D|\])=name\+asc/
+            end
           )
         }
-        it { should match(
-          if ActiveRecord::VERSION::STRING =~ /^3\.[1-2]\./
-            /people\?people_search%5Bs%5D=name\+asc/
-          else
-            /people\?people_search(%5B|\[)s(%5D|\])=name\+asc/
-          end)
-        } 
       end
 
       describe '#sort_link with default search_key defined as string' do
         subject {
           @controller.view_context.sort_link(
-            Person.search({ :sorts => ['name desc'] }, :search_key => 'people_search'),
-            :name, :controller => 'people'
+            Person.search(
+              { :sorts => ['name desc'] }, :search_key => 'people_search'
+              ),
+            :name,
+            :controller => 'people'
+          )
+        }
+        it {
+          should match(
+            if ActiveRecord::VERSION::STRING =~ /^3\.[1-2]\./
+              /people\?people_search%5Bs%5D=name\+asc/
+            else
+              /people\?people_search(%5B|\[)s(%5D|\])=name\+asc/
+            end
           )
         }
-        it { should match(
-          if ActiveRecord::VERSION::STRING =~ /^3\.[1-2]\./
-            /people\?people_search%5Bs%5D=name\+asc/
-          else
-            /people\?people_search(%5B|\[)s(%5D|\])=name\+asc/
-          end)
-        } 
       end
 
       context 'view has existing parameters' do
@@ -83,8 +99,11 @@ module Ransack
         describe '#sort_link should not remove existing params' do
           subject {
             @controller.view_context.sort_link(
-              Person.search({ :sorts => ['name desc'] }, :search_key => 'people_search'),
-              :name, :controller => 'people'
+              Person.search(
+                { :sorts => ['name desc'] }, :search_key => 'people_search'
+                ),
+              :name,
+              :controller => 'people'
             )
           }
           it {
@@ -92,6 +111,37 @@ module Ransack
           }
         end
       end
+
+      describe '#search_form_for with default format' do
+        subject {
+          @controller.view_context
+          .search_form_for(Person.search) {}
+        }
+        it {
+          should match /action="\/people"/
+        }
+      end
+
+      describe '#search_form_for with pdf format' do
+        subject {
+          @controller.view_context
+          .search_form_for(Person.search, :format => :pdf) {}
+        }
+        it {
+          should match /action="\/people.pdf"/
+        }
+      end
+
+      describe '#search_form_for with json format' do
+        subject {
+          @controller.view_context
+          .search_form_for(Person.search, :format => :json) {}
+        }
+        it {
+          should match /action="\/people.json"/
+        }
+      end
+
     end
   end
 end

data/spec/ransack/search_spec.rb

@@ -2,6 +2,39 @@ require 'spec_helper'
 
 module Ransack
   describe Search do
+    describe '#initialize' do
+      it "removes empty conditions before building" do
+        Search.any_instance.should_receive(:build).with({})
+        Search.new(Person, :name_eq => '')
+      end
+
+      it "keeps conditions with a false value before building" do
+        Search.any_instance.should_receive(:build).with({"name_eq" => false})
+        Search.new(Person, :name_eq => false)
+      end
+
+      it "keeps conditions with a value before building" do
+        Search.any_instance.should_receive(:build).with({"name_eq" => 'foobar'})
+        Search.new(Person, :name_eq => 'foobar')
+      end
+
+      it "removes empty suffixed conditions before building" do
+        Search.any_instance.should_receive(:build).with({})
+        Search.new(Person, :name_eq_any => [''])
+      end
+
+      it "keeps suffixed conditions with a false value before building" do
+        Search.any_instance.should_receive(:build).with({"name_eq_any" => [false]})
+        Search.new(Person, :name_eq_any => [false])
+      end
+
+      it "keeps suffixed conditions with a value before building" do
+        Search.any_instance.should_receive(:build).with({"name_eq_any" => ['foobar']})
+        Search.new(Person, :name_eq_any => ['foobar'])
+      end
+
+
+    end
 
     describe '#initialize' do
       it 'does not raise exception for string :params argument' do
@@ -180,42 +213,26 @@ module Ransack
         second.should match /#{children_people_name_field} = 'Bert'/
       end
 
-      if ::ActiveRecord::VERSION::STRING >= "4"
-        it 'returns distinct records when passed distinct: true' do
-          search = Search.new(
-            Person, g: [
-              { m: 'or',
-                comments_body_cont: 'e',
-                articles_comments_body_cont: 'e'
-              }
-            ]
-          )
-          search.result.load.should have(9000).items
-          search.result(distinct: true).should have(10).items
-          search.result.load.uniq.should eq search.result(distinct: true).load
-        end
-      else
-        it 'returns distinct records when passed :distinct => true' do
-          search = Search.new(
-            Person, :g => [
-              { :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
-          search.result.send(all_or_load).
-            should have(9000).items
-          search.result(:distinct => true).
-            should have(10).items
-          search.result.send(all_or_load).send(uniq_or_distinct).
-            should eq search.result(:distinct => true).send(all_or_load)
+      it 'returns distinct records when passed :distinct => true' do
+        search = Search.new(
+          Person, :g => [
+            { :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
+        search.result.send(all_or_load).
+          should have(9000).items
+        search.result(:distinct => true).
+          should have(10).items
+        search.result.send(all_or_load).send(uniq_or_distinct).
+          should eq search.result(:distinct => true).send(all_or_load)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Ernie Miller
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -210,7 +210,10 @@ files:
 - lib/ransack/helpers.rb
 - lib/ransack/helpers/form_builder.rb
 - lib/ransack/helpers/form_helper.rb
+- lib/ransack/locale/cs.yml
 - lib/ransack/locale/en.yml
+- lib/ransack/locale/es.yml
+- lib/ransack/locale/fr.yml
 - lib/ransack/locale/zh.yml
 - lib/ransack/naming.rb
 - lib/ransack/nodes.rb
@@ -269,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ransack
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Object-based searching for ActiveRecord (currently).