reactive-record 0.7.16 → 0.7.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 139439c144b766200fccb72d67240cbfec0d6eae
-  data.tar.gz: 1d67f45f99d68e4e2dd0ac5db2ee88885b491e80
+  metadata.gz: 906f180ce48df5a17368e98b8fc2dd12cadbe37f
+  data.tar.gz: 40966ab4582c08edd15d88625dd5de102ea8cfc0
 SHA512:
-  metadata.gz: 4389f9eeecb8e5da8ff5788bdcb5886b2f086111e8a7ca7620e65e78cec26fcdb2b371fb2ab2d38fa0a7f3517a675478557a1a157915e99a93848e6d526b105d
-  data.tar.gz: 1c647b32c2b98182e8e8dbd12672ce1faca07bce3613405baec06c8c30ed56a21f15e27d342448fdd10969dddcd82b40d36acb04669693ea5116262b83969e63
+  metadata.gz: 955d731a1ebf9cbaa76cf0ea44ef7e7cd9b1598b5e7662f28057055c4590de02b7bf9431e00f33cbb6733299bde1ecbf1cea2cff9d85b46fcd9f821f7bdf4e2a
+  data.tar.gz: 2f6bf61dfdfefcf9f90ef9a2b615612ef0014cbb1820b6103d28964a6f3058fad8606cce5be9f64ee45d7af4eab1fb682501d47a1e568d764813247b6b0171e1

data/lib/reactive_record/active_record/aggregations.rb

@@ -1,38 +1,40 @@
 module ActiveRecord
-  
+
   class Base
-    
+
     def self.reflect_on_all_aggregations
       base_class.instance_eval { @aggregations ||= [] }
     end
-    
+
     def self.reflect_on_aggregation(attribute)
       reflect_on_all_aggregations.detect { |aggregation| aggregation.attribute == attribute }
     end
-    
+
   end
-  
+
   module Aggregations
-    
+
     class AggregationReflection
-      
+
       attr_reader :klass_name
       attr_reader :attribute
-      
+      attr_reader :mapped_attributes
+
       def initialize(owner_class, macro, name, options = {})
         owner_class.reflect_on_all_aggregations << self
         @owner_class = owner_class
         @klass_name =  options[:class_name] || name.camelize
         @attribute =   name
+        @mapped_attributes = options[:mapping].collect &:last
       end
-      
+
       def klass
         @klass ||= Object.const_get(@klass_name)
       end
-      
+
     end
-    
+
   end
-  
-  
-end
+
+
+end

data/lib/reactive_record/active_record/base.rb

@@ -1,9 +1,9 @@
 module ActiveRecord
   class Base
-    
+
     extend  ClassMethods
-     
+
     include InstanceMethods
-    
+
   end
-end
+end

data/lib/reactive_record/active_record/instance_methods.rb

@@ -17,7 +17,7 @@ module ActiveRecord
           self.class.load_data do
             hash.each do |attribute, value|
               unless attribute == primary_key
-                reactive_set!(attribute, value) unless attribute == primary_key
+                reactive_set!(attribute, value)
                 changed_attributes << attribute
               end
             end
@@ -52,6 +52,10 @@ module ActiveRecord
       @backing_record.changed?
     end
 
+    def dup
+      self.class.new(self.attributes)
+    end
+
     def ==(ar_instance)
       @backing_record == ar_instance.instance_eval { @backing_record }
     end

data/lib/reactive_record/active_record/reactive_record/base.rb

@@ -100,9 +100,17 @@ module ReactiveRecord
         record = new model
         record.vector = vector
       end
-      record.aggregate_owner = aggregate_owner
-      record.aggregate_attribute = vector.last
+
       record.ar_instance ||= infer_type_from_hash(model, record.attributes).new(record)
+
+      if aggregate_owner
+        record.aggregate_owner = aggregate_owner
+        record.aggregate_attribute = vector.last
+        aggregate_owner.attributes[vector.last] = record.ar_instance
+      end
+
+      record.ar_instance
+
     end
 
     def initialize(model, hash = {}, ar_instance = nil)
@@ -180,11 +188,23 @@ module ReactiveRecord
               attributes[attribute].attributes[inverse_of] = nil
             end
           end
-        elsif @model.reflect_on_aggregation(attribute)
-          attributes[attribute].instance_variable_get(:@backing_record).aggregate_owner = nil if attributes[attribute]
-          aggregate = value.instance_variable_get(:@backing_record)
-          aggregate.aggregate_owner = self
-          aggregate.aggregate_attribute = attribute
+        elsif aggregation = @model.reflect_on_aggregation(attribute)
+
+          unless attributes[attribute]
+            raise "unitialized aggregate attribute - should never happen"
+          end
+
+          aggregate_record = attributes[attribute].instance_variable_get(:@backing_record)
+
+          if value
+            value_attributes = value.instance_variable_get(:@backing_record).attributes
+            aggregation.mapped_attributes.each { |mapped_attribute| aggregate_record.update_attribute(mapped_attribute, value_attributes[mapped_attribute])}
+          else
+            aggregation.mapped_attributes.each { |mapped_attribute| aggregate_record.update_attribute(mapped_attribute, nil) }
+          end
+
+          return attributes[attribute]
+
         end
         update_attribute(attribute, value)
       end

data/lib/reactive_record/active_record/reactive_record/isomorphic_base.rb

@@ -334,7 +334,7 @@ module ReactiveRecord
               puts "current parent attributes = #{current_attributes}"
               new_attributes = aggregate.attributes
               puts "current child attributes = #{new_attributes}"
-              merged_attributes = current_attributes.merge(new_attributes) { |k, n, o| n or o }
+              merged_attributes = current_attributes.merge(new_attributes) { |k, current_attr, new_attr| aggregate.send("#{k}_changed?") ? new_attr : current_attr}
               puts "merged attributes = #{merged_attributes}"
               aggregate.assign_attributes(merged_attributes)
               puts "aggregate attributes after merge = #{aggregate.attributes}"

data/lib/reactive_record/version.rb

@@ -1,3 +1,3 @@
 module ReactiveRecord
-  VERSION = "0.7.16"
+  VERSION = "0.7.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reactive-record
 version: !ruby/object:Gem::Version
-  version: 0.7.16
+  version: 0.7.17
 platform: ruby
 authors:
 - Mitch VanDuyn