ar_sync 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '01944ab2f90f657d412a17a52cb72eb249b5a3a96ca0531f273c1045900aae92'
-  data.tar.gz: 5f64eb0b5c66b24f886b693b9bee94a4f4ba95661768af4526fc3eda9be63d07
+  metadata.gz: c79d18d97624ed5b34f6471838d6b96eb6cfb71bba00cee9344a370dbb309498
+  data.tar.gz: c967bed5ff59000fcc8c1de827e98f1b8caef20d71d67532d8203eff4d97724a
 SHA512:
-  metadata.gz: 1305699ff98f51f6f8bb63bc8724c022c65475036b533b865fa48eabe4353c29805653c1204c81a1ee51a2e3d8f06de37b75eaabb3e7baa8b2f5dd0a9b04e08e
-  data.tar.gz: 7a25e40259ee1ff0baa93f783dddb1a9af36cab92ecd8686b2f22885022004aaf716e18a004cb6a2c4b44e15ae3bb9216e1f7c7def0f59920eed77ef4e062f5a
+  metadata.gz: 5966a10dfdce14e70e2df1a0d722889db8ff4bece153bf4d1bd73a8148dd6f79cb4581e254a26deed31c2fe09acbdcd9333cdbf6616ec8d892bfc0758ccd44e3
+  data.tar.gz: 87b53c9634f5afd4b4a1a708ce128d094290d3e5db9a24b70146dc4fc96091760efcdb5b8edf851f3ce83afb13f85e464e556d2c00890c4b36fa852871908d7a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ar_sync (1.0.0)
+    ar_sync (1.0.1)
       activerecord
       ar_serializer
 

data/lib/ar_sync/class_methods.rb

@@ -124,12 +124,12 @@ module ArSync::GraphSync::ClassMethods
   end
 
   def sync_has_many(name, **option, &data_block)
-    _sync_children_info[name] = :many
+    _sync_children_info[name] = [:many, option, data_block]
     _sync_has_many name, option, &data_block
   end
 
   def sync_has_one(name, **option, &data_block)
-    _sync_children_info[name] = :one
+    _sync_children_info[name] = [:one, option, data_block]
     _sync_define name, option, &data_block
   end
 
@@ -179,12 +179,13 @@ module ArSync::GraphSync::ClassMethods
       def write_attribute(attr_name, value)
         self.class.default_scoped.scoping do
           @_sync_parents_info_before_mutation ||= _sync_current_parents_info
+          @_sync_belongs_to_info_before_mutation ||= _sync_current_belongs_to_info
         end
         super attr_name, value
       end
     end
     prepend mod
-    attr_reader :_sync_parents_info_before_mutation
+    attr_reader :_sync_parents_info_before_mutation, :_sync_belongs_to_info_before_mutation
 
     _sync_define :id
 
@@ -198,10 +199,12 @@ module ArSync::GraphSync::ClassMethods
 
     before_destroy do
       @_sync_parents_info_before_mutation ||= _sync_current_parents_info
+      @_sync_belongs_to_info_before_mutation ||= _sync_current_belongs_to_info
     end
 
     before_save on: :create do
       @_sync_parents_info_before_mutation ||= _sync_current_parents_info
+      @_sync_belongs_to_info_before_mutation ||= _sync_current_belongs_to_info
     end
 
     %i[create update destroy].each do |action|
@@ -209,6 +212,7 @@ module ArSync::GraphSync::ClassMethods
         next if ArSync.skip_notification?
         self.class.default_scoped.scoping { _sync_notify action }
         @_sync_parents_info_before_mutation = nil
+        @_sync_belongs_to_info_before_mutation = nil
       end
     end
   end

data/lib/ar_sync/instance_methods.rb

@@ -82,6 +82,35 @@ module ArSync::GraphSync::InstanceMethods
     parents
   end
 
+  def _serializer_field_value(name)
+    field = self.class._serializer_field_info name
+    preloadeds = field.preloaders.map do |preloader|
+      args = [[self], nil, {}]
+      preloader.call(*(preloader.arity < 0 ? args : args.take(preloader.arity)))
+    end
+    instance_exec(*preloadeds, nil, {}, &field.data_block)
+  end
+
+  def _sync_current_belongs_to_info
+    belongs = {}
+    self.class._each_sync_child do |name, (type, option, data_block)|
+      next unless type == :one
+      option ||= {}
+      association_name = (option[:association] || name).to_s.underscore
+      association = self.class.reflect_on_association association_name
+      next if association && !association.belongs_to?
+      if association && !option[:preload] && !data_block
+        belongs[name] = {
+          type: association.foreign_type && self[association.foreign_type],
+          id: self[association.foreign_key]
+        }
+      else
+        belongs[name] = { value: _serializer_field_value(name) }
+      end
+    end
+    belongs
+  end
+
   def _sync_notify_parent(action)
     if action == :create
       parents = _sync_current_parents_info
@@ -125,6 +154,14 @@ module ArSync::GraphSync::InstanceMethods
   end
 
   def _sync_notify_self
+    belongs_was = _sync_belongs_to_info_before_mutation
+    belongs = _sync_current_belongs_to_info
+    belongs.each do |name, info|
+      next if belongs_was[name] == info
+      value = info.key?(:value) ? info[:value] : _serializer_field_value(name)
+      _sync_notify_child_added value, name, nil, true if value.is_a? ArSerializer::Serializable
+      _sync_notify_child_removed value, name, nil, true if value.nil?
+    end
     ArSync.sync_graph_send(to: self, action: :update, model: self)
   end
 end

data/lib/ar_sync/version.rb

@@ -1,3 +1,3 @@
 module ArSync
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/src/graph/ArSyncStore.ts

@@ -209,7 +209,7 @@ class ArSyncRecord extends ArSyncContainerBase {
           collection.parentKey = aliasName
         }
       } else {
-        if (subQuery.attributes) this.paths.push(key);
+        if (subQuery.attributes && Object.keys(subQuery.attributes).length > 0) this.paths.push(key);
         if (subData && subData.sync_keys) {
           if (this.children[aliasName]) {
             this.children[aliasName].replaceData(subData)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar_sync
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - tompng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-12 00:00:00.000000000 Z
+date: 2019-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord