ransack 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bf018bef97fde714331b98465544735b3cdd23c
-  data.tar.gz: 3f5e4cae6c7bcf4f09eb6aa3851b521b18150569
+  metadata.gz: 954c9a11f9682b9e3fe5689c40d56d1978c24bb9
+  data.tar.gz: 58f30b75616e213c3afc8a91f92c8a940b4ac837
 SHA512:
-  metadata.gz: e6b753315240e2e974e82e2542d3b0dfbd90c6fdb1718d02e917b6ff348764fefb5d87fbbc14d15f400026d9303c71013dca5e9194432e7716f9b81342c54f54
-  data.tar.gz: e17e95e45672c4feb667f9a1a940cac994b43a8844cd5606f5a53d6e25e8284fb55b5a6ddfa8119d74dacfa8b58bb9a8198ebcc540e4be3e83ab1887e4ccce24
+  metadata.gz: bcbd765da64c6a1919651d7e8544ee74eedf95d69c69b0e777fffc5ebc624fe6312ae6ef88f4789dcaa54a622787f5f67804bdcfd07025163cae71b6100c0fbd
+  data.tar.gz: 876abe7e9d6faf89b99b64e993645add3d1c64bca934c4066c5b97790c46401ed581df97b8ffdc98685a9fd7fd5d4885196374e7a2d9ac5c581a0caba10725bc

data/.travis.yml

@@ -52,7 +52,6 @@ matrix:
       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
     - rvm: 2.2

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Change Log
 
+## Version 1.6.4 - 2015-03-20
+
+*   ActionView patch to maintain compatibility with Rails 4.2.1 released today.
+
+    *Jon Atack*
+
+*   Enable scoping I18n by 'ransack.models'
+    ([#514](https://github.com/activerecord-hackery/ransack/pull/514)).
+
+    *nagyt234*
+
+*   Add ransacker arguments
+    ([#513](https://github.com/activerecord-hackery/ransack/pull/513)).
+
+    *Denis Tataurov*, *Jon Atack*
+
 ## Version 1.6.3 - 2015-01-21
 
 *   Fix a regression
@@ -11,6 +27,12 @@
 
     *Nate Berkopec*, *Jon Atack*
 
+*   Update travis-ci to no longer test Rails 3.1 with Ruby 2.2 and speed up the test matrix.
+
+*   Refactor Nodes::Condition.
+
+    *Jon Atack*
+
 
 ## Version 1.6.2 - 2015-01-14
 

data/README.md

@@ -27,8 +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.2).]
-(https://github.com/activerecord-hackery/ransack/tree/v1.6.2)
+[View documentation for the last release (1.6.4).]
+(https://github.com/activerecord-hackery/ransack/tree/v1.6.4)
 
 ## Getting started
 
@@ -632,6 +632,8 @@ en:
       end: ends with
       gt: greater than
       lt: less than
+    models:
+      person: Passanger
     attributes:
       person:
         name: Full Name

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

@@ -43,6 +43,7 @@ module Ransack
         def casted_array_with_in_predicate?(predicate)
           return unless defined?(Arel::Nodes::Casted)
           predicate.class == Arel::Nodes::In &&
+          predicate.right[0].respond_to?(:val) &&
           predicate.right[0].val.is_a?(Array)
         end
 

data/lib/ransack/helpers/form_builder.rb

@@ -1,17 +1,36 @@
 require 'action_view'
 
-# This patch is needed since this Rails commit:
-# https://github.com/rails/rails/commit/c1a118a
-#
-# TODO: Find a better way to solve this.
+# Monkey-patching, avert your eyes!
+# TODO: Find a better way to solve these two issues:
 #
 module ActionView::Helpers::Tags
+
+  # This patch is needed since this Rails commit:
+  # https://github.com/rails/rails/commit/c1a118a
+  #
   class Base
     private
     def value(object)
       object.send @method_name if object # use send instead of public_send
     end
   end
+
+  # This patch is needed for Rails 4.2.1 and 5.0.0 since these commits:
+  #
+  # Rails 4.2:
+  # https://github.com/rails/rails/commits/4-2-stable/actionview/lib/action_view/helpers/tags/translator.rb
+  # https://github.com/rails/rails/commits/4-2-stable/actionview/lib/action_view/helpers/tags/placeholderable.rb
+  #
+  # Rails master:
+  # https://github.com/rails/rails/commits/master/actionview/lib/action_view/helpers/tags/translator.rb
+  # https://github.com/rails/rails/commits/master/actionview/lib/action_view/helpers/tags/placeholderable.rb
+  #
+  class Translator
+    def i18n_default
+      return '' unless model
+      ["#{model}.#{method_and_value}".to_sym, ""]
+    end
+  end
 end
 
 RANSACK_FORM_BUILDER = 'RANSACK_FORM_BUILDER'.freeze

data/lib/ransack/nodes/attribute.rb

@@ -3,14 +3,15 @@ module Ransack
     class Attribute < Node
       include Bindable
 
-      attr_reader :name
+      attr_reader :name, :ransacker_args
 
       delegate :blank?, :present?, :==, :to => :name
       delegate :engine, :to => :context
 
-      def initialize(context, name = nil)
+      def initialize(context, name = nil, ransacker_args = [])
         super(context)
         self.name = name unless name.blank?
+        @ransacker_args = ransacker_args
       end
 
       def name=(name)

data/lib/ransack/nodes/condition.rb

@@ -66,7 +66,7 @@ module Ransack
           end
         when Hash
           args.each do |index, attrs|
-            attr = Attribute.new(@context, attrs[:name])
+            attr = Attribute.new(@context, attrs[:name], attrs[:ransacker_args])
             self.attributes << attr if attr.valid?
           end
         else

data/lib/ransack/translate.rb

@@ -59,7 +59,8 @@ module Ransack
 
       defaults =
         if key.blank?
-          [:"#{context.klass.i18n_scope}.models.#{i18n_key(context.klass)}"]
+          [:"ransack.models.#{i18n_key(context.klass)}",
+           :"#{context.klass.i18n_scope}.models.#{i18n_key(context.klass)}"]
         else
           [:"ransack.associations.#{i18n_key(context.klass)}.#{key}"]
         end

data/lib/ransack/version.rb

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

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

@@ -24,49 +24,49 @@ module Ransack
             end
 
             it "applies true scopes" do
-              search = Person.ransack('active' => true)
-              search.result.to_sql.should include "active = 1"
+              s = Person.ransack('active' => true)
+              s.result.to_sql.should include "active = 1"
             end
 
             it "applies stringy true scopes" do
-              search = Person.ransack('active' => 'true')
-              search.result.to_sql.should include "active = 1"
+              s = Person.ransack('active' => 'true')
+              s.result.to_sql.should include "active = 1"
             end
 
             it "applies stringy boolean scopes with true value in an array" do
-              search = Person.ransack('of_age' => ['true'])
-              search.result.to_sql.should include "age >= 18"
+              s = Person.ransack('of_age' => ['true'])
+              s.result.to_sql.should include "age >= 18"
             end
 
             it "applies stringy boolean scopes with false value in an array" do
-              search = Person.ransack('of_age' => ['false'])
-              search.result.to_sql.should include "age < 18"
+              s = Person.ransack('of_age' => ['false'])
+              s.result.to_sql.should include "age < 18"
             end
 
             it "ignores unlisted scopes" do
-              search = Person.ransack('restricted' => true)
-              search.result.to_sql.should_not include "restricted"
+              s = Person.ransack('restricted' => true)
+              s.result.to_sql.should_not include "restricted"
             end
 
             it "ignores false scopes" do
-              search = Person.ransack('active' => false)
-              search.result.to_sql.should_not include "active"
+              s = Person.ransack('active' => false)
+              s.result.to_sql.should_not include "active"
             end
 
             it "ignores stringy false scopes" do
-              search = Person.ransack('active' => 'false')
-              search.result.to_sql.should_not include "active"
+              s = Person.ransack('active' => 'false')
+              s.result.to_sql.should_not include "active"
             end
 
             it "passes values to scopes" do
-              search = Person.ransack('over_age' => 18)
-              search.result.to_sql.should include "age > 18"
+              s = Person.ransack('over_age' => 18)
+              s.result.to_sql.should include "age > 18"
             end
 
             it "chains scopes" do
-              search = Person.ransack('over_age' => 18, 'active' => true)
-              search.result.to_sql.should include "age > 18"
-              search.result.to_sql.should include "active = 1"
+              s = Person.ransack('over_age' => 18, 'active' => true)
+              s.result.to_sql.should include "age > 18"
+              s.result.to_sql.should include "active = 1"
             end
           end
 
@@ -80,14 +80,6 @@ module Ransack
           end
         end
 
-        context "search on an `in` predicate with an array" do
-          it "should function correctly when passing an array of ids" do
-            array = Person.all.map(&:id)
-            s = Person.ransack(id_in: array)
-            expect(s.result.count).to eq array.size
-          end
-        end
-
         describe '#ransacker' do
           # For infix tests
           def self.sane_adapter?
@@ -181,17 +173,32 @@ module Ransack
             expect(s.result.to_a).to eq [p]
           end
 
-          context "search on an `in` predicate with an array to a ransacker" do
+          context "searching on an `in` predicate with a ransacker" do
             it "should function correctly when passing an array of ids" do
               s = Person.ransack(array_users_in: true)
               expect(s.result.count).to be > 0
             end
 
             it "should function correctly when passing an array of strings" do
-              p = Person.create!(name: Person.first.id.to_s)
+              Person.create!(name: Person.first.id.to_s)
               s = Person.ransack(array_names_in: true)
               expect(s.result.count).to be > 0
             end
+
+            it 'should function correctly with an Arel SqlLiteral' do
+              s = Person.ransack(sql_literal_id_in: 1)
+              expect(s.result.count).to be 1
+              s = Person.ransack(sql_literal_id_in: ['2', 4, '5', 8])
+              expect(s.result.count).to be 4
+            end
+          end
+
+          context "search on an `in` predicate with an array" do
+            it "should function correctly when passing an array of ids" do
+              array = Person.all.map(&:id)
+              s = Person.ransack(id_in: array)
+              expect(s.result.count).to eq array.size
+            end
           end
 
           it "should function correctly when an attribute name ends with '_start'" do
@@ -306,6 +313,26 @@ module Ransack
                 quote_column_name("only_admin")} = 'htimS cirA'/
             )
           end
+
+          it 'should allow passing ransacker arguments to a ransacker' do
+            s = Person.ransack(
+              c: [{
+                a: {
+                  '0' => {
+                    name: 'with_passed_arguments', ransacker_args: [10, 100]
+                  }
+                },
+                p: 'cont',
+                v: ['Rails has been released']
+              }]
+            )
+            expect(s.result.to_sql).to match(
+              /CHAR_LENGTH\(articles.body\) BETWEEN 10 AND 100/
+            )
+            expect(s.result.to_sql).to match(
+              /LIKE \'\%Rails has been released\%\'/
+            )
+          end
         end
 
         describe '#ransackable_attributes' do

data/spec/ransack/nodes/grouping_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 module Ransack
   module Nodes
-
     describe Grouping do
 
       before do

data/spec/ransack/predicate_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 module Ransack
+  TRUE_VALUES  = [true,  1, '1', 't', 'T', 'true',  'TRUE'].to_set
+  FALSE_VALUES = [false, 0, '0', 'f', 'F', 'false', 'FALSE'].to_set
+
   describe Predicate do
 
     before do
@@ -20,18 +23,12 @@ module Ransack
     end
 
     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")}"
-        expect(@s.result.to_sql).to match /#{field} = #{
-          ActiveRecord::Base.connection.quoted_true}/
+      it 'generates an equality condition for boolean true values' do
+        test_boolean_equality_for(true)
       end
 
-      it 'generates an equality condition for boolean false' do
-        @s.awesome_eq = false
-        field = "#{quote_table_name("people")}.#{quote_column_name("awesome")}"
-        expect(@s.result.to_sql).to match /#{field} = #{
-          ActiveRecord::Base.connection.quoted_false}/
+      it 'generates an equality condition for boolean false values' do
+        test_boolean_equality_for(false)
       end
 
       it 'does not generate a condition for nil' do
@@ -361,5 +358,31 @@ module Ransack
         expect(@s.result.to_sql).to match /#{field} IS NOT NULL AND #{field} != ''/
       end
     end
-  end
+
+    private
+
+      def test_boolean_equality_for(boolean_value)
+        query = expected_query(boolean_value)
+        test_values_for(boolean_value).each do |value|
+          s = Search.new(Person, awesome_eq: value)
+          expect(s.result.to_sql).to match query
+        end
+      end
+
+      def test_values_for(boolean_value)
+        case boolean_value
+        when true
+          TRUE_VALUES
+        when false
+          FALSE_VALUES
+        end
+      end
+
+      def expected_query(value, attribute = 'awesome', operator = '=')
+        field = "#{quote_table_name("people")}.#{quote_column_name(attribute)}"
+        quoted_value = ActiveRecord::Base.connection.quote(value)
+        /#{field} #{operator} #{quoted_value}/
+      end
+    end
+
 end

data/spec/support/schema.rb

@@ -63,6 +63,23 @@ class Person < ActiveRecord::Base
       )
   end
 
+  ransacker :sql_literal_id do
+    Arel.sql('people.id')
+  end
+
+  ransacker :with_passed_arguments, args: [:parent, :ransacker_args] do |parent, args|
+    min_body, max_body = args
+    sql = <<-SQL
+      (SELECT MAX(articles.title)
+         FROM articles
+        WHERE articles.person_id = people.id
+          AND CHAR_LENGTH(articles.body) BETWEEN #{min_body} AND #{max_body}
+        GROUP BY articles.person_id
+      )
+    SQL
+    Arel.sql(sql.squish)
+  end
+
   def self.ransackable_attributes(auth_object = nil)
     if auth_object == :admin
       column_names + _ransackers.keys - ['only_sort']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Ernie Miller
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -310,7 +310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ransack
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Object-based searching for ActiveRecord (currently).