synced 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4220ff2ed647669303e132040f72a13835a2ea11
-  data.tar.gz: 575e7b3ba5985f389655252f040b279ec80976fc
+  metadata.gz: a83a3c02371bb0151640c39b2b7c529c2b499460
+  data.tar.gz: 21c79d0624f4802be4927d254b1ac0ab6765d33d
 SHA512:
-  metadata.gz: 1168823d0315ebbeff7524139d86fe17defd940d2371ff6fa634471d7033d5d28eb38cca898871e009b0fe47b5e482eb215d799a0b7bc1721046ba2eea4147b5
-  data.tar.gz: 0f6eaf9fac8a72b73f2b001afef26521485b88fa3e3279b64dce0054b0eb33aed927379843d20de869c0daf82222b80e475a6128bd1e82199c576c7a28510202
+  metadata.gz: e0c6e56b085199cd488d15b91ae1d1c789195e0711c8cd60f87ec8b199b5befa37a3fbde58671d4b72e14699a69014d54496650de31d237b5da19a2b84a41383
+  data.tar.gz: db536ee0ff73b25bd64f1245a5c60ce0236a6f670bb1a62c1041b8fab5d3b722cd593e9ef6ae23a1c169586e0373e0e388880a824913ccacd8bc8528e2c8d89e

data/lib/synced/model.rb

@@ -34,16 +34,19 @@ module Synced
     #   Works only for partial (updated_since param) synchronizations.
     # @option options [Array|Hash] delegate_attributes: Given attributes will be defined
     #   on synchronized object and delegated to synced_data Hash
+    # @option options [Hash] search_params: Given attributes and their values
+    #   which will be passed to api client to perform search
     def synced(options = {})
       options.symbolize_keys!
       options.assert_valid_keys(:associations, :data_key, :fields,
         :globalized_attributes, :id_key, :include, :initial_sync_since,
         :local_attributes, :mapper, :only_updated, :remove, :synced_all_at_key,
-        :delegate_attributes)
+        :delegate_attributes, :search_params)
       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_initial_sync_since, :synced_delegate_attributes
+        :synced_globalized_attributes, :synced_initial_sync_since, :synced_delegate_attributes,
+        :synced_search_params
       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))
@@ -62,6 +65,7 @@ module Synced
       self.synced_initial_sync_since    = options.fetch(:initial_sync_since,
         nil)
       self.synced_delegate_attributes   = options.fetch(:delegate_attributes, [])
+      self.synced_search_params         = options.fetch(:search_params, {})
       include Synced::DelegateAttributes
       include Synced::HasSyncedData
     end
@@ -98,10 +102,11 @@ module Synced
     def synchronize(options = {})
       options.symbolize_keys!
       options.assert_valid_keys(:api, :fields, :include, :remote, :remove,
-        :scope, :strategy)
+        :scope, :strategy, :search_params)
       options[:remove]  = synced_remove unless options.has_key?(:remove)
       options[:include] = Array(synced_include) unless options.has_key?(:include)
       options[:fields]  = Array(synced_fields) unless options.has_key?(:fields)
+      options[:search_params] = synced_search_params unless options.has_key?(:search_params)
       options.merge!({
         id_key:                synced_id_key,
         synced_data_key:       synced_data_key,

data/lib/synced/result_presenter.rb

@@ -0,0 +1,26 @@
+module Synced
+  module Strategies
+    class Check
+      class Result
+        def to_s
+%Q{
+#{line "synced_class", model_class}
+#{line "options", options}
+#{line "changed count", changed.size}
+#{line "additional count", additional.size}
+#{line "missing count", missing.size}
+#{line "changed", changed}
+#{line "additional", additional}
+#{line "missing", missing}
+}
+        end
+
+        private
+
+        def line(label, value)
+          "#{label}:".ljust(18) + "#{value}"
+        end
+      end
+    end
+  end
+end

data/lib/synced/strategies/check.rb

@@ -7,7 +7,7 @@ module Synced
 
       def initialize(model_class, options = {})
         super
-        @result = Result.new
+        @result = Result.new(model_class, options)
       end
 
       # Makes a DRY run of full synchronization. It checks and collects objects which
@@ -29,7 +29,9 @@ module Synced
               local_object.attributes = globalized_attributes_mapping(remote,
                 local_object.translations.translated_locales)
             end
-            result.changed << local_object.changes if local_object.changed?
+            if local_object.changed?
+              result.changed << [{ id: local_object.id }, local_object.changes]
+            end
           else
             result.missing << remote
           end
@@ -37,11 +39,19 @@ module Synced
         result
       end
 
+      # If we check model which uses cancel instead of destroy, we skip canceled
+      # when searching for additional objects by searching in :visible scope
+      def relation_scope
+        default_remove_strategy == :cancel_all ? super.visible : super
+      end
+
       # Represents result of synchronization integrity check
       class Result
-        attr_accessor :changed, :missing, :additional
+        attr_accessor :model_class, :options, :changed, :missing, :additional
 
-        def initialize
+        def initialize(model_class = nil, options = {})
+          @model_class = model_class
+          @options = options
           @changed, @missing, @additional = [], [], []
         end
 

data/lib/synced/strategies/full.rb

@@ -63,6 +63,7 @@ module Synced
         @perform_request       = options[:remote].nil?
         @remote_objects        = Array(options[:remote]) unless @perform_request
         @globalized_attributes = synced_attributes_as_hash(options[:globalized_attributes])
+        @search_params         = options[:search_params]
       end
 
       def perform
@@ -147,7 +148,7 @@ module Synced
         closest = [@scope, @scope.class, @model_class].find do |object|
                     object.respond_to?(:api)
                   end
-        closest.try(:api) || raise(MissingAPIClient.new(@scope, @model_class))
+        @api ||= closest.try(:api) || raise(MissingAPIClient.new(@scope, @model_class))
       end
 
       def local_object_by_remote_id(remote_id)
@@ -181,7 +182,18 @@ module Synced
           end
           options[:fields] = @fields if @fields.present?
           options[:auto_paginate] = true
-        end
+        end.merge(search_params)
+      end
+
+      def search_params
+        Hash[@search_params.map do |param, value|
+          final_value = value.respond_to?(:call) ? search_param_value_for_lambda(value) : value
+          [param, final_value]
+        end]
+      end
+
+      def search_param_value_for_lambda(func)
+        func.arity == 0 ? func.call : func.call(@scope)
       end
 
       def resource_name

data/lib/synced/version.rb

@@ -1,3 +1,3 @@
 module Synced
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: synced
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Sebastien Grosjean
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2015-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -151,6 +151,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.2
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Keep your BookingSync Application synced with BookingSync.
 email:
 - dev@bookingsync.com
@@ -167,6 +181,7 @@ files:
 - lib/synced/has_synced_data.rb
 - lib/synced/model.rb
 - lib/synced/rails.rb
+- lib/synced/result_presenter.rb
 - lib/synced/strategies/check.rb
 - lib/synced/strategies/full.rb
 - lib/synced/strategies/updated_since.rb