active_metadata 0.7.8 → 0.7.9

data/lib/active_metadata/persistence/attachment.rb

@@ -34,17 +34,30 @@ module ActiveMetadata::Persistence::Attachment
       self.send(:send_notification, a.label, filename, "", :delete_attachment_message, created_by)
     end
 
-    def update_attachment(id, newfile, starred=nil)
+    # Update an attachment replacing the old file
+    # Fires a notification.
+    # When is used to star or unstar fires a notification of the correct type
+    # The cache is reloaded any time an operation is completed
+    def update_attachment(id, newfile, *args)
+      options = args.last.is_a?(Hash) ? args.last : {}
+      options[:message_type] ||= :update_attachment_message
+
       a = ActiveMetadata::Attachment.find(id)
       old_filename = a.attach.original_filename
       a.attach = newfile
       a.updated_by = current_user_id
-      a.starred = starred if !starred.nil?
+
+      #mass assign starred inly if provided
+      unless options[:starred].nil?
+        a[:starred] = options[:starred]
+        options[:message_type] = options[:starred] ? :star_attachment_message : :unstar_attachment_message
+      end
+
       a.save!
       new_filename = a.attach.original_filename
-
       reload_attachments_cache_for a.label
-      self.send(:send_notification, a.label, old_filename, new_filename, :update_attachment_message, current_user_id)
+
+      self.send(:send_notification, a.label, old_filename, new_filename, options[:message_type], current_user_id)
     end
 
     def has_attachments_for field
@@ -71,12 +84,12 @@ module ActiveMetadata::Persistence::Attachment
 
     def star_attachment(id)
       n = ActiveMetadata::Attachment.find(id)
-      update_attachment id, n.attach, true
+      update_attachment id, n.attach, starred: true
     end
 
     def unstar_attachment(id)
       n = ActiveMetadata::Attachment.find(id)
-      update_attachment id, n.attach, false
+      update_attachment id, n.attach, starred: false
     end
 
     private

data/lib/active_metadata/persistence/note.rb

@@ -20,17 +20,29 @@ module ActiveMetadata::Persistence::Note
       self.send(:send_notification, field, "", note, :new_note_message, current_user_id)
     end
 
-    def update_note(id, note, starred=nil)
+    #
+    # Update a note
+    # *update the record and recreate the cache
+    # *send and update_note_meesage notification
+    # *if update is starring or unstarring is sent a message of the correct type
+    def update_note(id, note, *args)
+
+      options = options = args.last.is_a?(Hash) ? args.last : {}
+      options[:message_type] ||= :update_note_message
+
       n = ActiveMetadata::Note.find(id)
       old_value = n.note
       attributes = {:note => note, :updated_by => current_user_id, :updated_at => Time.now.utc}
+
       #mass assign starred inly if provided
-      unless starred.nil?
-        attributes[:starred] = starred
+      unless options[:starred].nil?
+        attributes[:starred] = options[:starred]
+        options[:message_type] = options[:starred] ? :star_note_message : :unstar_note_message
       end
+
       n.update_attributes! attributes
       reload_notes_cache_for n.label
-      self.send(:send_notification, n.label, old_value, note, :update_note_message, current_user_id)
+      self.send(:send_notification, n.label, old_value, note, options[:message_type], current_user_id)
     end
 
     def notes_for(field, order_by="updated_at DESC")
@@ -79,14 +91,14 @@ module ActiveMetadata::Persistence::Note
     # reload the cache calling update
     def star_note(id)
       n = ActiveMetadata::Note.find(id)
-      update_note id, n.note, true
+      update_note id, n.note, starred: true
     end
 
     # unstar a note
     # reload the cache calling update
     def unstar_note(id)
       n = ActiveMetadata::Note.find(id)
-      update_note id, n.note, false
+      update_note id, n.note, starred: false
     end
 
     private

data/lib/active_metadata/version.rb

@@ -1,3 +1,3 @@
 module ActiveMetadata
-  VERSION = "0.7.8"
+  VERSION = "0.7.9"
 end

data/spec/lib/attachments_spec.rb

@@ -142,7 +142,7 @@ describe ActiveMetadata do
       it "should update an attachment as starred" do
         @document.save_attachment_for(:name, @attachment)
         attachment = @document.attachments_for(:name).first
-        @document.update_attachment(attachment.id, attachment.attach, true)
+        @document.update_attachment(attachment.id, attachment.attach, starred: true)
         @document.attachments_for(:name).first.starred?.should be_true
       end
 
@@ -174,6 +174,39 @@ describe ActiveMetadata do
         att.starred?.should be_false
       end
 
+      context "when starring" do
+
+        it "should send a notification of type star_attachment_message" do
+          #watch
+          user = User.create!(:email => "email@email.it", :firstname => 'John', :lastname => 'smith' )
+          @document.create_watcher_for(:name, user)
+          # create note and star it
+          @document.save_attachment_for(:name, @attachment, true)
+          att = @document.attachments_for(:name).first
+
+          @document.star_attachment(att.id)
+          @document.notifier.type.should eq :star_attachment_message
+        end
+
+      end
+
+      context "when unstarring" do
+
+        it "should send a notification of type unstar_attachment_message" do
+          #watch
+          user = User.create!(:email => "email@email.it", :firstname => 'John', :lastname => 'smith' )
+          @document.create_watcher_for(:name, user)
+          # create note and star it
+          @document.save_attachment_for(:name, @attachment, true)
+          att = @document.attachments_for(:name).first
+
+          @document.unstar_attachment(att.id)
+          @document.notifier.type.should eq :unstar_attachment_message
+        end
+
+      end
+
+
     end
 
     describe "#starred_attachments" do

data/spec/lib/notes_spec.rb

@@ -168,7 +168,7 @@ describe ActiveMetadata do
       it "should update a note as starred" do
         @document.create_note_for(:name, "nuova nota")
         note = @document.notes_for(:name).first
-        @document.update_note(note.id, note.note, true)
+        @document.update_note(note.id, note.note, starred: true)
         @document.notes_for(:name).first.starred?.should be_true
       end
 
@@ -201,6 +201,36 @@ describe ActiveMetadata do
         nota.starred?.should be_false
       end
 
+      context "when starring a note" do
+
+        it "should send a notification of type star_note_message" do
+          #watch
+          user = User.create!(:email => "email@email.it", :firstname => 'John', :lastname => 'smith' )
+          @document.create_watcher_for(:name, user)
+          # create note and star it
+          @document.create_note_for(:name, "nota 1")
+          nota = @document.notes_for(:name).first
+          @document.star_note(nota.id)
+          @document.notifier.type.should eq :star_note_message
+        end
+
+      end
+
+      context "when unstarring a note" do
+
+        it "should send a notification of type unstar_note_message" do
+          #watch
+          user = User.create!(:email => "email@email.it", :firstname => 'John', :lastname => 'smith' )
+          @document.create_watcher_for(:name, user)
+          # create note and unstar it
+          @document.create_note_for(:name, "nota 1")
+          nota = @document.notes_for(:name).first
+          @document.unstar_note(nota.id)
+          @document.notifier.type.should eq :unstar_note_message
+        end
+
+      end
+
     end
 
     describe "#starred_notes" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_metadata
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2012-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -261,7 +261,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1265638142413354591
+      hash: 3903981385835603000
 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: -1265638142413354591
+      hash: 3903981385835603000
 requirements: []
 rubyforge_project: active_metadata
 rubygems_version: 1.8.19