ransack 0.5.0 → 0.5.1

data/lib/ransack/adapters/active_record/3.0/context.rb

@@ -13,7 +13,8 @@ module Ransack
 
         def evaluate(search, opts = {})
           viz = Visitor.new
-          @object.where(viz.accept(search.base)).order(viz.accept(search.sorts))
+          relation = @object.except(:order).where(viz.accept(search.base)).order(viz.accept(search.sorts))
+          opts[:distinct] ? relation.select("DISTINCT #{@klass.quoted_table_name}.*") : relation
         end
 
         def attribute_method?(str, klass = @klass)

data/lib/ransack/adapters/active_record/context.rb

@@ -11,7 +11,8 @@ module Ransack
 
         def evaluate(search, opts = {})
           viz = Visitor.new
-          @object.where(viz.accept(search.base)).order(viz.accept(search.sorts))
+          relation = @object.except(:order).where(viz.accept(search.base)).order(viz.accept(search.sorts))
+          opts[:distinct] ? relation.select("DISTINCT #{@klass.quoted_table_name}.*") : relation
         end
 
         def attribute_method?(str, klass = @klass)

data/lib/ransack/version.rb

@@ -1,3 +1,3 @@
 module Ransack
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/ransack/search_spec.rb

@@ -129,6 +129,12 @@ module Ransack
         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, :g => [{:m => 'or', :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
 
     describe '#sorts=' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-10 00:00:00.000000000 -04:00
+date: 2011-06-11 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2153569220 !ruby/object:Gem::Requirement
+  requirement: &2153456940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153569220
+  version_requirements: *2153456940
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153568300 !ruby/object:Gem::Requirement
+  requirement: &2153456420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153568300
+  version_requirements: *2153456420
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &2153567660 !ruby/object:Gem::Requirement
+  requirement: &2153455960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153567660
+  version_requirements: *2153455960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153567060 !ruby/object:Gem::Requirement
+  requirement: &2153455380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2153567060
+  version_requirements: *2153455380
 - !ruby/object:Gem::Dependency
   name: machinist
-  requirement: &2153566460 !ruby/object:Gem::Requirement
+  requirement: &2153454840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *2153566460
+  version_requirements: *2153454840
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &2153565840 !ruby/object:Gem::Requirement
+  requirement: &2153454360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *2153565840
+  version_requirements: *2153454360
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2153565180 !ruby/object:Gem::Requirement
+  requirement: &2153453880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,7 +88,7 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *2153565180
+  version_requirements: *2153453880
 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: