synchronisable 1.1.9 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4041291a6bd241b66daddda17f4bffece7063a02
-  data.tar.gz: 7a087a575f0148534808a15ab2c6e2e2cffcbcc8
+  metadata.gz: c9f2e26970dfe050c9902385f60c2dcbc7d54448
+  data.tar.gz: dd2ee445a9f95ea088cf7ec84136312cafc71c6e
 SHA512:
-  metadata.gz: e2f3273585a89bfe074085055f32a14cd4fd8c9b5b00b110796ff01f600a6afd2821ae888c21093c2999be9887da26756d5f602b2a939bdac27af4bd637e1828
-  data.tar.gz: ffcdbade020459c37d1baa55be23201c7e09e9d6a1a508bcadc1bd83dc29167fa338511c90cf1e7605003a44ffca3eed30f30d21878c4e1f28549a8dd2f646a8
+  metadata.gz: 86838267edeb7919d1e379ce58e9a26620eb9da69757731d4e8d2b484d02cfc12984cf9ea65fcf373a499d6f52bc4d79a7b489c1bdaf4ab97560cc1017c64e7d
+  data.tar.gz: 2982a13a2ab1d01778cd4829f2666d261dc4f0b40da7f2dc97ce39aa21ce9cb77e913f2c8ed698347a354aa27945a87bc750ac19968c3ac818508c7f2051f32f

data/.hound.yml

@@ -0,0 +1,2 @@
+ruby:
+  enabled: true

data/README.md

@@ -276,6 +276,14 @@ Post.sync
 ```
 P.S.: Better readme & wiki is coming! ^__^
 
+## Contributing
+
+How to run tests:
+```
+cd spec/dummy
+RAILS_ENV=test rake db:create db:migrate
+```
+
 ## Support
 
 <a href='https://www.codersclan.net/task/yorkinv' target='_blank'><img src='https://www.codersclan.net/button/yorkinv' alt='expert-button' width='205' height='64' style='width: 205px; height: 64px;'></a>

data/lib/generators/synchronisable/templates/initializer.rb

@@ -5,7 +5,7 @@ Synchronisable.configure do |config|
   # `STDOUT` will be used for output.
   #
   # config.logging = {
-  #   :logger   => defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
+  #   :logger   => defined?(Rails) ? Rails.logger : Logger.new(STDOUT),
   #   :verbose  => true,
   #   :colorize => true
   # }

data/lib/synchronisable/dsl/association.rb

@@ -0,0 +1,71 @@
+require 'synchronisable/dsl/macro'
+
+module Synchronisable
+  module DSL
+    # Association builder.
+    # Subclasses must implement #macro method.
+    class Association
+      include Synchronisable::DSL::Macro
+
+      KIND_KEY_SUFFIX_MAP = {
+        :belongs_to => :id,
+        :has_one => :id,
+        :has_many => :ids
+      }
+
+      class << self
+        attr_accessor :valid_options
+
+        def create(synchronizer, kind, name, options)
+          new(synchronizer, kind, name).create(options)
+        end
+      end
+
+      self.valid_options = %i(key class_name required force_sync)
+
+      attr_reader :kind, :name, :model, :key,
+        :required, :force_sync
+
+      def initialize(synchronizer, kind, name)
+        @synchronizer, @kind, @name = synchronizer, kind, name.to_sym
+        @key_suffix = KIND_KEY_SUFFIX_MAP[kind]
+      end
+
+      def create(options)
+        validate_options(options)
+
+        @key = options[:key]
+        @required = options[:required]
+        @force_sync = options[:force_sync]
+
+        if options[:class_name].present?
+          @model = options[:class_name].constantize
+        end
+
+        set_defaults
+
+        @synchronizer.associations[@key] = self
+      end
+
+      def model_name
+        @model.to_s.demodulize.underscore.to_sym
+      end
+
+      protected
+
+      def set_defaults
+        @required ||= false
+        @force_sync ||= false
+
+        @model ||= @name.to_s.classify.constantize
+        @key = "#{@name}_#{@key_suffix}" unless @key.present?
+      end
+
+      private
+
+      def validate_options(options)
+        options.assert_valid_keys(Association.valid_options)
+      end
+    end
+  end
+end

data/lib/synchronisable/dsl/associations.rb

@@ -1,6 +1,4 @@
-require 'synchronisable/dsl/associations/has_one'
-require 'synchronisable/dsl/associations/has_many'
-require 'synchronisable/dsl/associations/belongs_to'
+require 'synchronisable/dsl/association'
 
 module Synchronisable
   module DSL
@@ -18,10 +16,9 @@ module Synchronisable
           subclass.associations = {}
         end
 
-        [HasOne, HasMany, BelongsTo].each do |klass|
-          macro = klass.to_s.demodulize.underscore.to_sym
-          define_method(macro) do |name, options = {}|
-            klass.create(self, name, options)
+        %i(has_one has_many belongs_to).each do |kind|
+          define_method(kind) do |name, options = {}|
+            Association.create(self, kind, name, options)
           end
         end
 

data/lib/synchronisable/source.rb

@@ -86,8 +86,8 @@ module Synchronisable
       end
     end
 
-    def filter_associations(macroses)
-      @associations.select { |a| macroses.include? a.macro }
+    def filter_associations(kinds)
+      @associations.select { |a| kinds.include? a.kind }
     end
   end
 end

data/lib/synchronisable/synchronizer.rb

@@ -98,7 +98,7 @@ module Synchronisable
     #
     # @param source [Synchronisable::Source] synchronization source
     # @param id association remote id
-    # @param association [Synchronisable::DSL::Associations::Association]
+    # @param association [Synchronisable::DSL::Association]
     #   association builder
     #
     # @return [Boolean] `true` to continue sync, `false` to cancel
@@ -108,7 +108,7 @@ module Synchronisable
     #
     # @param source [Synchronisable::Source] synchronization source
     # @param id association remote id
-    # @param association [Synchronisable::DSL::Associations::Association]
+    # @param association [Synchronisable::DSL::Association]
     #   association builder
     method :after_association_sync
 

data/lib/synchronisable/version.rb

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

data/lib/synchronisable/worker/associations.rb

@@ -10,7 +10,7 @@ module Synchronisable
       #
       # @see Synchronisable::Source
       # @see Synchronisable::DSL::Associations
-      # @see Synchronisable::DSL::Associations::Association
+      # @see Synchronisable::DSL::Association
       %w(child parent).each do |type|
         define_method(:"sync_#{type}_associations") do
           associations = @source.send(:"#{type}_associations")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: synchronisable
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.2.0
 platform: ruby
 authors:
 - Vasiliy Yorkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-07 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -286,6 +286,7 @@ extra_rdoc_files: []
 files:
 - ".coveralls.yml"
 - ".gitignore"
+- ".hound.yml"
 - ".rspec"
 - ".ruby-version"
 - ".travis.yml"
@@ -305,11 +306,8 @@ files:
 - lib/synchronisable/configuration.rb
 - lib/synchronisable/context.rb
 - lib/synchronisable/controller.rb
+- lib/synchronisable/dsl/association.rb
 - lib/synchronisable/dsl/associations.rb
-- lib/synchronisable/dsl/associations/association.rb
-- lib/synchronisable/dsl/associations/belongs_to.rb
-- lib/synchronisable/dsl/associations/has_many.rb
-- lib/synchronisable/dsl/associations/has_one.rb
 - lib/synchronisable/dsl/macro.rb
 - lib/synchronisable/dsl/macro/attribute.rb
 - lib/synchronisable/dsl/macro/expression.rb
@@ -454,7 +452,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Provides base fuctionality (models, DSL) for AR synchronization with external

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

@@ -1,72 +0,0 @@
-require 'synchronisable/dsl/macro'
-
-module Synchronisable
-  module DSL
-    module Associations
-      # Association builder.
-      # Subclasses must implement #macro method.
-      class Association
-        include Synchronisable::DSL::Macro
-
-        attribute :key_suffix, default: -> { raise NotImplementedError }
-
-        class << self
-          attr_accessor :valid_options
-
-          def create(synchronizer, name, options)
-            new(synchronizer, name).create(options)
-          end
-        end
-
-        self.valid_options = %i(key class_name required force_sync)
-
-        attr_reader :name, :model, :key,
-          :required, :force_sync
-
-        def initialize(synchronizer, name)
-          @synchronizer, @name = synchronizer, name.to_sym
-        end
-
-        def create(options)
-          validate_options(options)
-
-          @key = options[:key]
-          @required = options[:required]
-          @force_sync = options[:force_sync]
-
-          if options[:class_name].present?
-            @model = options[:class_name].constantize
-          end
-
-          set_defaults
-
-          @synchronizer.associations[@key] = self
-        end
-
-        def macro
-          raise NotImplementedError
-        end
-
-        def model_name
-          @model.to_s.demodulize.underscore.to_sym
-        end
-
-        protected
-
-        def set_defaults
-          @required ||= false
-          @force_sync ||= false
-
-          @model ||= @name.to_s.classify.constantize
-          @key = "#{@name}_#{self.class.key_suffix}" unless @key.present?
-        end
-
-        private
-
-        def validate_options(options)
-          options.assert_valid_keys(Association.valid_options)
-        end
-      end
-    end
-  end
-end

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

@@ -1,16 +0,0 @@
-require 'synchronisable/dsl/associations/association'
-
-module Synchronisable
-  module DSL
-    module Associations
-      # `belongs_to` association builder.
-      class BelongsTo < Association
-        key_suffix 'id'
-
-        def macro
-          :belongs_to
-        end
-      end
-    end
-  end
-end

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

@@ -1,16 +0,0 @@
-require 'synchronisable/dsl/associations/association'
-
-module Synchronisable
-  module DSL
-    module Associations
-      # `has_many` association builder.
-      class HasMany < Association
-        key_suffix 'ids'
-
-        def macro
-          :has_many
-        end
-      end
-    end
-  end
-end

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

@@ -1,17 +0,0 @@
-require 'synchronisable/dsl/associations/association'
-
-module Synchronisable
-  module DSL
-    module Associations
-      # `has_one` association builder.
-      class HasOne < Association
-        key_suffix 'id'
-
-        def macro
-          :has_one
-        end
-      end
-    end
-  end
-end
-