approval2 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c160ff94c007a93967fa9e3437e0662ee679913
-  data.tar.gz: d64aeaab593e7498f67002a6eb862115d11d3f4e
+  metadata.gz: 75cbc454c1f7868049f8b32a21390afe4cd64005
+  data.tar.gz: 945dc93fc1676c4798ea802f994e97dd743dd9b1
 SHA512:
-  metadata.gz: 4cf79b315085c0793603a689d19e0a2a45220680827c9472f462d82f61cae03f0e71dc6539045f544f9423dcbe1e8e738f22fd624926cf2f1a30516c973c62ea
-  data.tar.gz: c7a83ba157b57dc8323e390f3d90077df4dc738254c37cc84c54d7a72e80b8d7030a6229cbe4186e91a9b91292b7796dee47872f359f54833ad0269ff5f188d8
+  metadata.gz: ac57187573a60bf8359d84ad1373db93c34ff306a0e2d0605db193190f155d37fcaad536d514f282ab80477e3caaa410059cc0c0be2154a22591c548e03f3749
+  data.tar.gz: f9994e72187dc621ba3af01166b32c40cb9702f7a90495932f4b68f21069c2665e0ed2f523bb6c7579e913d9cd0801b4c8f84f89a355f803139272e2db5e8623

data/approval2.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_dependency "audited"
   spec.add_dependency "will_paginate"
+  spec.add_dependency "unscoped_associations"
 end

data/lib/approval2/controller_additions.rb

@@ -3,47 +3,31 @@ module Approval2
     extend ActiveSupport::Concern
 
     included do
-      before_filter :before_edit, only: :edit
-      before_filter :before_approve, only: :approve
-      before_filter :before_index, only: :index
-      
-      def reject
-        modelName = self.class.name.sub("Controller", "").underscore.split('/').last.singularize
-        modelKlass = modelName.classify.constantize        
-        x = modelKlass.unscoped.find(params[:id])
-        x.destroy if x.can_destroy?
-        flash[:alert] = "The unapproved record has been deleted"
-        redirect_with_params
-      end
-      
+      before_action :before_edit, only: :edit
+      before_action :before_approve, only: :approve
+      before_action :before_index, only: :index
     end
 
 
     private 
     
-    # apps can provide redirect params via a known session variable
-    def redirect_with_params
-      if session[:approval2_redirect_params].present?
-        redirect_to unapproved_records_path(session[:approval2_redirect_params])
-      else
-        redirect_to unapproved_records_path
-      end
+    def modelName
+      self.class.name.sub("Controller", "").underscore.split('/').last.singularize
+    end
+    
+    def modelKlass
+      moduleName = self.class.name.include?("::") ? self.class.name.split("::").first : ""
+      "#{moduleName}::#{modelName.classify}".constantize
     end
 
     def before_index
-      if (params[:approval_status].present? and params[:approval_status] == 'U')      
-        modelName = self.class.name.sub("Controller", "").underscore.split('/').last.singularize
-        modelKlass = modelName.classify.constantize
-
+      if (params[:approval_status].present? and params[:approval_status] == 'U') 
         x = modelKlass.unscoped.where("approval_status =?",'U').order("id desc")
-        instance_variable_set("@#{modelName}s", x.paginate(:per_page => 10, :page => params[:page]))
+        instance_variable_set("@#{modelName}s", x)
       end
     end
 
     def before_edit
-      modelName = self.class.name.sub("Controller", "").underscore.split('/').last.singularize
-      modelKlass = modelName.classify.constantize
-
       x = modelKlass.unscoped.find_by_id(params[:id])
       if x.approval_status == 'A' && x.unapproved_record.nil?
         params = (x.attributes).merge({:approved_id => x.id,:approved_version => x.lock_version})
@@ -54,24 +38,20 @@ module Approval2
     end
 
     def before_approve
-      modelName = self.class.name.sub("Controller", "").underscore.split('/').last.singularize
-      modelKlass = modelName.classify.constantize
-
       x = modelKlass.unscoped.find(params[:id])
       modelKlass.transaction do
         approved_record = x.approve
         if approved_record.save
+          instance_variable_set("@#{modelName}", approved_record)
           flash[:alert] = "#{modelName.humanize.titleize} record was approved successfully"
         else
           msg = approved_record.errors.full_messages
           flash[:alert] = msg
+          instance_variable_set("@#{modelName}", x)
           raise ActiveRecord::Rollback
         end
       end
     end    
-    
-  
-  
   end
 end
 

data/lib/approval2/model_additions.rb

@@ -5,20 +5,20 @@ module Approval2
     included do
       audited except: [:approval_status, :last_action]
  
+      default_scope { where(approval_status: 'A') }
+
+      after_initialize { self.approval_status = 'U' if new_record? }
+
       # refers to the unapproved record in the common unapproved_record model, this is true only for U records
       has_one :unapproved_record_entry, :as => :approvable, :class_name => '::UnapprovedRecord'
  
       # refers to the approved/unapproved record in the model
-      belongs_to :unapproved_record, :primary_key => 'approved_id', :foreign_key => 'id', :class_name => self.name, :unscoped => true
-      belongs_to :approved_record, :foreign_key => 'approved_id', :primary_key => 'id', :class_name => self.name, :unscoped => true
+      belongs_to :unapproved_record, -> { unscope(where: :approval_status) }, :primary_key => 'approved_id', :foreign_key => 'id', :class_name => self.name
+      belongs_to :approved_record, -> { unscope(where: :approval_status) }, :foreign_key => 'approved_id', :primary_key => 'id', :class_name => self.name
 
       validates_uniqueness_of :approved_id, :allow_blank => true
       validate :validate_unapproved_record
 
-      def self.default_scope
-        where approval_status: 'A'
-      end
-
 
       after_create :on_create_create_unapproved_record_entry
       after_destroy :on_destory_remove_unapproved_record_entries
@@ -62,13 +62,6 @@ module Approval2
         return approved_record
       end    
     end
-    
-    def can_destroy?
-      # only unaproved records are allowed to be destroyed
-      self.approval_status == 'U'
-    end
-    
-    alias_method :enable_reject_button?, :can_destroy?
 
     def enable_approve_button?
       self.approval_status == 'U' ? true : false

data/lib/approval2/version.rb

@@ -1,3 +1,3 @@
 module Approval2
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

data/lib/generators/approval2/install/templates/_approve.html.haml

@@ -1,26 +1,15 @@
-- reject_url = polymorphic_path(@record, :action => 'reject') rescue nil
 - can = can? :approve, @record
 - approve_flag = @record.enable_approve_button?
-- reject_flag = @record.enable_reject_button?
 %a.btn{"data-toggle" => "modal", :href => "#{!(can && approve_flag) ? '#' : '#myModalApprove'}", :role => "button", :class => "btn btn-primary #{(can && approve_flag) ? '' : 'disabled'}"} Approve
-- if reject_url.present?
-  %a.btn{"data-toggle" => "modal", :href => "#{!(can && approve_flag) ? '#' : '#myModalReject'}", :role => "button", :class => "btn btn-primary #{(can && reject_flag) ? '' : 'disabled'}"} Reject
 .modal.hide.fade{"id" => "myModalApprove", "aria-hidden" => "true", "aria-labelledby" => "  myModalLabel", :role => "dialog", :tabindex => "-1"}
   .modal-header
     %button.close{"aria-hidden" => "true", "data-dismiss" => "modal", :type => "button"} ×
-    %h3#myModalLabel  Acknowledge Approval
+    %h3#myModalLabel  Acknowledge
     #error_message{:style => 'color:red'}
   .modal-body
-    = simple_form_for @record, :url => {:action => 'approve'}, :method => :put do |ef|
+    = simple_form_for @record, :url => {:action => 'approve'}, :method => :put, :html=>{:id=>"transition"} do |ef|
       = ef.input :updated_by, :as => :hidden, :input_html => {:value => current_user.id}
-      = submit_tag "Confirm", :class=>"btn btn-primary transition_button"
-.modal.hide.fade{"id" => "myModalReject", "aria-hidden" => "true", "aria-labelledby" => "  myModalLabel", :role => "dialog", :tabindex => "-1"}
-  .modal-header
-    %button.close{"aria-hidden" => "true", "data-dismiss" => "modal", :type => "button"} ×
-    %h3#myModalLabel  Acknowledge Rejection
-    #error_message{:style => 'color:red'}
-  .modal-body
-    = link_to 'Confirm', reject_url, method: :put, :class=>"btn btn-primary transition_button"
+      = submit_tag "Confirm", :class=>"btn btn-primary transition_button", :id => "transition_button"
 %p{:style => 'color:green;'}
   = created_or_edited_by(@record)
 %br

data/lib/generators/approval2/install/templates/create_unapproved_records.rb

@@ -1,4 +1,4 @@
-class CreateUnapprovedRecords < ActiveRecord::Migration
+class CreateUnapprovedRecords < ActiveRecord::Migration[5.1]
   def change
     create_table :unapproved_records, {:sequence_start_value => '1 cache 20 order increment by 1'} do |t|
       t.integer :approvable_id

data/lib/generators/approval2/install/templates/unapproved_records_controller.rb

@@ -11,10 +11,5 @@ class UnapprovedRecordsController < ApplicationController
     end
 
     @records = result.paginate(:per_page => 10, :page => params[:page]) rescue []
-    
-    # the approval2 gem requires a known session variable to include any redirect params to be sent to the unapproved_records_path
-    # for the reject action
-    session[:approval2_redirect_params] = {param1: 'some_param', param2: 'some_other_param'}
-    
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: approval2
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - akil
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-02 00:00:00.000000000 Z
+date: 2018-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: unscoped_associations
+  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: 
 email:
 - akhilesh.kataria@quantiguous.com