ransack 0.5.3 → 0.5.4

data/.travis.yml

@@ -0,0 +1,7 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - ree
+  - rbx
+  - rbx-2.0
+  - ruby-head

data/Gemfile

@@ -1,14 +1,39 @@
 source "http://rubygems.org"
 gemspec
 
-if ENV['RAILS_VERSION'] == 'release'
-  gem 'activesupport'
-  gem 'activerecord'
-  gem 'actionpack'
+gem 'rake'
+
+rails = ENV['RAILS'] || 'master'
+arel = ENV['AREL'] || 'master'
+
+arel_opts = case arel
+when /\// # A path
+  {:path => arel}
+when /^v/ # A tagged version
+  {:git => 'git://github.com/rails/arel.git', :tag => arel}
+else
+  {:git => 'git://github.com/rails/arel.git', :branch => arel}
+end
+
+gem 'arel', arel_opts
+
+case rails
+when /\// # A path
+  gem 'activesupport', :path => "#{rails}/activesupport"
+  gem 'activemodel', :path => "#{rails}/activemodel"
+  gem 'activerecord', :path => "#{rails}/activerecord"
+  gem 'actionpack', :path => "#{rails}/activerecord"
+when /^v/ # A tagged version
+  git 'git://github.com/rails/rails.git', :tag => rails do
+    gem 'activesupport'
+    gem 'activemodel'
+    gem 'activerecord'
+    gem 'actionpack'
+  end
 else
-  gem 'arel',  :git => 'git://github.com/rails/arel.git'
-  git 'git://github.com/rails/rails.git' do
+  git 'git://github.com/rails/rails.git', :branch => rails do
     gem 'activesupport'
+    gem 'activemodel'
     gem 'activerecord'
     gem 'actionpack'
   end

data/lib/ransack/context.rb

@@ -25,10 +25,6 @@ module Ransack
         end
       end
 
-      def can_accept?(object)
-        method_defined? DISPATCH[object.class]
-      end
-
     end
 
     def initialize(object)
@@ -99,7 +95,7 @@ module Ransack
     end
 
     def unpolymorphize_association(str)
-      if (match = str.match(/_of_(.+?)_type$/)) && Kernel.const_defined?(match.captures.first)
+      if (match = str.match(/_of_(.+?)_type$/))
         [match.pre_match, Kernel.const_get(match.captures.first)]
       else
         [str, nil]

data/lib/ransack/nodes/condition.rb

@@ -16,7 +16,7 @@ module Ransack
               :a => attributes,
               :p => predicate.name,
               :m => combinator,
-              :v => [values]
+              :v => %w(in not_in).include?(predicate.arel_predicate) ? Array(values) : [values]
             )
             # TODO: Figure out what to do with multiple types of attributes, if anything.
             # Tempted to go with "garbage in, garbage out" on this one
@@ -41,7 +41,7 @@ module Ransack
       end
 
       def valid_arity?
-        values.size <= 1 || predicate.compound || %w(in not_in).include?(predicate.name)
+        values.size <= 1 || predicate.wants_array
       end
 
       def attributes
@@ -113,7 +113,7 @@ module Ransack
       end
 
       def value
-        predicate.compound ? values.map {|v| v.cast(default_type)} : values.first.cast(default_type)
+        predicate.wants_array ? values.map {|v| v.cast(default_type)} : values.first.cast(default_type)
       end
 
       def build(params)
@@ -180,7 +180,7 @@ module Ransack
       end
 
       def validated_values
-        values.select {|v| predicate.validator ? predicate.validator.call(v.value) : v.present?}
+        values.select {|v| predicate.validator.call(v.value)}
       end
 
       def casted_values_for_attribute(attr)
@@ -188,11 +188,12 @@ module Ransack
       end
 
       def formatted_values_for_attribute(attr)
-        casted_values_for_attribute(attr).map do |val|
+        formatted = casted_values_for_attribute(attr).map do |val|
           val = attr.ransacker.formatter.call(val) if attr.ransacker && attr.ransacker.formatter
           val = predicate.format(val)
           val
         end
+        predicate.wants_array ? formatted : formatted.first
       end
 
       def default_type

data/lib/ransack/nodes/value.rb

@@ -65,10 +65,12 @@ module Ransack
        end
 
        def cast_to_boolean(val)
-         if val.is_a?(String) && val.blank?
-           nil
+         if Constants::TRUE_VALUES.include?(val)
+           true
+         elsif Constants::FALSE_VALUES.include?(val)
+           false
          else
-           Constants::TRUE_VALUES.include?(val)
+           nil
          end
        end
 

data/lib/ransack/predicate.rb

@@ -1,6 +1,6 @@
 module Ransack
   class Predicate
-    attr_reader :name, :arel_predicate, :type, :formatter, :validator, :compound
+    attr_reader :name, :arel_predicate, :type, :formatter, :validator, :compound, :wants_array
 
     class << self
 
@@ -39,8 +39,9 @@ module Ransack
       @arel_predicate = opts[:arel_predicate]
       @type = opts[:type]
       @formatter = opts[:formatter]
-      @validator = opts[:validator] || lambda { |v| v.present? }
+      @validator = opts[:validator] || lambda { |v| v.respond_to?(:empty?) ? !v.empty? : !v.nil? }
       @compound = opts[:compound]
+      @wants_array = @compound || ['in', 'not_in'].include?(@arel_predicate)
     end
 
     def eql?(other)

data/lib/ransack/version.rb

@@ -1,3 +1,3 @@
 module Ransack
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

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

@@ -5,33 +5,36 @@ module Ransack
     module ActiveRecord
       describe Base do
 
-        it 'adds a ransack method to ActiveRecord::Base' do
-          ::ActiveRecord::Base.should respond_to :ransack
-        end
+        subject { ::ActiveRecord::Base }
 
-        it 'aliases the method to search if available' do
-          ::ActiveRecord::Base.should respond_to :search
-        end
+        it { should respond_to :ransack }
+        it { should respond_to :search }
 
         describe '#search' do
-          before do
-            @s = Person.search
-          end
+          subject { Person.search }
 
-          it 'creates a search with Relation as its object' do
-            @s.should be_a Search
-            @s.object.should be_an ::ActiveRecord::Relation
+          it { should be_a Search }
+          it 'has a Relation as its object' do
+            subject.object.should be_an ::ActiveRecord::Relation
           end
         end
 
         describe '#ransacker' do
+          # in schema.rb, class Person:
+          # ransacker :reversed_name, :formatter => proc {|v| v.reverse} do |parent|
+          #   parent.table[:name]
+          # end
+          #
+          # ransacker :doubled_name do |parent|
+          #   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
             s.result.first.should eq Person.find_by_name('Aric Smith')
           end
 
-          it 'allows access of attributes through associations' do
+          it 'can be accessed through associations' do
             s = Person.search(:children_reversed_name_eq => 'htimS cirA')
             s.result.to_sql.should match /"children_people"."name" = 'Aric Smith'/
           end
@@ -42,6 +45,22 @@ module Ransack
           end if defined?(Arel::Nodes::InfixOperation)
         end
 
+        describe '#ransackable_attributes' do
+          subject { Person.ransackable_attributes }
+
+          it { should include 'name' }
+          it { should include 'reversed_name' }
+          it { should include 'doubled_name' }
+        end
+
+        describe '#ransackable_associations' do
+          subject { Person.ransackable_associations }
+
+          it { should include 'parent' }
+          it { should include 'children' }
+          it { should include 'articles' }
+        end
+
       end
     end
   end

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

@@ -4,19 +4,35 @@ module Ransack
   module Adapters
     module ActiveRecord
       describe Context do
-        before do
-          @c = Context.new(Person)
+        subject { Context.new(Person) }
+
+        describe '#evaluate' do
+          it 'evaluates search obects' do
+            search = Search.new(Person, :name_eq => 'Joe Blow')
+            result = subject.evaluate(search)
+
+            result.should be_an ::ActiveRecord::Relation
+            result.to_sql.should match /"name" = 'Joe Blow'/
+          end
+
+          it 'SELECTs DISTINCT when :distinct => true' do
+            search = Search.new(Person, :name_eq => 'Joe Blow')
+            result = subject.evaluate(search, :distinct => true)
+
+            result.should be_an ::ActiveRecord::Relation
+            result.to_sql.should match /SELECT DISTINCT/
+          end
         end
 
         it 'contextualizes strings to attributes' do
-          attribute = @c.contextualize 'children_children_parent_name'
+          attribute = subject.contextualize 'children_children_parent_name'
           attribute.should be_a Arel::Attributes::Attribute
           attribute.name.to_s.should eq 'name'
           attribute.relation.table_alias.should eq 'parents_people'
         end
 
         it 'builds new associations if not yet built' do
-          attribute = @c.contextualize 'children_articles_title'
+          attribute = subject.contextualize 'children_articles_title'
           attribute.should be_a Arel::Attributes::Attribute
           attribute.name.to_s.should eq 'title'
           attribute.relation.name.should eq 'articles'

data/spec/ransack/configuration_spec.rb

@@ -7,5 +7,25 @@ module Ransack
         config.should eq Ransack
       end
     end
+
+    it 'adds predicates' do
+      Ransack.configure do |config|
+        config.add_predicate :test_predicate
+      end
+
+      Ransack.predicates.should have_key 'test_predicate'
+      Ransack.predicates.should have_key 'test_predicate_any'
+      Ransack.predicates.should have_key 'test_predicate_all'
+    end
+
+    it 'avoids creating compound predicates if :compounds => false' do
+      Ransack.configure do |config|
+        config.add_predicate :test_predicate_without_compound, :compounds => false
+      end
+
+      Ransack.predicates.should have_key 'test_predicate_without_compound'
+      Ransack.predicates.should_not have_key 'test_predicate_without_compound_any'
+      Ransack.predicates.should_not have_key 'test_predicate_without_compound_all'
+    end
   end
 end

data/spec/ransack/predicate_spec.rb

@@ -7,6 +7,23 @@ module Ransack
       @s = Search.new(Person)
     end
 
+    describe 'eq' do
+      it 'generates an equality condition for boolean true' do
+        @s.awesome_eq = true
+        @s.result.to_sql.should match /"people"."awesome" = 't'/
+      end
+
+      it 'generates an equality condition for boolean false' do
+        @s.awesome_eq = false
+        @s.result.to_sql.should match /"people"."awesome" = 'f'/
+      end
+
+      it 'does not generate a condition for nil' do
+        @s.awesome_eq = nil
+        @s.result.to_sql.should_not match /WHERE/
+      end
+    end
+
     describe 'cont' do
       it 'generates a LIKE query with value surrounded by %' do
         @s.name_cont = 'ric'
@@ -21,5 +38,18 @@ module Ransack
       end
     end
 
+    describe 'null' do
+      it 'generates a value IS NULL query' do
+        @s.name_null = true
+        @s.result.to_sql.should match /"people"."name" IS NULL/
+      end
+    end
+
+    describe 'not_null' do
+      it 'generates a value IS NOT NULL query' do
+        @s.name_not_null = true
+        @s.result.to_sql.should match /"people"."name" IS NOT NULL/
+      end
+    end
   end
-end
+end

data/spec/ransack/search_spec.rb

@@ -126,7 +126,12 @@ module Ransack
         )
         search.result.should be_an ActiveRecord::Relation
         where = search.result.where_values.first
-        where.to_sql.should match /\("people"."name" = 'Ernie' OR "children_people"."name" = 'Ernie'\) AND \("people"."name" = 'Bert' OR "children_people"."name" = 'Bert'\)/
+        sql = where.to_sql
+        first, second = sql.split(/ AND /)
+        first.should match /"people"."name" = 'Ernie'/
+        first.should match /"children_people"."name" = 'Ernie'/
+        second.should match /"people"."name" = 'Bert'/
+        second.should match /"children_people"."name" = 'Bert'/
       end
 
       it 'returns distinct records when passed :distinct => true' do
@@ -175,13 +180,11 @@ module Ransack
           }
         }
         @s.sorts.should have(2).items
-        sort1, sort2 = @s.sorts
-        sort1.should be_a Nodes::Sort
-        sort1.name.should eq 'id'
-        sort1.dir.should eq 'desc'
-        sort2.should be_a Nodes::Sort
-        sort2.name.should eq 'name'
-        sort2.dir.should eq 'asc'
+        @s.sorts.should be_all {|s| Nodes::Sort === s}
+        id_sort = @s.sorts.detect {|s| s.name == 'id'}
+        name_sort = @s.sorts.detect {|s| s.name == 'name'}
+        id_sort.dir.should eq 'desc'
+        name_sort.dir.should eq 'asc'
       end
     end
 

data/spec/spec_helper.rb

@@ -25,4 +25,17 @@ RSpec.configure do |config|
   config.before(:each)  { Sham.reset(:before_each) }
 
   config.include RansackHelper
+end
+
+RSpec::Matchers.define :be_like do |expected|
+  match do |actual|
+    actual.gsub(/^\s+|\s+$/, '').gsub(/\s+/, ' ').strip ==
+      expected.gsub(/^\s+|\s+$/, '').gsub(/\s+/, ' ').strip
+  end
+end
+
+RSpec::Matchers.define :have_attribute_method do |expected|
+  match do |actual|
+    actual.attribute_method?(expected)
+  end
 end

data/spec/support/schema.rb

@@ -53,6 +53,7 @@ module Schema
           t.integer  :parent_id
           t.string   :name
           t.integer  :salary
+          t.boolean  :awesome, :default => false
           t.timestamps
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-27 00:00:00.000000000Z
+date: 2011-07-24 00:00:00.000000000 -04:00
+default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2153182720 !ruby/object:Gem::Requirement
+  requirement: &70355886036760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153182720
+  version_requirements: *70355886036760
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153182180 !ruby/object:Gem::Requirement
+  requirement: &70355886036220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +33,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153182180
+  version_requirements: *70355886036220
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &2153181700 !ruby/object:Gem::Requirement
+  requirement: &70355886035700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +44,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153181700
+  version_requirements: *70355886035700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153181180 !ruby/object:Gem::Requirement
+  requirement: &70355886035200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +55,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2153181180
+  version_requirements: *70355886035200
 - !ruby/object:Gem::Dependency
   name: machinist
-  requirement: &2153180680 !ruby/object:Gem::Requirement
+  requirement: &70355886034700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +66,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *2153180680
+  version_requirements: *70355886034700
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &2153180220 !ruby/object:Gem::Requirement
+  requirement: &70355886034140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +77,10 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *2153180220
+  version_requirements: *70355886034140
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2153179740 !ruby/object:Gem::Requirement
+  requirement: &70355886033680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +88,7 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *2153179740
+  version_requirements: *70355886033680
 description: Ransack is the successor to the MetaSearch gem. It improves and expands
   upon MetaSearch's functionality, but does not have a 100%-compatible API.
 email:
@@ -97,6 +98,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -153,6 +155,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/en.yml
 - spec/support/schema.rb
+has_rdoc: true
 homepage: http://metautonomo.us/projects/ransack
 licenses: []
 post_install_message: 
@@ -173,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ransack
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Object-based searching for ActiveRecord (currently).