active_metadata 0.3.2 → 0.4.1

data/db/migrate/02_active_metadata_migrations.rb

@@ -14,6 +14,7 @@ class ActiveMetadataMigrations < ActiveRecord::Migration
     add_index :notes, :document_id
     add_index :notes, :label
     add_index :notes, :updated_at
+    add_index :notes, :document_class
 
     create_table :histories do |t|
       t.text :value
@@ -27,6 +28,7 @@ class ActiveMetadataMigrations < ActiveRecord::Migration
     add_index :histories, :document_id
     add_index :histories, :label
     add_index :histories, :created_at
+    add_index :histories, :document_class
 
     create_table :attachments do |t|
       t.string :label
@@ -45,6 +47,7 @@ class ActiveMetadataMigrations < ActiveRecord::Migration
     add_index :attachments, :document_id
     add_index :attachments, :label
     add_index :attachments, :attach_updated_at
+    add_index :attachments, :document_class
 
     create_table :watchers do |t|
       t.integer :owner_id

data/lib/active_metadata/base.rb

@@ -24,7 +24,7 @@ module ActiveMetadata
         attr_accessor :conflicts
         attr_accessor :active_metadata_timestamp
 
-        class_variable_set("@@metadata_id_from", args.empty? ? nil : args[0][:metadata_id_from])
+        class_variable_set("@@active_metadata_ancestors", args.empty? ? nil : args[0][:active_metadata_ancestors])
 
         include ActiveMetadata::Base::InstanceMethods
         include ActiveMetadata::Persistence
@@ -58,6 +58,10 @@ module ActiveMetadata
         metadata_root.id
       end
 
+      def metadata_class
+        metadata_root.class.to_s
+      end
+
       # Normalize the active_metadata_timestamp into a float to be comparable with the history
       def am_timestamp
         ts = metadata_root.active_metadata_timestamp
@@ -74,10 +78,10 @@ module ActiveMetadata
       end
 
       def metadata_root
-        metadata_id_from = self.class.class_variable_get("@@metadata_id_from")
-        return self if metadata_id_from.nil?
+        active_metadata_ancestors = self.class.class_variable_get("@@active_metadata_ancestors")
+        return self if active_metadata_ancestors.nil?
         receiver = self
-        metadata_id_from.each do |item|
+        active_metadata_ancestors.each do |item|
           receiver = receiver.send item
         end
         receiver

data/lib/active_metadata/persistence/active_record/attachment.rb

@@ -7,7 +7,7 @@ module ActiveMetadata::Persistence::ActiveRecord::Attachment
   module InstanceMethods
 
     def save_attachment_for(field, file)      
-      attachment = Attachment.create! :document_id => metadata_id, :label => field, :attach => file, :created_by => current_user_id       
+      attachment = Attachment.create! :document_class => metadata_class, :document_id => metadata_id, :label => field, :attach => file, :created_by => current_user_id
       reload_attachments_cache_for field 
       self.send(:send_notification, field, "", attachment.attach.original_filename, :attachment_message, current_user_id)
     end
@@ -49,7 +49,7 @@ module ActiveMetadata::Persistence::ActiveRecord::Attachment
     end  
     
     def fetch_attachments_for field
-      Attachment.all(:conditions => {:document_id => metadata_id,:label => field}, :order => "attach_updated_at DESC")
+      Attachment.all(:conditions => {:document_class => metadata_class, :document_id => metadata_id,:label => field}, :order => "attach_updated_at DESC")
     end  
     
 

data/lib/active_metadata/persistence/active_record/history.rb

@@ -9,7 +9,7 @@ module ActiveMetadata::Persistence::ActiveRecord::History
     def save_history
       self.changes.each do |key, value|
         next if ActiveMetadata::CONFIG['history_skip_fields'].include?(key)        
-        History.create! :value => value[1],:document_id => metadata_id,:label => key.to_s, :created_by => current_user_id 
+        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) 
       end
@@ -28,7 +28,7 @@ module ActiveMetadata::Persistence::ActiveRecord::History
     end  
 
     def fetch_histories_for field, order
-      History.all(:conditions => {:document_id => metadata_id,:label => field}, :order => order)
+      History.all(:conditions => {:document_class => metadata_class, :document_id => metadata_id,:label => field}, :order => order)
     end  
 
 

data/lib/active_metadata/persistence/active_record/note.rb

@@ -7,7 +7,7 @@ module ActiveMetadata::Persistence::ActiveRecord::Note
   module InstanceMethods
     
     def create_note_for(field, note)      
-      Note.create! :document_id => metadata_id,:label => field.to_s,:note => note, :created_by => current_user_id  
+      Note.create! :document_id => metadata_id, :document_class => metadata_class, :label => field.to_s,:note => note, :created_by => current_user_id
       reload_notes_cache_for field 
       self.send(:send_notification, field, "", note, :note_message, current_user_id) 
     end
@@ -53,7 +53,7 @@ module ActiveMetadata::Persistence::ActiveRecord::Note
     end  
     
     def fetch_notes_for field
-      Note.all(:conditions => {:label => field, :document_id => metadata_id}, :order => "updated_at DESC" )              
+      Note.all(:conditions => {:label => field, :document_class => metadata_class, :document_id => metadata_id}, :order => "updated_at DESC" )
     end  
         
   end

data/lib/active_metadata/persistence/active_record/watcher.rb

@@ -7,11 +7,11 @@ module ActiveMetadata::Persistence::ActiveRecord::Watcher
   module InstanceMethods
     def create_watcher_for(field, owner)
       raise RuntimeError, "The object id MUST be valued" unless self.id
-      Watcher.create! :document_id => metadata_id, :label => field, :owner_id => owner.id 
+      Watcher.create! :document_class => metadata_class, :document_id => metadata_id, :label => field, :owner_id => owner.id
     end                      
 
     def watchers_for(field)
-      Watcher.all(:conditions => {:label => field, :document_id => metadata_id})   
+      Watcher.all(:conditions => {:document_class => metadata_class, :label => field, :document_id => metadata_id})
     end
 
     def delete_watcher_for(field, owner)
@@ -21,7 +21,7 @@ module ActiveMetadata::Persistence::ActiveRecord::Watcher
     end    
     
     def is_watched_by(field,owner)
-      Watcher.where(:document_id => metadata_id, :label => field, :owner_id => owner.id).empty? ? false : true 
+      Watcher.where(:document_class => metadata_class, :document_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)   

data/lib/active_metadata/version.rb

@@ -1,3 +1,3 @@
 module ActiveMetadata
-  VERSION = "0.3.2"
+  VERSION = "0.4.1"
 end

data/lib/rails/railties/tasks.rake

@@ -8,7 +8,7 @@ namespace :active_metadata do
 
     puts "Copying migrations"
     ts = Time.now.utc.strftime('%Y%m%d%H%M%S')
-    FileUtils.cp File.expand_path('../../templates/active_metadata_migrations',__FILE__), File.expand_path("db/migrate/#{ts}_active_metadata_migrations.rb")
+    FileUtils.cp File.expand_path('../../../db/migrate/02_active_metadata_migrations.rb',__FILE__), File.expand_path("db/migrate/#{ts}_active_metadata_migrations.rb")
     puts "run rake db:migrate to complete the gem installation"    
 
   end

data/lib/templates/active_metadata_migrations

@@ -4,6 +4,7 @@ class ActiveMetadataMigrations < ActiveRecord::Migration
     create_table :notes do |t|
       t.text :note
       t.string :label
+      t.string :document_class
       t.integer :document_id
       t.integer :created_by
       t.integer :updated_by      
@@ -17,6 +18,7 @@ class ActiveMetadataMigrations < ActiveRecord::Migration
     create_table :histories do |t|
       t.text :value
       t.string :label
+      t.string :document_class
       t.integer :document_id
       t.integer :created_by
       t.timestamps
@@ -29,6 +31,7 @@ class ActiveMetadataMigrations < ActiveRecord::Migration
     create_table :attachments do |t|
       t.string :label
       t.integer :document_id
+      t.string :document_class
       t.integer :created_by
       t.integer :updated_by
       t.integer :counter
@@ -46,6 +49,7 @@ class ActiveMetadataMigrations < ActiveRecord::Migration
     create_table :watchers do |t|
       t.integer :owner_id
       t.string :label
+      t.string :document_class
       t.integer :document_id
       t.timestamps
     end

data/spec/active_metadata_spec.rb

@@ -10,18 +10,20 @@ describe ActiveMetadata do
       Document.respond_to?(:acts_as_metadata).should be_true
     end
 
-    it "should find the metadata id if no metadata_id_from params has been provided" do
+    it "should find the active_metadata_ancestors if no active_metadata_ancestors params has been provided" do
       @document = Document.create! { |d| d.name = "John" }
       @document.reload
       @document.metadata_id.should eq @document.id
+      @document.metadata_class.should eq @document.class.to_s
     end
 
-    it "should find the metadata id if a metadata_id_from params has been specified" do
+    it "should find the metadata_root.id if an active_metadata_ancestors params has been specified" do
       @document = Document.create! { |d| d.name = "John" }
       @document.reload
       @section = @document.create_section :title => "new section"
       @section.reload
       @section.metadata_id.should eq @document.id
+      @section.metadata_class.should eq @document.class.to_s
     end
 
   end
@@ -38,11 +40,17 @@ describe ActiveMetadata do
       @document.notes_for(:name).should have(1).record
     end
 
+
     it "should verify the content of a note created" do
       @document.create_note_for(:name, "Very important note!")
       @document.notes_for(:name).last.note.should eq "Very important note!"
     end
 
+    it "should verify that notes are created for the correct model" do
+      @document.create_note_for(:name, "Very important note!")
+      @document.notes_for(:name).last.document_class.should eq(@document.class.to_s)
+    end
+
     it "should verify the created_by of a note created" do
       @document.create_note_for(:name, "Very important note!")
       @document.notes_for(:name).last.created_by.should eq User.current.id
@@ -189,6 +197,10 @@ describe ActiveMetadata do
       @document.history_for(:name)[0].value.should eq(@document.name)
     end
 
+    it "should verify that histories are created for the correct model" do
+      @document.history_for(:name)[0].document_class.should eq(@document.class.to_s)
+    end
+
     it "should save the craeted_at datetime anytime an history entry is created" do
       @document.history_for(:name)[0].created_at.should be_a_kind_of Time
     end

data/spec/support/section.rb

@@ -3,6 +3,6 @@ class Section < ActiveRecord::Base
   set_table_name :sections
   belongs_to :document
 
-  acts_as_metadata :metadata_id_from => [:document]
+  acts_as_metadata :active_metadata_ancestors => [:document]
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_metadata
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-21 00:00:00.000000000Z
+date: 2011-11-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2168900840 !ruby/object:Gem::Requirement
+  requirement: &2154399200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168900840
+  version_requirements: *2154399200
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2168900260 !ruby/object:Gem::Requirement
+  requirement: &2154398660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168900260
+  version_requirements: *2154398660
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2168899660 !ruby/object:Gem::Requirement
+  requirement: &2154397860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168899660
+  version_requirements: *2154397860
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2168898680 !ruby/object:Gem::Requirement
+  requirement: &2154397280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168898680
+  version_requirements: *2154397280
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2168897840 !ruby/object:Gem::Requirement
+  requirement: &2154396700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168897840
+  version_requirements: *2154396700
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2168896740 !ruby/object:Gem::Requirement
+  requirement: &2154395740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -77,10 +77,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2168896740
+  version_requirements: *2154395740
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2168895600 !ruby/object:Gem::Requirement
+  requirement: &2154395100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -88,10 +88,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2168895600
+  version_requirements: *2154395100
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &2168894400 !ruby/object:Gem::Requirement
+  requirement: &2154394040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168894400
+  version_requirements: *2154394040
 - !ruby/object:Gem::Dependency
   name: to_xls
-  requirement: &2168893600 !ruby/object:Gem::Requirement
+  requirement: &2154392820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,7 +110,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168893600
+  version_requirements: *2154392820
 description: First implementation will write metadata on mongodb
 email:
 - acampolonghi@gmail.com
@@ -164,7 +164,6 @@ files:
 - config/initializers/inflections.rb
 - config/mongoid.yml
 - config/routes.rb
-- db/development.sqlite3
 - db/migrate/01_create_test_resources.rb
 - db/migrate/02_active_metadata_migrations.rb
 - db/test.sqlite3