approval 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 887c9791882f3ddcad06255f3c51bdce3f3a3bc2c0303f4b08c6675049cab402
-  data.tar.gz: cf49a8a8805feb9197b07d7248032da32b8fa22d8baee4e403c75f5b266627f7
+  metadata.gz: 2b64f5cbbf148b7340aff7de77d998bded8d7b3ee0437e7993f9a2089adb7c66
+  data.tar.gz: e80a019fd898640e4ed837664661e84053c7bee2501d1e26ea73ce1587ff6ace
 SHA512:
-  metadata.gz: acc899127438f3fc8ed8c157fb91cf677a7dab0a41ba54e78300cfe4d9cee722fc530fea6d87d0be1537362ae317432e88d8819de604137afe761044302b4f8c
-  data.tar.gz: 8e2d0d89ce1b639a025f400e0cb0b3e64cd00218fb1b646df538957c63665c9f2e283b4cec710ce588f742512ae32045b471216549bd57fd384b039fa9bf03b2
+  metadata.gz: a0ab4cfb2e56c725b36188c4d6c91962c2c67c0cc64a95e9624e95d94d24560a733cc8d648ec9364e05b20bff396b553c49a439fb933bfbd576b9d42cf05a78f
+  data.tar.gz: '090a5b2c02d64f05a7c0b3519b5bb7c2439bc1ba4d279817c4df24c294228763ae9b56c7d38df49fa05223a8f26ade7e7e1ff485b637806ad4a5e8a6d054ce95'

data/README.md

@@ -35,6 +35,16 @@
   end
   ```
 
+  Or if you want to use PORO:
+
+  ```ruby
+  class SomeProcess
+    def self.perform
+      # something
+    end
+  end
+  ```
+
 ## Approval Flow
 
 ### Make request
@@ -83,6 +93,16 @@ request = staff.request_for_destroy(records, reason: "something")
 request.save!
 ```
 
+#### :pray: Perform
+
+```ruby
+staff = User.find_or_create_by(email: "staff@example.com")
+
+record  = MyProcess.new(recipient: "somebody@example.com")
+request = staff.request_for_perform(record, reason: "something")
+request.save
+```
+
 ### Respond
 
 #### :ok_woman: Approve

data/app/models/approval/item.rb

@@ -3,7 +3,7 @@ module Approval
     class UnexistResource < StandardError; end
 
     self.table_name = :approval_items
-    EVENTS = %w[create update destroy].freeze
+    EVENTS = %w[create update destroy perform].freeze
 
     belongs_to :request, class_name: :"Approval::Request", inverse_of: :items
     belongs_to :resource, polymorphic: true, optional: true
@@ -11,17 +11,11 @@ module Approval
     serialize :params, Hash
 
     validates :resource_type, presence: true
+    validates :resource_id,   presence: true, if: ->(item) { item.update_event? || item.destroy_event? }
     validates :event,         presence: true, inclusion: { in: EVENTS }
+    validates :params,        presence: true, if: :update_event?
 
-    with_options unless: :create_event? do
-      validates :resource_id, presence: true
-    end
-
-    with_options if: :update_event? do
-      validates :params, presence: true
-    end
-
-    validate :ensure_resource_be_valid
+    validate :ensure_resource_be_valid, if: ->(item) { item.create_event? || item.update_event? }
 
     EVENTS.each do |event_name|
       define_method "#{event_name}_event?" do
@@ -30,30 +24,45 @@ module Approval
     end
 
     def apply
-      case event
-      when "create"
+      send("exec_#{event}")
+    end
+
+    private
+
+      def exec_create
         resource_model.create!(params).tap do |created_resource|
           update!(resource_id: created_resource.id)
         end
-      when "update"
+      end
+
+      def exec_update
         raise UnexistResource unless resource
 
         resource.update!(params)
-      when "destroy"
+      end
+
+      def exec_destroy
         raise UnexistResource unless resource
 
         resource.destroy
       end
-    end
 
-    private
+      def exec_perform
+        raise NotImplementedError unless resource_model.respond_to?(:perform)
+
+        if resource_model.method(:perform).arity > 0
+          resource_model.perform(params)
+        else
+          resource_model.perform
+        end
+      end
 
       def resource_model
         @resource_model ||= resource_type.to_s.safe_constantize
       end
 
       def ensure_resource_be_valid
-        return if resource_model.nil? || destroy_event?
+        return unless resource_model
 
         record = if resource_id.present?
                    resource_model.find(resource_id).tap {|m| m.assign_attributes(params) }

data/app/models/approval/request_form/perform.rb

@@ -0,0 +1,25 @@
+module Approval
+  module RequestForm
+    class Perform < Base
+      private
+
+        def prepare
+          ::Approval::Request.transaction do
+            request.comments.new(user_id: user.id, content: reason)
+            Array(records).each do |record|
+              request.items.new(
+                event: "perform",
+                resource_type: record.class.to_s,
+                params: extract_params_from(record),
+              )
+            end
+            yield(request)
+          end
+        end
+
+        def extract_params_from(record)
+          record.try(:attributes) || record.try(:to_h) || {}
+        end
+    end
+  end
+end

data/app/models/concerns/approval/acts_as_user.rb

@@ -19,6 +19,10 @@ module Approval
       Approval::RequestForm::Destroy.new(user: self, reason: reason, records: records)
     end
 
+    def request_for_perform(records, reason:)
+      Approval::RequestForm::Perform.new(user: self, reason: reason, records: records)
+    end
+
     def cancel_request(request, reason:)
       Approval::RespondForm::Cancel.new(user: self, reason: reason, request: request)
     end

data/lib/approval/version.rb

@@ -1,3 +1,3 @@
 module Approval
-  VERSION = "0.4.0".freeze
+  VERSION = "0.5.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: approval
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Yoshiyuki Hirano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-17 00:00:00.000000000 Z
+date: 2018-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -41,6 +41,7 @@ files:
 - app/models/approval/request_form/base.rb
 - app/models/approval/request_form/create.rb
 - app/models/approval/request_form/destroy.rb
+- app/models/approval/request_form/perform.rb
 - app/models/approval/request_form/update.rb
 - app/models/approval/respond_form/approve.rb
 - app/models/approval/respond_form/approve_with_execute.rb