synchronisable 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96693280363388813f167c19dc3bdcb95e645bd7
-  data.tar.gz: 7520f5bc6856f053eea801d1ee7b8346b484de1f
+  metadata.gz: ef3f05db3248f6b97f08228ce7efb74b4e515272
+  data.tar.gz: b973aef1b36c665a89cfcbb350863eea51034ba0
 SHA512:
-  metadata.gz: 3cbdabf408ad30d339d7e966501a5534fb375f9f3801a08d7ee0ab00c1d8104588f722257f11bfee4d1a6e7ff6f86d6aef2d58e3988166d0e9050ed4dfa0277a
-  data.tar.gz: c4399371c437ddf519fba064f85445f34d116b9a08fc6dc9c312dd3b0c9eda19b16412e84d0a0c3a241a2e23b7b5433b2a3216e09b0796606f79779062d8527c
+  metadata.gz: 4ef0a3f27605d49e471f170c889ac92a3895406765a770aa86ab907325c55077081cee6c0b12c809303dff7c2c3232ec0a90499c3e99ad8f966d58e09858c07c
+  data.tar.gz: 3c0ef536eb6433a0f421ea4d4f1f161aac67a2898e1314e13438857edaa4b9af12e394be6c222b8be465b75ba61d213bffe89bf04f4f146d9a67901532c42ba3

data/lib/synchronisable/controller.rb

@@ -41,7 +41,7 @@ module Synchronisable
 
     # Initiates model synchronization.
     #
-    # @param data [Array<Hash>, Array<String>, Array<Integer>, String, Integer]
+    # @param data [Hash, Array<Hash>, Array<String>, Array<Integer>, String, Integer]
     #   synchronization data.
     #   If not specified, it will try to get array of hashes to sync with
     #   using defined gateway class or `fetch` lambda/proc

data/lib/synchronisable/gateway.rb

@@ -2,7 +2,7 @@ module Synchronisable
   class Gateway
     attr_reader :synchronizer
 
-    def fetch
+    def fetch(params = {})
       not_implemented :fetch
     end
 

data/lib/synchronisable/input_descriptor.rb

@@ -16,6 +16,10 @@ module Synchronisable
       @data.blank?
     end
 
+    def params?
+      @data.is_a?(Hash)
+    end
+
     def remote_id?
       @data.is_a?(String)
     end

data/lib/synchronisable/input_parser.rb

@@ -22,17 +22,17 @@ module Synchronisable
       input = InputDescriptor.new(data)
 
       result = case
-      when input.empty?
-        @synchronizer.fetch
-      when input.remote_id?
-        @synchronizer.find(data)
-      when input.local_id?
-        find_by_local_id(data)
-      when input.array_of_ids?
-        find_by_array_of_ids(input)
-      else
-        result = data.dup
-      end
+               when input.empty? || input.params?
+                 @synchronizer.fetch(data || {})
+               when input.remote_id?
+                 @synchronizer.find(data)
+               when input.local_id?
+                 find_by_local_id(data)
+               when input.array_of_ids?
+                 find_by_array_of_ids(input)
+               else
+                 result = data.dup
+               end
 
       [result].flatten.compact
     end

data/lib/synchronisable/model/methods.rb

@@ -11,16 +11,15 @@ module Synchronisable
       # in your model synchronizer, than it will be used if no data supplied.
       #
       # @overload sync(data, options)
-      #   @param data [Array<Hash>, Array<String>, Array<Integer>, String, Integer] synchronization data
+      #   @param data [Hash, Array<Hash>, Array<String>, Array<Integer>, String, Integer] synchronization data
       #   @param options [Hash] synchronization options
-      #   @option options [Hash] :include assocations to be synchronized.
+      #   @option options [Hash] :includes assocations to be synchronized.
       #     Use this option to override `has_one` & `has_many` assocations
       #     defined in model synchronizer.
       # @overload sync(options)
       # @overload sync(data)
       # @overload sync
       #
-      #
       # @see Synchronisable::Controller
       #
       # @example Supplying array of hashes with remote attributes

data/lib/synchronisable/synchronizer.rb

@@ -44,17 +44,27 @@ module Synchronisable
     attribute :gateway
 
     # Lambda that returns array of hashes with remote attributes.
-    method :fetcher, default: -> { [] }
+    method :fetcher, default: -> (params = {}) { [] }
 
-    # Lambda that returns a hash with remote attributes by id.
+    # Lambda that returns a hash with remote attributes by params.
     #
     # @example Common use case
     #   class FooSynchronizer < Synchronisable::Synchronizer
-    #     find do |id|
+    #     finder do |id|
     #       remote_source.find { |h| h[:foo_id] == id } }
     #     end
     #   end
-    method :finder, default: -> (id) { nil }
+    # @example Composite identifier
+    #   class BarSynchronizer < Synchronisable::Synchronizer
+    #     finder do |params|
+    #       remote_source.find do |h|
+    #         h[:x] == params[:x] &&
+    #         h[:y] == params[:y] &&
+    #         h[:z] == params[:z]
+    #       end
+    #     end
+    #   end
+    method :finder, default: -> (params) { nil }
 
     # Lambda, that will be called before synchronization
     # of each record and its assocations.
@@ -100,14 +110,14 @@ module Synchronisable
     method :after_association_sync
 
     class << self
-      def fetch
-        data = fetcher.()
-        data.present? ? data : gateway_instance.try(:fetch)
+      def fetch(params = {})
+        data = fetcher.(params)
+        data.present? ? data : gateway_instance.try(:fetch, params)
       end
 
-      def find(id)
-        data = finder.(id)
-        data.present? ? data : gateway_instance.try(:find, id)
+      def find(params)
+        data = finder.(params)
+        data.present? ? data : gateway_instance.try(:find, params)
       end
 
       # Extracts remote id from given attribute hash.

data/lib/synchronisable/version.rb

@@ -2,7 +2,7 @@ module Synchronisable
   module VERSION
     MAJOR = 1
     MINOR = 0
-    PATCH = 4
+    PATCH = 5
     SUFFIX = nil
 
     STRING = [MAJOR, MINOR, PATCH, SUFFIX].compact.join('.')

data/spec/dummy/app/gateways/gateway_base.rb

@@ -9,7 +9,7 @@ class GatewayBase < Synchronisable::Gateway
     not_implemented :source
   end
 
-  def fetch
+  def fetch(params)
     source
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synchronisable
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Vasiliy Yorkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord