synchronisable 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 670f61c0f12b85b365a456735ad8a8c9d67ba37b
-  data.tar.gz: 2ab99ead8df5badb9fef3ee54d3343d5748826f2
+  metadata.gz: 6de60703f28fbed5c2a30a924474691bf98c489e
+  data.tar.gz: f5da8cda6005fa932be6ce2a9ecc8eb6a7973053
 SHA512:
-  metadata.gz: f929b28fb870bc097bf8c3e28895ed16bebd2f2403cbb4570e6d1b8afcaf729f518116411ecc2f38a13864329510c8b1ab3f09d7ae491fbcc4e44fbe94a880e1
-  data.tar.gz: 03c0b36a7b6a56022faa4b0adff9b5d6003315a5148778541ff6ba90f65bb57f4826213eaf328ea2974894ccea3b3f2feae543a1680f297323b42c69e722d215
+  metadata.gz: 485bd2ca85dcf24fc9ff56cec0442498bfe62cfd523cc220cd2a319fb0d5cde49b574f3e3666af35e126528a46774364a967d0d0e232c8d42f13a3b7687f8c4b
+  data.tar.gz: 68d4ff7a28e5b2952b072cf5bbfa1f8d66c124b8c5bf365f8b958968cd390c48632fbbb54793035ede94e4e061519bbb79ca0519ee63dfd6873e3d3a3bfec14f

data/TODO.md

@@ -26,3 +26,4 @@ Secondary objectives
 ======================================
 - [x] option for verbose logging
 - [x] colorized STDOUT
+- [ ] actualize docs

data/lib/synchronisable/dsl/associations.rb

@@ -12,6 +12,11 @@ module Synchronisable
       end
 
       module ClassMethods
+        def inherited(subclass)
+          super
+          subclass.associations = {}
+        end
+
         [HasOne, HasMany].each do |klass|
           macro = klass.to_s.demodulize.underscore.to_sym
           define_method(macro) do |name, options = {}|
@@ -49,7 +54,7 @@ module Synchronisable
         end
 
         def required_associations
-          self.associations.select { |_, a| a.required }.map(&:key)
+          self.associations.select { |_, a| a.required }.keys
         end
       end
     end

data/lib/synchronisable/dsl/macro.rb

@@ -48,6 +48,7 @@ module Synchronisable
 
       module ClassMethods
         def inherited(subclass)
+          super
           class_attributes[subclass] = class_attributes[self].deep_dup
         end
 

data/lib/synchronisable/input_descriptor.rb

@@ -1,4 +1,5 @@
 module Synchronisable
+  # @api private
   class InputDescriptor
     attr_reader :data
 

data/lib/synchronisable/{data_builder.rb → input_dispatcher.rb}

@@ -1,10 +1,11 @@
 require 'synchronisable/input_descriptor'
 
 module Synchronisable
-  class DataBuilder
+  # @api private
+  class InputDispatcher
     class << self
-      def build(model, synchronizer, data)
-        new(model, synchronizer).build(data)
+      def dispatch(model, synchronizer, data)
+        new(model, synchronizer).dispatch(data)
       end
     end
 
@@ -13,17 +14,17 @@ module Synchronisable
       @synchronizer = synchronizer
     end
 
-    def build(data)
+    def dispatch(data)
       input = InputDescriptor.new(data)
 
-      result = case input
-      when ->(i) { i.empty? }
+      result = case
+      when input.empty?
         @synchronizer.fetch
-      when ->(i) { i.remote_id? }
+      when input.remote_id?
         @synchronizer.find(data)
-      when ->(i) { i.local_id? }
+      when input.local_id?
         find_by_local_id(data)
-      when ->(i) { i.array_of_ids? }
+      when input.array_of_ids?
         find_by_array_of_ids(input)
       else
         result = data.dup
@@ -44,8 +45,6 @@ module Synchronisable
       import ? @synchronizer.find(import.remote_id) : nil
     end
 
-    private
-
     def find_imports(class_name, ids)
       case class_name
       when 'Fixnum'

data/lib/synchronisable/model.rb

@@ -41,13 +41,13 @@ module Synchronisable
       def set_defaults(args)
         options = args.extract_options!
 
-        self.synchronizer = args.first ||
-          options[:synchronizer] || default_synchronizer
+        self.synchronizer = args.first || options[:synchronizer] ||
+          find_synchronizer || SynchronizerDefault
       end
 
-      def default_synchronizer
+      def find_synchronizer
         const_name = "#{self.name.demodulize}#{SYNCHRONIZER_SUFFIX}"
-        const_name.safe_constantize || SynchronizerDefault
+        const_name.safe_constantize
       end
     end
   end

data/lib/synchronisable/source.rb

@@ -31,7 +31,7 @@ module Synchronisable
       end
 
       @import_record = Import.find_by(
-        :remote_id => @remote_id,
+        :remote_id => @remote_id.to_s,
         :synchronisable_type => @model
       )
 
@@ -51,7 +51,7 @@ module Synchronisable
       @import_record = Import.create!(
         :synchronisable_id    => record.id,
         :synchronisable_type  => @model.to_s,
-        :remote_id            => @remote_id,
+        :remote_id            => @remote_id.to_s,
         :attrs                => @local_attrs
       )
     end

data/lib/synchronisable/synchronizer.rb

@@ -110,10 +110,6 @@ module Synchronisable
         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
@@ -165,12 +161,16 @@ module Synchronisable
       #
       # @raise [MissedRemoteIdError] raised when data doesn't contain remote id
       def ensure_remote_id(id)
-        return id if id.present?
+        return id.to_s if id.present?
         raise MissedRemoteIdError, I18n.t(
           'errors.missed_remote_id',
           remote_id: remote_id
         )
       end
+
+      def gateway_instance
+        @gateway_instance ||= gateway.try(:new, self)
+      end
     end
   end
 end

data/lib/synchronisable/synchronizers/synchronizer_default.rb

@@ -5,6 +5,8 @@ module Synchronisable
   # model specific synchronizer is not defined.
   #
   # @api private
+  #
+  # @see Synchronisable::Synchronizer
   class SynchronizerDefault < Synchronizer
   end
 end

data/lib/synchronisable/version.rb

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

data/lib/synchronisable/worker.rb

@@ -2,7 +2,7 @@ require 'colorize'
 
 require 'synchronisable/error_handler'
 require 'synchronisable/context'
-require 'synchronisable/data_builder'
+require 'synchronisable/input_dispatcher'
 require 'synchronisable/source'
 require 'synchronisable/models/import'
 
@@ -45,7 +45,7 @@ module Synchronisable
         error_handler = ErrorHandler.new(@logger, context)
         context.before = @model.imports_count
 
-        hashes = DataBuilder.build(@model, @synchronizer, data)
+        hashes = InputDispatcher.dispatch(@model, @synchronizer, data)
         hashes.each do |attrs|
           source = Source.new(@model, @parent, attrs)
           error_handler.handle(source) do

data/lib/synchronisable.rb

@@ -14,6 +14,7 @@ require 'synchronisable/version'
 require 'synchronisable/models/import'
 require 'synchronisable/synchronizer'
 require 'synchronisable/model'
+require 'synchronisable/gateway'
 
 locale_paths = File.join(File.dirname(__FILE__),
   'synchronisable', 'locale', '*.yml')
@@ -34,7 +35,7 @@ I18n.available_locales = [:en, :ru]
 # Match.sync(:include => {
 #   :match_players => :player
 # })
-# Model.sync([id1, ..., idn])
+# + Model.sync([id1, ..., idn])
 #
 # Model.where(condition).sync
 # Match.where(condition).sync(:include => {

data/spec/models/team_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'pry-byebug'
 
 describe Team do
   describe 'synchronization' do

data/spec/synchronisable/dsl/macro_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Synchronisable::DSL::Macro do
   describe 'commom attributes' do
-    subject { HasMacro }
+    subject { HasMacroFoo }
 
     before do
       subject.xyz 7
@@ -15,6 +15,9 @@ describe Synchronisable::DSL::Macro do
     it { respond_to? :xxx }
     it { respond_to? :arr }
 
+    it { should_not respond_to? :baz }
+    it { should_not respond_to? :sqr2 }
+
     its(:foo) { should be nil  }
     its(:bar) { should eq(1)   }
     its(:baz) { should eq(2)   }
@@ -24,11 +27,14 @@ describe Synchronisable::DSL::Macro do
 
   describe 'attribute with default value lambda that raises an error' do
     it 'raises error' do
-      expect { HasMacro.carefull }.to raise_error(NotImplementedError)
+      expect { HasMacroFoo.carefull }.to raise_error(NotImplementedError)
     end
 
     context 'when overriden in subclass not to raise an error' do
-      subject { HasMacroSubclass }
+      subject { HasMacroFooSubclass }
+
+      it { should_not respond_to? :baz }
+      it { should_not respond_to? :sqr2 }
 
       it { respond_to? :foo }
       it { respond_to? :bar }
@@ -37,17 +43,17 @@ describe Synchronisable::DSL::Macro do
       its(:bar) { should eq(1)   }
 
       it 'not raises error' do
-        expect { HasMacroSubclass.carefull }.to_not raise_error
+        expect { HasMacroFooSubclass.carefull }.to_not raise_error
       end
 
       it 'equals to the new default value' do
-        expect(HasMacroSubclass.carefull).to eq(0)
+        expect(HasMacroFooSubclass.carefull).to eq(0)
       end
     end
   end
 
   describe 'methods' do
-    subject { HasMacroSubclass }
+    subject { HasMacroFooSubclass }
 
     it { respond_to? :sqr }
     its(:sqr) { respond_to? :call }
@@ -56,4 +62,15 @@ describe Synchronisable::DSL::Macro do
       expect(subject.sqr.(2)).to eq(4)
     end
   end
+
+  describe 'class attributes' do
+    subject { HasMacroBar }
+
+    it { should_not respond_to? :bar }
+    it { should_not respond_to? :foo }
+    it { should_not respond_to? :sqr }
+
+    it { respond_to? :baz }
+    it { respond_to? :sqr2 }
+  end
 end

data/spec/synchronisable/support/has_macro_bar.rb

@@ -0,0 +1,6 @@
+class HasMacroBar
+  include Synchronisable::DSL::Macro
+
+  attribute :baz
+  method :sqr2
+end

data/spec/synchronisable/support/{has_macro.rb → has_macro_foo.rb}

@@ -1,4 +1,4 @@
-class HasMacro
+class HasMacroFoo
   include Synchronisable::DSL::Macro
 
   attribute :bar, default: 1

data/spec/synchronisable/support/has_macro_foo_subclass.rb

@@ -0,0 +1,9 @@
+require_relative 'has_macro_foo'
+
+class HasMacroFooSubclass < HasMacroFoo
+  attribute :carefull, default: 0
+
+  sqr do |x|
+    x * x
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synchronisable
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Vasiliy Yorkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -308,7 +308,6 @@ files:
 - lib/synchronisable.rb
 - lib/synchronisable/attribute_mapper.rb
 - lib/synchronisable/context.rb
-- lib/synchronisable/data_builder.rb
 - lib/synchronisable/dsl/associations.rb
 - lib/synchronisable/dsl/associations/association.rb
 - lib/synchronisable/dsl/associations/has_many.rb
@@ -321,6 +320,7 @@ files:
 - lib/synchronisable/exceptions.rb
 - lib/synchronisable/gateway.rb
 - lib/synchronisable/input_descriptor.rb
+- lib/synchronisable/input_dispatcher.rb
 - lib/synchronisable/locale/en.yml
 - lib/synchronisable/locale/ru.yml
 - lib/synchronisable/model.rb
@@ -417,8 +417,9 @@ files:
 - spec/spec_helper.rb
 - spec/synchronisable/dsl/macro_spec.rb
 - spec/synchronisable/models/import_spec.rb
-- spec/synchronisable/support/has_macro.rb
-- spec/synchronisable/support/has_macro_subclass.rb
+- spec/synchronisable/support/has_macro_bar.rb
+- spec/synchronisable/support/has_macro_foo.rb
+- spec/synchronisable/support/has_macro_foo_subclass.rb
 - spec/synchronisable/support/shared/contexts.rb
 - spec/synchronisable/support/shared/examples.rb
 - spec/synchronisable/synchronisable_spec.rb
@@ -535,8 +536,9 @@ test_files:
 - spec/spec_helper.rb
 - spec/synchronisable/dsl/macro_spec.rb
 - spec/synchronisable/models/import_spec.rb
-- spec/synchronisable/support/has_macro.rb
-- spec/synchronisable/support/has_macro_subclass.rb
+- spec/synchronisable/support/has_macro_bar.rb
+- spec/synchronisable/support/has_macro_foo.rb
+- spec/synchronisable/support/has_macro_foo_subclass.rb
 - spec/synchronisable/support/shared/contexts.rb
 - spec/synchronisable/support/shared/examples.rb
 - spec/synchronisable/synchronisable_spec.rb

data/spec/synchronisable/support/has_macro_subclass.rb

@@ -1,9 +0,0 @@
-require_relative 'has_macro'
-
-class HasMacroSubclass < HasMacro
-  attribute :carefull, default: 0
-
-  sqr do |x|
-    x * x
-  end
-end