squeel 0.8.9 → 0.8.10

data/lib/squeel/adapters/active_record.rb

@@ -1,13 +1,12 @@
-ActiveRecord::Relation.send :include, Squeel::Nodes::Aliasing
-
 case ActiveRecord::VERSION::MAJOR
 when 3
+  ActiveRecord::Relation.send :include, Squeel::Nodes::Aliasing
+  require 'squeel/adapters/active_record/join_dependency'
+
   case ActiveRecord::VERSION::MINOR
   when 0
     require 'squeel/adapters/active_record/3.0/compat'
     require 'squeel/adapters/active_record/3.0/relation'
-    require 'squeel/adapters/active_record/3.0/join_dependency'
-    require 'squeel/adapters/active_record/3.0/join_association'
     require 'squeel/adapters/active_record/3.0/association_preload'
     require 'squeel/adapters/active_record/3.0/context'
 
@@ -16,8 +15,6 @@ when 3
     ActiveRecord::Base.extend Squeel::Adapters::ActiveRecord::AssociationPreload
   else
     require 'squeel/adapters/active_record/relation'
-    require 'squeel/adapters/active_record/join_dependency'
-    require 'squeel/adapters/active_record/join_association'
     require 'squeel/adapters/active_record/preloader'
     require 'squeel/adapters/active_record/context'
 

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

@@ -1,4 +1,4 @@
-require 'active_record'
+require 'polyamorous'
 
 module Squeel
   module Adapters
@@ -8,44 +8,19 @@ module Squeel
         def self.included(base)
           base.class_eval do
             alias_method_chain :build, :squeel
-            alias_method_chain :graft, :squeel
           end
         end
 
-        def graft_with_squeel(*associations)
-          associations.each do |association|
-            unless join_associations.detect {|a| association == a}
-              if association.reflection.options[:polymorphic]
-                build(Nodes::Join.new(association.reflection.name, association.join_type, association.reflection.klass),
-                      association.find_parent_in(self) || join_base, association.join_type)
-              else
-                build(association.reflection.name, association.find_parent_in(self) || join_base, association.join_type)
-              end
-            end
-          end
-          self
-        end
-
         def build_with_squeel(associations, parent = nil, join_type = Arel::InnerJoin)
-          associations = associations.symbol if Nodes::Stub === associations
-
           case associations
+          when Nodes::Stub
+            associations = associations.symbol
           when Nodes::Join
-            parent ||= join_parts.last
-            reflection = parent.reflections[associations._name] or
-              raise ::ActiveRecord::ConfigurationError, "Association named '#{ associations._name }' was not found; perhaps you misspelled it?"
-
-            unless join_association = find_join_association_respecting_polymorphism(reflection, parent, associations._klass)
-              @reflections << reflection
-              join_association = build_join_association_respecting_polymorphism(reflection, parent, associations._klass)
-              join_association.join_type = associations._type
-              @join_parts << join_association
-              cache_joined_association(join_association)
-            end
+            associations = associations._join
+          end
 
-            join_association
-          when Nodes::KeyPath
-            parent ||= join_parts.last
+          if Nodes::KeyPath === associations
+            parent ||= _join_parts.last
             associations.path_with_endpoint.each do |key|
               parent = build(key, parent, join_type)
             end
@@ -55,24 +30,6 @@ module Squeel
           end
         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)
-          if reflection.options[:polymorphic] && klass
-            JoinAssociation.new(reflection, self, parent, klass)
-          else
-            JoinAssociation.new(reflection, self, parent)
-          end
-        end
-
       end
     end
   end

data/lib/squeel/nodes/join.rb

@@ -4,50 +4,34 @@ module Squeel
     class Join
       undef_method :id if method_defined?(:id)
 
-      # @return [Symbol] The join's association name
-      attr_reader :_name
+      attr_reader :_join
 
-      # @return [Arel::InnerJoin, Arel::OuterJoin] The ARel join type
-      attr_reader :_type
-
-      # @return [Class] The polymorphic belongs_to join class
-      # @return [NilClass] If the join is not a polymorphic belongs_to join
-      attr_reader :_klass
+      delegate :name, :type, :klass, :name=, :type=, :klass=, :to => :_join, :prefix => ''
 
       # Create a new Join node
       # @param [Symbol] name The association name
       # @param [Arel::InnerJoin, Arel::OuterJoin] type The ARel join class
       # @param [Class, String, Symbol] klass The polymorphic belongs_to class or class name
       def initialize(name, type = Arel::InnerJoin, klass = nil)
-        @_name, @_type = name, type
-        @_klass = convert_to_class(klass) if klass
+        @_join = Polyamorous::Join.new(name, type, klass)
       end
 
       # Set the join type to an inner join
       # @return [Join] The join, with an updated join type.
       def inner
-        @_type = Arel::InnerJoin
+        self._type = Arel::InnerJoin
         self
       end
 
       # Set the join type to an outer join
       # @return [Join] The join, with an updated join type.
       def outer
-        @_type = Arel::OuterJoin
+        self._type = Arel::OuterJoin
         self
       end
 
-      # Set the polymorphic belongs_to class
-      # @param [Class, String, Symbol] class_or_class_name The polymorphic belongs_to class or class name
-      # @return [Class] The class that's just been set
-      def _klass=(class_or_class_name)
-        @_klass = convert_to_class(class_or_class_name)
-      end
-
-      # Returns a true value (the class itself) if a polymorphic belongs_to class has been set
-      # @return [NilClass, Class] The class, if present.
       def polymorphic?
-        @_klass
+        _klass
       end
 
       # Compare with other objects
@@ -92,22 +76,6 @@ module Squeel
         nil
       end
 
-      private
-
-      # Convert the given value into a class.
-      # @param [Class, String, Symbol] value The value to be converted
-      # @return [Class] The class after conversion
-      def convert_to_class(value)
-        case value
-        when String, Symbol
-          Kernel.const_get(value)
-        when Class
-          value
-        else
-          raise ArgumentError, "#{value} cannot be converted to a Class"
-        end
-      end
-
     end
   end
 end

data/lib/squeel/version.rb

@@ -1,3 +1,3 @@
 module Squeel
-  VERSION = "0.8.9"
+  VERSION = "0.8.10"
 end

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

@@ -16,7 +16,7 @@ module Squeel
         end
 
         it 'contextualizes join parts with the proper alias' do
-          table = @c.contextualize @jd.join_parts.last
+          table = @c.contextualize @jd._join_parts.last
           table.table_alias.should eq 'parents_people_2'
         end
 

data/spec/squeel/adapters/active_record/relation_spec.rb

@@ -19,7 +19,7 @@ module Squeel
             visitor = relation.predicate_visitor
 
             visitor.should be_a Visitors::PredicateVisitor
-            table = visitor.contextualize(relation.join_dependency.join_parts.last)
+            table = visitor.contextualize(relation.join_dependency._join_parts.last)
             table.table_alias.should eq 'parents_people_2'
           end
 
@@ -39,7 +39,7 @@ module Squeel
             visitor = relation.attribute_visitor
 
             visitor.should be_a Visitors::AttributeVisitor
-            table = visitor.contextualize(relation.join_dependency.join_parts.last)
+            table = visitor.contextualize(relation.join_dependency._join_parts.last)
             table.table_alias.should eq 'parents_people_2'
           end
 

data/squeel.gemspec

@@ -29,6 +29,7 @@ you're feeling especially appreciative. It'd help me justify this
 
   s.add_dependency 'activerecord', '~> 3.0'
   s.add_dependency 'activesupport', '~> 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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squeel
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.8.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-29 00:00:00.000000000Z
+date: 2011-09-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70295228232080 !ruby/object:Gem::Requirement
+  requirement: &70152532762100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70295228232080
+  version_requirements: *70152532762100
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70295228231580 !ruby/object:Gem::Requirement
+  requirement: &70152532761420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,21 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70295228231580
+  version_requirements: *70152532761420
+- !ruby/object:Gem::Dependency
+  name: polyamorous
+  requirement: &70152532757160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70152532757160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70295228231120 !ruby/object:Gem::Requirement
+  requirement: &70152532756300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +54,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70295228231120
+  version_requirements: *70152532756300
 - !ruby/object:Gem::Dependency
   name: machinist
-  requirement: &70295228230660 !ruby/object:Gem::Requirement
+  requirement: &70152532755220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *70295228230660
+  version_requirements: *70152532755220
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70295228230200 !ruby/object:Gem::Requirement
+  requirement: &70152532754580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +76,10 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *70295228230200
+  version_requirements: *70152532754580
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70295228229740 !ruby/object:Gem::Requirement
+  requirement: &70152532753940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +87,7 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *70295228229740
+  version_requirements: *70152532753940
 description: ! "\n      Squeel unlocks the power of ARel in your Rails 3 application
   with\n      a handy block-based syntax. You can write subqueries, access named\n
   \     functions provided by your RDBMS, and more, all without writing\n      SQL
@@ -101,11 +112,8 @@ files:
 - lib/squeel/adapters/active_record/3.0/association_preload.rb
 - lib/squeel/adapters/active_record/3.0/compat.rb
 - lib/squeel/adapters/active_record/3.0/context.rb
-- lib/squeel/adapters/active_record/3.0/join_association.rb
-- lib/squeel/adapters/active_record/3.0/join_dependency.rb
 - lib/squeel/adapters/active_record/3.0/relation.rb
 - lib/squeel/adapters/active_record/context.rb
-- lib/squeel/adapters/active_record/join_association.rb
 - lib/squeel/adapters/active_record/join_dependency.rb
 - lib/squeel/adapters/active_record/preloader.rb
 - lib/squeel/adapters/active_record/relation.rb
@@ -149,7 +157,6 @@ files:
 - spec/helpers/squeel_helper.rb
 - spec/spec_helper.rb
 - spec/squeel/adapters/active_record/context_spec.rb
-- spec/squeel/adapters/active_record/join_association_spec.rb
 - spec/squeel/adapters/active_record/join_dependency_spec.rb
 - spec/squeel/adapters/active_record/relation_spec.rb
 - spec/squeel/core_ext/symbol_spec.rb
@@ -202,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: squeel
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: ActiveRecord 3, improved.
@@ -217,7 +224,6 @@ test_files:
 - spec/helpers/squeel_helper.rb
 - spec/spec_helper.rb
 - spec/squeel/adapters/active_record/context_spec.rb
-- spec/squeel/adapters/active_record/join_association_spec.rb
 - spec/squeel/adapters/active_record/join_dependency_spec.rb
 - spec/squeel/adapters/active_record/relation_spec.rb
 - spec/squeel/core_ext/symbol_spec.rb

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

@@ -1,54 +0,0 @@
-require 'active_record'
-
-module Squeel
-  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 association_join
-          return @join if @Join
-
-          @join = super
-
-          if reflection.macro == :belongs_to && reflection.options[:polymorphic]
-            aliased_table = Arel::Table.new(table_name, :as      => @aliased_table_name,
-                                                        :engine  => arel_engine,
-                                                        :columns => klass.columns)
-
-            parent_table = Arel::Table.new(parent.table_name, :as      => parent.aliased_table_name,
-                                                              :engine  => arel_engine,
-                                                              :columns => parent.active_record.columns)
-
-            @join << parent_table[reflection.options[:foreign_type]].eq(reflection.klass.name)
-          end
-
-          @join
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,80 +0,0 @@
-require 'active_record'
-
-module Squeel
-  module Adapters
-    module ActiveRecord
-      module JoinDependency
-
-        def self.included(base)
-          base.class_eval do
-            alias_method_chain :build, :squeel
-            alias_method_chain :graft, :squeel
-            alias :join_parts :joins
-          end
-        end
-
-        def graft_with_squeel(*associations)
-          associations.each do |association|
-            unless join_associations.detect {|a| association == a}
-              if association.reflection.options[:polymorphic]
-                build(Nodes::Join.new(association.reflection.name, association.join_type, association.reflection.klass),
-                      association.find_parent_in(self) || join_base, association.join_type)
-              else
-                build(association.reflection.name, association.find_parent_in(self) || join_base, association.join_type)
-              end
-            end
-          end
-          self
-        end
-
-        def build_with_squeel(associations, parent = nil, join_type = Arel::InnerJoin)
-          associations = associations.symbol if Nodes::Stub === associations
-
-          case associations
-          when Nodes::Join
-            parent ||= @joins.last
-            reflection = parent.reflections[associations._name] or
-              raise ::ActiveRecord::ConfigurationError, "Association named '#{ associations._name }' was not found; perhaps you misspelled it?"
-
-            unless join_association = find_join_association_respecting_polymorphism(reflection, parent, associations._klass)
-              @reflections << reflection
-              join_association = build_join_association_respecting_polymorphism(reflection, parent, associations._klass)
-              join_association.join_type = associations._type
-              @joins << join_association
-              cache_joined_association(join_association)
-            end
-
-            join_association
-          when Nodes::KeyPath
-            parent ||= @joins.last
-            associations.path_with_endpoint.each do |key|
-              parent = build(key, parent, join_type)
-            end
-            parent
-          else
-            build_without_squeel(associations, parent, join_type)
-          end
-        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)
-          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/squeel/adapters/active_record/join_association.rb

@@ -1,44 +0,0 @@
-require 'active_record'
-
-module Squeel
-  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/spec/squeel/adapters/active_record/join_association_spec.rb

@@ -1,20 +0,0 @@
-require 'spec_helper'
-
-module Squeel
-  module Adapters
-    module ActiveRecord
-      describe JoinAssociation do
-        before do
-          @jd = new_join_dependency(Note, {}, [])
-          @notable = Note.reflect_on_association(:notable)
-        end
-
-        it 'accepts a 4th parameter to set a polymorphic class' do
-          join_association = JoinAssociation.new(@notable, @jd, @jd.join_base, Article)
-          join_association.reflection.klass.should eq Article
-        end
-
-      end
-    end
-  end
-end