activerecord_to_poro 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69aba8f2a10463279cad3508895914d15e273f0a
-  data.tar.gz: 23c28ef06203deef5f487f83da6d0bca03e6db85
+  metadata.gz: 8b997c823f571e6337d990f45915271b65bdf283
+  data.tar.gz: 43abefbf9e2a0aefef0db4a9b4c9198551cc91f5
 SHA512:
-  metadata.gz: 69e06f848fc228e3500275833eb28519140b34568a6994673798909ceba8140de3aa585f398a3f0ddf48f22c8d1daf8ffc45fca537e5d973bd4c4257ec91e2b9
-  data.tar.gz: de404d5cac77aa930610899ed0d6acdefe52cd1ffd73a26c9da85bd27730baa66ff91c4d37a656ea783a4fbaea10b7a69dc248929026227670b642d5c56701ae
+  metadata.gz: 12924d53f57249f4844e1a96d34ac60b67f5389082a95de2325ce85f02199f5ed3bfa0368ba39a2e7938f22ade7e246bd500916639498f5cd94b4e5187e3da46
+  data.tar.gz: 884ef768777721768959fa5f5d15270380452f3321b9a52c870158e95fbf4e00bb53f4df298cff3d11e253295e7bcc1c8a17075a33fa679513614e790b024736

data/lib/activerecord_to_poro/metadata.rb

@@ -34,19 +34,24 @@ module ActiverecordToPoro
     end
 
     def for_ar_class(ar_class_name)
-      Set.new.find
       source_object_info.find(->{SourceObjectInfo.new}){|data|
         data.class_name == ar_class_name
       }
     end
 
     def set_source_info(ar_object)
-      self.source_object_info << SourceObjectInfo.new(class_name: ar_object.class.name,
-                                                      column: ar_object.class.primary_key,
-                                                      value: ar_object.send(ar_object.class.primary_key),
-                                                      object_id: ar_object.object_id,
-                                                      lock_version: ar_object.respond_to?(:lock_version) ? ar_object.lock_version : nil
-                                                     )
+      new_info = create_source_info(ar_object)
+      self.source_object_info.delete_if { |info| info == new_info }
+      self.source_object_info << new_info
+    end
+
+    def create_source_info(ar_object)
+      SourceObjectInfo.new(class_name: ar_object.class.name,
+                           column: ar_object.class.primary_key,
+                           value: ar_object.send(ar_object.class.primary_key),
+                           object_id: ar_object.object_id,
+                           lock_version: ar_object.respond_to?(:lock_version) ? ar_object.lock_version : nil
+      )
     end
 
     def to_hash

data/lib/activerecord_to_poro/metadata_enabled_ar.rb

@@ -1,59 +1,90 @@
 module ActiverecordToPoro
 
   module MetadataEnabledAr
+    require 'active_support/concern'
 
-    def _from_attrs_with_metadata(attrs={}, pre_created_object= nil)
-      record_by_primary_key = _record_from_metadata!(attrs)
+    extend ActiveSupport::Concern
 
-      record = pre_created_object || record_by_primary_key || new
+    included do
+      after_save :_update_poro_metadata
+    end
+
+    def _referenced_poros
+      @_referenced_poros ||= []
+    end
 
-      record.tap do |new_obj|
+    def _update_poro_metadata
 
-        new_obj.attributes = attrs
+      _referenced_poros.each do |entity|
+        entity._set_metadata_from_ar = self if entity.respond_to? :_set_metadata_from_ar=
 
-        _patch_has_many_members(attrs, new_obj) unless new_obj.new_record?
+        [:id, :updated_at, :created_at, :lock_version,].each do |magic_col|
+           entity.send("#{magic_col}=", send(magic_col)) if [entity, self].all? { |obj| obj.respond_to? magic_col }
+        end
       end
 
+      @_referenced_poros = nil # one way method to prevent circular references
+
+      true
     end
 
-    def _patch_has_many_members(attrs, new_obj)
-      has_many_attrs = attrs.slice(* _has_many_attr_names(new_obj))
 
-      has_many_attrs.each_pair do |name, updated_records|
 
-        new_obj.public_send(name).each do |attached_record|
-          record_with_updated_values = updated_records.find {|r| r == attached_record}
-          next unless record_with_updated_values
+    module ClassMethods
+
+      def _from_attrs_with_metadata(attrs={}, pre_created_object= nil)
+        record_by_primary_key = _record_from_metadata!(attrs)
+
+        record = pre_created_object || record_by_primary_key || new
 
-          _apply_change_set_to_record(attached_record, record_with_updated_values.changes)
+        record.tap do |new_obj|
+
+          new_obj.attributes = attrs
+
+          _patch_has_many_members(attrs, new_obj) unless new_obj.new_record?
         end
 
       end
-    end
 
-    def _has_many_attr_names(obj_or_class)
-      class_to_check = obj_or_class.respond_to?(:reflect_on_all_associations) ? obj_or_class : obj_or_class.class
-      class_to_check.reflect_on_all_associations(:has_many).map(&:name)
-    end
+      def _patch_has_many_members(attrs, new_obj)
+        has_many_attrs = attrs.slice(* _has_many_attr_names(new_obj))
+
+        has_many_attrs.each_pair do |name, updated_records|
+
+          new_obj.public_send(name).each do |attached_record|
+            record_with_updated_values = updated_records.find { |r| r == attached_record }
+            next unless record_with_updated_values
 
-    def _apply_change_set_to_record(attached_record, changes)
-      changes.each_pair do |attr_name, (_, new_value)|
-        attached_record.public_send("#{attr_name}=", new_value)
+            _apply_change_set_to_record(attached_record, record_with_updated_values.changes)
+          end
+
+        end
       end
-    end
 
-    def _as_scope(attr)
-      attr.empty? ? none : where(attr)
-    end
+      def _has_many_attr_names(obj_or_class)
+        class_to_check = obj_or_class.respond_to?(:reflect_on_all_associations) ? obj_or_class : obj_or_class.class
+        class_to_check.reflect_on_all_associations(:has_many).map(&:name)
+      end
 
-    def _extract_metadata!(attrs)
-      metadata = (attrs || {}).delete(:_set_metadata_to_ar) {|*| Metadata.new}
-      metadata.for_ar_class(self.name)
-    end
+      def _apply_change_set_to_record(attached_record, changes)
+        changes.each_pair do |attr_name, (_, new_value)|
+          attached_record.public_send("#{attr_name}=", new_value)
+        end
+      end
+
+      def _as_scope(attr)
+        attr.empty? ? none : where(attr)
+      end
 
-    def _record_from_metadata!(attrs)
-      specific_metadata = _extract_metadata!(attrs)
-      _as_scope(specific_metadata.as_scope_hash).first
+      def _extract_metadata!(attrs)
+        metadata = (attrs || {}).delete(:_set_metadata_to_ar) { |*| Metadata.new }
+        metadata.for_ar_class(self.name)
+      end
+
+      def _record_from_metadata!(attrs)
+        specific_metadata = _extract_metadata!(attrs)
+        _as_scope(specific_metadata.as_scope_hash).first
+      end
     end
 
   end

data/lib/activerecord_to_poro/object_mapper.rb

@@ -2,7 +2,11 @@ module ActiverecordToPoro
 
   module MappingToArClass
     def call(pre_created_object=nil)
-      self.target_source._from_attrs_with_metadata(to_hash_or_array(), pre_created_object)
+      self.target_source._from_attrs_with_metadata(to_hash_or_array(), pre_created_object).tap do |new_obj|
+
+        new_obj._referenced_poros << to_convert
+
+      end
     end
   end
 
@@ -82,7 +86,7 @@ module ActiverecordToPoro
 
     def dump_result_source=(new_dump_result)
       unless new_dump_result.respond_to? :_from_attrs_with_metadata
-        new_dump_result.send(:extend, MetadataEnabledAr)
+        new_dump_result.send(:include, MetadataEnabledAr)
       end
 
       @dump_result_source = new_dump_result

data/lib/activerecord_to_poro/version.rb

@@ -1,3 +1,3 @@
 module ActiverecordToPoro
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/acceptance/map_ar_objects_spec.rb

@@ -42,6 +42,20 @@ feature "Map active record objects", %q{
     expect(mapper_with_custom_source.load(a_active_record_object)).to be_kind_of custom_poro_class
   end
 
+  scenario 'updates "_metadata" of the poro after save ' do
+    poro = mapper.load(a_active_record_object)
+    old_lock_version = poro._metadata.for_ar_class(a_active_record_object).lock_version || 0
+    ar_object = mapper.dump(poro)
+
+    ar_object.email = "1_#{ar_object.email}"
+
+    ar_object.save!
+
+    expect(poro._metadata.for_ar_class(ar_object.class.name).lock_version).to eq old_lock_version + 1
+    expect(poro.lock_version).to eq old_lock_version + 1
+
+  end
+
   scenario 'extend default mapping' do
     mapper_with_custom_source.extend_mapping do
       rule to: :lock_version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_to_poro
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Dieter Späth