synced 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c71b2841c8fd03bb702daf3b1def631351cce6c1
-  data.tar.gz: 70fae9dcf236a28c404ba8ddf4ab81c1ff348676
+  metadata.gz: bcd4edd03dc87fc6cd5cd837340cb752a417c4ff
+  data.tar.gz: d99b69c0ef5dbc59ac1ba882e4615e0079e46456
 SHA512:
-  metadata.gz: a6bf3bc61e324ee4217cb8fce81f7d1b08cc2640f82e6d89f95f063ca2a1f1fc106cd21396395980855a102e860f0438ad2b9c38a10af0b4e0426f93e561bdc4
-  data.tar.gz: 492f92534e2da64b14ef9b6d114c1f6833171260e1a83a545b5627cd60b0968cb1a7039054adaf259883eef11b76733d5c7f2bd7b4a2b5e599314ec4662b6cf6
+  metadata.gz: 581410ff985c089f7e2a7de047f8b6d5b229330cefc7d84d3b63d5817c3c48b5df64820e486048125780c49df7b51e11509027ea452b368b75865ba9cd7b1e2a
+  data.tar.gz: 738dc68aae7c8f6aee54ed15b340345b48c96ee461ecb077a837a606d839591f09928bd4422df79403d7e28133d636bc278bb8d8b59d4ad67b3868473f292d31

data/lib/synced/model.rb

@@ -29,15 +29,18 @@ module Synced
     #   to remove: :mark_as_missing.
     # @option options [Array|Hash] globalized_attributes: A list of attributes
     #   which will be mapped with their translations.
+    # @option options [Time|Proc] initial_sync_since: A point in time from which
+    #   objects will be synchronized on first synchronization.
+    #   Works only for partial (updated_since param) synchronizations.
     def synced(options = {})
       options.symbolize_keys!
       options.assert_valid_keys(:associations, :data_key, :fields,
-        :globalized_attributes, :id_key, :include, :local_attributes, :mapper,
-        :only_updated, :remove, :synced_all_at_key)
+        :globalized_attributes, :id_key, :include, :initial_sync_since,
+        :local_attributes, :mapper, :only_updated, :remove, :synced_all_at_key)
       class_attribute :synced_id_key, :synced_all_at_key, :synced_data_key,
         :synced_local_attributes, :synced_associations, :synced_only_updated,
         :synced_mapper, :synced_remove, :synced_include, :synced_fields,
-        :synced_globalized_attributes
+        :synced_globalized_attributes, :synced_initial_sync_since
       self.synced_id_key                = options.fetch(:id_key, :synced_id)
       self.synced_all_at_key            = options.fetch(:synced_all_at_key,
         synced_column_presence(:synced_all_at))
@@ -53,6 +56,8 @@ module Synced
       self.synced_fields                = options.fetch(:fields, [])
       self.synced_globalized_attributes = options.fetch(:globalized_attributes,
         [])
+      self.synced_initial_sync_since    = options.fetch(:initial_sync_since,
+        nil)
       include Synced::HasSyncedData
     end
 
@@ -101,7 +106,8 @@ module Synced
         associations:          synced_associations,
         only_updated:          synced_only_updated,
         mapper:                synced_mapper,
-        globalized_attributes: synced_globalized_attributes
+        globalized_attributes: synced_globalized_attributes,
+        initial_sync_since:    synced_initial_sync_since
       })
       Synced::Synchronizer.new(self, options).perform
     end

data/lib/synced/synchronizer.rb

@@ -39,6 +39,9 @@ module Synced
     #   mapping remote objects attributes into local object attributes
     # @option options [Array|Hash] globalized_attributes: A list of attributes
     #   which will be mapped with their translations.
+    # @option options [Time|Proc] initial_sync_since: A point in time from which
+    #   objects will be synchronized on first synchronization.
+    #   Works only for partial (updated_since param) synchronizations.
     def initialize(model_class, options = {})
       @model_class           = model_class
       @scope                 = options[:scope]
@@ -58,6 +61,7 @@ module Synced
       @remote_objects        = Array(options[:remote]) unless options[:remote].nil?
       @request_performed     = false
       @globalized_attributes = attributes_as_hash(options[:globalized_attributes])
+      @initial_sync_since    = options[:initial_sync_since]
     end
 
     def perform
@@ -185,14 +189,24 @@ module Synced
           options[:include] += @include
         end
         options[:fields] = @fields if @fields.present?
-        options[:updated_since] = minimum_updated_at if updated_since_enabled?
+        options[:updated_since] = updated_since if updated_since_enabled?
         options[:auto_paginate] = true
       end
     end
 
-    def minimum_updated_at
-      instrument("minimum_updated_at.synced") do
-        relation_scope.minimum(@synced_all_at_key)
+    def updated_since
+      instrument("updated_since.synced") do
+        [relation_scope.minimum(@synced_all_at_key),
+          initial_sync_since].compact.min
+      end
+    end
+
+    def initial_sync_since
+      if @initial_sync_since.respond_to?(:call)
+        @initial_sync_since.arity == 0 ? @initial_sync_since.call :
+          @initial_sync_since.call(@scope)
+      else
+        @initial_sync_since
       end
     end
 
@@ -217,7 +231,7 @@ module Synced
     end
 
     def remove_relation
-      if @only_updated
+      if @only_updated && @request_performed
         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.4"
+  VERSION = "1.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: synced
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Sebastien Grosjean
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-13 00:00:00.000000000 Z
+date: 2014-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -192,4 +192,3 @@ signing_key:
 specification_version: 4
 summary: Keep your BookingSync Application synced with BookingSync.
 test_files: []
-has_rdoc: