active_metadata 0.7.6 → 0.7.7

data/features/step_definitions/trigger_alert_on_modify_steps.rb

@@ -84,3 +84,7 @@ end
 Then /^should record the current_user_id in the created_by$/ do
   @notifier.created_by.to_i.should == User.current.id
 end
+
+Then /^should record the "([^"]*)" in type$/ do |type|
+  @notifier.type.to_s.should eq type
+end

data/features/trigger_alert_on_modify.feature

@@ -20,7 +20,8 @@ Feature: Trigger alert on modify
 		And should record the "pippo" in the old_value 
 		And should record the "history_message" in the type
 		And should record the current_user_id in the created_by
-		
+		And should record the "history_message" in type
+
 	Scenario: receive a new alert in the inbox when a note of a field is added
 		Given a watcher on the "name" field 
 		When creating a new note on the "name" field with content "new note!"
@@ -29,10 +30,10 @@ Feature: Trigger alert on modify
 		And should record the "Document" model class 
 		And should record the "new note!" in the new_value
 		And should record the "" in the old_value 
-		And should record the "note_message" in the type
+		And should record the "new_note_message" in the type
 		And should record the current_user_id in the created_by
 
-	Scenario: receive a new alert in the inbox when a note of a field is updated
+  Scenario: receive a new alert in the inbox when a note of a field is updated
 		Given a watcher on the "name" field 
 		When creating a new note on the "name" field with content "new note!"
 		And afterwards I update the note on the field "name" with content "updated note!"
@@ -41,7 +42,7 @@ Feature: Trigger alert on modify
 		And should record the "Document" model class 
 		And should record the "new note!" in the old_value 
 		And should record the "updated note!" in the new_value
-		And should record the "note_message" in the type
+		And should record the "update_note_message" in the type
 		And should record the current_user_id in the created_by
 
 	Scenario: receive a new alert in the inbox when a note of a field is deleted
@@ -53,7 +54,7 @@ Feature: Trigger alert on modify
 		And should record the "Document" model class 
 		And should record the "new note!" in the old_value 
 		And should record the "" in the new_value
-		And should record the "note_message" in the type
+		And should record the "delete_note_message" in the type
 		And should record the current_user_id in the created_by
 
 	Scenario: receive a new alert in the inbox when a attachment of a field is created
@@ -64,7 +65,7 @@ Feature: Trigger alert on modify
 		And should record the "Document" model class 
 		And should record the "file.txt" in the new_value
 		And should record the "" in the old_value
-		And should record the "attachment_message" in the type
+		And should record the "new_attachment_message" in the type
 		And should record the current_user_id in the created_by
 
 	Scenario: receive a new alert in the inbox when a attachment of a field is updated
@@ -76,7 +77,7 @@ Feature: Trigger alert on modify
 		And should record the "Document" model class 
 		And should record the "updated_file.txt" in the new_value
 		And should record the "file.txt" in the old_value
-		And should record the "attachment_message" in the type
+		And should record the "update_attachment_message" in the type
 		And should record the current_user_id in the created_by
 
 	Scenario: receive a new alert in the inbox when a attachment of a field is deleted
@@ -88,5 +89,5 @@ Feature: Trigger alert on modify
 		And should record the "Document" model class 
 		And should record the "" in the new_value
 		And should record the "file.txt" in the old_value
-		And should record the "attachment_message" in the type
+		And should record the "delete_attachment_message" in the type
         And should record the current_user_id in the created_by

data/lib/active_metadata/persistence/attachment.rb

@@ -17,7 +17,7 @@ module ActiveMetadata::Persistence::Attachment
               :group => group)
 
       reload_attachments_cache_for field
-      self.send(:send_notification, field, "", attachment.attach.original_filename, :attachment_message, current_user_id)
+      self.send(:send_notification, field, "", attachment.attach.original_filename, :new_attachment_message, current_user_id)
     end
 
     def attachments_for(field, order_by="updated_at DESC")
@@ -31,7 +31,7 @@ module ActiveMetadata::Persistence::Attachment
       filename, created_by = a.attach.original_filename, a.created_by
       a.destroy
       reload_attachments_cache_for a.label
-      self.send(:send_notification, a.label, filename, "", :attachment_message, created_by)
+      self.send(:send_notification, a.label, filename, "", :delete_attachment_message, created_by)
     end
 
     def update_attachment(id, newfile, starred=nil)
@@ -44,7 +44,7 @@ module ActiveMetadata::Persistence::Attachment
       new_filename = a.attach.original_filename
 
       reload_attachments_cache_for a.label
-      self.send(:send_notification, a.label, old_filename, new_filename, :attachment_message, current_user_id)
+      self.send(:send_notification, a.label, old_filename, new_filename, :update_attachment_message, current_user_id)
     end
 
     def has_attachments_for field

data/lib/active_metadata/persistence/history.rb

@@ -12,7 +12,7 @@ module ActiveMetadata::Persistence::History
         next if ActiveMetadata::CONFIG['history_skip_fields'].include?(key)
         ActiveMetadata::History.create! :value => value[1],:document_class => metadata_class, :document_id => metadata_id,:label => key.to_s, :created_by => current_user_id
         invalidate_history_cache_for key.to_s
-        self.send(:send_notification, key, value[0], value[1], :history_message,current_user_id) 
+        self.send(:send_notification, key, value[0], value[1], :history_message, current_user_id)
       end
     end
 

data/lib/active_metadata/persistence/note.rb

@@ -17,7 +17,7 @@ module ActiveMetadata::Persistence::Note
           :group => group)
 
       reload_notes_cache_for field
-      self.send(:send_notification, field, "", note, :note_message, current_user_id)
+      self.send(:send_notification, field, "", note, :new_note_message, current_user_id)
     end
 
     def update_note(id, note, starred=nil)
@@ -30,7 +30,7 @@ module ActiveMetadata::Persistence::Note
       end
       n.update_attributes! attributes
       reload_notes_cache_for n.label
-      self.send(:send_notification, n.label, old_value, note, :note_message, current_user_id)
+      self.send(:send_notification, n.label, old_value, note, :update_note_message, current_user_id)
     end
 
     def notes_for(field, order_by="updated_at DESC")
@@ -52,7 +52,7 @@ module ActiveMetadata::Persistence::Note
       old_value, created_by = note.note, note.created_by
       note.destroy
       reload_notes_cache_for note.label
-      self.send(:send_notification, note.label, old_value, "", :note_message, created_by)
+      self.send(:send_notification, note.label, old_value, "", :delete_note_message, created_by)
     end
 
     def has_notes_for field

data/lib/active_metadata/version.rb

@@ -1,3 +1,3 @@
 module ActiveMetadata
-  VERSION = "0.7.6"
+  VERSION = "0.7.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_metadata
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
   prerelease: 
 platform: ruby
 authors:
@@ -261,7 +261,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1997960578253629340
+      hash: -3740493897087200554
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -270,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1997960578253629340
+      hash: -3740493897087200554
 requirements: []
 rubyforge_project: active_metadata
 rubygems_version: 1.8.19