synchronisable 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3845145123b947ba744fd0312ae7302131b9aa02
-  data.tar.gz: 79c2c958faf936420e9ef0166e055fce4fd8d952
+  metadata.gz: f01f7f0b2ba76796fe60eeb27ffc074a99ca1f0f
+  data.tar.gz: 71334451aaf9676cddd63b1489d368b15981a968
 SHA512:
-  metadata.gz: 2c30615cf121cd45f57ac47f659357441ad185145545294165e61dceb4d67f1cfac0d54effd7fdfc9a2d93f709fdf8025b46e825e04a0d49788a798fd6c6e916
-  data.tar.gz: 51349d8e1a49c8e240680ba11d55fb98eec97f7c9b595c821ef0bfa0e3726f7b0cfda102e94fdb637f7851430e9a99eb0a32057f0448a31154c3ca72e8e581eb
+  metadata.gz: 41805d28b8840c2bc4d4c4c4434cae52e3f52ae7078741497455a14169bf39aae45f1c6e8cf7f2446a4518a0dacf5692aafa0524e11b98e7c08a24660a8bbc14
+  data.tar.gz: 3c8fa21d0c36007278d3d09a0e52b321e93a1517a0464436ed843d97a89b07c308220a7ebe75a6ff2f93aa54ad58e8dafdf52007351f95c552ce8e14ba06fd47

data/lib/synchronisable/controller.rb

@@ -58,7 +58,7 @@ module Synchronisable
 
         hashes = @input.parse(data)
         hashes.each do |attrs|
-          source = Source.new(@model, @parent, attrs)
+          source = Source.new(@model, @parent, @includes, attrs)
 
           error_handler.handle(source) do
             source.prepare
@@ -84,6 +84,8 @@ module Synchronisable
     def initialize(model, options)
       @model, @synchronizer = model, model.synchronizer
       @logger = @synchronizer.logger
+
+      @includes = options[:includes]
       @parent = options[:parent]
 
       @input = InputParser.new(@model, @synchronizer)

data/lib/synchronisable/dsl/associations/association.rb

@@ -45,6 +45,10 @@ module Synchronisable
           raise NotImplementedError
         end
 
+        def model_name
+          @model.to_s.demodulize.underscore.to_sym
+        end
+
         protected
 
         def set_defaults

data/lib/synchronisable/input_parser.rb

@@ -4,6 +4,8 @@ module Synchronisable
   # Responsible for guessing the user input format.
   #
   # @api private
+  #
+  # @see Synchronisable::InputDescriptor
   class InputParser
     def initialize(model, synchronizer)
       @model = model

data/lib/synchronisable/model/methods.rb

@@ -34,12 +34,12 @@ module Synchronisable
       #   ])
       #
       # @example General usage
-      #   FooModel.sync(:include => {
-      #     :assocation_model => :nested_assocaiton_model
+      #   FooModel.sync(:includes => {
+      #     :assocation_model => :nested_association_model
       #   })
       #
       # @example Football domain use case
-      #   Match.sync(:include => {
+      #   Match.sync(:includes => {
       #     :match_players => :player
       #   })
       def sync(*args)

data/lib/synchronisable/source.rb

@@ -1,3 +1,5 @@
+require 'pry-byebug'
+
 module Synchronisable
   # TODO: Massive refactoring needed
 
@@ -9,10 +11,13 @@ module Synchronisable
     attr_accessor :import_record
     attr_reader :parent_associations, :child_associations
     attr_reader :model, :remote_attrs, :remote_id,
-                :local_attrs, :import_ids, :parent
+                :local_attrs, :import_ids, :parent,
+                :includes
 
-    def initialize(model, parent, remote_attrs)
+    def initialize(model, parent, includes, remote_attrs)
       @model, @parent, @synchronizer = model, parent, model.synchronizer
+      @model_name = @model.to_s.demodulize.underscore.to_sym
+      @includes = includes
       @remote_attrs = remote_attrs.with_indifferent_access
     end
 
@@ -26,15 +31,10 @@ module Synchronisable
     def prepare
       @remote_id = @synchronizer.extract_remote_id(@remote_attrs)
       @local_attrs = @synchronizer.map_attributes(@remote_attrs)
-
       @associations = @synchronizer.associations_for(@local_attrs)
-      @parent_associations = @associations.select do |association|
-        PARENT_ASSOCIATION_KEYS.include? association.macro
-      end
 
-      @child_associations = @associations.select do |association|
-        CHILD_ASSOCIATION_KEYS.include? association.macro
-      end
+      @parent_associations = filter_associations(PARENT_ASSOCIATION_KEYS)
+      @child_associations  = filter_associations(CHILD_ASSOCIATION_KEYS)
 
       @import_record = Import.find_by(
         :remote_id => @remote_id.to_s,
@@ -75,7 +75,6 @@ module Synchronisable
     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
@@ -92,5 +91,9 @@ module Synchronisable
         %i(has_one has_many).include?(reflection.macro)
       end
     end
+
+    def filter_associations(macroses)
+      @associations.select { |a| macroses.include? a.macro }
+    end
   end
 end

data/lib/synchronisable/version.rb

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

data/lib/synchronisable/worker/associations.rb

@@ -1,4 +1,5 @@
 require 'synchronisable/worker/base'
+require 'pry-byebug'
 
 module Synchronisable
   module Worker
@@ -17,9 +18,7 @@ module Synchronisable
           log_info("starting #{type} associations sync", :blue) if associations.present?
 
           associations.each do |association, ids|
-            ids.each do |id|
-              send(:"sync_#{type}_association", id, association)
-            end
+            ids.each { |id| send(:"sync_#{type}_association", id, association) }
           end
 
           log_info("done #{type} associations sync", :blue) if associations.present?
@@ -44,13 +43,34 @@ module Synchronisable
       end
 
       def sync_child_association(id, association)
+        return unless can_sync_association?(association)
+
         log_info("synchronizing child association with id: #{id}", :blue)
 
         @synchronizer.with_association_sync_callbacks(@source, id, association) do
           attrs = association.model.synchronizer.find(id)
-          Controller.call(association.model, [attrs], { :parent => @source })
+
+          Controller.call(association.model, [attrs],
+            child_association_options(association))
         end
       end
+
+      def can_sync_association?(association)
+        @includes.nil? || (
+          @includes.try(:include?, association.name) ||
+          @includes == association.name
+        )
+      end
+
+      def child_association_options(association)
+        default = @includes.nil? ? nil : {}
+        child_includes = @includes.try(:fetch, association.name) || default
+
+        {
+          :parent => @source,
+          :includes => child_includes
+        }
+      end
     end
   end
 end

data/lib/synchronisable/worker/base.rb

@@ -13,6 +13,7 @@ module Synchronisable
 
       def initialize(synchronizer, source)
         @synchronizer, @source = synchronizer, source
+        @includes = source.includes
       end
 
       def logger

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

@@ -31,6 +31,11 @@ class MatchSynchronizer < Synchronisable::Synchronizer
 
   class << self
     def sync_match_players(source, ref_type)
+
+      # to support :includes option
+      return unless source.includes.nil? ||
+        source.includes.try(:include?, :match_players)
+
       match = source.local_record
       remote_player_ids = source.remote_attrs[ref_type.to_sym] || {}
 

data/spec/models/match_spec.rb

@@ -15,27 +15,26 @@ describe Match do
       it { is_expected.to change { Synchronisable::Import.count }.by(11) }
     end
 
-    # TODO: Left here until :include option is implemented
-    #
-    # context 'when associations specified with :include option' do
-    #   subject do
-    #     -> { sync_match }
-    #   end
+    context 'when associations specified with :includes option' do
+      subject do
+        -> { sync_match }
+      end
 
-    #   def sync_match
-    #     Match.sync(:include => {
-    #       :match => {
-    #         :team => :players
-    #       }
-    #     })
-    #   end
+      def sync_match
+        Match.sync(:includes => {
+          :team => :players,
+          :blha => {
+            :x => :z,
+            :y => :f
+          }
+        })
+      end
 
-    #   it { is_expected.to change { Match.count }.by(1) }
-    #   it { is_expected.to change { Team.count }.by(2) }
-    #   it { is_expected.to change { Player.count }.by(22) }
-    #   it { is_expected.to change { MatchPlayer.count }.by(22) }
+      it { is_expected.to change { Match.count }.by(1) }
+      it { is_expected.to change { Team.count }.by(2) }
+      it { is_expected.to change { Player.count }.by(4) }
 
-    #   it { is_expected.to change { Synchronisable::Import.count }.by(47) }
-    # end
+      it { is_expected.to change { Synchronisable::Import.count }.by(7) }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synchronisable
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Vasiliy Yorkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -449,7 +449,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Provides base fuctionality (models, DSL) for AR synchronization with external