synchronisable 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 373108e0dab22db4d8c9ff814efc6df6c875a012
-  data.tar.gz: 01d16982d0a8085ed46b69a117b4189ef8d39be1
+  metadata.gz: 670f61c0f12b85b365a456735ad8a8c9d67ba37b
+  data.tar.gz: 2ab99ead8df5badb9fef3ee54d3343d5748826f2
 SHA512:
-  metadata.gz: ecefc4f286f2227d86193e6aa5c16861ca1d2feb668ba874e28dbc0815cae88ba080c41978a57352ac4935f0c08db7bbe7b54b5bc943de60ddaf45263dde2465
-  data.tar.gz: 1a67ad8603495c3b6e41d0a6a95f512ad31f8b65213711f784a671504ffffc242bda2befed97e8ac2b0855f5af7e9dc3842ecd79f9aa1a71411b6c5904400c13
+  metadata.gz: f929b28fb870bc097bf8c3e28895ed16bebd2f2403cbb4570e6d1b8afcaf729f518116411ecc2f38a13864329510c8b1ab3f09d7ae491fbcc4e44fbe94a880e1
+  data.tar.gz: 03c0b36a7b6a56022faa4b0adff9b5d6003315a5148778541ff6ba90f65bb57f4826213eaf328ea2974894ccea3b3f2feae543a1680f297323b42c69e722d215

data/lib/synchronisable/data_builder.rb

@@ -18,9 +18,9 @@ module Synchronisable
 
       result = case input
       when ->(i) { i.empty? }
-        @synchronizer.fetch.()
+        @synchronizer.fetch
       when ->(i) { i.remote_id? }
-        @synchronizer.find.(data)
+        @synchronizer.find(data)
       when ->(i) { i.local_id? }
         find_by_local_id(data)
       when ->(i) { i.array_of_ids? }
@@ -29,19 +29,19 @@ module Synchronisable
         result = data.dup
       end
 
-      [result].flatten
+      [result].flatten.compact
     end
 
     private
 
     def find_by_array_of_ids(input)
       records = find_imports(input.element_class.name, input.data)
-      records.map { |r| @synchronizer.find.(r.remote_id) }
+      records.map { |r| @synchronizer.find(r.remote_id) }
     end
 
     def find_by_local_id(id)
       import = @model.find_by(id: id).try(:import)
-      import ? @synchronizer.find.(import.remote_id) : nil
+      import ? @synchronizer.find(import.remote_id) : nil
     end
 
     private

data/lib/synchronisable/gateway.rb

@@ -0,0 +1,24 @@
+module Synchronisable
+  class Gateway
+    attr_reader :synchronizer
+
+    def initialize(synchronizer)
+      @synchronizer = synchronizer
+    end
+
+    def fetch
+      not_implemented :fetch
+    end
+
+    def find(id)
+      not_implemented :find
+    end
+
+    protected
+
+    def not_implemented(method)
+      raise NotImplementedError,
+        I18n.t('errors.gateway_method_missing', method: method)
+    end
+  end
+end

data/lib/synchronisable/synchronizer.rb

@@ -38,8 +38,13 @@ module Synchronisable
     # of this particular model.
     attribute :logger, default: -> { Synchronisable.logging[:logger] }
 
+    # Gateway to be used to get the remote data
+    #
+    # @see Synchronizable::Gateway
+    attribute :gateway
+
     # Lambda that returns array of hashes with remote attributes.
-    method :fetch, default: -> { [] }
+    method :fetcher, default: -> { [] }
 
     # Lambda that returns a hash with remote attributes by id.
     #
@@ -49,7 +54,7 @@ module Synchronisable
     #       remote_source.find { |h| h[:foo_id] == id } }
     #     end
     #   end
-    method :find
+    method :finder, default: -> (id) { nil }
 
     # Lambda, that will be called before synchronization
     # of each record and its assocations.
@@ -95,6 +100,20 @@ module Synchronisable
     method :after_association_sync
 
     class << self
+      def fetch
+        data = fetcher.()
+        data.present? ? data : gateway_instance.try(:fetch)
+      end
+
+      def find(id)
+        data = finder.(id)
+        data.present? ? data : gateway_instance.try(:find, id)
+      end
+
+      def gateway_instance
+        @gateway_instance ||= gateway.try(:new, self)
+      end
+
       # Extracts remote id from given attribute hash.
       #
       # @param attrs [Hash] remote attributes

data/lib/synchronisable/version.rb

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

data/lib/synchronisable/worker.rb

@@ -36,7 +36,8 @@ module Synchronisable
     #
     # @param data [Array<Hash>] array of hashes with remote attriutes.
     #   If not specified worker will try to get the data
-    #   using `fetch` lambda/proc defined in corresponding synchronizer
+    #   using defined gateway class or `fetch` lambda/proc
+    #   defined in corresponding synchronizer
     #
     # @return [Synchronisable::Context] synchronization context
     def run(data)
@@ -133,7 +134,7 @@ module Synchronisable
       log_info("synchronizing association with id: #{id}", :blue)
 
       @synchronizer.with_association_sync_callbacks(source, id, association) do
-        attrs = association.model.synchronizer.find.(id)
+        attrs = association.model.synchronizer.find(id)
         Worker.run(association.model, [attrs], { :parent => source })
       end
     end

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

@@ -1,12 +1,12 @@
-class GatewayBase
+require 'synchronisable/gateway'
+
+class GatewayBase < Synchronisable::Gateway
   def id_key
-    raise NotImplementedError,
-      I18n.t('errors.gateway_method_missing', method: 'id_key')
+    not_implemented :id_key
   end
 
   def source
-    raise NotImplementedError,
-      I18n.t('errors.gateway_method_missing', method: 'source')
+    not_implemented :source
   end
 
   def fetch

data/spec/dummy/app/synchronizers/break_convention_team_synchronizer.rb

@@ -1,6 +1,4 @@
 class BreakConventionTeamSynchronizer < Synchronisable::Synchronizer
-  @gateway = TeamGateway.new
-
   has_many :players
 
   remote_id :maet_id
@@ -11,6 +9,5 @@ class BreakConventionTeamSynchronizer < Synchronisable::Synchronizer
   )
   except :ignored_1, :ignored_2
 
-  find  { |id| @gateway.find(id) }
-  fetch { @gateway.fetch }
+  gateway TeamGateway
 end

data/spec/dummy/app/synchronizers/match_synchronizer.rb

@@ -1,6 +1,4 @@
 class MatchSynchronizer < Synchronisable::Synchronizer
-  @gateway = MatchGateway.new
-
   has_one :team, key: 'home_team_id'
   has_one :team, key: 'away_team_id'
 
@@ -23,8 +21,7 @@ class MatchSynchronizer < Synchronisable::Synchronizer
 
   destroy_missed true
 
-  find  { |id| @gateway.find(id) }
-  fetch { @gateway.fetch }
+  gateway MatchGateway
 
   after_sync do |source|
     MatchPlayer::REF_TYPES.each do |ref_type|

data/spec/dummy/app/synchronizers/player_synchronizer.rb

@@ -1,6 +1,4 @@
 class PlayerSynchronizer < Synchronisable::Synchronizer
-  @gateway = PlayerGateway.new
-
   remote_id :player_id
 
   mappings(
@@ -14,6 +12,5 @@ class PlayerSynchronizer < Synchronisable::Synchronizer
   )
   only :team_id, :first_name, :last_name
 
-  find  { |id| @gateway.find(id) }
-  fetch { @gateway.fetch }
+  gateway PlayerGateway
 end

data/spec/dummy/app/synchronizers/stage_synchronizer.rb

@@ -1,6 +1,4 @@
 class StageSynchronizer < Synchronisable::Synchronizer
-  @gateway = StageGateway.new
-
   has_many :matches
 
   remote_id :stage_id
@@ -15,6 +13,5 @@ class StageSynchronizer < Synchronisable::Synchronizer
 
   except :ignored_1, :ignored_2
 
-  find  { |id| @gateway.find(id) }
-  fetch { @gateway.fetch }
+  gateway StageGateway
 end

data/spec/dummy/app/synchronizers/tournament_synchronizer.rb

@@ -1,6 +1,4 @@
 class TournamentSynchronizer < Synchronisable::Synchronizer
-  @gateway = TournamentGateway.new
-
   has_many :stages
 
   remote_id :tour_id
@@ -15,6 +13,5 @@ class TournamentSynchronizer < Synchronisable::Synchronizer
 
   only :name, :beginning, :ending
 
-  find  { |id| @gateway.find(id) }
-  fetch { @gateway.fetch }
+  gateway TournamentGateway
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: synchronisable
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Vasiliy Yorkin
@@ -319,6 +319,7 @@ files:
 - lib/synchronisable/dsl/macro/method.rb
 - lib/synchronisable/error_handler.rb
 - lib/synchronisable/exceptions.rb
+- lib/synchronisable/gateway.rb
 - lib/synchronisable/input_descriptor.rb
 - lib/synchronisable/locale/en.yml
 - lib/synchronisable/locale/ru.yml