approval 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96cbfaad3eec0628b1df065e1aa3450690e04665
-  data.tar.gz: bad5172b5906155ed76df929974148dc3ace9fa8
+  metadata.gz: 1e5565e3f6c257574039cad1c483a21489d18c15
+  data.tar.gz: f51f115da397201f00071fe460e09f25d491ecbf
 SHA512:
-  metadata.gz: f5f9596ec03959d06a84dd38a2ed1c9eb6962d78f7e242edfbdc27a62ab8e52cc2f8efe959c3fa249fb142e9171d3d4414ed46391c6cedc1fe773502992be42c
-  data.tar.gz: a4ad827b058e9cd26c9b16b3176378f51f3a39c9e594d52cf2781db1e7d5126270a113d3734f0cc2c365f3de31c5bb4f2f0d967e9602ebe40a16b0b4043eea2b
+  metadata.gz: 4b0f80d3cd453758bbc95b07f57e9b379940f61242e19dc348a5ad96c327f4599d5ad15a96b6f067dc2c9662632c3b1dd9a8eca73c7aad674abbf0bdc47cb883
+  data.tar.gz: 8613e89392f7b110b2871a1a8849ae0dbfa1f3c15121bc7f23c70ec1e0980e0447f56a024e57a5fbf782a1ac042e60ef85045cb60dd9128fa8d1f07878b64004

data/config/locales/en.yml

@@ -5,12 +5,25 @@ en:
       cannot_respond_to_own_request: "cannot respond to own request."
 
   attributes:
+    id: "ID"
     reason: "Reason"
+    created_at: "Created at"
+    updated_at: "Updated at"
 
   activerecord:
-    model:
-      approval/request: "Request"
+    models:
+      approval/comment: "Approval Comment"
+      approval/item: "Approval Item"
+      approval/request: "Approval Request"
     attributes:
+      approval/comment:
+        user: "User"
+        content: "Content"
+      approval/item:
+        resource_type: "Resource type"
+        resource_id: "Resource ID"
+        event: "Event"
+        params: "Parameters"
       approval/request:
         request_user: "Requested user"
         respond_user: "Responded user"

data/config/locales/ja.yml

@@ -5,12 +5,25 @@ ja:
       cannot_respond_to_own_request: "は自身の申請のため対応できません"
 
   attributes:
+    id: ID
     reason: 理由
+    created_at: 作成日時
+    updated_at: 更新日時
 
   activerecord:
-    model:
+    models:
+      approval/comment: コメント
+      approval/item: 対象リソース
       approval/request: 申請
     attributes:
+      approval/comment:
+        user: ユーザー
+        content: 内容
+      approval/item:
+        resource_type: リソース種別
+        resource_id: リソースID
+        event: イベント
+        params: パラメータ
       approval/request:
         request_user: 申請者
         respond_user: 対応者

data/lib/approval/models/approval/request_form/create.rb

@@ -5,7 +5,7 @@ module Approval
 
         def prepare
           ::Approval::Request.transaction do
-            request.comments.new(user: user, content: reason)
+            request.comments.new(user_id: user.id, content: reason)
             Array(records).each do |record|
               request.items.new(
                 event: "create",

data/lib/approval/models/approval/request_form/destroy.rb

@@ -5,7 +5,7 @@ module Approval
 
         def prepare
           ::Approval::Request.transaction do
-            request.comments.new(user: user, content: reason)
+            request.comments.new(user_id: user.id, content: reason)
             Array(records).each do |record|
               request.items.new(
                 event: "destroy",

data/lib/approval/models/approval/request_form/update.rb

@@ -5,7 +5,7 @@ module Approval
 
         def prepare
           ::Approval::Request.transaction do
-            request.comments.new(user: user, content: reason)
+            request.comments.new(user_id: user.id, content: reason)
             Array(records).each do |record|
               request.items.new(
                 event: "update",

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

@@ -8,8 +8,8 @@ module Approval
         def prepare
           ::Approval::Request.transaction do
             request.lock!
-            request.assign_attributes(state: :approved, approved_at: Time.current, respond_user: user)
-            request.comments.new(user: user, content: reason)
+            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

data/lib/approval/models/approval/respond_form/cancel.rb

@@ -6,8 +6,8 @@ module Approval
         def prepare
           ::Approval::Request.transaction do
             request.lock!
-            request.assign_attributes(state: :cancelled, cancelled_at: Time.current, respond_user: user)
-            request.comments.new(user: user, content: reason)
+            request.assign_attributes(state: :cancelled, cancelled_at: Time.current, respond_user_id: user.id)
+            request.comments.new(user_id: user.id, content: reason)
             yield(request)
           end
         end

data/lib/approval/models/approval/respond_form/reject.rb

@@ -8,8 +8,8 @@ module Approval
         def prepare
           ::Approval::Request.transaction do
             request.lock!
-            request.assign_attributes(state: :rejected, rejected_at: Time.current, respond_user: user)
-            request.comments.new(user: user, content: reason)
+            request.assign_attributes(state: :rejected, rejected_at: Time.current, respond_user_id: user.id)
+            request.comments.new(user_id: user.id, content: reason)
             yield(request)
           end
         end

data/lib/approval/version.rb

@@ -1,3 +1,3 @@
 module Approval
-  VERSION = "0.3.4".freeze
+  VERSION = "0.3.5".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: approval
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Yoshiyuki Hirano