conjoin 0.0.44 → 0.0.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82f2329fc232dd3b07c0e7fdb0fee34c3913d5d0
-  data.tar.gz: 882039aa582719f307dbfdb70e80e491e5bb64dd
+  metadata.gz: 4018cf046d8a09ddb2a56601a2cc76ba4c95ef67
+  data.tar.gz: eee3f521dc8cf7a30f656c958ba9989475481228
 SHA512:
-  metadata.gz: 8dfdc892c1bdf7a2e96cca8bceca2aad0a202a979a870cbb8b2e6a84408d486580cd66017c3620be67cec0fc3a616d42bb13053e5f6be2078a0096783466dc91
-  data.tar.gz: 6f4a18edaa8863e963050505f4fbf64c8f3c1f9b5b59865495bb5a3d80ac7f79766e3cb30480f469bf6be887e9abd279dfa66225523c6f4f0f47f4b893d3dd89
+  metadata.gz: 056ada6836139becaa18be8d28941b957a57303e42578fd3d5d16c912c6c16388b920a4b0ada1e89eef0524a65d2f8dfab73a55dbf09bb5d7947b8d6c68d948a
+  data.tar.gz: df6ad52f9eef9ed1ae7c8535de604f81efe92bab9d2bb10f84ead9006511d9a898e1a711a4b462ea56efea07d8d418674dc4b3f4384c46135e8058b96d4d0916

data/lib/conjoin/active_record.rb

@@ -183,193 +183,3 @@ module Conjoin
     end
   end
 end
-
-# https://github.com/rails/rails/blob/4-1-stable/activerecord/lib/active_record/associations/association_scope.rb#L63
-# module ActiveRecord
-#   module Associations
-#     class AssociationScope #:nodoc:
-#       def add_constraints(scope, owner, assoc_klass, refl, tracker)
-#         chain = refl.chain
-#         scope_chain = refl.scope_chain
-#
-#         tables = construct_tables(chain, assoc_klass, refl, tracker)
-#
-#         chain.each_with_index do |reflection, i|
-#           table, foreign_table = tables.shift, tables.first
-#
-#           if reflection.source_macro == :belongs_to
-#             if reflection.options[:polymorphic]
-#               key = reflection.association_primary_key(assoc_klass)
-#             else
-#               key = reflection.association_primary_key
-#             end
-#
-#             foreign_key = reflection.foreign_key
-#           else
-#             key         = reflection.foreign_key
-#             foreign_key = reflection.active_record_primary_key
-#           end
-#
-#           if reflection == chain.last
-#             bind_val = bind scope, table.table_name, key.to_s, owner[foreign_key], tracker
-#             scope    = scope.where(table[key].eq(bind_val))
-#
-#             if reflection.type
-#               #############################################
-#               #############################################
-#               #############################################
-#               #############################################
-#               #############################################
-#               #############################################
-#               # .gsub(/\w+::/, '')
-#               # is a fix for polymorphic associations like
-#               # VendorWizard::VendorGroup so it can work
-#               # with the _type VendorGroup instead of
-#               # VendorWizard::VendorGroup
-#               #############################################
-#               #############################################
-#               #############################################
-#               #############################################
-#               #############################################
-#               value    = owner.class.base_class.name.gsub(/\w+::/, '')
-#               #############################################
-#               bind_val = bind scope, table.table_name, reflection.type.to_s, value, tracker
-#               scope    = scope.where(table[reflection.type].eq(bind_val))
-#             end
-#           else
-#             constraint = table[key].eq(foreign_table[foreign_key])
-#
-#             if reflection.type
-#               value    = chain[i + 1].klass.base_class.name
-#               bind_val = bind scope, table.table_name, reflection.type.to_s, value, tracker
-#               scope    = scope.where(table[reflection.type].eq(bind_val))
-#             end
-#
-#             scope = scope.joins(join(foreign_table, constraint))
-#           end
-#
-#           is_first_chain = i == 0
-#           klass = is_first_chain ? assoc_klass : reflection.klass
-#
-#           # Exclude the scope of the association itself, because that
-#           # was already merged in the #scope method.
-#           scope_chain[i].each do |scope_chain_item|
-#             item  = eval_scope(klass, scope_chain_item, owner)
-#
-#             if scope_chain_item == refl.scope
-#               scope.merge! item.except(:where, :includes, :bind)
-#             end
-#
-#             if is_first_chain
-#               scope.includes! item.includes_values
-#             end
-#
-#             scope.where_values += item.where_values
-#             scope.order_values |= item.order_values
-#           end
-#         end
-#
-#         scope
-#       end
-#     end
-#   end
-# end
-# ACTIVERECORD 4.0.3
-module ActiveRecord
-  module Associations
-    class AssociationScope #:nodoc:
-      def add_constraints(scope)
-        tables = construct_tables
-
-        chain.each_with_index do |reflection, i|
-          table, foreign_table = tables.shift, tables.first
-
-          if reflection.source_macro == :has_and_belongs_to_many
-            join_table = tables.shift
-
-            scope = scope.joins(join(
-              join_table,
-              table[reflection.association_primary_key].
-                eq(join_table[reflection.association_foreign_key])
-            ))
-
-            table, foreign_table = join_table, tables.first
-          end
-
-          if reflection.source_macro == :belongs_to
-            if reflection.options[:polymorphic]
-              key = reflection.association_primary_key(self.klass)
-            else
-              key = reflection.association_primary_key
-            end
-
-            foreign_key = reflection.foreign_key
-          else
-            key         = reflection.foreign_key
-            foreign_key = reflection.active_record_primary_key
-          end
-
-          if reflection == chain.last
-            bind_val = bind scope, table.table_name, key.to_s, owner[foreign_key]
-            scope    = scope.where(table[key].eq(bind_val))
-
-            if reflection.type
-              #############################################
-              #############################################
-              #############################################
-              #############################################
-              #############################################
-              #############################################
-              # .gsub(/\w+::/, '')
-              # is a fix for polymorphic associations like
-              # VendorWizard::VendorGroup so it can work
-              # with the _type VendorGroup instead of
-              # VendorWizard::VendorGroup
-              #############################################
-              #############################################
-              #############################################
-              #############################################
-              #############################################
-              value    = owner.class.base_class.name.gsub(/\w+::{1}(\w+::\w+)/, '\1')
-              #############################################
-              bind_val = bind scope, table.table_name, reflection.type.to_s, value
-              scope    = scope.where(table[reflection.type].eq(bind_val))
-            end
-
-          else
-            constraint = table[key].eq(foreign_table[foreign_key])
-
-            if reflection.type
-              type = chain[i + 1].klass.base_class.name
-              constraint = constraint.and(table[reflection.type].eq(type))
-            end
-
-            scope = scope.joins(join(foreign_table, constraint))
-          end
-
-          is_first_chain = i == 0
-          klass = is_first_chain ? self.klass : reflection.klass
-
-          # Exclude the scope of the association itself, because that
-          # was already merged in the #scope method.
-          scope_chain[i].each do |scope_chain_item|
-            item  = eval_scope(klass, scope_chain_item)
-
-            if scope_chain_item == self.reflection.scope
-              scope.merge! item.except(:where, :includes)
-            end
-
-            if is_first_chain
-              scope.includes! item.includes_values
-            end
-
-            scope.where_values += item.where_values
-            scope.order_values |= item.order_values
-          end
-        end
-
-        scope
-      end
-    end
-  end
-end

data/lib/conjoin/version.rb

@@ -1,3 +1,3 @@
 module Conjoin
-  VERSION = "0.0.44"
+  VERSION = "0.0.45"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjoin
 version: !ruby/object:Gem::Version
-  version: 0.0.44
+  version: 0.0.45
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuba