synced 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e12f68714c45cb3257ac0116c7412e34879bff8
-  data.tar.gz: 07828256826de59fcb3e8e0c8da913270bab003d
+  metadata.gz: b945df81754cad42074724a1571ee354c1933224
+  data.tar.gz: 751cd8bbe6f45e57291d803b84a732ce85f8b94f
 SHA512:
-  metadata.gz: aad5845c643c3a8485db188837bf7f43307513c8cbf3092b0e190a4759ffb00dd879ba74cfa0f77798128c0b81ab7710db268eec8e14fed782d51d4389b53195
-  data.tar.gz: f000eb92f1ccb6d09b10a10995571240f8619612206129305faa8a7283809169ed02a656cf9a50e775fecb93e847a8c35e4cfd2f64ca98992b1f94c8942f716a
+  metadata.gz: 8ddb414c76f87761d53d9cef876709c216da97bff6ad3deed9e972919559d41ec71d1deef1e6c6bb3e7a584f3c8e2dae4d9ad590d5ac9e873daa1667b737e4d5
+  data.tar.gz: ac416d727ee33daf592af9b7d4d0717d151212d0d3c39070abcb65e3492ffc28b6e5e04acded3bc97dcf783f3e9a1d9789250cd704536653d6d8bfe6249a5b59

data/README.md

@@ -243,7 +243,7 @@ class CreateSyncedTimestamps < ActiveRecord::Migration
       t.datetime :synced_at, null: false
     end
 
-    add_index :synced_timestamps, [:parent_scope_id, :parent_scope_type, :synced_at], name: 'synced_timestamps_max_index', order: { synced_at: 'DESC' }
+    add_index :synced_timestamps, [:parent_scope_id, :parent_scope_type, :model_class, :synced_at], name: 'synced_timestamps_max_index', order: { synced_at: 'DESC' }
   end
 end
 ```

data/lib/synced/strategies/full.rb

@@ -47,7 +47,6 @@ module Synced
         @scope                 = options[:scope]
         @id_key                = options[:id_key]
         @data_key              = options[:data_key]
-        @remove                = options[:remove]
         @only_updated          = options[:only_updated]
         @include               = options[:include]
         @local_attributes      = synced_attributes_as_hash(options[:local_attributes])

data/lib/synced/strategies/updated_since.rb

@@ -16,11 +16,12 @@ module Synced
       end
 
       def perform
+        raise MissingTimestampError.new unless first_request_timestamp
         super.tap do |local_objects|
           instrument("update_synced_timestamp_perform.synced", model: @model_class) do
             # TODO: it can't be Time.now. this value has to be fetched from the API as well
             # https://github.com/BookingSync/synced/issues/29
-            @timestamp_strategy.update(Time.now)
+            @timestamp_strategy.update(first_request_timestamp)
           end
         end
       end
@@ -54,11 +55,22 @@ module Synced
         meta && meta[:deleted_ids] or raise CannotDeleteDueToNoDeletedIdsError.new(@model_class)
       end
 
+      def first_request_timestamp
+        if first_response_headers && first_response_headers["x-updated-since-request-synced-at"]
+          Time.zone.parse(first_response_headers["x-updated-since-request-synced-at"])
+        end
+      end
+
       def meta
         remote_objects
         @meta ||= api.last_response.meta
       end
 
+      def first_response_headers
+        remote_objects
+        @first_response_headers ||= api.pagination_first_response.headers
+      end
+
       # Remove all objects with ids from deleted_ids field in the meta key
       def remove_relation
         relation_scope.where(@id_key => deleted_remote_objects_ids)
@@ -79,6 +91,12 @@ module Synced
           @model_class.to_s.pluralize
         end
       end
+
+      class MissingTimestampError < StandardError
+        def message
+          "Synchronization failed. API response is missing 'x-updated-since-request-synced-at' header."
+        end
+      end
     end
   end
 end

data/lib/synced/version.rb

@@ -1,3 +1,3 @@
 module Synced
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: synced
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Sebastien Grosjean
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.20
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.20
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -81,6 +81,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -210,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Keep your BookingSync Application synced with BookingSync.