approval 0.5.0 → 0.6.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/models/approval/execute_form.rb +8 -5
- data/app/models/approval/request_form/base.rb +1 -0
- data/app/models/approval/request_form/create.rb +11 -9
- data/app/models/approval/request_form/destroy.rb +11 -9
- data/app/models/approval/request_form/perform.rb +11 -9
- data/app/models/approval/request_form/update.rb +12 -10
- data/app/models/approval/respond_form/approve.rb +7 -5
- data/app/models/approval/respond_form/approve_with_execute.rb +8 -6
- data/app/models/approval/respond_form/base.rb +1 -0
- data/app/models/approval/respond_form/cancel.rb +7 -5
- data/app/models/approval/respond_form/reject.rb +7 -5
- data/app/models/concerns/approval/form_notifiable.rb +12 -0
- data/config/locales/en.yml +1 -0
- data/config/locales/ja.yml +1 -0
- data/lib/approval/version.rb +1 -1
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b569ae57b3644b8c2cc853e55ac67f14436447d84033bf334979e3bc77ef2a3f
|
4
|
+
data.tar.gz: 7e283cb4c83a1dc16e4b2866b2ee87e0ab39991614b1c6856b34d8afbf33debd
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3adfc855ae861184026e30ae8f55b2b632118cfae5d28d34f8d2c9171ba9179b58f056c54f5ccfeb9bac79df181ad5a79026db1c32473b08167b6fced7aaaca1
|
7
|
+
data.tar.gz: 534bc1feeeb6fb610f9a1d92c09e5a718c78b51a5affbf1d0446fbdb71a2ab91f774c728d577328d4ef38b5b4fd93f44b1db9096054d0e21572c46e485723675
|
@@ -1,6 +1,7 @@
|
|
1
1
|
module Approval
|
2
2
|
class ExecuteForm
|
3
3
|
include ::ActiveModel::Model
|
4
|
+
include ::Approval::FormNotifiable
|
4
5
|
|
5
6
|
attr_accessor :user, :reason, :request
|
6
7
|
|
@@ -32,11 +33,13 @@ module Approval
|
|
32
33
|
private
|
33
34
|
|
34
35
|
def execute
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
36
|
+
instrument "execute" do |payload|
|
37
|
+
::Approval::Request.transaction do
|
38
|
+
request.lock!
|
39
|
+
payload[:comment] = request.comments.new(user_id: user.id, content: reason) if reason
|
40
|
+
request.execute
|
41
|
+
yield(request)
|
42
|
+
end
|
40
43
|
end
|
41
44
|
end
|
42
45
|
|
@@ -4,16 +4,18 @@ module Approval
|
|
4
4
|
private
|
5
5
|
|
6
6
|
def prepare
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
7
|
+
instrument "request" do |payload|
|
8
|
+
::Approval::Request.transaction do
|
9
|
+
payload[:comment] = request.comments.new(user_id: user.id, content: reason)
|
10
|
+
Array(records).each do |record|
|
11
|
+
request.items.new(
|
12
|
+
event: "create",
|
13
|
+
resource_type: record.class.to_s,
|
14
|
+
params: record.create_params_for_approval,
|
15
|
+
)
|
16
|
+
end
|
17
|
+
yield(request)
|
15
18
|
end
|
16
|
-
yield(request)
|
17
19
|
end
|
18
20
|
end
|
19
21
|
end
|
@@ -4,16 +4,18 @@ module Approval
|
|
4
4
|
private
|
5
5
|
|
6
6
|
def prepare
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
7
|
+
instrument "request" do |payload|
|
8
|
+
::Approval::Request.transaction do
|
9
|
+
payload[:comment] = request.comments.new(user_id: user.id, content: reason)
|
10
|
+
Array(records).each do |record|
|
11
|
+
request.items.new(
|
12
|
+
event: "destroy",
|
13
|
+
resource_type: record.class.to_s,
|
14
|
+
resource_id: record.id,
|
15
|
+
)
|
16
|
+
end
|
17
|
+
yield(request)
|
15
18
|
end
|
16
|
-
yield(request)
|
17
19
|
end
|
18
20
|
end
|
19
21
|
end
|
@@ -4,16 +4,18 @@ module Approval
|
|
4
4
|
private
|
5
5
|
|
6
6
|
def prepare
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
7
|
+
instrument "request" do |payload|
|
8
|
+
::Approval::Request.transaction do
|
9
|
+
payload[:comment] = request.comments.new(user_id: user.id, content: reason)
|
10
|
+
Array(records).each do |record|
|
11
|
+
request.items.new(
|
12
|
+
event: "perform",
|
13
|
+
resource_type: record.class.to_s,
|
14
|
+
params: extract_params_from(record),
|
15
|
+
)
|
16
|
+
end
|
17
|
+
yield(request)
|
15
18
|
end
|
16
|
-
yield(request)
|
17
19
|
end
|
18
20
|
end
|
19
21
|
|
@@ -4,17 +4,19 @@ module Approval
|
|
4
4
|
private
|
5
5
|
|
6
6
|
def prepare
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
7
|
+
instrument "request" do |payload|
|
8
|
+
::Approval::Request.transaction do
|
9
|
+
payload[:comment] = request.comments.new(user_id: user.id, content: reason)
|
10
|
+
Array(records).each do |record|
|
11
|
+
request.items.new(
|
12
|
+
event: "update",
|
13
|
+
resource_type: record.class.to_s,
|
14
|
+
resource_id: record.id,
|
15
|
+
params: record.update_params_for_approval,
|
16
|
+
)
|
17
|
+
end
|
18
|
+
yield(request)
|
16
19
|
end
|
17
|
-
yield(request)
|
18
20
|
end
|
19
21
|
end
|
20
22
|
end
|
@@ -6,11 +6,13 @@ module Approval
|
|
6
6
|
private
|
7
7
|
|
8
8
|
def prepare
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
9
|
+
instrument "approve" do |payload|
|
10
|
+
::Approval::Request.transaction do
|
11
|
+
request.lock!
|
12
|
+
request.assign_attributes(state: :approved, approved_at: Time.current, respond_user_id: user.id)
|
13
|
+
payload[:comment] = request.comments.new(user_id: user.id, content: reason)
|
14
|
+
yield(request)
|
15
|
+
end
|
14
16
|
end
|
15
17
|
end
|
16
18
|
end
|
@@ -6,12 +6,14 @@ module Approval
|
|
6
6
|
private
|
7
7
|
|
8
8
|
def prepare
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
9
|
+
instrument "approve_with_execute" do |payload|
|
10
|
+
::Approval::Request.transaction do
|
11
|
+
request.lock!
|
12
|
+
request.assign_attributes(state: :approved, approved_at: Time.current, respond_user_id: user.id)
|
13
|
+
payload[:comment] = request.comments.new(user_id: user.id, content: reason)
|
14
|
+
request.execute
|
15
|
+
yield(request)
|
16
|
+
end
|
15
17
|
end
|
16
18
|
end
|
17
19
|
end
|
@@ -4,11 +4,13 @@ module Approval
|
|
4
4
|
private
|
5
5
|
|
6
6
|
def prepare
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
7
|
+
instrument "cancel" do |payload|
|
8
|
+
::Approval::Request.transaction do
|
9
|
+
request.lock!
|
10
|
+
request.assign_attributes(state: :cancelled, cancelled_at: Time.current, respond_user_id: user.id)
|
11
|
+
payload[:comment] = request.comments.new(user_id: user.id, content: reason)
|
12
|
+
yield(request)
|
13
|
+
end
|
12
14
|
end
|
13
15
|
end
|
14
16
|
end
|
@@ -6,11 +6,13 @@ module Approval
|
|
6
6
|
private
|
7
7
|
|
8
8
|
def prepare
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
9
|
+
instrument "reject" do |payload|
|
10
|
+
::Approval::Request.transaction do
|
11
|
+
request.lock!
|
12
|
+
request.assign_attributes(state: :rejected, rejected_at: Time.current, respond_user_id: user.id)
|
13
|
+
payload[:comment] = request.comments.new(user_id: user.id, content: reason)
|
14
|
+
yield(request)
|
15
|
+
end
|
14
16
|
end
|
15
17
|
end
|
16
18
|
end
|
@@ -0,0 +1,12 @@
|
|
1
|
+
module Approval
|
2
|
+
module FormNotifiable
|
3
|
+
extend ActiveSupport::Concern
|
4
|
+
|
5
|
+
private
|
6
|
+
|
7
|
+
def instrument(operation, payload = {}, &block)
|
8
|
+
payload.merge!(request: request, user: user, reason: reason)
|
9
|
+
ActiveSupport::Notifications.instrument("#{operation}.approval", payload, &block)
|
10
|
+
end
|
11
|
+
end
|
12
|
+
end
|
data/config/locales/en.yml
CHANGED
data/config/locales/ja.yml
CHANGED
data/lib/approval/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: approval
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.6.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Yoshiyuki Hirano
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-
|
11
|
+
date: 2018-05-09 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -50,6 +50,7 @@ files:
|
|
50
50
|
- app/models/approval/respond_form/reject.rb
|
51
51
|
- app/models/concerns/approval/acts_as_resource.rb
|
52
52
|
- app/models/concerns/approval/acts_as_user.rb
|
53
|
+
- app/models/concerns/approval/form_notifiable.rb
|
53
54
|
- app/models/concerns/approval/mixins.rb
|
54
55
|
- config/locales/en.yml
|
55
56
|
- config/locales/ja.yml
|