ransack 1.5.1 → 1.6.0

data/spec/ransack/dependencies_spec.rb

@@ -1,4 +1,6 @@
-unless ::ActiveRecord::VERSION::STRING >= '4'
+rails = ::ActiveRecord::VERSION::STRING.first(3)
+
+if %w(3.2 4.0 4.1).include?(rails) || rails == '3.1' && RUBY_VERSION < '2.2'
   describe 'Ransack' do
     it 'can be required without errors' do
       output = `bundle exec ruby -e "require 'ransack'" 2>&1`

data/spec/ransack/helpers/form_builder_spec.rb

@@ -18,12 +18,12 @@ module Ransack
         @controller.instance_variable_set(:@_routes, router)
         @controller.class_eval { include router.url_helpers }
         @controller.view_context_class.class_eval { include router.url_helpers }
-        @s = Person.search
+        @s = Person.ransack
         @controller.view_context.search_form_for(@s) { |f| @f = f }
       end
 
       it 'selects previously-entered time values with datetime_select' do
-        date_values = %w(2011 1 2 03 04 05).freeze
+        date_values = %w(2011 1 2 03 04 05)
       # @s.created_at_eq = date_values # This works in Rails 4.x but not 3.x
         @s.created_at_eq = [2011, 1, 2, 3, 4, 5] # so we have to do this
         html = @f.datetime_select(
@@ -57,7 +57,7 @@ module Ransack
         end
         context 'with `belongs_to` association attributes' do
           before do
-            @controller.view_context.search_form_for(Comment.search) { |f| @f = f }
+            @controller.view_context.search_form_for(Comment.ransack) { |f| @f = f }
           end
           it 'localizes :"#{singularized model}_#{attribute name}_#{predicate}"' do
             test_label(@f, :article_body_start, /Article maiN BoDy starts with/)
@@ -132,7 +132,7 @@ module Ransack
           end
         end
         it 'filters predicates with multi-value :only' do
-          html = @f.predicate_select only: [:eq, :lt]
+          html = @f.predicate_select :only => [:eq, :lt]
           Predicate.names.reject { |k| k =~ /^(eq|lt)/ }.each do |key|
             expect(html).not_to match /<option value="#{key}">/
           end
@@ -147,7 +147,7 @@ module Ransack
 
       context 'fields used in polymorphic relations as search attributes in form' do
         before do
-          @controller.view_context.search_form_for(Note.search) { |f| @f = f }
+          @controller.view_context.search_form_for(Note.ransack) { |f| @f = f }
         end
         it 'accepts poly_id field' do
           html = @f.text_field(:notable_id_eq)
@@ -168,7 +168,7 @@ module Ransack
         # Starting from Rails 4.2, the date_select html attributes are no longer
         # `sort`ed (for a speed gain), so the tests have to be different:
         def date_select_html(val)
-          if ::ActiveRecord::VERSION::STRING >= '4.2'.freeze
+          if ::ActiveRecord::VERSION::STRING >= '4.2'
             %(<option value="#{val}" selected="selected">#{val}</option>)
           else
             %(<option selected="selected" value="#{val}">#{val}</option>)

data/spec/ransack/helpers/form_helper_spec.rb

@@ -7,6 +7,7 @@ module Ransack
       router = ActionDispatch::Routing::RouteSet.new
       router.draw do
         resources :people
+        resources :notes
         get ':controller(/:action(/:id(.:format)))'
       end
 
@@ -42,12 +43,8 @@ module Ransack
             end
           )
         }
-        it {
-          should match /sort_link desc/
-        }
-        it {
-          should match /Full Name ▼/
-        }
+        it { should match /sort_link desc/ }
+        it { should match /Full Name ▼/ }
       end
 
       describe '#sort_link with default search_key defined as symbol' do
@@ -124,7 +121,7 @@ module Ransack
         }
       end
 
-      describe '#sort_link with default search_key defined as string' do
+      describe '#sort_link with search_key defined as a string' do
         subject {
           @controller.view_context.sort_link(
             Person.search(
@@ -145,6 +142,18 @@ module Ransack
         }
       end
 
+      describe '#sort_link with default_order defined with a string key' do
+        subject { @controller.view_context
+          .sort_link(
+            [:main_app, Person.search()],
+            :name,
+            :controller => 'people',
+            'default_order' => 'desc'
+          )
+        }
+        it { should_not match /default_order/ }
+      end
+
       describe '#sort_link with multiple search_keys defined as an array' do
         subject { @controller.view_context
           .sort_link(
@@ -158,12 +167,25 @@ module Ransack
             /people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+asc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
           )
         }
-        it {
-          should match /sort_link desc/
+        it { should match /sort_link desc/ }
+        it { should match /Full Name ▼/ }
+      end
+
+      describe '#sort_link with multiple search_keys does not break on nil values & ignores them' do
+        subject { @controller.view_context
+          .sort_link(
+            [:main_app, Person.search(:sorts => ['name desc', nil, 'email', nil])],
+            :name, [nil, :name, nil, 'email DESC', nil],
+            :controller => 'people'
+          )
         }
         it {
-          should match /Full Name ▼/
+          should match(
+            /people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+asc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
+          )
         }
+        it { should match /sort_link desc/ }
+        it { should match /Full Name ▼/ }
       end
 
       describe '#sort_link with multiple search_keys should allow a label to be specified' do
@@ -175,9 +197,7 @@ module Ransack
             :controller => 'people'
           )
         }
-        it {
-          should match /Property Name ▼/
-        }
+        it { should match /Property Name ▼/ }
       end
 
       describe '#sort_link with multiple search_keys should flip multiple fields specified without a direction' do
@@ -193,21 +213,17 @@ module Ransack
             /people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+asc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
           )
         }
-        it {
-          should match /sort_link desc/
-        }
-        it {
-          should match /Full Name ▼/
-        }
+        it { should match /sort_link desc/ }
+        it { should match /Full Name ▼/ }
       end
 
-      describe '#sort_link with multiple search_keys should allow a default_order to be specified' do
+      describe '#sort_link with multiple search_keys and default_order specified as a string' do
         subject { @controller.view_context
           .sort_link(
             [:main_app, Person.search()],
             :name, [:name, :email],
             :controller => 'people',
-            :default_order => 'desc'
+            'default_order' => 'desc'
           )
         }
         it {
@@ -215,12 +231,26 @@ module Ransack
             /people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+desc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
           )
         }
-        it {
-          should match /sort_link/
+        it { should match /sort_link/ }
+        it { should match /Full Name/ }
+      end
+
+      describe '#sort_link with multiple search_keys and default_order specified as a symbol' do
+        subject { @controller.view_context
+          .sort_link(
+            [:main_app, Person.search()],
+            :name, [:name, :email],
+            :controller => 'people',
+            :default_order => :desc
+          )
         }
         it {
-          should match /Full Name/
+          should match(
+            /people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+desc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
+          )
         }
+        it { should match /sort_link/ }
+        it { should match /Full Name/ }
       end
 
       describe '#sort_link with multiple search_keys should allow multiple default_orders to be specified' do
@@ -237,12 +267,8 @@ module Ransack
             /people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+desc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+asc/
           )
         }
-        it {
-          should match /sort_link/
-        }
-        it {
-          should match /Full Name/
-        }
+        it { should match /sort_link/ }
+        it { should match /Full Name/ }
       end
 
       describe '#sort_link with multiple search_keys with multiple default_orders should not override a specified order' do
@@ -259,13 +285,30 @@ module Ransack
             /people\?q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=name\+desc&q(%5B|\[)s(%5D|\])(%5B|\[)(%5D|\])=email\+desc/
           )
         }
-        it {
-          should match /sort_link/
+        it { should match /sort_link/ }
+        it { should match /Full Name/ }
+      end
+
+      describe "#sort_link on polymorphic association should preserve association model name case" do
+        subject { @controller.view_context
+          .sort_link(
+            [:main_app, Note.search()],
+            :notable_of_Person_type_name, "Notable", :controller => 'notes'
+          )
         }
         it {
-          should match /Full Name/
+          should match(
+            if ActiveRecord::VERSION::STRING =~ /^3\.[1-2]\./
+              /notes\?q%5Bs%5D=notable_of_Person_type_name\+asc/
+            else
+              /notes\?q(%5B|\[)s(%5D|\])=notable_of_Person_type_name\+asc/
+            end
+          )
         }
+        it { should match /sort_link/ }
+        it { should match /Notable/ }
       end
+
       context 'view has existing parameters' do
         before do
           @controller.view_context.params.merge!({ :exist => 'existing' })
@@ -280,20 +323,37 @@ module Ransack
               :controller => 'people'
             )
           }
-          it {
-            should match /exist\=existing/
-          }
+          it { should match /exist\=existing/ }
         end
       end
 
-      describe '#search_form_for with default format' do
-        subject {
-          @controller.view_context
-          .search_form_for(Person.search) {}
+      describe '#sort_link with hide order indicator set to true' do
+        subject { @controller.view_context
+          .sort_link(
+            [:main_app, Person.search(:sorts => ['name desc'])],
+            :name,
+            :controller => 'people',
+            :hide_indicator => true
+          )
         }
-        it {
-          should match /action="\/people"/
+        it { should match /Full Name/ }
+      end
+
+      describe '#sort_link with hide order indicator set to false' do
+        subject { @controller.view_context
+          .sort_link(
+            [:main_app, Person.search(:sorts => ['name desc'])],
+            :name,
+            :controller => 'people',
+            :hide_indicator => false
+          )
         }
+        it { should match /Full Name ▼/ }
+      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
@@ -301,9 +361,7 @@ module Ransack
           @controller.view_context
           .search_form_for(Person.search, :format => :pdf) {}
         }
-        it {
-          should match /action="\/people.pdf"/
-        }
+        it { should match /action="\/people.pdf"/ }
       end
 
       describe '#search_form_for with json format' do
@@ -311,9 +369,18 @@ module Ransack
           @controller.view_context
           .search_form_for(Person.search, :format => :json) {}
         }
-        it {
-          should match /action="\/people.json"/
+        it { should match /action="\/people.json"/ }
+      end
+
+      describe '#search_form_for with custom default search key' do
+        before do
+          Ransack.configure { |c| c.search_key = :example }
+        end
+        subject {
+          @controller.view_context
+          .search_form_for(Person.search) { |f| f.text_field :name_eq }
         }
+        it { should match /example_name_eq/ }
       end
 
     end

data/spec/ransack/nodes/condition_spec.rb

@@ -23,7 +23,7 @@ module Ransack
 
         context "when ignore_unknown_conditions is false" do
           before do
-            Ransack.configure { |config| config.ignore_unknown_conditions = false }
+            Ransack.configure { |c| c.ignore_unknown_conditions = false }
           end
 
           specify { expect { subject }.to raise_error ArgumentError }
@@ -31,7 +31,7 @@ module Ransack
 
         context "when ignore_unknown_conditions is true" do
           before do
-            Ransack.configure { |config| config.ignore_unknown_conditions = true }
+            Ransack.configure { |c| c.ignore_unknown_conditions = true }
           end
 
           specify { subject.should be_nil }

data/spec/ransack/search_spec.rb

@@ -178,9 +178,7 @@ module Ransack
 
         context "when ignore_unknown_conditions is false" do
           before do
-            Ransack.configure { |config|
-              config.ignore_unknown_conditions = false
-            }
+            Ransack.configure { |c| c.ignore_unknown_conditions = false }
           end
 
           specify { expect { subject }.to raise_error ArgumentError }
@@ -188,9 +186,7 @@ module Ransack
 
         context "when ignore_unknown_conditions is true" do
           before do
-            Ransack.configure { |config|
-              config.ignore_unknown_conditions = true
-            }
+            Ransack.configure { |c| c.ignore_unknown_conditions = true }
           end
 
           specify { expect { subject }.not_to raise_error }

data/spec/ransack/translate_spec.rb

@@ -8,7 +8,7 @@ module Ransack
         ar_translation = ::Namespace::Article.human_attribute_name(:title)
         ransack_translation = Ransack::Translate.attribute(
           :title,
-          :context => ::Namespace::Article.search.context
+          :context => ::Namespace::Article.ransack.context
           )
         expect(ransack_translation).to eq ar_translation
       end

data/spec/spec_helper.rb

@@ -2,15 +2,14 @@ require 'machinist/active_record'
 require 'sham'
 require 'faker'
 require 'ransack'
+require 'pry'
 
 I18n.enforce_available_locales = false
 Time.zone = 'Eastern Time (US & Canada)'
 I18n.load_path += Dir[File.join(File.dirname(__FILE__), 'support', '*.yml')]
 
 Dir[File.expand_path('../{helpers,support,blueprints}/*.rb', __FILE__)]
-.each do |f|
-  require f
-end
+.each { |f| require f }
 
 Sham.define do
   name        { Faker::Name.name }

data/spec/support/schema.rb

@@ -39,11 +39,20 @@ 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) }
 
   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|
+    parent.table[:id]
+  end
+
+  ransacker :array_names, formatter: proc { |v| Person.first(2).map {|p| p.id.to_s } } do |parent|
+    parent.table[:name]
+  end
+
   ransacker :doubled_name do |parent|
     Arel::Nodes::InfixOperation.new(
       '||', parent.table[:name], parent.table[:name]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Ernie Miller
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -207,6 +207,25 @@ files:
 - lib/ransack/adapters/active_record/base.rb
 - lib/ransack/adapters/active_record/compat.rb
 - lib/ransack/adapters/active_record/context.rb
+- lib/ransack/adapters/active_record/ransack/constants.rb
+- lib/ransack/adapters/active_record/ransack/context.rb
+- lib/ransack/adapters/active_record/ransack/nodes/condition.rb
+- lib/ransack/adapters/active_record/ransack/translate.rb
+- lib/ransack/adapters/active_record/ransack/visitor.rb
+- lib/ransack/adapters/mongoid.rb
+- lib/ransack/adapters/mongoid/3.2/.gitkeep
+- lib/ransack/adapters/mongoid/attributes/attribute.rb
+- lib/ransack/adapters/mongoid/attributes/order_predications.rb
+- lib/ransack/adapters/mongoid/attributes/predications.rb
+- lib/ransack/adapters/mongoid/base.rb
+- lib/ransack/adapters/mongoid/context.rb
+- lib/ransack/adapters/mongoid/inquiry_hash.rb
+- lib/ransack/adapters/mongoid/ransack/constants.rb
+- lib/ransack/adapters/mongoid/ransack/context.rb
+- lib/ransack/adapters/mongoid/ransack/nodes/condition.rb
+- lib/ransack/adapters/mongoid/ransack/translate.rb
+- lib/ransack/adapters/mongoid/ransack/visitor.rb
+- lib/ransack/adapters/mongoid/table.rb
 - lib/ransack/configuration.rb
 - lib/ransack/constants.rb
 - lib/ransack/context.rb
@@ -244,6 +263,19 @@ files:
 - spec/blueprints/tags.rb
 - spec/console.rb
 - spec/helpers/ransack_helper.rb
+- spec/mongoid/adapters/mongoid/base_spec.rb
+- spec/mongoid/adapters/mongoid/context_spec.rb
+- spec/mongoid/configuration_spec.rb
+- spec/mongoid/dependencies_spec.rb
+- spec/mongoid/helpers/ransack_helper.rb
+- spec/mongoid/nodes/condition_spec.rb
+- spec/mongoid/nodes/grouping_spec.rb
+- spec/mongoid/predicate_spec.rb
+- spec/mongoid/search_spec.rb
+- spec/mongoid/support/mongoid.yml
+- spec/mongoid/support/schema.rb
+- spec/mongoid/translate_spec.rb
+- spec/mongoid_spec_helper.rb
 - spec/ransack/adapters/active_record/base_spec.rb
 - spec/ransack/adapters/active_record/context_spec.rb
 - spec/ransack/configuration_spec.rb
@@ -270,7 +302,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -278,7 +310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ransack
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Object-based searching for ActiveRecord (currently).
@@ -290,6 +322,19 @@ test_files:
 - spec/blueprints/tags.rb
 - spec/console.rb
 - spec/helpers/ransack_helper.rb
+- spec/mongoid/adapters/mongoid/base_spec.rb
+- spec/mongoid/adapters/mongoid/context_spec.rb
+- spec/mongoid/configuration_spec.rb
+- spec/mongoid/dependencies_spec.rb
+- spec/mongoid/helpers/ransack_helper.rb
+- spec/mongoid/nodes/condition_spec.rb
+- spec/mongoid/nodes/grouping_spec.rb
+- spec/mongoid/predicate_spec.rb
+- spec/mongoid/search_spec.rb
+- spec/mongoid/support/mongoid.yml
+- spec/mongoid/support/schema.rb
+- spec/mongoid/translate_spec.rb
+- spec/mongoid_spec_helper.rb
 - spec/ransack/adapters/active_record/base_spec.rb
 - spec/ransack/adapters/active_record/context_spec.rb
 - spec/ransack/configuration_spec.rb