active_metadata 0.2.2 → 0.2.3

data/db/migrate/01_create_test_resources.rb

@@ -0,0 +1,30 @@
+class CreateTestResources < ActiveRecord::Migration
+  def self.up
+    create_table :documents do |t|
+      t.string :name
+      t.string :surname
+      t.boolean :keep_alive
+      t.timestamps
+    end
+
+    create_table :sections do |t|
+      t.string :title
+      t.integer :document_id
+      t.timestamps
+    end
+
+    create_table :users do |t|
+      t.string :email
+      t.string :firstname
+      t.string :lastname
+      t.timestamps
+    end
+
+  end
+
+  def self.down
+    drop_table :documents
+    drop_table :sections
+    drop_table :users
+  end
+end

data/db/migrate/02_active_metadata_migrations.rb

@@ -0,0 +1,71 @@
+class ActiveMetadataMigrations < ActiveRecord::Migration
+  def self.up
+
+    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
+      t.timestamps
+    end
+
+    add_index :notes, :document_id
+    add_index :notes, :label
+    add_index :notes, :updated_at
+
+    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
+    end
+
+    add_index :histories, :document_id
+    add_index :histories, :label
+    add_index :histories, :created_at
+
+    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
+      t.string :attach_file_name
+      t.string :attach_content_type
+      t.integer :attach_file_size
+      t.datetime :attach_updated_at
+      t.timestamps
+    end
+
+    add_index :attachments, :document_id
+    add_index :attachments, :label
+    add_index :attachments, :attach_updated_at
+
+    create_table :watchers do |t|
+      t.integer :owner_id
+      t.string :label
+      t.string :document_class
+      t.integer :document_id
+      t.timestamps
+    end
+
+    add_index :watchers, :document_id
+    add_index :watchers, :label
+    add_index :watchers, :owner_id
+    add_index :watchers, :created_at
+
+  end
+
+  def self.down
+    drop_table :notes
+    drop_table :histories
+	drop_table :attachments
+	drop_table :watchers
+  end
+
+end

data/lib/active_metadata/base.rb

@@ -2,12 +2,13 @@ module ActiveMetadata
 
   CONFIG = File.exists?('config/active_metadata.yml') ? YAML.load_file('config/active_metadata.yml')[Rails.env] : {}
   CONFIG['cache_expires_in'] ||= 60
-  
+
   ## Define ModelMethods
   module Base
-    
+
     require 'paperclip'
     require "active_metadata/persistence/persistence"
+    require "active_metadata/helpers"
 
     def self.included(klass)
       klass.class_eval do
@@ -19,24 +20,26 @@ module ActiveMetadata
 
       def acts_as_metadata *args
         after_save :save_history
-        
+
         class_variable_set("@@metadata_id_from", args.empty? ? nil : args[0][:metadata_id_from])
 
         include ActiveMetadata::Base::InstanceMethods
-        include ActiveMetadata::Persistence   
-             
+        include ActiveMetadata::Persistence
+
       end
 
     end
 
     module InstanceMethods
-      
+
+      include ActiveMetadata::Helpers
+
       def self.included(klass)
-        [:notes,:attachments,:history].each do |item|
-          klass.send(:define_method,"#{item.to_s}_cache_key".to_sym) do |field|
-            "#{Rails.env}/active_metadata/#{item.to_s}/#{self.class}/#{metadata_id}/#{field}/"            
-          end  
-        end          
+        [:notes, :attachments, :history].each do |item|
+          klass.send(:define_method, "#{item.to_s}_cache_key".to_sym) do |field|
+            "#{Rails.env}/active_metadata/#{item.to_s}/#{self.class}/#{metadata_id}/#{field}/"
+          end
+        end
       end
 
       def metadata_id
@@ -48,16 +51,70 @@ module ActiveMetadata
         end
         receiver.id
       end
-      
+
       def current_user_id
         if User.respond_to?(:current) && !User.current.nil?
-            User.current.id
+          User.current.id
         else
           nil
-        end      
-      end        
-                
+        end
+      end
+
+      # Resolve concurrency using the passed timestamps and the active_metadata histories
+      # To be called from controller before updating the model. Params that contains a conflict are removed from the params list.
+      # Returns 2 values containing the the deleted params with the related history:
+      # [{:key => [passed_value,history]}]
+      #
+      # first result is the WARNINGS array: conflict appears on a field not touched by the user that submit the value
+      # first result is the FATALS Array : if the conflict appears on a field modified by the user that submit the value
+      # an empty array is returned by default
+      def manage_concurrency(params, timestamp)
+        warnings = []
+        fatals = []
+
+        # scan params
+        params.each do |key, val|
+          # ensure the query order
+          histories = history_for key.to_sym, "created_at DESC"
+          latest_history = histories.first
+
+          # if form timestamp is subsequent the history last change go on
+          # if history does not exists yet go on
+          next if latest_history.nil? || timestamp > latest_history.created_at
+
+          #if the timestamp is previous of the last history change
+          if timestamp < latest_history.created_at
+            #remove the key from the update process
+            params.delete key
+
+            # We have a conflict.
+            # Check if the actual submission has been modified
+            histories.each do |h|
+              # Looking for the value that was loaded by the user. First history with a ts that is younger than the form ts
+              next if timestamp > h.created_at
+
+              # History stores values as strings so any boolean is stored as "0" or "1"
+              # We need to translate the params passed for a safer comparison.
+              if self.column_for_attribute(key).type == :boolean
+                b_val = to_bool(h.value)
+              end
+
+              if [h.value, b_val].include? val
+                warnings << {key => [val, h]}
+              else
+                fatals << {key => [val, h]}
+              end
+            end
+
+          end
+
+        end
+
+        return warnings, fatals
+      end
+
     end # InstanceMethods
+
   end
 
 end

data/lib/active_metadata/helpers.rb

@@ -0,0 +1,9 @@
+module  ActiveMetadata::Helpers
+
+  def to_bool str
+    return true if str == true || str =~ (/(true|t|yes|y|1)$/i)
+    return false if str == false || str.blank? || str =~ (/(false|f|no|n|0)$/i)
+    raise ArgumentError.new("invalid value for Boolean: \"#{str}\"")
+  end
+
+end

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

@@ -15,9 +15,9 @@ module ActiveMetadata::Persistence::ActiveRecord::History
       end
     end
 
-    def history_for field
+    def history_for field, order="created_at DESC"
       Rails.cache.fetch(history_cache_key(field), :expires_in => ActiveMetadata::CONFIG['cache_expires_in'].minutes) do
-        fetch_histories_for field
+        fetch_histories_for field, order
       end  
     end
 
@@ -27,8 +27,8 @@ module ActiveMetadata::Persistence::ActiveRecord::History
       Rails.cache.delete history_cache_key(field)     
     end  
 
-    def fetch_histories_for field
-      History.all(:conditions => {:document_id => metadata_id,:label => field}, :order => "created_at DESC")
+    def fetch_histories_for field, order
+      History.all(:conditions => {:document_id => metadata_id,:label => field}, :order => order)
     end  
 
 

data/lib/active_metadata/version.rb

@@ -1,3 +1,3 @@
 module ActiveMetadata
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/concurrency_spec.rb

@@ -0,0 +1,105 @@
+require "spec_helper"
+
+describe "Manage Concurrency" do
+
+  before(:each) do
+    @document = Document.create! { |d| d.name = "John" }
+    @document.reload
+  end
+
+  describe "when a field is modified and the form ts is subsequent of the history ts" do
+
+    it "should save the new value and history must be updated with the latest change" do
+        sleep 0.2.seconds
+
+        params = {:name => "nuovo nome"}
+        warn,fatal = @document.manage_concurrency params,Time.now
+        @document.update_attributes(params)
+
+        warn.should be_empty
+        fatal.should be_empty
+        hs = @document.history_for(:name)
+        hs.count.should eq 2
+        hs.first.value.should eq "nuovo nome"
+        Document.last.name.should eq "nuovo nome"
+    end
+
+  end
+
+  describe "when a field is modified and the form ts is preceding the history ts" do
+
+    it "should not change the model value and the history if the newest history value is equal to the submitted once, param should be retuned as warning" do
+      form_timestamp = Time.now
+      params = {:name => "nuovo nome"}
+
+      #someone change the field value
+      sleep 0.2.seconds
+      warn,fatal = @document.manage_concurrency params,Time.now
+      @document.update_attributes(params)
+
+      # user submit pushing the same value that was already saved by another user
+      sleep 0.2.seconds
+      warn,fatal = @document.manage_concurrency params,form_timestamp
+      @document.update_attributes(params)
+
+      warn.size.should eq 1
+      warn[0][:name][0].should eq "nuovo nome"
+      fatal.should be_empty
+      hs = @document.history_for(:name)
+      #last change shoudl not be recorded in history
+      hs.count.should eq 2
+      hs.first.value.should eq "nuovo nome"
+      Document.last.name.should eq "nuovo nome"
+
+    end
+
+    it "should reject the change if the history newest value is different from the submitted once, param should be returned as fatal" do
+      form_timestamp = Time.now
+      params = {:name => "nuovo nome"}
+
+      #someone change the field value
+      sleep 0.2.seconds
+      warn,fatal = @document.manage_concurrency params,Time.now
+      @document.update_attributes(params)
+
+      # user submit a new value
+      sleep 0.2.seconds
+      different_params = {:name => "altro nome"}
+      warn,fatal = @document.manage_concurrency different_params,form_timestamp
+      @document.update_attributes(different_params)
+
+      fatal.size.should eq 1
+      fatal[0][:name][0].should eq "altro nome"
+      warn.should be_empty
+      hs = @document.history_for(:name)
+      #last change shoudl not be recorded in history
+      hs.count.should eq 2
+      hs.first.value.should eq "nuovo nome"
+      Document.last.name.should eq "nuovo nome"
+
+    end
+
+    it "should return both fatals and warnings if required" do
+      form_timestamp = Time.now
+      params = {:name => "nuovo nome", :keep_alive => false}
+
+      #someone change the field value
+      sleep 0.2.seconds
+      warn,fatal = @document.manage_concurrency params,Time.now
+      @document.update_attributes(params)
+
+      # user submit a new value
+      sleep 0.2.seconds
+      different_params = {:name => "altro nome", :keep_alive => false}
+      warn,fatal = @document.manage_concurrency different_params,form_timestamp
+      @document.update_attributes(different_params)
+
+      fatal.size.should eq 1
+      fatal[0][:name][0].should eq "altro nome"
+      warn.size.should eq 1
+      warn[0][:keep_alive][0].should eq false
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_metadata
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-13 00:00:00.000000000Z
+date: 2011-10-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2170647660 !ruby/object:Gem::Requirement
+  requirement: &2168675080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2170647660
+  version_requirements: *2168675080
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2170646500 !ruby/object:Gem::Requirement
+  requirement: &2168674400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2170646500
+  version_requirements: *2168674400
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2170645220 !ruby/object:Gem::Requirement
+  requirement: &2168673660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2170645220
+  version_requirements: *2168673660
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2170640380 !ruby/object:Gem::Requirement
+  requirement: &2168672720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2170640380
+  version_requirements: *2168672720
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2170639580 !ruby/object:Gem::Requirement
+  requirement: &2168672140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2170639580
+  version_requirements: *2168672140
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2170638800 !ruby/object:Gem::Requirement
+  requirement: &2168671320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -77,10 +77,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2170638800
+  version_requirements: *2168671320
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2170638040 !ruby/object:Gem::Requirement
+  requirement: &2168670740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -88,10 +88,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2170638040
+  version_requirements: *2168670740
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &2170637440 !ruby/object:Gem::Requirement
+  requirement: &2168670280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2170637440
+  version_requirements: *2168670280
 - !ruby/object:Gem::Dependency
   name: to_xls
-  requirement: &2170636980 !ruby/object:Gem::Requirement
+  requirement: &2168669560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,7 +110,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2170636980
+  version_requirements: *2168669560
 description: First implementation will write metadata on mongodb
 email:
 - acampolonghi@gmail.com
@@ -120,6 +120,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/active_metadata/base.rb
+- lib/active_metadata/helpers.rb
 - lib/active_metadata/persistence/active_record/attachment.rb
 - lib/active_metadata/persistence/active_record/history.rb
 - lib/active_metadata/persistence/active_record/note.rb
@@ -136,12 +137,6 @@ files:
 - lib/model/active_record/history.rb
 - lib/model/active_record/note.rb
 - lib/model/active_record/watcher.rb
-- lib/model/mongoid/active_meta.rb
-- lib/model/mongoid/attachment.rb
-- lib/model/mongoid/history.rb
-- lib/model/mongoid/label.rb
-- lib/model/mongoid/note.rb
-- lib/model/mongoid/watcher.rb
 - lib/rails/railties/tasks.rake
 - lib/rake/active_record_tasks.rb
 - lib/rake/task.rb
@@ -169,18 +164,8 @@ files:
 - config/initializers/inflections.rb
 - config/mongoid.yml
 - config/routes.rb
-- db/development.sqlite3
-- db/migrate/001_create_document.rb
-- db/migrate/002_add_surname_to_document.rb
-- db/migrate/003_create_section.rb
-- db/migrate/004_create_user.rb
-- db/migrate/005_create_inboxes.rb
-- db/migrate/006_create_alert_message.rb
-- db/migrate/007_create_notes.rb
-- db/migrate/008_create_history.rb
-- db/migrate/009_create_watcher.rb
-- db/migrate/010_create_attachment.rb
-- db/migrate/011_add_created_by_to_histories.rb
+- db/migrate/01_create_test_resources.rb
+- db/migrate/02_active_metadata_migrations.rb
 - db/test.sqlite3
 - features/step_definitions/add_a_user_to_a_watcher_steps.rb
 - features/step_definitions/trigger_alert_on_modify_steps.rb
@@ -191,6 +176,7 @@ files:
 - features/watchlist/trigger_alert_on_modify.feature
 - spec/active_metadata_spec.rb
 - spec/benchmark_spec.rb
+- spec/concurrency_spec.rb
 - spec/controllers/metadata_controller_spec.rb
 - spec/spec_helper.rb
 - spec/support/document.rb
@@ -233,6 +219,7 @@ test_files:
 - features/watchlist/trigger_alert_on_modify.feature
 - spec/active_metadata_spec.rb
 - spec/benchmark_spec.rb
+- spec/concurrency_spec.rb
 - spec/controllers/metadata_controller_spec.rb
 - spec/spec_helper.rb
 - spec/support/document.rb

data/db/migrate/001_create_document.rb

@@ -1,12 +0,0 @@
-class CreateDocument < ActiveRecord::Migration
-  def self.up
-    create_table :documents do |t|
-      t.string :name
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :documents
-  end
-end

data/db/migrate/002_add_surname_to_document.rb

@@ -1,9 +0,0 @@
-class AddSurnameToDocument < ActiveRecord::Migration
-  def self.up
-    add_column :documents, :surname, :string
-  end
-
-  def self.down
-    remove_column :documents, :surname
-  end
-end

data/db/migrate/003_create_section.rb

@@ -1,13 +0,0 @@
-class CreateSection < ActiveRecord::Migration
-  def self.up
-    create_table :sections do |t|
-      t.string :title
-      t.integer :document_id
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :sections
-  end
-end

data/db/migrate/004_create_user.rb

@@ -1,14 +0,0 @@
-class CreateUser < ActiveRecord::Migration
-  def self.up
-    create_table :users do |t|
-      t.string :email
-      t.string :firstname
-      t.string :lastname
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :users
-  end
-end

data/db/migrate/005_create_inboxes.rb

@@ -1,19 +0,0 @@
-class CreateInboxes < ActiveRecord::Migration
-  def self.up
-    create_table :inboxes do |t|
-      t.string :label
-      t.string :object_class
-      t.integer :object_id
-      t.string :alert_type
-      t.string :old_value
-      t.string :new_value
-      t.text :content
-      t.integer :user_id
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :inboxes
-  end
-end

data/db/migrate/006_create_alert_message.rb

@@ -1,37 +0,0 @@
-class CreateAlertMessage < ActiveRecord::Migration
-  def self.up
-    drop_table :inboxes
-
-    create_table :inboxes do |t|
-      t.integer :user_id
-    end
-    
-    create_table :alert_messages do |t|
-      t.string :label
-      t.string :model_class
-      t.integer :model_id
-      t.string :alert_type
-      t.text :old_value
-      t.text :new_value
-      t.integer :inbox_id
-      t.boolean :read
-      
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :alert_messages
-    create_table :inboxes do |t|
-       t.string :label
-       t.string :object_class
-       t.integer :object_id
-       t.string :alert_type
-       t.string :old_value
-       t.string :new_value
-       t.text :content
-       t.integer :user_id
-       t.timestamps
-     end
-  end
-end

data/db/migrate/007_create_notes.rb

@@ -1,22 +0,0 @@
-class CreateNotes < ActiveRecord::Migration
-  def self.up
-    create_table :notes do |t|
-      t.text :note
-      t.string :label
-      t.integer :document_id
-      t.integer :created_by
-      t.integer :updated_by      
-      t.timestamps
-    end
-
-    add_index :notes, :document_id
-    add_index :notes, :label
-    add_index :notes, :updated_at
-        
-  end
-
-  def self.down
-    drop_table :notes
-  end
-
-end

data/db/migrate/008_create_history.rb

@@ -1,20 +0,0 @@
-class CreateHistory < ActiveRecord::Migration
-  def self.up
-    create_table :histories do |t|
-      t.text :value
-      t.string :label
-      t.integer :document_id
-      t.timestamps
-    end
-
-    add_index :histories, :document_id
-    add_index :histories, :label
-    add_index :histories, :created_at
-        
-  end
-
-  def self.down
-    drop_table :histories
-  end
-
-end

data/db/migrate/009_create_watcher.rb

@@ -1,21 +0,0 @@
-class CreateWatcher < ActiveRecord::Migration
-  def self.up
-    create_table :watchers do |t|
-      t.integer :owner_id
-      t.string :label
-      t.integer :document_id
-      t.timestamps
-    end
-
-    add_index :watchers, :document_id
-    add_index :watchers, :label
-    add_index :watchers, :owner_id
-    add_index :watchers, :created_at
-        
-  end
-
-  def self.down
-    drop_table :watchers
-  end
-
-end

data/db/migrate/010_create_attachment.rb

@@ -1,26 +0,0 @@
-class CreateAttachment < ActiveRecord::Migration
-  def self.up
-    create_table :attachments do |t|
-      t.string :label
-      t.integer :document_id
-      t.integer :created_by
-      t.integer :updated_by
-      t.integer :counter
-      t.string :attach_file_name
-      t.string :attach_content_type
-      t.integer :attach_file_size
-      t.datetime :attach_updated_at
-      t.timestamps
-    end
-
-    add_index :attachments, :document_id
-    add_index :attachments, :label
-    add_index :attachments, :attach_updated_at
-        
-  end
-
-  def self.down
-    drop_table :attachments
-  end
-
-end

data/db/migrate/011_add_created_by_to_histories.rb

@@ -1,10 +0,0 @@
-class AddCreatedByToHistories < ActiveRecord::Migration
-  def self.up
-    add_column :histories, :created_by, :integer
-  end
-
-  def self.down
-    remove_column :histories, :created_by
-  end
-
-end

data/lib/model/mongoid/active_meta.rb

@@ -1,6 +0,0 @@
-class ActiveMeta
-  include Mongoid::Document
-  field :document_id, type: Integer
-  has_many :labels, :class_name => "Label"
-  index :document_id
-end

data/lib/model/mongoid/attachment.rb

@@ -1,25 +0,0 @@
-class Attachment
-  include Mongoid::Document
-  include Mongoid::Paperclip
-
-  belongs_to :label
-  has_mongoid_attached_file :attach,
-      :path  => "#{ActiveMetadata::CONFIG['attachment_base_path']}/:document_id/:label/:counter/:basename.:extension",
-      :url  => "#{ActiveMetadata::CONFIG['attachment_base_url']}/:document_id/:label/:counter/:basename.:extension"
-
-  field :created_by, :type => Integer
-  field :counter, :type => Integer
-
-  Paperclip.interpolates :document_id do |attachment,style|
-   attachment.instance.label.active_meta.document_id
-  end
-
-  Paperclip.interpolates :label do |attachment,style|
-    attachment.instance.label.name
-  end
-
-  Paperclip.interpolates :counter do |attachment,style|
-    attachment.instance.counter
-  end
-
-end

data/lib/model/mongoid/history.rb

@@ -1,9 +0,0 @@
-class History
-  include Mongoid::Document
-  store_in :history
-  
-  belongs_to :label
-
-  field :value, :type => String
-
-end

data/lib/model/mongoid/label.rb

@@ -1,14 +0,0 @@
-class Label
-  include Mongoid::Document  
-  field :name
-  
-  belongs_to :active_meta, :class_name => "ActiveMeta"
-  
-  has_many :notes, :class_name => "Note"
-  has_many :histories, :class_name => "History"
-  has_many :attachments, :class_name => "Attachment"
-  has_many :watchers, :class_name => "Watcher"
-  
-  index :name
-  
-end

data/lib/model/mongoid/note.rb

@@ -1,10 +0,0 @@
-class Note
-  include Mongoid::Document
-  belongs_to :label
-
-  field :note, :type => String
-  field :updated_by, :type => Integer
-  field :updated_at, :type => Time 
-  
-  index :updated_at  
-end

data/lib/model/mongoid/watcher.rb

@@ -1,24 +0,0 @@
-class Watcher
-  include Mongoid::Document
-
-  belongs_to :label
-
-  field :owner_id, :type => Integer
-
-  def notify_changes(matched_label, old_value, new_value, model_class, model_id)
-    create_inbox_alert(User.find(owner_id).inbox, matched_label, old_value, new_value, model_class, model_id)
-  end
-
-  def create_inbox_alert(inbox, label, old_value, new_value, model_class, model_id)
-    Message.create! do |message|
-      message.label = label
-      message.model_class = model_class.to_s
-      message.model_id = model_id
-      message.alert_type = :model_value_changed
-      message.old_value = old_value
-      message.new_value = new_value
-      message.inbox_id = inbox.id
-      message.read = false
-    end 
-  end
-end