change_manager 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04869266d59b398a40c9cfc421769bf7c9177dc4
-  data.tar.gz: 60950b44a16edaa95b8ed7015f55a9b0c11ac151
+  metadata.gz: eaef00e1eb69b31268ab24e359ea02a343db52c6
+  data.tar.gz: 66624dafb2f25dd2f1000dee0db38302ba065b16
 SHA512:
-  metadata.gz: a3a30a6561ee6c5f3e38231269e50f7f877ab08920e5e6c901415615e9fd4e39a2ed66bf82f9bf1eb43cc670a0c244e5851e46e6fbbc6227e83bb1ba800fc324
-  data.tar.gz: c661dc1f0a1fd3b897634d149c0df4d7fe023a5746895dad498d927db3c6199ef9d512799f6847acc8196af9a3d90c01b885d7f790d84585d66907fc319e3970
+  metadata.gz: 4c6e6dc30d5565d0a67b89ea76a31746f169700b7e7a1156526eb60c523e7d3e0c2eeced999e19f5a539ab60868bb93a4a141c381fdd342cd5f9d160cfeb67f4
+  data.tar.gz: cc12a9ede04b38dedd74d274d3f83b7baad529e5c03703342496483cf2ec8a426e4603d9c9725c242f1f119a23bea8a852b82b4bf73789961dcf143651d30880

data/app/jobs/change_manager/begin_change.rb

@@ -1,3 +1,4 @@
+require 'yaml'
 module ChangeManager
 	class BeginChange
 		def self.queue
@@ -5,7 +6,9 @@ module ChangeManager
 		end
 
 		def self.perform(change_id)
-		    ChangeManager::Manager.process_change(change_id)
+			puts 'job started'
+			config ||= YAML.load_file(File.join(Curate::Engine.root, 'config/change_manager_config.yml'))
+			config['manager_class'].constantize.process_change(change_id)
 		end
 	end
 end

data/app/models/change_manager/change.rb

@@ -37,6 +37,18 @@ module ChangeManager
       self.notified
     end
 
+    def is_group_change?
+      self.change_type == 'added_to_group' || self.change_type == 'removed_from_group'
+    end
+
+    def is_delegate_change?
+      self.change_type == 'added_as_delegate' || self.change_type == 'removed_as_delegate'
+    end
+
+    def is_editor_change?
+      self.change_type == 'added_as_editor' || self.change_type == 'removed_as_editor'
+    end
+
     def inverse_of?(possible_inverse_change)
       @change_types ||= YAML.load_file(File.join(ChangeManager::Engine.root, 'config/change_types.yaml'))
       if self.context == possible_inverse_change.context

data/app/services/change_manager/local_manager.rb

@@ -0,0 +1,5 @@
+module ChangeManager
+	class LocalManager
+		extend Manager
+	end
+end

data/app/services/change_manager/manager.rb

@@ -1,12 +1,12 @@
 module ChangeManager
-	class Manager
-		def self.queue_change(owner, change_type, context, target)
+	module Manager
+		def queue_change(owner, change_type, context, target)
 			change_id = Change.new_change(owner, change_type, context, target)
-			# Resque.enqueue(MakeChange, change_id)
-			Resque.enqueue_in(5.minutes, ChangeManager::BeginChange, change_id)
+			Resque.enqueue(ChangeManager::BeginChange, change_id)
+			# Resque.enqueue_in(5.minutes, ChangeManager::BeginChange, change_id)
 		end
 
-		def self.process_change(change_id)
+		def process_change(change_id)
 			unless Change.find(change_id).cancelled?
 				change = Change.find change_id
 				verified_changes = process_changes change
@@ -14,12 +14,11 @@ module ChangeManager
 			end
 		end
 
-		private
-		def self.process_changes(change)
+		def process_changes(change)
 			cancel_all_changes(group_similar_changes(change.owner, change.target))
 		end
 
-		def self.group_similar_changes(owner, target)
+		def group_similar_changes(owner, target)
 			similar_changes = Change.where(owner: owner, target: target, cancelled: false)
 			if similar_changes.length > 1
 				cancel_inverse_changes(similar_changes)
@@ -27,7 +26,7 @@ module ChangeManager
 			return similar_changes
 		end
 
-		def self.cancel_inverse_changes(similar_changes)
+		def cancel_inverse_changes(similar_changes)
 			similar_changes.each do |change|
 				similar_changes.each do |next_change|
 					if change.inverse_of?(next_change)
@@ -41,14 +40,14 @@ module ChangeManager
 			return similar_changes
 		end
 
-		def self.cancel_all_changes(verified_changes)
+		def cancel_all_changes(verified_changes)
 			verified_changes.each do |change|
 				change.cancel
 			end
 			verified_changes
 		end
 
-		def self.notify(changes)
+		def notify(changes)
 			mailer = ChangeManager::NotificationMailer
 			if mailer.send_email(mailer.construct_email(changes))
 				changes.each do |change|

data/config/change_manager_config.yaml

@@ -0,0 +1 @@
+manager_class: LocalManager

data/config/change_types.yaml

@@ -22,50 +22,3 @@ removed_from_group:
  print: removed_from_group
  inverse: added_to_group
  human_readable: Removed from a group
-
-# added_as_delegate:
-#  - added_as_delegate
-#  - inverse: removed_as_delegate
-#  - Added as a delegate
-# removed_as_delegate:
-#  - removed_as_delegate
-#  - inverse: added_as_delegate
-#  - Removed as a delegate
-# added_as_editor:
-#  - added_as_editor
-#  - inverse: removed_as_editor
-#  - Added as an editor
-# removed_as_editor:
-#  - removed_as_editor
-#  - inverse: added_as_editor
-#  - Removed as an editor
-# added_to_group:
-#  - added_to_group
-#  - inverse: removed_from_group
-#  - Added to a group
-# removed_from_group:
-#  - removed_from_group
-#  - inverse: added_to_group
-#  - Removed from a group
-
-
-
-
- # - added_as_delegate
- # - removed_as_delegate
- # - added_as_editor
- # - removed_as_editor
- # - added_to_group
- # - removed_from_group
-
-
-
- # delegates:
- #  - added_as_delegate
- #  - removed_as_delegate
- # editors:
- #  - added_as_editor
- #  - removed_as_delegate
- # groups:
- #  - added_to_group
- #  - removed_from_group

data/lib/change_manager/version.rb

@@ -1,3 +1,3 @@
 module ChangeManager
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

data/spec/services/change_manager/manager_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 module ChangeManager
-	describe Manager do
+	describe LocalManager do
 		describe '#queue_change' do
-			let(:queued_change) { Manager.queue_change('test', 'removed_as_delegate', 'work_id1', 'testemail@gmail.com') }
+			let(:queued_change) { LocalManager.queue_change('test', 'removed_as_delegate', 'work_id1', 'testemail@gmail.com') }
 			it 'should spawn a background worker' do
 				queued_change.should be_true
 			end
@@ -12,15 +12,15 @@ module ChangeManager
 			let(:cancelled_change) { FactoryGirl.create(:change, cancelled: true)}
 			let(:change) { FactoryGirl.create(:change) }
 			it 'should do nothing if initial change is cancelled' do
-				Manager.process_change(cancelled_change.id).should be_nil
+				LocalManager.process_change(cancelled_change.id).should be_nil
 			end
 			it 'should execute if initial change isn\'t cancelled' do
-				Manager.process_change(change.id).should_not be_nil
+				LocalManager.process_change(change.id).should_not be_nil
 			end
 		end
 		describe '#group_similar_changes:' do
 			let!(:initial_change) { Change.find(Change.new_change('owner', 'added_as_editor', 'work_id1', 'target'))}
-			let(:possible_similar_changes) { Manager.group_similar_changes(initial_change.owner, initial_change.target) }
+			let(:possible_similar_changes) { LocalManager.group_similar_changes(initial_change.owner, initial_change.target) }
 		# describe the different changes
 			# unrelated changes (owner and target aren't the same as initial - cancelled doesnt matter)
 			context 'unrelated changes' do