detailed 0.0.1 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebb8d712163dd4d41866b153caab4487fc5ea0df
-  data.tar.gz: 84f9477a757a7e8703372bc9e3f1a646901a9c78
+  metadata.gz: 2efe8712c8cebafa02154279d77781c1c8c9ae0b
+  data.tar.gz: 3cb6c4f19e28eb1867faa19fc94c77b708a3fa34
 SHA512:
-  metadata.gz: f4e6e5b0f4f774ae160a589b5e45b245669faa53d6ae13be0e87f1929fb5c9c16b1047a69e2cfccbf92fb329ee8c98cc5401609a603ffb8d98f7f9f4b33fbac3
-  data.tar.gz: 3710cb97f3fbccf88cf94021efd5d8c64fdd966186caaa866dc9073251656ec86c34bffb5fd2d02721a95105e25b1ec680c93e9187341ae80d08e25ed8943fd1
+  metadata.gz: 5dd9307c2b7fd553f9de88db1e44ada0942b245e302db7418ac6fc6e01fc4b4f6f70612b2ee8571ba527f6d37161ca2b04d77572c938a3a8583f417c3989a26d
+  data.tar.gz: 4626cdf7a0824c5df4d2223dd5de21c44fb97e9fdfbef36f929ef2cedb2d4e71aa2302778351c0b435252abedb2e4dae31252ade01d27b337f20b3c1fe613894

data/lib/detailed.rb

@@ -1,4 +1,6 @@
-module Detailed  
+require "active_record/associations/association_scope.rb"
+
+module Detailed
   def self.included (mod)
     class << mod
       attr_accessor :subclasses
@@ -24,13 +26,12 @@ module Detailed
 	  #has_one :details, class_name: "#{self.superclass.name}#{self.name}Detail", dependent: :destroy
 	  accepts_nested_attributes_for :"details_of_#{self.name.tableize}"
 	  #default_scope :include => :details
-          default_scope -> { includes(:"details_of_#{self.name.tableize}") }
+          default_scope -> { includes(:"details_of_#{self.name.tableize}").joins(:"details_of_#{self.name.tableize}") }
           
           alias :details  :"details_of_#{self.name.tableize}"
           alias :details= :"details_of_#{self.name.tableize}="
 	  
-	  def initialize *s, &blk
-	    super *s, &blk
+	  after_initialize do
 	    self.details ||= Object.const_get("#{self.class.superclass.name}#{self.class.name}Detail").new
 	  end
 	  
@@ -80,4 +81,105 @@ module Detailed
       end
     end
   end
+  
+  module AssociationScope
+    def self.included cl
+      cl.class_eval do
+        def maybe_split(table, field, reflection, scope)
+          if field.match /\./
+            table, field = field.split(/\./, 2)
+            table = alias_tracker.aliased_table_for(table, table_alias_for(reflection, self.reflection != reflection))
+            
+            #scope = scope.merge()
+          end
+                    
+          [table, field, scope]
+        end
+        
+        # Extend add_constraints support for "table.column" notation
+        #
+        # This gives us power to do eg.:
+        #  has_many :frames, foreign_key: "project_frame_details.glass_id"        
+        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[association_primary_key].
+                                      eq(join_table[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
+            
+            # this is our addition
+            table, key, scope = maybe_split(table, key, reflection, scope)
+            foreign_table, foreign_key, scope = maybe_split(foreign_table, foreign_key, reflection, scope)
+            # 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
+                value    = owner.class.base_class.name
+                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
+            
+            # Exclude the scope of the association itself, because that
+            # was already merged in the #scope method.
+            scope_chain[i].each do |scope_chain_item|
+              klass = i == 0 ? self.klass : reflection.klass
+              item  = eval_scope(klass, scope_chain_item)
+              
+              if scope_chain_item == self.reflection.scope
+                scope.merge! item.except(:where, :includes)
+              end
+              
+              scope.includes! item.includes_values
+              scope.where_values += item.where_values
+              scope.order_values |= item.order_values
+            end
+          end
+          
+          scope
+        end
+      end
+    end
+  end
+end
+
+
+class ActiveRecord::Associations::AssociationScope
+  include Detailed::AssociationScope
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: detailed
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.4
 platform: ruby
 authors:
 - Marcin Łabanowski