pravangi 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17eb6808981135d07d9e82a9d813d026cdf9df54
-  data.tar.gz: c89b505e48a2c4e5fb25f4dee867f2d9639a923f
+  metadata.gz: ee37830a1eff542a742a7b05f4e3f618dd4b1c51
+  data.tar.gz: 098bcfb5a9843dc7ee860f77a62996213d031f06
 SHA512:
-  metadata.gz: 13addedda080733c3dd64f99eb5a7f9232b2adb8f532f7adb8b5dc2635a7c07f885d4ba4488bd63c4d20da959202f06007941d595b5007e56046ec6fb76d78b6
-  data.tar.gz: af3da5a09ace4ab69ce06e499a98ed85506484bf3f214fae8a6ce4e282090334362516bf259f747ae43d846ea146e3695beade288b17266abd917443bf66b44d
+  metadata.gz: 9d40df6d4ca7736cce7d3cdfb75f14735b683a7edb17c6dcacf780dff9fb8432d8a9a2aa82699b088c6af1c75bea880c4b5935fd0310bd9abc0e09cdf7d481e3
+  data.tar.gz: cba37201cf7d63ce00b85484dfd7e5636f9307583ecedd5e23815b8921093f8d00bc3d06709805b996808de3edadadf0fdf17816282dc4083604f0d04559685f

data/lib/generators/pravangi/templates/create_pending_approvals.rb

@@ -5,6 +5,8 @@ class CreatePendingApprovals < ActiveRecord::Migration
       t.integer  :resource_id,       null: false
       t.text     :object_changes
       t.text     :raw_object,        null: false
+      t.boolean  :is_approved,       null: false, default: false
+      t.boolean  :is_rejected,       null: false, default: false
       t.timestamps                   null: false
     end
   end

data/lib/pravangi/models/pending_approval.rb

@@ -7,6 +7,8 @@ module Pravangi
     serialize :object_changes, Hash
     before_save :skip_attributes
 
+    default_scope { where(is_approved: false, is_rejected: false) }
+
     def as_object
       @object ||= YAML.load(raw_object)
     end
@@ -16,16 +18,19 @@ module Pravangi
     end
 
     def approve_changes
-      resource.skip_approval = true
-      object_changes.each do |k,v|
-        resource[k] = v[1]
+      PendingApproval.transaction do
+        resource.skip_approval = true
+        object_changes.each do |k,v|
+          resource[k] = v[1]
+        end
+        self.update_attribute(:is_approved, true)
+        resource.save
+        resource.reload
       end
-      resource.save
-      resource.reload
     end
 
     def reject_changes
-      self.destroy
+      self.update_attribute(:is_rejected, true)
     end
 
     def skip_attributes

data/lib/pravangi/requires_approval.rb

@@ -58,5 +58,15 @@ module Pravangi
       pending_approvals.present?
     end
 
+    def approve_pending_changes
+      self.pending_approvals.each(&:approve_changes)
+      self.reload
+    end
+
+    def reject_pending_changes
+      self.pending_approvals.each(&:reject_changes)
+      self.reload
+    end
+
   end
 end

data/lib/pravangi/version.rb

@@ -1,3 +1,3 @@
 module Pravangi
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/lib/pravangi_spec.rb

@@ -243,4 +243,46 @@ describe Pravangi do
 
   end
 
+  context 'approval queue is cleared after accepting changes' do
+
+    let(:post) { Post.create(title: 'metaware', state: 'approved') }
+
+    before(:each) do
+      post.title = 'metaware 2'
+      post.save
+      post.title = 'metaware 3'
+      post.save
+      post.reload
+    end
+
+    it 'should clear approval queue after accepting changes' do
+      expect(post.pending_approvals.count).to eq(2)
+      post.approve_pending_changes
+      expect(post.pending_approvals.count).to eq(0)
+      expect(post.pending_approval?).to eq(false)
+    end
+
+  end
+
+  context 'approval queue is cleared after rejecting changes' do
+
+    let(:post) { Post.create(title: 'metaware', state: 'approved') }
+
+    before(:each) do
+      post.title = 'metaware 2'
+      post.save
+      post.title = 'metaware 3'
+      post.save
+      post.reload
+    end
+
+    it 'should clear approval queue after accepting changes' do
+      expect(post.pending_approvals.count).to eq(2)
+      post.reject_pending_changes
+      expect(post.pending_approvals.count).to eq(0)
+      expect(post.pending_approval?).to eq(false)
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pravangi
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jasdeep Singh