operationable 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba4f68a864b7430a94ab73c82f58c556a251aecd
-  data.tar.gz: 33af1348f7da1d56c5caeee3aae8654f8e25b6fd
+  metadata.gz: da4f2c001b58a3ce07d7d7a16100c9abdee28cd2
+  data.tar.gz: 52b9abff75acce3b938c60708e10646e79fb7a98
 SHA512:
-  metadata.gz: 7d655c4b3c5c320be0fd90a458dc533b8abe2d3d9133af243dce47f1730aa08b7847807046904a50bbe6bfd4910411f65032187ae7849a164c402ecfcf5f277f
-  data.tar.gz: b7117faa87f4a64fbf73d440c8c2213e33dec571003c5355c477e6602100136a0c696542276f5f61d1f686dd4ab6d2739a23d31124715333b50a6e3264740a5a
+  metadata.gz: 907b157d42743139639ee5999ad221e25b576bb33a802078db1a9f18f5e3047502c4844f6957f1c41001168e7d518fac48265075aa1b475ba2bbcde17441e275
+  data.tar.gz: 19838de1878f31a759c11002d42ff0c1bd301f8a794e310cdd477965bcf81f0a05deb58714d76df99d7863627a2fe14911aefb748c533a1463d6f5a7f53b6882

data/lib/operationable.rb

@@ -8,6 +8,7 @@ require 'operationable/callback'
 require 'operationable/operation'
 require 'operationable/serializer'
 require 'operationable/specification'
+require 'operationable/persister'
 
 require 'operationable/runners/base'
 require 'operationable/runners/serial'
@@ -24,5 +25,6 @@ module Operationable
     class Callback < ::Operationable::Callback; end
     class Specification < ::Operationable::Specification; end
     class Serializer < ::Operationable::Serializer; end
+    class Persister < ::Operationable::Persister; end
   end
 end

data/lib/operationable/persister.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+module Operationable
+  class Persister
+    class << self
+      def persist(callbacks, initiator_id, params, name)
+        ::Operation.create(
+          callbacks: callbacks.map { |callback|
+            {
+              status: ::Operation::STATUS_INIT,
+              name: callback[:callback_method_name],
+              queue: callback[:queue]
+            }
+          },
+          initiator_id: initiator_id,
+          params: params,
+          name: name
+        )
+      end
+
+      def working(id, name)
+        update(id, name, ::Operation::STATUS_WORKING)
+      end
+
+      def completed(id, name)
+        update(id, name, ::Operation::STATUS_COMPLETED)
+      end
+
+      def around_call(id, name, block)
+        working(id, name)
+        block.call
+        completed(id, name)
+      end
+
+      private
+
+      def update(id, name, status)
+        op = ::Operation.find(id)
+        callbacks = op.callbacks.map do |cb|
+          cb['status'] = status if cb['name'] === name
+          cb
+        end
+
+        op.callbacks = callbacks
+        op.save
+      end
+    end
+  end
+end

data/lib/operationable/runners/base.rb

@@ -12,6 +12,8 @@ module Operationable
         @callbacks = []
 
         initialize_callbacks
+
+        persist_operation
       end
 
       def run
@@ -19,6 +21,10 @@ module Operationable
 
       private
 
+      def persist_operation
+        @persist_operation ||= ::Operationable::Persister.persist(check_callbacks, user.id, props, operation_class_name)
+      end
+
       def props
         serializer_instance.serialize
       end

data/lib/operationable/runners/separate.rb

@@ -14,12 +14,20 @@ module Operationable
         { type: 'separate',
           callback_class_name: callback_class_name,
           callback_method_name: callback_method_name,
-          queue: queue }
+          queue: queue,
+          op_id: persist_operation.id }
       end
 
+      # def self.call(options, props)
+      #   options[:callback_class_name].constantize.new(props).method(options[:callback_method_name]).call
+      # end
+
       def self.call(options, props)
-        options[:callback_class_name].constantize.new(props).method(options[:callback_method_name]).call
+        ::Operationable::Persister.around_call(options[:op_id], options[:callback_method_name], -> {
+          options[:callback_class_name].constantize.new(props).method(options[:callback_method_name]).call
+        })
       end
+
     end
   end
 end

data/lib/operationable/runners/serial.rb

@@ -10,16 +10,27 @@ module Operationable
         (queue.blank? ? self.class : OperationJob.method(perform_method)).call(options, props)
       end
 
+      # def self.call(options, props)
+      #   instance = options[:callback_class_name].constantize.new(props)
+      #   options[:callback_names].each { |method_name| instance.method(method_name).call }
+      # end
+
       def self.call(options, props)
         instance = options[:callback_class_name].constantize.new(props)
-        options[:callback_names].each { |method_name| instance.method(method_name).call }
+
+        options[:callback_names].each do |method_name|
+          ::Operationable::Persister.around_call(options[:op_id], method_name, -> {
+            instance.method(method_name).call
+          })
+        end
       end
 
       def options
         { type: 'serial',
           callback_class_name: callback_class_name,
           callback_names: callback_names,
-          queue: queue }
+          queue: queue,
+          op_id: persist_operation.id }
       end
 
       private

data/lib/operationable/serializer.rb

@@ -22,7 +22,13 @@ module Operationable
     private
 
     def extract_props(record, user)
-      { **extract_from_record(record), **extract_from_user(user), activity: activity, action_name: action_name }
+      {
+        **extract_from_record(record),
+        **extract_from_user(user),
+        params: params,
+        activity: activity,
+        action_name: action_name
+      }
     end
 
     def extract_from_record(record)

data/lib/operationable/version.rb

@@ -1,3 +1,3 @@
 module Operationable
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: operationable
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Kirill Suhodolov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-28 00:00:00.000000000 Z
+date: 2017-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -90,6 +90,7 @@ files:
 - lib/operationable/builder.rb
 - lib/operationable/callback.rb
 - lib/operationable/operation.rb
+- lib/operationable/persister.rb
 - lib/operationable/runners/base.rb
 - lib/operationable/runners/separate.rb
 - lib/operationable/runners/serial.rb
@@ -99,13 +100,6 @@ files:
 - lib/operations/create.rb
 - lib/operations/destroy.rb
 - lib/operations/update.rb
-- operationable-0.1.7.gem
-- operationable-0.1.8.gem
-- operationable-0.1.9.gem
-- operationable-0.2.0.gem
-- operationable-0.2.1.gem
-- operationable-0.2.2.gem
-- operationable-0.2.3.gem
 - operationable.gemspec
 - spec/operationable_spec.rb
 - spec/spec_helper.rb
@@ -129,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Implementation of command pattern to avoid ActiveRecord callbacks and get