ransack 0.5.6 → 0.5.7

data/lib/ransack/adapters/active_record.rb

@@ -3,15 +3,7 @@ ActiveRecord::Base.extend Ransack::Adapters::ActiveRecord::Base
 
 case ActiveRecord::VERSION::STRING
 when /^3\.0\./
-  require 'ransack/adapters/active_record/3.0/join_dependency'
-  require 'ransack/adapters/active_record/3.0/join_association'
   require 'ransack/adapters/active_record/3.0/context'
-
-  ActiveRecord::Associations::ClassMethods::JoinDependency.send :include, Ransack::Adapters::ActiveRecord::JoinDependency
 else
-  require 'ransack/adapters/active_record/join_dependency'
-  require 'ransack/adapters/active_record/join_association'
   require 'ransack/adapters/active_record/context'
-
-  ActiveRecord::Associations::JoinDependency.send :include, Ransack::Adapters::ActiveRecord::JoinDependency
 end

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

@@ -1,5 +1,5 @@
 require 'ransack/context'
-require 'active_record'
+require 'polyamorous'
 require 'ransack/adapters/active_record/3.0/compat'
 
 module Ransack
@@ -138,7 +138,7 @@ module Ransack
             (!klass || assoc.reflection.klass == klass)
           end
           unless found_association
-            @join_dependency.send(:build_polymorphic, name.to_sym, parent, Arel::Nodes::OuterJoin, klass)
+            @join_dependency.send(:build, Polyamorous::Join.new(name, @join_type, klass), parent)
             found_association = @join_dependency.join_associations.last
             # Leverage the stashed association functionality in AR
             @object = @object.joins(found_association)

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

@@ -1,5 +1,5 @@
 require 'ransack/context'
-require 'active_record'
+require 'polyamorous'
 
 module Ransack
   module Adapters
@@ -143,7 +143,7 @@ module Ransack
             (!klass || assoc.reflection.klass == klass)
           end
           unless found_association
-            @join_dependency.send(:build_polymorphic, name.to_sym, parent, Arel::Nodes::OuterJoin, klass)
+            @join_dependency.send(:build, Polyamorous::Join.new(name, @join_type, klass), parent)
             found_association = @join_dependency.join_associations.last
             # Leverage the stashed association functionality in AR
             @object = @object.joins(found_association)

data/lib/ransack/context.rb

@@ -7,30 +7,31 @@ module Ransack
 
     class << self
 
-      def for(object)
-        context = Class === object ? for_class(object) : for_object(object)
+      def for(object, options = {})
+        context = Class === object ? for_class(object, options) : for_object(object, options)
         context or raise ArgumentError, "Don't know what context to use for #{object}"
       end
 
-      def for_class(klass)
+      def for_class(klass, options = {})
         if klass < ActiveRecord::Base
-          Adapters::ActiveRecord::Context.new(klass)
+          Adapters::ActiveRecord::Context.new(klass, options)
         end
       end
 
-      def for_object(object)
+      def for_object(object, options = {})
         case object
         when ActiveRecord::Relation
-          Adapters::ActiveRecord::Context.new(object.klass)
+          Adapters::ActiveRecord::Context.new(object.klass, options)
         end
       end
 
     end
 
-    def initialize(object)
+    def initialize(object, options = {})
       @object = object.scoped
       @klass = @object.klass
       @join_dependency = join_dependency(@object)
+      @join_type = options[:join_type] || Arel::OuterJoin
       @base = @join_dependency.join_base
       @engine = @base.arel_engine
       @arel_visitor = Arel::Visitors.visitor_for @engine

data/lib/ransack/search.rb

@@ -15,7 +15,7 @@ module Ransack
 
     def initialize(object, params = {}, options = {})
       params ||= {}
-      @context = Context.for(object)
+      @context = Context.for(object, options)
       @context.auth_object = options[:auth_object]
       @base = Nodes::Grouping.new(@context, 'and')
       build(params.with_indifferent_access)

data/lib/ransack/version.rb

@@ -1,3 +1,3 @@
 module Ransack
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end

data/ransack.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "ransack"
 
   s.add_dependency 'activerecord', '~> 3.0'
-  s.add_dependency 'activesupport', '~> 3.0'
   s.add_dependency 'actionpack', '~> 3.0'
+  s.add_dependency 'polyamorous', '~> 0.5.0'
   s.add_development_dependency 'rspec', '~> 2.6.0'
   s.add_development_dependency 'machinist', '~> 1.0.6'
   s.add_development_dependency 'faker', '~> 0.9.5'

data/spec/support/schema.rb

@@ -11,7 +11,7 @@ class Person < ActiveRecord::Base
   has_many   :articles
   has_many   :comments
   has_many   :authored_article_comments, :through => :articles,
-             :class_name => 'Comment', :foreign_key => :person_id
+             :source => :comments, :foreign_key => :person_id
   has_many   :notes, :as => :notable
 
   ransacker :reversed_name, :formatter => proc {|v| v.reverse} do |parent|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-02 00:00:00.000000000Z
+date: 2011-09-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70140004765680 !ruby/object:Gem::Requirement
+  requirement: &70314605054500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70140004765680
+  version_requirements: *70314605054500
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &70140004764800 !ruby/object:Gem::Requirement
+  name: actionpack
+  requirement: &70314605053560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +32,21 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70140004764800
+  version_requirements: *70314605053560
 - !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: &70140004763840 !ruby/object:Gem::Requirement
+  name: polyamorous
+  requirement: &70314605053020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70140004763840
+  version_requirements: *70314605053020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70140004762700 !ruby/object:Gem::Requirement
+  requirement: &70314605052340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70140004762700
+  version_requirements: *70314605052340
 - !ruby/object:Gem::Dependency
   name: machinist
-  requirement: &70140004761980 !ruby/object:Gem::Requirement
+  requirement: &70314605051080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *70140004761980
+  version_requirements: *70314605051080
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70140004760960 !ruby/object:Gem::Requirement
+  requirement: &70314605050120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *70140004760960
+  version_requirements: *70314605050120
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70140004759960 !ruby/object:Gem::Requirement
+  requirement: &70314605049340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *70140004759960
+  version_requirements: *70314605049340
 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:
@@ -106,12 +106,8 @@ files:
 - lib/ransack/adapters/active_record.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

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

@@ -1,44 +0,0 @@
-require 'active_record'
-
-module Ransack
-  module Adapters
-    module ActiveRecord
-      class JoinAssociation < ::ActiveRecord::Associations::ClassMethods::JoinDependency::JoinAssociation
-
-        def initialize(reflection, join_dependency, parent = nil, polymorphic_class = nil)
-          if polymorphic_class && ::ActiveRecord::Base > polymorphic_class
-            swapping_reflection_klass(reflection, polymorphic_class) do |reflection|
-              super(reflection, join_dependency, parent)
-            end
-          else
-            super(reflection, join_dependency, parent)
-          end
-        end
-
-        def swapping_reflection_klass(reflection, klass)
-          reflection = reflection.clone
-          original_polymorphic = reflection.options.delete(:polymorphic)
-          reflection.instance_variable_set(:@klass, klass)
-          yield reflection
-        ensure
-          reflection.options[:polymorphic] = original_polymorphic
-        end
-
-        def ==(other)
-          super && active_record == other.active_record
-        end
-
-        def build_constraint(reflection, table, key, foreign_table, foreign_key)
-          if reflection.options[:polymorphic]
-            super.and(
-              foreign_table[reflection.foreign_type].eq(reflection.klass.name)
-            )
-          else
-            super
-          end
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,60 +0,0 @@
-require 'active_record'
-
-module Ransack
-  module Adapters
-    module ActiveRecord
-      module JoinDependency
-
-        def self.included(base)
-          base.class_eval do
-            # Squeel's graft is more capable than Ransack's.
-            alias_method_chain :graft, :ransack unless defined?(Squeel)
-          end
-        end
-
-        def graft_with_ransack(*associations)
-          associations.each do |association|
-            join_associations.detect {|a| association == a} ||
-              build_polymorphic(association.reflection.name, association.find_parent_in(self) || join_base, association.join_type, association.reflection.klass)
-          end
-          self
-        end
-
-        # Should only be called by Ransack, and only with a single association name
-        def build_polymorphic(association, parent = nil, join_type = Arel::OuterJoin, klass = nil)
-          parent ||= joins.last
-          reflection = parent.reflections[association] or
-            raise ::ActiveRecord::ConfigurationError, "Association named '#{ association }' was not found; perhaps you misspelled it?"
-          unless join_association = find_join_association_respecting_polymorphism(reflection, parent, klass)
-            @reflections << reflection
-            join_association = build_join_association_respecting_polymorphism(reflection, parent, klass)
-            join_association.join_type = join_type
-            @joins << join_association
-            cache_joined_association(join_association)
-          end
-
-          join_association
-        end
-
-        def find_join_association_respecting_polymorphism(reflection, parent, klass)
-          if association = find_join_association(reflection, parent)
-            unless reflection.options[:polymorphic]
-              association
-            else
-              association if association.active_record == klass
-            end
-          end
-        end
-
-        def build_join_association_respecting_polymorphism(reflection, parent, klass = nil)
-          if reflection.options[:polymorphic] && klass
-            JoinAssociation.new(reflection, self, parent, klass)
-          else
-            JoinAssociation.new(reflection, self, parent)
-          end
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,44 +0,0 @@
-require 'active_record'
-
-module Ransack
-  module Adapters
-    module ActiveRecord
-      class JoinAssociation < ::ActiveRecord::Associations::JoinDependency::JoinAssociation
-
-        def initialize(reflection, join_dependency, parent = nil, polymorphic_class = nil)
-          if polymorphic_class && ::ActiveRecord::Base > polymorphic_class
-            swapping_reflection_klass(reflection, polymorphic_class) do |reflection|
-              super(reflection, join_dependency, parent)
-            end
-          else
-            super(reflection, join_dependency, parent)
-          end
-        end
-
-        def swapping_reflection_klass(reflection, klass)
-          reflection = reflection.clone
-          original_polymorphic = reflection.options.delete(:polymorphic)
-          reflection.instance_variable_set(:@klass, klass)
-          yield reflection
-        ensure
-          reflection.options[:polymorphic] = original_polymorphic
-        end
-
-        def ==(other)
-          super && active_record == other.active_record
-        end
-
-        def build_constraint(reflection, table, key, foreign_table, foreign_key)
-          if reflection.options[:polymorphic]
-            super.and(
-              foreign_table[reflection.foreign_type].eq(reflection.klass.name)
-            )
-          else
-            super
-          end
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,60 +0,0 @@
-require 'active_record'
-
-module Ransack
-  module Adapters
-    module ActiveRecord
-      module JoinDependency
-
-        def self.included(base)
-          base.class_eval do
-            # Squeel's graft is more capable than Ransack's.
-            alias_method_chain :graft, :ransack unless defined?(Squeel)
-          end
-        end
-
-        def graft_with_ransack(*associations)
-          associations.each do |association|
-            join_associations.detect {|a| association == a} ||
-              build_polymorphic(association.reflection.name, association.find_parent_in(self) || join_base, association.join_type, association.reflection.klass)
-          end
-          self
-        end
-
-        # Should only be called by Ransack, and only with a single association name
-        def build_polymorphic(association, parent = nil, join_type = Arel::OuterJoin, klass = nil)
-          parent ||= join_parts.last
-          reflection = parent.reflections[association] or
-            raise ::ActiveRecord::ConfigurationError, "Association named '#{ association }' was not found; perhaps you misspelled it?"
-          unless join_association = find_join_association_respecting_polymorphism(reflection, parent, klass)
-            @reflections << reflection
-            join_association = build_join_association_respecting_polymorphism(reflection, parent, klass)
-            join_association.join_type = join_type
-            @join_parts << join_association
-            cache_joined_association(join_association)
-          end
-
-          join_association
-        end
-
-        def find_join_association_respecting_polymorphism(reflection, parent, klass)
-          if association = find_join_association(reflection, parent)
-            unless reflection.options[:polymorphic]
-              association
-            else
-              association if association.active_record == klass
-            end
-          end
-        end
-
-        def build_join_association_respecting_polymorphism(reflection, parent, klass = nil)
-          if reflection.options[:polymorphic] && klass
-            JoinAssociation.new(reflection, self, parent, klass)
-          else
-            JoinAssociation.new(reflection, self, parent)
-          end
-        end
-
-      end
-    end
-  end
-end