ransack 1.4.1 → 1.5.0

data/spec/ransack/helpers/form_helper_spec.rb

@@ -51,8 +51,8 @@ module Ransack
       end
 
       describe '#sort_link with default search_key defined as symbol' do
-        subject { @controller.
-          view_context.sort_link(
+        subject { @controller.view_context
+          .sort_link(
             Person.search(
               { :sorts => ['name desc'] }, :search_key => :people_search
               ),
@@ -71,6 +71,46 @@ module Ransack
         }
       end
 
+      describe '#sort_link desc through association table defined as a symbol' do
+        subject { @controller.view_context
+          .sort_link(
+            Person.search({ :sorts => 'comments_body asc' }),
+            :comments_body, :controller => 'people'
+            )
+          }
+        it {
+          should match(
+            if ActiveRecord::VERSION::STRING =~ /^3\.[1-2]\./
+              /people\?q%5Bs%5D=comments.body\+desc/
+            else
+              /people\?q(%5B|\[)s(%5D|\])=comments.body\+desc/
+            end
+            )
+          }
+        it { should match /sort_link asc/ }
+        it { should match /Body ▲/ }
+      end
+
+      describe '#sort_link through association table defined as a string' do
+        subject { @controller.view_context
+          .sort_link(
+            Person.search({ :sorts => 'comments.body desc' }),
+            'comments.body', :controller => 'people'
+            )
+          }
+        it {
+          should match(
+            if ActiveRecord::VERSION::STRING =~ /^3\.[1-2]\./
+              /people\?q%5Bs%5D=comments.body\+asc/
+            else
+              /people\?q(%5B|\[)s(%5D|\])=comments.body\+asc/
+            end
+            )
+          }
+        it { should match /sort_link desc/ }
+        it { should match /Comments.body ▼/ }
+      end
+
       describe '#sort_link works even if search params are a blank string' do
         before { @controller.view_context.params[:q] = '' }
         specify {
@@ -105,6 +145,127 @@ module Ransack
         }
       end
 
+      describe '#sort_link with multiple search_keys defined as an array' do
+        subject { @controller.view_context
+          .sort_link(
+            [:main_app, Person.search(:sorts => ['name desc', 'email asc'])],
+            :name, [:name, 'email DESC'],
+            :controller => 'people'
+          )
+        }
+        it {
+          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
+        subject { @controller.view_context
+          .sort_link(
+            [:main_app, Person.search(:sorts => ['name desc', 'email asc'])],
+            :name, [:name, 'email DESC'],
+            'Property Name',
+            :controller => 'people'
+          )
+        }
+        it {
+          should match /Property Name ▼/
+        }
+      end
+
+      describe '#sort_link with multiple search_keys should flip multiple fields specified without a direction' do
+        subject { @controller.view_context
+          .sort_link(
+            [:main_app, Person.search(:sorts => ['name desc', 'email asc'])],
+            :name, [:name, :email],
+            :controller => 'people'
+          )
+        }
+        it {
+          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 default_order to be specified' do
+        subject { @controller.view_context
+          .sort_link(
+            [:main_app, Person.search()],
+            :name, [:name, :email],
+            :controller => 'people',
+            :default_order => 'desc'
+          )
+        }
+        it {
+          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
+        subject { @controller.view_context
+          .sort_link(
+            [:main_app, Person.search()],
+            :name, [:name, :email],
+            :controller => 'people',
+            :default_order => { 'name' => 'desc', :email => 'asc' }
+          )
+        }
+        it {
+          should match(
+            /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/
+        }
+      end
+
+      describe '#sort_link with multiple search_keys with multiple default_orders should not override a specified order' do
+        subject { @controller.view_context
+          .sort_link(
+            [:main_app, Person.search()],
+            :name, [:name, 'email desc'],
+            :controller => 'people',
+            :default_order => { 'name' => 'desc', :email => 'asc' }
+          )
+        }
+        it {
+          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
       context 'view has existing parameters' do
         before do
           @controller.view_context.params.merge!({ :exist => 'existing' })

data/spec/ransack/nodes/grouping_spec.rb

@@ -2,12 +2,55 @@ require 'spec_helper'
 
 module Ransack
   module Nodes
+
     describe Grouping do
+
       before do
         @g = 1
       end
 
+      let(:context) { Context.for(Person) }
+
+      subject { described_class.new(context) }
+
+      describe '#attribute_method?' do
+        context 'for attributes of the context' do
+          it 'is true' do
+            expect(subject.attribute_method?('name')).to be_true
+          end
+
+          context "when the attribute contains '_and_'" do
+            it 'is true' do
+              expect(subject.attribute_method?('terms_and_conditions')).to be_true
+            end
+          end
+
+          context "when the attribute contains '_or_'" do
+            it 'is true' do
+              expect(subject.attribute_method?('true_or_false')).to be_true
+            end
+          end
+
+          context "when the attribute ends with '_start'" do
+            it 'is true' do
+              expect(subject.attribute_method?('life_start')).to be_true
+            end
+          end
+
+          context "when the attribute ends with '_end'" do
+            it 'is true' do
+              expect(subject.attribute_method?('stop_end')).to be_true
+            end
+          end
+        end
+
+        context 'for unknown attributes' do
+          it 'is false' do
+            expect(subject.attribute_method?('not_an_attribute')).to be_false
+          end
+        end
+      end
 
     end
   end
-end
+end

data/spec/ransack/predicate_spec.rb

@@ -22,8 +22,7 @@ module Ransack
     describe 'eq' do
       it 'generates an equality condition for boolean true' do
         @s.awesome_eq = true
-        field = "#{quote_table_name("people")}.#{
-          quote_column_name("awesome")}"
+        field = "#{quote_table_name("people")}.#{quote_column_name("awesome")}"
         expect(@s.result.to_sql).to match /#{field} = #{
           ActiveRecord::Base.connection.quoted_true}/
       end
@@ -41,8 +40,91 @@ module Ransack
       end
     end
 
-    describe 'cont' do
+    describe 'lteq' do
+      it 'generates a <= condition with an integer column' do
+        val = 1000
+        @s.salary_lteq = val
+        field = "#{quote_table_name("people")}.#{quote_column_name("salary")}"
+        expect(@s.result.to_sql).to match /#{field} <= #{val}/
+      end
+
+      it 'generates a <= condition with a string column' do
+        val = 'jane@doe.com'
+        @s.email_lteq = val
+        field = "#{quote_table_name("people")}.#{quote_column_name("email")}"
+        expect(@s.result.to_sql).to match /#{field} <= '#{val}'/
+      end
+
+      it 'does not generate a condition for nil' do
+        @s.salary_lteq = nil
+        expect(@s.result.to_sql).not_to match /WHERE/
+      end
+    end
+
+    describe 'lt' do
+      it 'generates a < condition with an integer column' do
+        val = 2000
+        @s.salary_lt = val
+        field = "#{quote_table_name("people")}.#{quote_column_name("salary")}"
+        expect(@s.result.to_sql).to match /#{field} < #{val}/
+      end
+
+      it 'generates a < condition with a string column' do
+        val = 'jane@doe.com'
+        @s.email_lt = val
+        field = "#{quote_table_name("people")}.#{quote_column_name("email")}"
+        expect(@s.result.to_sql).to match /#{field} < '#{val}'/
+      end
+
+      it 'does not generate a condition for nil' do
+        @s.salary_lt = nil
+        expect(@s.result.to_sql).not_to match /WHERE/
+      end
+    end
+
+    describe 'gteq' do
+      it 'generates a >= condition with an integer column' do
+        val = 300
+        @s.salary_gteq = val
+        field = "#{quote_table_name("people")}.#{quote_column_name("salary")}"
+        expect(@s.result.to_sql).to match /#{field} >= #{val}/
+      end
+
+      it 'generates a >= condition with a string column' do
+        val = 'jane@doe.com'
+        @s.email_gteq = val
+        field = "#{quote_table_name("people")}.#{quote_column_name("email")}"
+        expect(@s.result.to_sql).to match /#{field} >= '#{val}'/
+      end
+
+      it 'does not generate a condition for nil' do
+        @s.salary_gteq = nil
+        expect(@s.result.to_sql).not_to match /WHERE/
+      end
+    end
+
+    describe 'gt' do
+      it 'generates a > condition with an integer column' do
+        val = 400
+        @s.salary_gt = val
+        field = "#{quote_table_name("people")}.#{quote_column_name("salary")}"
+        expect(@s.result.to_sql).to match /#{field} > #{val}/
+      end
+
+      it 'generates a > condition with a string column' do
+        val = 'jane@doe.com'
+        @s.email_gt = val
+        field = "#{quote_table_name("people")}.#{quote_column_name("email")}"
+        expect(@s.result.to_sql).to match /#{field} > '#{val}'/
+      end
+
+      it 'does not generate a condition for nil' do
+        @s.salary_gt = nil
+        expect(@s.result.to_sql).not_to match /WHERE/
+      end
+    end
 
+    describe 'cont' do
       it_has_behavior 'wildcard escaping', :name_cont,
         (if ActiveRecord::Base.connection.adapter_name == "PostgreSQL"
           /"people"."name" ILIKE '%\\%\\._\\\\%'/
@@ -80,6 +162,86 @@ module Ransack
       end
     end
 
+    describe 'start' do
+      it 'generates a LIKE query with value followed by %' do
+        @s.name_start = 'Er'
+        field = "#{quote_table_name("people")}.#{quote_column_name("name")}"
+        expect(@s.result.to_sql).to match /#{field} I?LIKE 'Er%'/
+      end
+
+      it "works with attribute names ending with '_start'" do
+        @s.new_start_start = 'hEy'
+        field = "#{quote_table_name("people")}.#{quote_column_name("new_start")}"
+        expect(@s.result.to_sql).to match /#{field} I?LIKE 'hEy%'/
+      end
+
+      it "works with attribute names ending with '_end'" do
+        @s.stop_end_start = 'begin'
+        field = "#{quote_table_name("people")}.#{quote_column_name("stop_end")}"
+        expect(@s.result.to_sql).to match /#{field} I?LIKE 'begin%'/
+      end
+    end
+
+    describe 'not_start' do
+      it 'generates a NOT LIKE query with value followed by %' do
+        @s.name_not_start = 'Eri'
+        field = "#{quote_table_name("people")}.#{quote_column_name("name")}"
+        expect(@s.result.to_sql).to match /#{field} NOT I?LIKE 'Eri%'/
+      end
+
+      it "works with attribute names ending with '_start'" do
+        @s.new_start_not_start = 'hEy'
+        field = "#{quote_table_name("people")}.#{quote_column_name("new_start")}"
+        expect(@s.result.to_sql).to match /#{field} NOT I?LIKE 'hEy%'/
+      end
+
+      it "works with attribute names ending with '_end'" do
+        @s.stop_end_not_start = 'begin'
+        field = "#{quote_table_name("people")}.#{quote_column_name("stop_end")}"
+        expect(@s.result.to_sql).to match /#{field} NOT I?LIKE 'begin%'/
+      end
+    end
+
+    describe 'end' do
+      it 'generates a LIKE query with value preceded by %' do
+        @s.name_end = 'Miller'
+        field = "#{quote_table_name("people")}.#{quote_column_name("name")}"
+        expect(@s.result.to_sql).to match /#{field} I?LIKE '%Miller'/
+      end
+
+      it "works with attribute names ending with '_start'" do
+        @s.new_start_end = 'finish'
+        field = "#{quote_table_name("people")}.#{quote_column_name("new_start")}"
+        expect(@s.result.to_sql).to match /#{field} I?LIKE '%finish'/
+      end
+
+      it "works with attribute names ending with '_end'" do
+        @s.stop_end_end = 'Ending'
+        field = "#{quote_table_name("people")}.#{quote_column_name("stop_end")}"
+        expect(@s.result.to_sql).to match /#{field} I?LIKE '%Ending'/
+      end
+    end
+
+    describe 'not_end' do
+      it 'generates a NOT LIKE query with value preceded by %' do
+        @s.name_not_end = 'Miller'
+        field = "#{quote_table_name("people")}.#{quote_column_name("name")}"
+        expect(@s.result.to_sql).to match /#{field} NOT I?LIKE '%Miller'/
+      end
+
+      it "works with attribute names ending with '_start'" do
+        @s.new_start_not_end = 'finish'
+        field = "#{quote_table_name("people")}.#{quote_column_name("new_start")}"
+        expect(@s.result.to_sql).to match /#{field} NOT I?LIKE '%finish'/
+      end
+
+      it "works with attribute names ending with '_end'" do
+        @s.stop_end_not_end = 'Ending'
+        field = "#{quote_table_name("people")}.#{quote_column_name("stop_end")}"
+        expect(@s.result.to_sql).to match /#{field} NOT I?LIKE '%Ending'/
+      end
+    end
+
     describe 'true' do
       it 'generates an equality condition for boolean true' do
         @s.awesome_true = true

data/spec/ransack/translate_spec.rb

@@ -6,7 +6,10 @@ module Ransack
     describe '.attribute' do
       it 'translate namespaced attribute like AR does' do
         ar_translation = ::Namespace::Article.human_attribute_name(:title)
-        ransack_translation = Ransack::Translate.attribute(:title, :context => ::Namespace::Article.search.context)
+        ransack_translation = Ransack::Translate.attribute(
+          :title,
+          :context => ::Namespace::Article.search.context
+          )
         expect(ransack_translation).to eq ar_translation
       end
     end

data/spec/support/en.yml

@@ -5,6 +5,11 @@ en:
     attributes:
       person:
         name: Full Name
+        only_admin: admin uSer Only
+        salary: wages
+        awesome: ransack is really awesome
+      article:
+        body: maiN BoDy
   activerecord:
     attributes:
       namespace/article: