active_metadata 0.8.1 → 0.8.2

data/lib/active_metadata/base.rb

@@ -32,8 +32,9 @@ module ActiveMetadata
 
         before_update :manage_concurrency
         after_save :save_history
-        attr_accessor :conflicts
-        attr_accessor :active_metadata_timestamp
+        attr_accessor :conflicts, :active_metadata_timestamp, :skip_history_notification
+
+        alias_method :skip_history_notification?, :skip_history_notification
 
         instance_variable_set("@active_metadata_options", options)
 

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],:model_class => metadata_class, :model_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) unless skip_history_notification?
       end
     end
 

data/lib/active_metadata/persistence/watcher.rb

@@ -30,7 +30,7 @@ module ActiveMetadata::Persistence::Watcher
       ActiveMetadata::Watcher.where(:model_class => metadata_class, :model_id => metadata_id, :label => field, :owner_id => owner.id).empty? ? false : true
     end                    
 
-    def send_notification(field, old_value, new_value, type=:default_message, created_by=nil)   
+    def send_notification(field, old_value, new_value, type=:default_message, created_by=nil)
       watchers_for(field).each { |watch| notify_changes(field, old_value, new_value, self.class.to_s, self.id, watch.owner_id, type, created_by) }
     end
           

data/lib/active_metadata/version.rb

@@ -1,3 +1,3 @@
 module ActiveMetadata
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/spec/lib/history_spec.rb

@@ -3,13 +3,14 @@ require "time"
 
 describe ActiveMetadata do
 
-  before(:each) do
-    @document = Document.create! { |d| d.name = "John" }
-    @document.reload
-  end
 
   describe "history" do
 
+    before(:each) do
+      @document = Document.create! { |d| d.name = "John" }
+      @document.reload
+    end
+
     it "should create history when a document is created" do
       @document.history_for(:name).should have(1).record
     end
@@ -78,4 +79,53 @@ describe ActiveMetadata do
 
   end
 
+  describe "skip_history_notification" do
+
+    context "given an user that watch Document#name" do
+
+      before do
+        @user = User.create!(:email => "email@email.it", :firstname => 'John', :lastname => 'smith')
+        ActiveMetadata::Watcher.create! :model_class => "Document", :label => :name, :owner_id => @user.id
+      end
+
+      it "and skip_history_notification false creating a Document with name not null should save the history and generate a notification" do
+        @document = Document.create! name: "John"
+        @document.history_for(:name)[0].value.should eq(@document.name)
+        @document.notifier.should_not be_nil
+      end
+
+      it "when true creating a Document with name not null should save the history but do not generate any notification" do
+        @document = Document.create! name: "John", skip_history_notification: true
+        @document.history_for(:name)[0].value.should eq(@document.name)
+        @document.notifier.should be_nil
+      end
+
+    end
+
+    context "given an user that watch Author#name (does not persist ancestor)" do
+
+      before do
+        @user = User.create!(:email => "email@email.it", :firstname => 'John', :lastname => 'smith')
+        ActiveMetadata::Watcher.create! :model_class => "Author", :label => :name, :owner_id => @user.id
+      end
+
+      it "when a new record is craeted by the parent document instance should save history and generate a notification" do
+        @document = Document.create! name: "John"
+        @author = @document.create_author name: "my title"
+        @author.history_for(:name)[0].value.should eq(@author.name)
+        @author.notifier.should_not be_nil
+      end
+
+      it "when a new record is craeted by the parent document skipping notifications should save history and not generate any notification" do
+        @document = Document.create! name: "John"
+        @author = @document.create_author name: "my title", skip_history_notification: true
+        @author.history_for(:name)[0].value.should eq(@author.name)
+        @author.notifier.should be_nil
+      end
+
+    end
+
+  end
+
+
 end

data/spec/lib/watchers_spec.rb

@@ -3,12 +3,13 @@ require "time"
 
 describe ActiveMetadata do
 
-  before(:each) do
-    @document = Document.create! { |d| d.name = "John" }
-  end
 
   describe "watchers" do
 
+    before(:each) do
+      @document = Document.create! { |d| d.name = "John" }
+    end
+
     it "should create a watcher for a given field" do
       user = User.create!(:email => "email@email.it", :firstname => 'John', :lastname => 'smith' )
       @document.create_watcher_for(:name, user)
@@ -33,28 +34,6 @@ describe ActiveMetadata do
       @document.is_watched_by(:name,another_user).should be_false
     end
 
-
-    it "should create an unread message by default" do
-      pending "to be moved in virgilio project"
-      user = User.create!(:email => "email@email.it", :firstname => 'John', :lastname => 'smith' )
-      @document.create_watcher_for(:name, user)
-      @document.update_attribute(:name, 'new_value')
-
-
-      user.inbox.messages.should have(1).record
-      user.inbox.messages.first.read.should be_false
-    end
-
-    it "should read an unread message" do
-      pending "to be moved in virgilio project"
-      user = User.create!(:email => "email@email.it", :firstname => 'John', :lastname => 'smith' )
-      @document.create_watcher_for(:name, user)
-      @document.update_attribute(:name, 'new_value')
-      alert_message = user.inbox.messages.first
-      alert_message.mark_as_read
-      user.inbox.messages.first.read.should be_true
-    end
-
   end
 
   describe "#watchers_for" do
@@ -64,6 +43,7 @@ describe ActiveMetadata do
       before do
         @user = User.create!(:email => "email@email.it", :firstname => 'John', :lastname => 'smith' )
         @another_user = User.create!(:email => "email2@email.it", :firstname => 'George', :lastname => 'Washington' )
+        @document = Document.create! { |d| d.name = "John" }
         @document.create_watcher_for(:name, @user)
         ActiveMetadata::Watcher.create! :model_class => "Document", :label => :name, :owner_id => @another_user.id
       end

data/spec/support/migrations.rb

@@ -18,6 +18,12 @@ module TestDb
       t.timestamps
     end
 
+    ActiveRecord::Base.connection.create_table :authors, force: true do |t|
+      t.string :name
+      t.integer :document_id
+      t.timestamps
+    end
+
     ActiveRecord::Base.connection.create_table :chapters, force: true do |t|
       t.string :title
       t.timestamps

data/spec/support/models.rb

@@ -0,0 +1,34 @@
+# encoding: utf-8
+class Document < ActiveRecord::Base
+  has_one :section
+  has_one :author
+  acts_as_metadata
+end
+
+# Persist ancestor
+class Section < ActiveRecord::Base
+  belongs_to :document
+  acts_as_metadata :ancestors => [:document], :persists_ancestor => true
+end
+
+# Does not persist ancestor
+class Author < ActiveRecord::Base
+  belongs_to :document
+  acts_as_metadata :ancestors => [:document]
+end
+
+class Chapter < ActiveRecord::Base
+  acts_as_metadata ancestors: [:sections, :document]
+  has_many :sections
+end
+
+class User < ActiveRecord::Base
+  has_one :inbox
+
+  @@current_user = User.create!
+
+  def self.current
+    @@current_user
+  end
+
+end

data/spec/support/watcher_notifier.rb

@@ -5,7 +5,7 @@ class WatcherNotifier
     puts "---------------------------------------->"
   end
 
-  def notify(matched_label, old_value, new_value, model_class, model_id,owner_id,type, created_by)          
+  def notify(matched_label, old_value, new_value, model_class, model_id,owner_id,type, created_by)
      @matched_label= matched_label
      @old_value = old_value
      @new_value = new_value

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_metadata
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-17 00:00:00.000000000 Z
+date: 2012-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -240,14 +240,11 @@ files:
 - spec/models/history_spec.rb
 - spec/routing/active_metadata/stream_controller_routing_spec.rb
 - spec/spec_helper.rb
-- spec/support/chapter.rb
-- spec/support/document.rb
 - spec/support/migrations.rb
+- spec/support/models.rb
 - spec/support/pdf_test.pdf
 - spec/support/pdf_test_1.pdf
 - spec/support/pdf_test_2.pdf
-- spec/support/section.rb
-- spec/support/user.rb
 - spec/support/watcher_notifier.rb
 - spec/views/active_metadata/stream/index.html.erb_spec.rb
 homepage: ''
@@ -264,7 +261,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3451596570019589333
+      hash: 2514822335632258370
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -273,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3451596570019589333
+      hash: 2514822335632258370
 requirements: []
 rubyforge_project: active_metadata
 rubygems_version: 1.8.19
@@ -337,13 +334,10 @@ test_files:
 - spec/models/history_spec.rb
 - spec/routing/active_metadata/stream_controller_routing_spec.rb
 - spec/spec_helper.rb
-- spec/support/chapter.rb
-- spec/support/document.rb
 - spec/support/migrations.rb
+- spec/support/models.rb
 - spec/support/pdf_test.pdf
 - spec/support/pdf_test_1.pdf
 - spec/support/pdf_test_2.pdf
-- spec/support/section.rb
-- spec/support/user.rb
 - spec/support/watcher_notifier.rb
 - spec/views/active_metadata/stream/index.html.erb_spec.rb

data/spec/support/chapter.rb

@@ -1,5 +0,0 @@
-# encoding: utf-8
-class Chapter < ActiveRecord::Base
-  acts_as_metadata ancestors: [:sections, :document]
-  has_many :sections
-end

data/spec/support/document.rb

@@ -1,6 +0,0 @@
-# encoding: utf-8
-class Document < ActiveRecord::Base  
-  has_one :section
-  acts_as_metadata
-
-end

data/spec/support/section.rb

@@ -1,5 +0,0 @@
-# encoding: utf-8
-class Section < ActiveRecord::Base
-  belongs_to :document
-  acts_as_metadata :ancestors => [:document], :persists_ancestor => true
-end

data/spec/support/user.rb

@@ -1,11 +0,0 @@
-# encoding: utf-8
-class User < ActiveRecord::Base  
-  has_one :inbox
-  
-  @@current_user = User.create!
-  
-  def self.current
-    @@current_user
-  end
-    
-end