external_services 0.1.7 → 0.1.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTA0OWIzM2UxMzM0ZjllMjVkYmNhNzJiZGIyNjgxNmUzY2YzYTg5NA==
+    OTkwOWFmMmQwMzBhNzRmOWQyYWMwNTIwOTc2YzU2MGRlMDlhOTMzNA==
   data.tar.gz: !binary |-
-    MGY0MmY1ZmUzYzE3OGQ3MTIwZWIwZTAwYzRiZWE4MzQ1NjVlNTkzZg==
+    YTMwMTU4OGNhZWFlYzhmMWQ2ODg1NjFjNjkwMzhkNjdiY2M4NmEwYg==
 SHA512:
   metadata.gz: !binary |-
-    MTc3ZmQxN2JlZjVkODU3NjNkYTA1NmVhNWYzZmYxZDcyMWIzOThmM2RhMGI5
-    NjU1OGQ4M2MyMzg0NjUzMGI0YTUzNzllMmM4ZTA2ZmNkZWRlYWIxMTAzZTc1
-    ZmMxZGE2N2MzMWMwN2RiNTNlYmNjMGZkNjYxYjFmNGU0MzI4ODE=
+    ZjEyMWQ2YmY0NzAxNWI5ZDVjYmYwMGM3NTYxOTBjOTc3ZmE2YTYxZjIxM2Zj
+    NjczMjA4MjRiYzkxODYyYTE1MWU2ZDY4OWI0ZTVlMDliNjE2MTAwNjRmNjRi
+    ODE1MjhlYjZkMGY3YzBhYmMxZjY2MTU0NDk1NTNhNjI1NmEzNGM=
   data.tar.gz: !binary |-
-    MDI5MWM4MTc0OTJhOTYyNzRhZTZiMDQ4NzdlNzA4YmRiYmM0YmEwYzAyZDQ2
-    NWZiZGJjZWMwOTQwZTcyZTg5NTYyNDVhYzZmMGZiN2RlOTE1MGQyMzhlZGNh
-    ODNlNzNlZWZhOWJjNDkzNDI3YWEyMzBmYWE2Njc2NWRkMmE4NDA=
+    NzU2OWI1Yzk4ZDBkYjQxMGYzZGE0ZTIzYTBlYzlhZGI3MzQyZDFhMDE2MmEz
+    Mzg2ZmU5YTEyYzQwNjU0ZWUzZDFkNWRiOTU3NmQ0ZWI1MmRkOTRlYTQ3NGRl
+    NTExZGE3M2Y1YjE5OTdlNGVmMzkzMWRiMzVhNDYzN2JhMTAwNzQ=

data/app/models/concerns/external_services/action.rb

@@ -0,0 +1,38 @@
+module ExternalServices
+  module Action
+    extend ActiveSupport::Concern
+
+    included do
+      scope :processed, -> { where.not(processed_at: nil) }
+      scope :unprocessed, -> { where(processed_at: nil) }
+
+      after_commit :kick_active_job
+    end
+
+    def processed?
+      processed_at.present?
+    end
+
+    def set_processed!
+      update_attributes! processed_at: Time.now
+    end
+
+    def execute!
+      raise NotImplementedError
+    end
+
+    def kick_active_job
+      return if api_disabled?
+
+      job_class.set(queue: queue).perform_later(id)
+    end
+
+    module ClassMethods
+      def perform_unprocessed
+        Rails.logger.info "Running unprocessed #{self.class.name.demodulize} api actions..."
+
+        unprocessed.each(&:kick_active_job)
+      end
+    end
+  end
+end

data/app/models/external_services/api_action.rb

@@ -1,5 +1,9 @@
 module ExternalServices
   class ApiAction < ::ActiveRecord::Base
+    include ExternalServices::Action
+
+    attr_accessor :async
+
     self.table_name = :external_services_api_actions
 
     belongs_to :initiator, polymorphic: true
@@ -19,23 +23,11 @@ module ExternalServices
 
     before_create :calculate_signature
 
-    def processed?
-      processed_at.present?
-    end
-
-    def set_processed!
-      update_attributes! processed_at: Time.now
-    end
-
     def initiator_class
       # Need to use initiator object for STI in polymorphic.. But still will be bugs with deleted STI object
       initiator.try(:class) || initiator_type.constantize
     end
 
-    def api_disabled?
-      initiator_class.send(:"#{self.class.to_s.demodulize.underscore}_api_disabled")
-    end
-
     def change_external_id?
       options['change_external_id']
     end
@@ -44,20 +36,8 @@ module ExternalServices
       "ExternalServices::#{self.class.to_s.demodulize}ApiJob".constantize
     end
 
-    def kick_active_job
-      return if api_disabled?
-
-      job_class.set(queue: queue).perform_later(id)
-    end
-
-    def self.perform_unprocessed
-      Rails.logger.info "Running unprocessed #{self.class.name.demodulize} api actions..."
-
-      unprocessed.each(&:kick_active_job)
-    end
-
-    def execute!
-      raise NotImplementedError
+    def api_disabled?
+      initiator_class.send(:"#{self.class.to_s.demodulize.underscore}_api_disabled")
     end
 
     protected
@@ -83,5 +63,16 @@ module ExternalServices
     def path_format_correctness
       errors.add(:path, :invalid) if path =~ %r{//}
     end
+
+    def async
+      @async.nil? ? true : @async
+    end
+
+    private
+
+    def create_or_update(*args)
+      return true unless async
+      super
+    end
   end
 end

data/lib/external_services/active_record.rb

@@ -129,11 +129,6 @@ module ExternalServices
             end
             protected :"#{name}_on_destroy"
 
-            define_method :"#{name}_on_revive" do
-              public_send(service_assoc).on_subject_revive(self) unless only_api_actions
-            end
-            protected :"#{name}_on_revive"
-
             protected def halt_on_external_services_syncing
               if external_services_syncing?
                 errors.add :base, :external_services_sync_in_process
@@ -188,10 +183,10 @@ module ExternalServices
         def define_external_service_helper_methods(name, _options = {})
           ## subject class methods
           helpers_class_module = Module.new do
-            define_method :"with_#{name}_api_for" do |synced: [], for_syncing: [], &b|
-              return if ([synced] + [for_syncing]).flatten.select(&:"#{name}_api_disabled").any?
 
+            define_method :"with_#{name}_api_for" do |synced: [], for_syncing: [], &b|
               unsynced = [synced].flatten.select { |o| o.send("#{name}_id").nil? }
+
               if unsynced.any?
                 objects = unsynced.map { |o| "#{o.class.name} (id=#{o.id})" }.join(', ')
                 raise "[#{name}] Trying to work with an unsynced objects: #{objects}"
@@ -226,6 +221,19 @@ module ExternalServices
                 send :"#{name}_api_disabled=", old
               end
             end
+
+            define_method :"find_all_by_#{name}_ids" do |ids|
+              conditions = { external_services: { type: get_service_class(name).name, external_id: ids } }
+              includes(:"#{name}_service").where(conditions)
+            end
+
+            define_method :"#{name}_synced" do
+              includes(:"#{name}_service").where.not(external_services: { external_id: [nil, ''] })
+            end
+
+            define_method :"not_#{name}_synced" do
+              includes(:"#{name}_service").where(external_services: { external_id: [nil, ''] })
+            end
           end
 
           ## subject methods
@@ -253,18 +261,26 @@ module ExternalServices
               path    = args[:path]    || send(:"#{name}_api_path")
               data    = args[:data]    || send(:"#{name}_api_data")
               options = args[:options] || {}
+              async   = args[:async].nil? ? true : args[:async]
 
               options[:change_external_id] = true if options[:change_external_id].nil?
 
-              "ExternalServices::ApiActions::#{name.to_s.camelize}".constantize.create!(
+              action = "ExternalServices::ApiActions::#{name.to_s.camelize}".constantize.new(
                 initiator: self,
                 name:      args[:name] || self.class.send(:"#{name}_api_name"),
                 method:    method,
                 path:      path,
                 data:      data,
                 queue:     args[:queue],
-                options:   options
+                options:   options,
+                async:     async
               )
+
+              if async
+                action.save!
+              else
+                action.execute!
+              end
             end
           end
 

data/lib/external_services/version.rb

@@ -1,3 +1,3 @@
 module ExternalServices
-  VERSION = '0.1.7'.freeze
+  VERSION = '0.1.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: external_services
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Sergey Gnuskov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2016-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -75,6 +75,7 @@ files:
 - README.md
 - Rakefile
 - app/jobs/external_services/api_job.rb
+- app/models/concerns/external_services/action.rb
 - app/models/external_services/api_action.rb
 - app/models/external_services/service.rb
 - bin/rails