ransack 0.1.0 → 0.2.0

data/spec/ransack/search_spec.rb

@@ -22,6 +22,15 @@ module Ransack
         condition.value.should eq 'Ernie'
       end
 
+      it 'creates Conditions for polymorphic belongs_to association attributes' do
+        search = Search.new(Note, :notable_of_Person_type_name_eq => 'Ernie')
+        condition = search.base[:notable_of_Person_type_name_eq]
+        condition.should be_a Nodes::Condition
+        condition.predicate.name.should eq 'eq'
+        condition.attributes.first.name.should eq 'notable_of_Person_type_name'
+        condition.value.should eq 'Ernie'
+      end
+
       it 'discards empty conditions' do
         search = Search.new(Person, :children_name_eq => '')
         condition = search.base[:children_name_eq]
@@ -84,6 +93,13 @@ module Ransack
         where.to_sql.should match /"children_people"\."name" = 'Ernie' OR "people"\."name" = 'Ernie'/
       end
 
+      it 'evaluates polymorphic belongs_to association conditions contextually' do
+        search = Search.new(Note, :notable_of_Person_type_name_eq => 'Ernie')
+        search.result.should be_an ActiveRecord::Relation
+        where = search.result.where_values.first
+        where.to_sql.should match /"people"."name" = 'Ernie'/
+      end
+
       it 'evaluates nested conditions' do
         search = Search.new(Person, :children_name_eq => 'Ernie',
           :o => [{
@@ -93,7 +109,7 @@ module Ransack
         )
         search.result.should be_an ActiveRecord::Relation
         where = search.result.where_values.first
-        where.to_sql.should match /\("children_people"."name" = 'Ernie' AND \("people"."name" = 'Ernie' OR "children_people_2"."name" = 'Ernie'\)\)/
+        where.to_sql.should match /"children_people"."name" = 'Ernie' AND \("people"."name" = 'Ernie' OR "children_people_2"."name" = 'Ernie'\)/
       end
 
       it 'evaluates arrays of groupings' do
@@ -105,7 +121,14 @@ 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'\)\)/
+        where.to_sql.should match /\("people"."name" = 'Ernie' OR "children_people"."name" = 'Ernie'\) AND \("people"."name" = 'Bert' OR "children_people"."name" = 'Bert'\)/
+      end
+
+      it 'returns distinct records when passed :distinct => true' do
+        search = Search.new(Person, :o => [{:comments_body_cont => 'e', :articles_comments_body_cont => 'e'}])
+        search.result.should have(920).items
+        search.result(:distinct => true).should have(330).items
+        search.result.all.uniq.should eq search.result(:distinct => true).all
       end
     end
 

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'machinist/active_record'
 require 'sham'
 require 'faker'
+require 'ransack'
 
 Time.zone = 'Eastern Time (US & Canada)'
 
@@ -23,6 +24,4 @@ RSpec.configure do |config|
   config.before(:each)  { Sham.reset(:before_each) }
 
   config.include RansackHelper
-end
-
-require 'ransack'
+end

data/spec/support/schema.rb

@@ -13,6 +13,14 @@ class Person < ActiveRecord::Base
   has_many   :authored_article_comments, :through => :articles,
              :class_name => 'Comment', :foreign_key => :person_id
   has_many   :notes, :as => :notable
+
+  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
 end
 
 class Article < ActiveRecord::Base

metadata

@@ -2,7 +2,7 @@
 name: ransack
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Ernie Miller
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 -04:00
-default_executable: 
+date: 2011-04-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -21,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.1.0.alpha
+        version: "3.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -32,7 +31,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.1.0.alpha
+        version: "3.0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -43,7 +42,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.1.0.alpha
+        version: "3.0"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -107,8 +106,15 @@ files:
 - Rakefile
 - lib/ransack.rb
 - lib/ransack/adapters/active_record.rb
+- lib/ransack/adapters/active_record/3.0/base.rb
+- lib/ransack/adapters/active_record/3.0/compat.rb
+- lib/ransack/adapters/active_record/3.0/context.rb
+- lib/ransack/adapters/active_record/3.0/join_association.rb
+- lib/ransack/adapters/active_record/3.0/join_dependency.rb
 - lib/ransack/adapters/active_record/base.rb
 - lib/ransack/adapters/active_record/context.rb
+- lib/ransack/adapters/active_record/join_association.rb
+- lib/ransack/adapters/active_record/join_dependency.rb
 - lib/ransack/configuration.rb
 - lib/ransack/constants.rb
 - lib/ransack/context.rb
@@ -120,6 +126,7 @@ files:
 - lib/ransack/nodes.rb
 - lib/ransack/nodes/and.rb
 - lib/ransack/nodes/attribute.rb
+- lib/ransack/nodes/bindable.rb
 - lib/ransack/nodes/condition.rb
 - lib/ransack/nodes/grouping.rb
 - lib/ransack/nodes/node.rb
@@ -127,9 +134,11 @@ files:
 - lib/ransack/nodes/sort.rb
 - lib/ransack/nodes/value.rb
 - lib/ransack/predicate.rb
+- lib/ransack/ransacker.rb
 - lib/ransack/search.rb
 - lib/ransack/translate.rb
 - lib/ransack/version.rb
+- lib/ransack/visitor.rb
 - ransack.gemspec
 - spec/blueprints/articles.rb
 - spec/blueprints/comments.rb
@@ -150,7 +159,6 @@ files:
 - spec/ransack/search_spec.rb
 - spec/spec_helper.rb
 - spec/support/schema.rb
-has_rdoc: true
 homepage: http://metautonomo.us/projects/ransack
 licenses: []
 
@@ -174,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ransack
-rubygems_version: 1.5.3
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Object-based searching. Like MetaSearch, but this time, with a better name.