synchronisable 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70388e8c1eef4b5cb5e12223a4201d02073248ad
-  data.tar.gz: 829ab2f2ebf18374eaaab7e34b97ca084c494224
+  metadata.gz: 02c09a1ef8d6a3cfb421f127643ad5b79655756f
+  data.tar.gz: 7f5e474b07df81f291239fbd71a7a700007cfbaa
 SHA512:
-  metadata.gz: 3c4b925a4fb1a39e8c7d440fea7803c2303f89b7fad7b951564aa800b18b21d48934691f686e9e112102e005df959792f67d08ba4529687b7e4a84977905e74e
-  data.tar.gz: 7f69d985173f10d17fb3e84474c7b1dc4c0d0d8e8f85eadf9d7cf42a6364aa3072606a0a275a09060a8ec28268998640664019ba2de87f9bae199a239cc58e14
+  metadata.gz: 453ce50073eb8f24ee073738c08f2a96d2692a0e5ce193e5652fc1800887f61347172ca1ccb83f17f4b0ad7c941b84d9746e519e7ba83db6910c8d9c61d9d648
+  data.tar.gz: a13eff1a136a0b5d001c6a9268dd53e66aeab994ccebb3960f99ca7ac761f72d9d4b439ed0805880d3742fa0924c6f188381b2ff8838129918b443d49f7bdb4d

data/README.md

@@ -32,10 +32,6 @@ And then execute:
 
     $ bundle
 
-Or install it yourself as:
-
-    $ gem install synchronisable
-
 Optionally, if you are using rails to run an initializer generator:
 
     $ rails g synchronisable:install

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

@@ -15,4 +15,8 @@ Synchronisable.configure do |config|
   # a `synchronisable` dsl instruction.
   #
   # config.models = %w(Foo Bar)
+
+  # What to do with an associated import record
+  # when its synchronisable is destroyed. Default is `:destroy`.
+  # config.dependent_import = :destroy
 end

data/lib/synchronisable/configuration.rb

@@ -2,9 +2,14 @@ module Synchronisable
   class Configuration
     include ActiveSupport::Configurable
 
+    config_accessor :dependent_import do
+      :destroy
+    end
+
     config_accessor :models do
-      {}
+      []
     end
+
     config_accessor :logging do
       default_logger = -> { Logger.new(STDOUT) }
       rails_logger   = -> { Rails.logger || default_logger.() }

data/lib/synchronisable/model/scopes.rb

@@ -0,0 +1,22 @@
+require 'synchronisable/models/import'
+
+module Synchronisable
+  module Model
+    module Scopes
+      def not_imported
+        includes(:import)
+          .where(imports: { synchronisable_id: nil })
+          .references(:imports)
+      end
+
+      def imported
+        includes(:import)
+          .where.not(imports: { synchronisable_id: nil })
+          .refences(:imports)
+      end
+
+      alias_method :without_import, :not_imported
+      alias_method :with_import, :imported
+    end
+  end
+end

data/lib/synchronisable/model.rb

@@ -1,4 +1,5 @@
 require 'synchronisable/model/methods'
+require 'synchronisable/model/scopes'
 require 'synchronisable/synchronizers/synchronizer_default'
 
 module Synchronisable
@@ -29,24 +30,28 @@ module Synchronisable
       #   end
       def synchronisable(*args)
         extend Synchronisable::Model::Methods
+        extend Synchronisable::Model::Scopes
 
         class_attribute :synchronizer
-        has_one :import, as: :synchronisable, class_name: 'Synchronisable::Import'
 
-        scope :without_import, -> {
-          includes(:import)
-            .where(imports: { synchronisable_id: nil })
-            .references(:imports)
-        }
+        options = args.extract_options!
+
+        set_defaults(options)
+        set_synchronizer(args, options)
 
-        set_defaults(args)
+        has_one :import,
+          as: :synchronisable,
+          class_name: 'Synchronisable::Import',
+          dependent: options[:dependent]
       end
 
       private
 
-      def set_defaults(args)
-        options = args.extract_options!
+      def set_defaults(options)
+        options[:dependent] ||= Synchronisable.config.dependent_import
+      end
 
+      def set_synchronizer(args, options)
         self.synchronizer = args.first || options[:synchronizer] ||
           find_synchronizer || SynchronizerDefault
       end

data/lib/synchronisable/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: synchronisable
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Vasiliy Yorkin
@@ -310,6 +310,7 @@ files:
 - lib/synchronisable/locale/ru.yml
 - lib/synchronisable/model.rb
 - lib/synchronisable/model/methods.rb
+- lib/synchronisable/model/scopes.rb
 - lib/synchronisable/models/import.rb
 - lib/synchronisable/source.rb
 - lib/synchronisable/synchronizer.rb