approval 0.3.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 036447a5b614f818fa6a3ace7ee80d56c736d307bf1b8020cca81c2e6458ac07
-  data.tar.gz: 95feed0024428c045f96adaa675618751481ac9111f3aeafb79e02d6d9e17856
+  metadata.gz: 887c9791882f3ddcad06255f3c51bdce3f3a3bc2c0303f4b08c6675049cab402
+  data.tar.gz: cf49a8a8805feb9197b07d7248032da32b8fa22d8baee4e403c75f5b266627f7
 SHA512:
-  metadata.gz: afdc581773b236d893187061146bbb58e4c3e5760eda31b74a73105c52ee22b3647ad2400f5b31421cf3224b9c5920fcc0f4ae572101721f741e746fd567f19b
-  data.tar.gz: 05a14a3c41748d87ecbdc9365b3198a7f750be241385966c5a5b55cc53c7c7874fdcb4092c933195a1f43b01dff5c81c91fbdd4ceb5c5e81c4df50fd67f58f8b
+  metadata.gz: acc899127438f3fc8ed8c157fb91cf677a7dab0a41ba54e78300cfe4d9cee722fc530fea6d87d0be1537362ae317432e88d8819de604137afe761044302b4f8c
+  data.tar.gz: 8e2d0d89ce1b639a025f400e0cb0b3e64cd00218fb1b646df538957c63665c9f2e283b4cec710ce588f742512ae32045b471216549bd57fd384b039fa9bf03b2

data/app/models/approval/execute_form.rb

@@ -0,0 +1,57 @@
+module Approval
+  class ExecuteForm
+    include ::ActiveModel::Model
+
+    attr_accessor :user, :reason, :request
+
+    def initialize(user:, reason:, request:)
+      @user    = user
+      @reason  = reason
+      @request = request
+    end
+
+    validates :user,    presence: true
+    validates :request, presence: true
+    validates :reason,  allow_blank: true, length: { maximum: Approval.config.comment_maximum }
+
+    validate :ensure_request_is_approved
+    validate :ensure_user_same_as_request_user
+
+    def save
+      return false unless valid?
+
+      execute(&:save)
+    end
+
+    def save!
+      raise ::ActiveRecord::RecordInvalid unless valid?
+
+      execute(&:save!)
+    end
+
+    private
+
+      def execute
+        ::Approval::Request.transaction do
+          request.lock!
+          request.comments.new(user_id: user.id, content: reason) if reason
+          request.execute
+          yield(request)
+        end
+      end
+
+      def ensure_request_is_approved
+        return unless request
+
+        errors.add(:request, :is_not_approved) unless request.approved?
+      end
+
+      def ensure_user_same_as_request_user
+        return unless user && request
+
+        unless user.id == request.request_user_id
+          errors.add(:user, :cannot_execute_others_request)
+        end
+      end
+  end
+end

data/app/models/approval/request.rb

@@ -10,7 +10,7 @@ module Approval
     has_many :comments, class_name: :"Approval::Comment", inverse_of: :request, dependent: :destroy
     has_many :items,    class_name: :"Approval::Item",    inverse_of: :request, dependent: :destroy
 
-    enum state: { pending: 0, cancelled: 1, approved: 2, rejected: 3 }
+    enum state: { pending: 0, cancelled: 1, approved: 2, rejected: 3, executed: 4 }
 
     scope :recently, -> { order(id: :desc) }
 
@@ -28,12 +28,20 @@ module Approval
       self.requested_at = Time.current
     end
 
+    def execute
+      self.state = :executed
+      self.executed_at = Time.current
+      items.each(&:apply)
+    end
+
     private
 
       def ensure_state_was_pending
         return unless persisted?
 
-        errors.add(:base, :already_performed) if state_was != "pending"
+        if %w[pending approved].exclude?(state_was)
+          errors.add(:base, :already_performed)
+        end
       end
   end
 end

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

@@ -11,11 +11,9 @@ module Approval
         @records = records
       end
 
-      with_options presence: true do
-        validates :user
-        validates :reason, length: { maximum: Approval.config.comment_maximum }
-        validates :records
-      end
+      validates :user,    presence: true
+      validates :reason,  presence: true, length: { maximum: Approval.config.comment_maximum }
+      validates :records, presence: true
 
       def save
         return false unless valid?

data/app/models/approval/respond_form/approve.rb

@@ -10,7 +10,6 @@ module Approval
             request.lock!
             request.assign_attributes(state: :approved, approved_at: Time.current, respond_user_id: user.id)
             request.comments.new(user_id: user.id, content: reason)
-            request.items.each(&:apply)
             yield(request)
           end
         end

data/app/models/approval/respond_form/approve_with_execute.rb

@@ -0,0 +1,19 @@
+module Approval
+  module RespondForm
+    class ApproveWithExecute < Base
+      validate :ensure_user_cannot_respond_to_my_request
+
+      private
+
+        def prepare
+          ::Approval::Request.transaction do
+            request.lock!
+            request.assign_attributes(state: :approved, approved_at: Time.current, respond_user_id: user.id)
+            request.comments.new(user_id: user.id, content: reason)
+            request.execute
+            yield(request)
+          end
+        end
+    end
+  end
+end

data/app/models/approval/respond_form/base.rb

@@ -11,11 +11,9 @@ module Approval
         @request = request
       end
 
-      with_options presence: true do
-        validates :user
-        validates :reason, length: { maximum: Approval.config.comment_maximum }
-        validates :request
-      end
+      validates :user,    presence: true
+      validates :reason,  presence: true, length: { maximum: Approval.config.comment_maximum }
+      validates :request, presence: true
 
       def save
         return false unless valid?

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

@@ -23,12 +23,20 @@ module Approval
       Approval::RespondForm::Cancel.new(user: self, reason: reason, request: request)
     end
 
-    def approve_request(request, reason:)
-      Approval::RespondForm::Approve.new(user: self, reason: reason, request: request)
+    def approve_request(request, reason:, execute: true)
+      if execute
+        Approval::RespondForm::ApproveWithExecute.new(user: self, reason: reason, request: request)
+      else
+        Approval::RespondForm::Approve.new(user: self, reason: reason, request: request)
+      end
     end
 
     def reject_request(request, reason:)
       Approval::RespondForm::Reject.new(user: self, reason: reason, request: request)
     end
+
+    def execute_request(request, reason: nil)
+      Approval::ExecuteForm.new(user: self, reason: reason, request: request)
+    end
   end
 end

data/config/locales/en.yml

@@ -3,6 +3,8 @@ en:
     messages:
       already_performed: "This request has already performed."
       cannot_respond_to_own_request: "cannot respond to own request."
+      cannot_execute_others_request: "cannot execute others request."
+      is_not_approved: "is not approved."
 
   attributes:
     id: "ID"

data/config/locales/ja.yml

@@ -3,6 +3,8 @@ ja:
     messages:
       already_performed: "申請は既に実行されています"
       cannot_respond_to_own_request: "は自身の申請のため対応できません"
+      cannot_execute_others_request: "は自身の申請ではないため実行できません"
+      is_not_approved: "は承認されていません"
 
   attributes:
     id: ID

data/db/migrate/20180409000000_create_approval_tables.rb

@@ -8,6 +8,7 @@ class CreateApprovalTables < ActiveRecord::Migration[5.0]
       t.datetime :cancelled_at
       t.datetime :approved_at
       t.datetime :rejected_at
+      t.datetime :executed_at
 
       t.timestamps
 

data/lib/approval/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: approval
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
 platform: ruby
 authors:
 - Yoshiyuki Hirano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2018-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -35,6 +35,7 @@ files:
 - README.md
 - app/models/approval/application_record.rb
 - app/models/approval/comment.rb
+- app/models/approval/execute_form.rb
 - app/models/approval/item.rb
 - app/models/approval/request.rb
 - app/models/approval/request_form/base.rb
@@ -42,6 +43,7 @@ files:
 - app/models/approval/request_form/destroy.rb
 - app/models/approval/request_form/update.rb
 - app/models/approval/respond_form/approve.rb
+- app/models/approval/respond_form/approve_with_execute.rb
 - app/models/approval/respond_form/base.rb
 - app/models/approval/respond_form/cancel.rb
 - app/models/approval/respond_form/reject.rb