approval2 0.1.6 → 0.1.7

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODE5NDM4YWIxMmQwNTE5ODE2NzEwYmFmODJkZDFmMGY5YmE0YTI4MQ==
-  data.tar.gz: !binary |-
-    ZjBkNzAwZTMxODdhODEwNzQ5OWQ0YzNiNTBiMjkxNDg0NzA3MjVkZA==
+SHA1:
+  metadata.gz: 63eb8f62ec9ef31d1b8e8ae748720d6f3625e4e5
+  data.tar.gz: d94a300234cc6afc0b0eb2e2d7fa996a5ec842b9
 SHA512:
-  metadata.gz: !binary |-
-    ZWMxNTYxZWNjNjJmMzIxM2QxZmRiNmJhMjU0MzgzNWJlYmI2ODFlYWI3YjAx
-    OTZlZGNiZWFlMzY5MzAzNjQ2MTExNGRkZWU5YmQ0YTk4MDQ3MDk2Y2MwNjFj
-    OTY2MWFhN2U1YjM2ODEzMTAzNGM5NWIwNjRkMjczNjIyNWNhZjU=
-  data.tar.gz: !binary |-
-    MGZiYzM0NDc3ZDBjMjcyNmFmZDEyMGQ5NGU5YTY1NWM0OGQ2NTA4ODY5NzJk
-    NmMxNjE3NGMyZTMzNDk0ZDkzMWNlOTI0NGE3MTA2M2MwN2MyYzJmOGRhMGY0
-    NDA3MGIyN2EyZDIzYWFjNTg5NjQ0OTNlOTRkNWRmNTg5YWNkM2U=
+  metadata.gz: 26c6e7d9d25aa4499db102f5a4009c636172f15cb0da272d460349cc3cd8ca81bddf1dcb2de143aa221c33f583dcf912f6a673517272004e288e4eecca61a38c
+  data.tar.gz: 8d41f124ba55c670e496532e358037e5aef16ee974248d2bf1b2433b6d7c7040ca0735554e78b2879461817360d259e2fe40f4257a914405600ab5d4cc0d86b7

data/lib/approval2/controller_additions.rb

@@ -38,13 +38,13 @@ module Approval2
       modelName = self.class.name.sub("Controller", "").underscore.split('/').last.singularize
       modelKlass = modelName.classify.constantize
 
-      x = modelKlass.unscoped.find(params[:id]) rescue nil
+      x = modelKlass.unscoped.find(params[:id])
       modelKlass.transaction do
-        approval = x.approve
-        if approval.empty?
+        approved_record = x.approve
+        if approved_record.save
           flash[:alert] = "#{modelName.humanize.titleize} record was approved successfully"
         else
-          msg = x.errors.full_messages << approval
+          msg = approved_record.errors.full_messages
           flash[:alert] = msg
           raise ActiveRecord::Rollback
         end

data/lib/approval2/model_additions.rb

@@ -43,27 +43,24 @@ module Approval2
       if self.approved_record.nil?
         # create action, all we need to do is set the status to approved
         self.approval_status = 'A'
-        self.save!
-      else
-        # copy all attributes of the U record to the A record, and delete the U record
-        attributes = self.attributes.select do |attr, value|
-          self.class.column_names.include?(attr.to_s) and 
-          ['id', 'approved_id', 'approval_status', 'lock_version', 'approved_version', 'created_at', 'updated_at', 'updated_by', 'created_by'].exclude?(attr)
-        end
-      
-        self.class.unscoped do
-          approved_record = self.approved_record
-          approved_record.assign_attributes(attributes)
-          approved_record.last_action = 'U'
-          approved_record.updated_by = self.created_by
-          self.destroy
-          # not enought time to test cases where the approval is being done after changes in validations of the model, such that the saving of the approved 
-          # record fails, this can be fixed to return the errors so that they can be shown to the user
-          approved_record.save!
-        end
+        return self
       end
-    
-      return ""
+
+      # edit action
+      # copy all attributes of the U record to the A record, and delete the U record
+      attributes = self.attributes.select do |attr, value|
+        self.class.column_names.include?(attr.to_s) and
+        ['id', 'approved_id', 'approval_status', 'lock_version', 'approved_version', 'created_at', 'updated_at', 'updated_by', 'created_by'].exclude?(attr)
+      end
+
+      self.class.unscoped do
+        approved_record = self.approved_record
+        approved_record.assign_attributes(attributes)
+        approved_record.last_action = 'U'
+        approved_record.updated_by = self.created_by
+        self.destroy
+        return approved_record
+      end    
     end
 
     def enable_approve_button?

data/lib/approval2/version.rb

@@ -1,3 +1,3 @@
 module Approval2
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: approval2
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - akil
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: audited
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -73,7 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -103,17 +103,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Enable the approval pattern for an AR model