synchronisable 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46e5d5f7aa22b3aba79572bb609e1944e14e5d6d
-  data.tar.gz: 5858c6ad336fa0e59ef3c682d29beb8c0be80aed
+  metadata.gz: 00ba5533ba3d705a1e3c245124ceb78afd57da1d
+  data.tar.gz: abdedfecc1bf48eb0554cace0b9c323ccefe6fa6
 SHA512:
-  metadata.gz: e925cf5b4ecf118c8f74dfa0837fde9c9942581826d9d907d88c23b135a6633dce8f6a6ce4a745d7eaa4a18e80ed7adab9f3cb188496e537bac8fbc7fb32f634
-  data.tar.gz: 0d40c8a690b4e03fb8770f63e5d425be912aca8c7bacec78f0f3ec13b40ac6bcb38008a37e3cb7c93ceb4ef6b31b6f19f3dbebe858a7cc568f805e155c384ebe
+  metadata.gz: 2cd022bab4b92cd95a3b738c0b49f935a5fdcb9abac8c38b2716ae506baa371e893881e0524f3495db65c44f10b9c032ba52d93fc5812a549fa97dfed934c401
+  data.tar.gz: fd464896a1dce4ff99789b5e595186d5a6c043b0051759917a6a1479512484403fb31905bca4fae3f921bdfede5a102685b40d34d2f41540e21f12e34fbdcb70

data/lib/synchronisable/controller.rb

@@ -19,6 +19,8 @@ module Synchronisable
     attr_reader :logger
 
     class << self
+      VALID_OPTIONS = %i(includes parent)
+
       # Creates a new instance of controller and initiates model synchronization.
       #
       # @overload call(model, data, options)
@@ -32,10 +34,36 @@ module Synchronisable
       #
       # @return [Synchronisable::Context] synchronization context
       def call(model, *args)
-        options = args.extract_options!
+        data, options = *extract_args(args)
+        new(model, options).call(data)
+      end
+
+      private
+
+      # Model.sync({ tournament_id: '1014' }, {})
+      #                 ^^^^ <- data          ^^ <- options
+
+      # Figures out what is meant to be data,
+      # and what is options.
+      def extract_args(args)
+        last_hash = args.extract_options!
+
         data = args.first
+        opts = {}
 
-        new(model, options).call(data)
+        if last_hash.present?
+          if options?(last_hash)
+            opts = last_hash
+          elsif data.blank?
+            data = last_hash
+          end
+        end
+
+        [data, opts]
+      end
+
+      def options?(hash)
+        hash.any? { |k, _| VALID_OPTIONS.include? k }
       end
     end
 
@@ -58,6 +86,7 @@ module Synchronisable
         context.before = @model.imports_count
 
         hashes = @input.parse(data)
+
         hashes.each do |attrs|
           error_handler.handle(source) do
             source.prepare(data, attrs)

data/lib/synchronisable/input_parser.rb

@@ -25,7 +25,7 @@ module Synchronisable
                when input.empty?
                  @synchronizer.fetch
                when input.params?
-                 find_or_fetch_by_data(input.data)
+                 find_or_fetch_by_params(input.data)
                when input.remote_id?
                  @synchronizer.find(data)
                when input.local_id?
@@ -41,9 +41,9 @@ module Synchronisable
 
     private
 
-    def find_or_fetch_by_data(data)
-      sync_method = data.key?(:id) ? :find : :fetch
-      @synchronizer.send(sync_method, data)
+    def find_or_fetch_by_params(params)
+      sync_method = params.key?(:id) ? :find : :fetch
+      @synchronizer.send(sync_method, params)
     end
 
     def find_by_array_of_ids(input)

data/lib/synchronisable/model/methods.rb

@@ -41,6 +41,16 @@ module Synchronisable
       #   Match.sync(:includes => {
       #     :match_players => :player
       #   })
+      #
+      # @example Here is all possible ways to call #sync:
+      #   Model.sync
+      #   Model.sync({ :a1 => 1, :a2 => 2 })
+      #   Model.sync({ :includes => {...}, :parent => xxx })
+      #   Model.sync(123)
+      #   Model.sync('asdf')
+      #   Model.sync([{ :a1 => 1, :a2 => 2 }, { :a1 => 3, :a2 => 4 }, ...])
+      #   Model.sync([123, 345, 456])
+      #   Model.sync(['123', '345', '456'])
       def sync(*args)
         Controller.call(self, *args)
       end

data/lib/synchronisable/source.rb

@@ -44,7 +44,6 @@ module Synchronisable
       @import_record = find_import
 
       remove_association_keys_from_local_attrs
-      set_belongs_to_parent_foreign_key
     end
 
     def find_import
@@ -92,26 +91,6 @@ module Synchronisable
       end
     end
 
-    def set_belongs_to_parent_foreign_key
-      return unless @parent && parent_has_current_model_as_reflection?
-      @local_attrs[parent_foreign_key_name] = @parent.local_record.id
-    end
-
-    def parent_foreign_key_name
-      "#{parent_name}_id"
-    end
-
-    def parent_name
-      @parent.model.table_name.singularize
-    end
-
-    def parent_has_current_model_as_reflection?
-      @parent.model.reflections.values.any? do |reflection|
-        reflection.plural_name == @model.table_name &&
-        %i(has_one has_many).include?(reflection.macro)
-      end
-    end
-
     def filter_associations(macroses)
       @associations.select { |a| macroses.include? a.macro }
     end

data/lib/synchronisable/version.rb

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

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

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

data/spec/models/team_spec.rb

@@ -121,9 +121,10 @@ describe Team do
     end
 
     context 'when remote id is not specified in attributes hash' do
-      subject { Team.sync([remote_attrs.last]) }
-
-      its(:errors) { should have(1).items }
+      it "return synchronization result that contains 1 error" do
+        result = Team.sync([remote_attrs.last])
+        expect(result.errors.count).to eq(1)
+      end
     end
 
     context 'when local record does not exist' do

metadata

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