detailed 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2efe8712c8cebafa02154279d77781c1c8c9ae0b
-  data.tar.gz: 3cb6c4f19e28eb1867faa19fc94c77b708a3fa34
+  metadata.gz: 28e43c195327231d8e2e93365dff966ebdbc98ef
+  data.tar.gz: 53854de1aef853ca8085cabd40afc707b2ff9c13
 SHA512:
-  metadata.gz: 5dd9307c2b7fd553f9de88db1e44ada0942b245e302db7418ac6fc6e01fc4b4f6f70612b2ee8571ba527f6d37161ca2b04d77572c938a3a8583f417c3989a26d
-  data.tar.gz: 4626cdf7a0824c5df4d2223dd5de21c44fb97e9fdfbef36f929ef2cedb2d4e71aa2302778351c0b435252abedb2e4dae31252ade01d27b337f20b3c1fe613894
+  metadata.gz: 3247784accccc96c5465a21a0241fb46f102cc54f9b1485b332eee0d16fb6d67580a334f2f36b993add05ffdaaba66db0f7ea32e3fdb45f3c7cbf38e0cda11c9
+  data.tar.gz: 4f78a226d723cc07c99b9df0f2f3f8dfa1f46fc75ecac79f94f6b9df1b57616760d92bc2adc9cbd4a4e887f561f45ea2f7dbf1ca59a71ff03febc7bfff143ea3

data/lib/detailed.rb

@@ -16,23 +16,23 @@ module Detailed
       
       def all_with_details
         @subclasses ||= []
-        @subclasses.inject(self.all) { |a,b| a.includes(:"details_of_#{b.name.tableize}") }
+        @subclasses.inject(self.unscoped) { |a,b| a.includes(:"details_of_#{b.name.tableize}") }
       end
       
       def request_details
         self.superclass.add_subclass(self)
         
 	class_eval do
-	  #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}").joins(:"details_of_#{self.name.tableize}") }
+          default_scope do
+            eager_load :"details_of_#{self.name.tableize}"
+          end
           
           alias :details  :"details_of_#{self.name.tableize}"
           alias :details= :"details_of_#{self.name.tableize}="
 	  
 	  after_initialize do
-	    self.details ||= Object.const_get("#{self.class.superclass.name}#{self.class.name}Detail").new
+	    self.details ||= "#{self.class.superclass.name}#{self.class.name}Detail".constantize.new if self.new_record?
 	  end
 	  
 	  alias :__old_method_missing :method_missing
@@ -59,14 +59,14 @@ module Detailed
               raise e
             end
           end
-          
+
 	  def method_missing a, *b
             __old_method_missing a, *b
           rescue NoMethodError, NameError => e
 	    begin
               details.send a, *b
             rescue NoMethodError, NameError
-		raise e
+              raise e
             end
 	  end
 	  
@@ -85,15 +85,13 @@ module Detailed
   module AssociationScope
     def self.included cl
       cl.class_eval do
-        def maybe_split(table, field, reflection, scope)
+        def maybe_split(table, field, reflection)
           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]
+          [table, field]
         end
         
         # Extend add_constraints support for "table.column" notation
@@ -132,8 +130,8 @@ module Detailed
             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)
+            table, key = maybe_split(table, key, reflection)
+            foreign_table, foreign_key = maybe_split(foreign_table, foreign_key, reflection)
             # end
             
             if reflection == chain.last              

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: detailed
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Marcin Łabanowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies: []
 description: An ActiveRecord module giving you the power of multiple table inheritance
   while still resorting to an API resembling single table inheritance