external_services 0.1.5 → 0.1.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWNlM2UzYTQxZGE4ZmNiMDVmMTA3ZTc3ZjI3OTc1MjE5MWViYmNiYg==
+    NDU3NjA4NTljMWEwODUxMDRiNzM4YjYzZGU1YzQ4NTRhZDkzOGMwOA==
   data.tar.gz: !binary |-
-    Mjg2YmE2MmIzZDcwYTdmYTY3OGY5NWE1NmZkY2QyM2RkMmFkOWE5OA==
+    OTVhY2JhMjUzM2NhZjJiMDkyODM3MWRkZDZhN2UxM2ViMTc2YTZiNA==
 SHA512:
   metadata.gz: !binary |-
-    NTMzOGQzZTdmMmZjZDg0ODY1NzM3MmVlNTliM2Y4ZDk1ZGI5ZDI1ZGM0NDlh
-    MGM1NGQ3MmRjYTgwN2RhMmYxM2QwNDVlZDdjZTdiZjhlNTFjNzhhOGQ0ZjNl
-    NGIxMTdjZmEzYjdhZTA0NTg3MzhkOGZlODMwZmVmZTI3MjI1ZDM=
+    OTQxOTVkYzNiZDZhZGRiNmY1MzE1NmE4YTBlYTlhZGUxMzhjYTc5NTNlNDE4
+    Mjg3YzhlNTQyMjgxZjY2ZDU1ZTk5M2RlYTAyNWUyNDg4YzUxOTQ2Yjc3MTJk
+    Njc2ZTExYTJmMmE1ZThiMGVlZGFkYWRlM2JiZjlhNGY5NjlmY2U=
   data.tar.gz: !binary |-
-    ZmNmNDE2MTIzMzQ2ZjYzNWUyMTVmODdkMzU0ZGE0OWUyZDFlOTI4MWM3YzE1
-    ZjhjNDQwY2ZmNmQ2YzQ4MzMyYzVmZGQzNTY3NmE5YzcwOWFiYzI4MmY3OThi
-    MjA4YmQyZTMyYTM1YWM1Nzc4NjM5ZGQ3Mjk5YzUyYTllZjJmOTc=
+    MGEyNzQ2ZmEyMmU4NWMxZmZhY2M2ODVlMmJmZGJkZWQ4MDU3NGY3NDdiOGY1
+    YzNiNDE3OGE4YTE1MDRiNTIzZThkMjk3OGMzMTZmNDVkMmY5ZmMyN2IwYTdl
+    NzQyYTQ2ZjI0NzgwYTZkM2QwNTMwNmVjOGIxNmEyNTBiNzlhNDc=

data/app/models/external_services/api_action.rb

@@ -11,6 +11,7 @@ module ExternalServices
     serialize :options, JSON
 
     scope :unprocessed, -> { where(processed_at: nil) }
+    scope :to_create, ->(obj) { where(initiator: obj, method: :post) }
 
     before_validation :assign_queue
     before_validation :process_data

data/config/locales/en.yml

@@ -2,4 +2,4 @@ en:
   activerecord:
     errors:
       messages:
-        external_services_not_synced: "Not all external services are synced"
+        external_services_sync_in_process: "External services sync is in process now"

data/lib/external_services/active_record.rb

@@ -102,8 +102,8 @@ module ExternalServices
                   public_send(:"build_#{service_assoc}") if public_send(service_assoc).blank?
                 end
 
-                before_update  :halt_on_external_services_unsynced
-                before_destroy :halt_on_external_services_unsynced
+                before_update  :halt_on_external_services_syncing
+                before_destroy :halt_on_external_services_syncing
               end
 
               after_save    :"#{name}_on_create", if: :id_changed?
@@ -134,9 +134,9 @@ module ExternalServices
             end
             protected :"#{name}_on_revive"
 
-            protected def halt_on_external_services_unsynced
-              unless external_services_synced?
-                errors.add :base, :external_services_not_synced
+            protected def halt_on_external_services_syncing
+              if external_services_syncing?
+                errors.add :base, :external_services_sync_in_process
                 if ::ActiveRecord::VERSION::MAJOR < 5
                   return false
                 else
@@ -153,6 +153,7 @@ module ExternalServices
         def define_external_service_sync_methods(name, _options = {})
           service_assoc = :"#{name}_service"
           synced_method = :"#{name}_service_synced?"
+          syncing_method = :"#{name}_service_syncing?"
           disabled_method = :"#{name}_api_disabled"
 
           syncs_module = Module.new do
@@ -162,11 +163,22 @@ module ExternalServices
               public_send(service_assoc).external_id?
             end
 
+            define_method syncing_method do
+              action_class = "ExternalServices::ApiActions::#{name.to_s.camelize}".constantize
+              action_class.to_create(self).unprocessed.exists?
+            end
+
             define_method :external_services_synced? do
               result = (!defined?(super) || super())
               result &&= public_send(synced_method) unless public_send(disabled_method)
               result
             end
+
+            define_method :external_services_syncing? do
+              result = (!defined?(super) || super())
+              result &&= public_send(syncing_method) unless public_send(disabled_method)
+              result
+            end
           end
 
           include syncs_module

data/lib/external_services/version.rb

@@ -1,3 +1,3 @@
 module ExternalServices
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.1.6'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: external_services
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Sergey Gnuskov