ransack 0.4.2 → 0.5.0

data/README.md

@@ -55,15 +55,13 @@ If you're coming from MetaSearch, things to note:
      is passed to it.
   3. Common ActiveRecord::Relation methods are no longer delegated by the search object.
      Instead, you will get your search results (an ActiveRecord::Relation in the case of
-     the ActiveRecord adapter) via a call to `Search#result`. If passed `:distinct => true`,
-     `result` will generate a `SELECT DISTINCT` to avoid returning duplicate rows, even if
-     conditions on a join would otherwise result in some.
+     the ActiveRecord adapter) via a call to `Search#result`.
 
 In your controller:
 
     def index
       @q = Person.search(params[:q])
-      @people = @q.result(:distinct => true)
+      @people = @q.result
     end
 
 In your view:

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

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

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

@@ -5,7 +5,7 @@ module Ransack
 
         def self.extended(base)
           alias :search :ransack unless base.method_defined? :search
-          base.instance_eval do
+          base.class_eval do
             class_attribute :_ransackers
             self._ransackers ||= {}
           end
@@ -16,7 +16,7 @@ module Ransack
         end
 
         def ransacker(name, opts = {}, &block)
-          Ransacker.new(self, name, opts, &block)
+          self._ransackers = _ransackers.merge name.to_s => Ransacker.new(self, name, opts, &block)
         end
 
         def ransackable_attributes(auth_object = nil)

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

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

data/lib/ransack/ransacker.rb

@@ -14,8 +14,6 @@ module Ransack
       @callable = opts[:callable] || block ||
                   (@klass.method(name) if @klass.respond_to?(name)) ||
                   proc {|parent| parent.table[name]}
-
-      @klass._ransackers[name.to_s] = self
     end
 
     def attr_from(bindable)

data/lib/ransack/version.rb

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

data/spec/ransack/search_spec.rb

@@ -129,12 +129,6 @@ 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.4.2
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-09 00:00:00.000000000 -04:00
+date: 2011-06-10 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2161553440 !ruby/object:Gem::Requirement
+  requirement: &2153569220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161553440
+  version_requirements: *2153569220
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2161552940 !ruby/object:Gem::Requirement
+  requirement: &2153568300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161552940
+  version_requirements: *2153568300
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &2161552460 !ruby/object:Gem::Requirement
+  requirement: &2153567660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161552460
+  version_requirements: *2153567660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161552000 !ruby/object:Gem::Requirement
+  requirement: &2153567060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2161552000
+  version_requirements: *2153567060
 - !ruby/object:Gem::Dependency
   name: machinist
-  requirement: &2161551540 !ruby/object:Gem::Requirement
+  requirement: &2153566460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *2161551540
+  version_requirements: *2153566460
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &2161551080 !ruby/object:Gem::Requirement
+  requirement: &2153565840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *2161551080
+  version_requirements: *2153565840
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2161550620 !ruby/object:Gem::Requirement
+  requirement: &2153565180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,7 +88,7 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *2161550620
+  version_requirements: *2153565180
 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: