synced 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7d60ab7f5ecb738bb46d858dc48d7df17091de0
-  data.tar.gz: 26077b427c696ae5354e23fa087d4be2690ca7cf
+  metadata.gz: 7aa93a0045e49e35ef45f18f16afcd94d9e0bd24
+  data.tar.gz: 699a8ae50503c3bb5467dacc47084ce59f849c92
 SHA512:
-  metadata.gz: 7cf9b81a096a123dd070c494ba4684b327faaaa17671e3e4bb3159482a19fb914b7bd560ca15021fb10c1d5f80956b6b889c900cbe6d8e2c39897a6797e38e91
-  data.tar.gz: f7c4f5fc0295733e235b008e79e9d1994dc1fffa289f2c9e1758ebdd50a0cc21ee6dad2c2d24cd4d640de3f537d597d69820aef844892f8940ec72547b731339
+  metadata.gz: 539bad5fcea8a7499960b79168d83196658a3479e953486fa70240c75e89079bf4bb3a1f12802d8edaee653fc66799cc6547db2f6a1f830fc404c4ddd1baa103
+  data.tar.gz: 4d1c9bb509766abbb41a245522b150442338f25ef23901650378a239709cb1c384fd14ed090238ff085ca6eaf2c341918c53f2476ba05e009d933608c74b7f2b

data/lib/synced/synchronizer.rb

@@ -58,8 +58,8 @@ module Synced
       @fields                = options[:fields]
       @remove                = options[:remove]
       @associations          = Array(options[:associations])
-      @remote_objects        = Array(options[:remote]) unless options[:remote].nil?
-      @request_performed     = false
+      @perform_request       = options[:remote].nil?
+      @remote_objects        = Array(options[:remote]) unless @perform_request
       @globalized_attributes = attributes_as_hash(options[:globalized_attributes])
       @initial_sync_since    = options[:initial_sync_since]
     end
@@ -90,7 +90,7 @@ module Synced
               end
             end
           end.tap do |local_objects|
-            if updated_since_enabled? && @request_performed
+            if updated_since_enabled?
               instrument("update_synced_all_at_perform.synced", model: @model_class) do
                 relation_scope.update_all(@synced_all_at_key => Time.now)
               end
@@ -165,19 +165,17 @@ module Synced
     end
 
     def remote_objects
-      @remote_objects ||= fetch_remote_objects
+      @remote_objects ||= @perform_request ? fetch_remote_objects : nil
     end
 
     def deleted_remote_objects_ids
-      remote_objects unless @request_performed
+      remote_objects
       api.last_response.meta[:deleted_ids]
     end
 
     def fetch_remote_objects
       instrument("fetch_remote_objects.synced", model: @model_class) do
-        api.paginate(resource_name, api_request_options).tap do
-          @request_performed = true
-        end
+        api.paginate(resource_name, api_request_options)
       end
     end
 
@@ -211,7 +209,7 @@ module Synced
     end
 
     def updated_since_enabled?
-      @only_updated && @synced_all_at_key
+      @only_updated && @synced_all_at_key && @perform_request
     end
 
     def resource_name
@@ -231,7 +229,7 @@ module Synced
     end
 
     def remove_relation
-      if @only_updated && @request_performed
+      if updated_since_enabled?
         relation_scope.where(id_key => deleted_remote_objects_ids)
       else
         relation_scope.where.not(id_key => remote_objects_ids)

data/lib/synced/version.rb

@@ -1,3 +1,3 @@
 module Synced
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: synced
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Sebastien Grosjean
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails