operationable 0.5.6 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 040e59f59c21f9ef4173c7c6a8b92361b0322a0c8665050025fca4d31928601d
-  data.tar.gz: 9452b615efa14ab19318a586d1b28fb3f4c2e9a3bb9d72993242cde7ae2f0ce4
+  metadata.gz: 4fd1e53ce750855eed63256b1df0d140f502043e9355baa2c3592c5c12430e00
+  data.tar.gz: 4c4f0c4ccf6a67f4c2c016e05a4f3dab4c149338dbcefa5e154a2d17d820b346
 SHA512:
-  metadata.gz: 31144ef82aad7945a9a1b8a7fb749c1e0130d5fe3a0a78e3da76781f3cc42a699a6448ea8293d23e335212588f4e349243fee4b2c9cd66e8ff4055ce77b88040
-  data.tar.gz: ebd984eca0102f0883037087308580ad098607319e046c27c2389a27a50099f7e81143d23c7b8db70c51a1ed87bf0a0fceab9eb25700c13fa033341921456eb6
+  metadata.gz: afc4520e8d990fcf27b0065e272b14173986d1904b179dfb31033635694fb8b83f1443fb2c11559ef17998f5163f08e93474bcf9b715e48834a727fc81ffc828
+  data.tar.gz: 8200c85e7a02990d9df672c6325c95f2b47bf4fcbc0e805030fa2ee7b65eba9398e9cf71351f240f277b58ab71d30c0fda9f267b55a9546eb1197ed1ef1ec3d4

data/lib/operationable.rb

@@ -9,20 +9,18 @@ require 'operationable/callback'
 require 'operationable/operation'
 require 'operationable/serializer'
 require 'operationable/specification'
+require 'operationable/delayer'
 
 require 'operationable/runners/base'
 require 'operationable/runners/serial'
 require 'operationable/runners/separate'
 
-require 'operations/create'
-require 'operations/destroy'
-require 'operations/update'
-
 module Operationable
   class Operation
     class Builder < ::Operationable::Builder; end
     class Callback < ::Operationable::Callback; end
     class Specification < ::Operationable::Specification; end
     class Serializer < ::Operationable::Serializer; end
+    class Delayer < ::Operationable::Delayer; end
   end
 end

data/lib/operationable/callback.rb

@@ -15,5 +15,9 @@ module Operationable
     def user
       @user ||= User.find(props[:changed_by_id])
     end
+
+    def params
+      props[:params]
+    end
   end
 end

data/lib/operationable/delayer.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 module Operationable
   class Delayer
-    attr_reader :record, :user, :params, :activity, :action_name
+    attr_reader :record, :user, :params, :result, :activity, :action_name
 
-    def initialize(record, user, params={}, activity='', action_name='')
+    def initialize(record, user, params={}, result=nil, activity='', action_name='')
       @record = record
       @user = user
       @params = params
+      @result = result
       @activity = activity
       @action_name = action_name
     end

data/lib/operationable/operation.rb

@@ -28,9 +28,13 @@ module Operationable
     end
 
     def persist
-      record
+      save_record(record)
     end
 
+    def save_record(record)
+      record
+    end
+    
     def build
       "#{class_name}::Builder".constantize.new(record, user, params).build
     end
@@ -42,5 +46,9 @@ module Operationable
     def class_name
       self.class.name
     end
+
+    def operation_name
+      self.class.to_s.split('::').last(2).map(&:underscore).join(':')
+    end
   end
 end

data/lib/operationable/runners/base.rb

@@ -1,9 +1,47 @@
 # frozen_string_literal: true
 module Operationable
   module Runners
+    module Wrappable
+      def push_to_queue(*callback_method_names, job_class_name: nil, queue: nil, params: {})
+        callback_method_names.each do |callback_method_name|
+          callbacks << {
+            callback_method_name: callback_method_name.to_s,
+            job_class_name: job_class_name.nil? ? job_class.to_s : job_class_name.to_s,
+            queue: (job_class_name && queue.blank?) ? job_class_name.to_s.constantize.queue_name : queue.to_s,
+            params: params
+          }
+        end
+      end
+  
+      def add_part(modul, opts=nil)
+        modul.execute(self, opts)
+      end
+  
+      def callbacks
+        @callbacks ||= []
+      end
+  
+      def inherited_callbacks
+        ancestors
+          .grep(Wrappable)
+          .reverse
+          .flat_map(&:callbacks)
+      end
+  
+      def new(*arguments, &block)
+        instance = allocate
+        instance.send(:initialize, *arguments, &block)
+        instance_callbacks = instance.instance_variable_get(:@callbacks)
+        instance.instance_variable_set(:@callbacks, instance_callbacks.concat(inherited_callbacks).uniq)
+        instance
+      end
+    end
+    
     class Base
       attr_reader :callbacks, :record, :user, :params, :result
 
+      extend Wrappable
+
       def initialize(record, params, result, user)
         @record = record
         @params = params
@@ -81,7 +119,7 @@ module Operationable
       end
 
       def specification
-        @specification ||= specification_class_name.constantize.new(record, user, params, activity, action_name)
+        @specification ||= specification_class_name.constantize.new(record, user, params, result, activity, action_name)
       end
 
       def callback_class_name

data/lib/operationable/runners/separate.rb

@@ -11,10 +11,10 @@ module Operationable
         # callback_class = callback_method_name.to_s.safe_constantize
 
         args = {
-          q_options: q_options(callback_method_name, queue),
-          props: props.merge(params)
-        }
-
+          q_options: q_options(callback_method_name, queue).to_h,
+          props: props.merge(params).to_h
+        }.to_h.deep_stringify_keys
+  
         queue.blank? ? self.class.call(args) : perform(job_class_name, args, get_delayed_params(callback_method_name))
       end
 
@@ -30,8 +30,25 @@ module Operationable
           queue: queue })
       end
 
-      def self.call(q_options:, props:)
-        q_options[:callback_class_name].constantize.new(props, q_options).method(q_options[:callback_method_name]).call
+      class << self
+        def operation_name
+          self.to_s.split('::').last(3).first(2).map(&:underscore).join(':')
+        end
+    
+        def call(params)
+          q_options = extract_q_options(params)
+          props = extract_props(params)
+  
+          q_options[:callback_class_name].constantize.new(props, q_options).method(q_options[:callback_method_name]).call
+        end
+  
+        def extract_props(params)
+          params['props'].deep_symbolize_keys
+        end
+  
+        def extract_q_options(params)
+          params['q_options'].deep_symbolize_keys
+        end
       end
     end
   end

data/lib/operationable/serializer.rb

@@ -63,8 +63,8 @@ module Operationable
       params.transform_values! do |value|
         if value.is_a? Array
           value.map { |i| acceptable_argument?(i) ? i : i.to_s }
-        elsif value.is_a? Hash
-          stringify_arguments(value)
+        elsif [Hash, HashWithIndifferentAccess, ActionController::Parameters].any? { |klass| value.is_a? klass }
+          stringify_arguments(value.to_h)
         else
           acceptable_argument?(value) ? value : value.to_s
         end

data/lib/operationable/specification.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 module Operationable
   class Specification
-    attr_reader :record, :user, :params, :activity, :action_name
+    attr_reader :record, :user, :params, :result, :activity, :action_name
 
-    def initialize(record, user, params={}, activity='', action_name='')
+    def initialize(record, user, params={}, result=nil, activity='', action_name='')
       @record = record
       @user = user
       @params = params
+      @result = result
       @activity = activity
       @action_name = action_name
     end

data/lib/operationable/version.rb

@@ -1,3 +1,3 @@
 module Operationable
-  VERSION = "0.5.6"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: operationable
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.7.0
 platform: ruby
 authors:
 - Kirill Suhodolov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-02 00:00:00.000000000 Z
+date: 2021-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,9 +82,6 @@ files:
 - lib/operationable/serializer.rb
 - lib/operationable/specification.rb
 - lib/operationable/version.rb
-- lib/operations/create.rb
-- lib/operations/destroy.rb
-- lib/operations/update.rb
 - operationable.gemspec
 - spec/operationable_spec.rb
 - spec/spec_helper.rb

data/lib/operations/create.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-module Operations
-  class Create < ::Operationable::Operation
-    def persist
-      record.save
-    end
-  end
-end

data/lib/operations/destroy.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-module Operations
-  class Destroy < ::Operationable::Operation
-    def persist
-      record.destroy
-    end
-  end
-end

data/lib/operations/update.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-module Operations
-  class Update < ::Operationable::Operation
-    def persist
-      record.save
-    end
-  end
-end