active_metadata 0.7.9 → 0.8.0

data/app/models/active_metadata/attachment.rb

@@ -6,19 +6,19 @@ module ActiveMetadata
     include ::Paperclip::Glue
 
     has_attached_file :attach,
-                      :path => "#{ActiveMetadata::CONFIG['attachment_base_path']}/:document_class/:document_id/:label/:id/:basename.:extension",
-                      :url => "#{ActiveMetadata::CONFIG['attachment_base_url']}/:document_class/:document_id/:label/:id/"
+                      :path => "#{ActiveMetadata::CONFIG['attachment_base_path']}/:model_class/:model_id/:label/:id/:basename.:extension",
+                      :url => "#{ActiveMetadata::CONFIG['attachment_base_url']}/:model_class/:model_id/:label/:id/"
 
-    Paperclip.interpolates :document_id do |attachment, style|
-      attachment.instance.document_id
+    Paperclip.interpolates :model_id do |attachment, style|
+      attachment.instance.model_id
     end
 
     Paperclip.interpolates :label do |attachment, style|
       attachment.instance.label
     end
 
-    Paperclip.interpolates :document_class do |attachment, style|
-      attachment.instance.document_class
+    Paperclip.interpolates :model_class do |attachment, style|
+      attachment.instance.model_class
     end
     class << self
 

data/app/models/active_metadata/history.rb

@@ -1,5 +1,6 @@
 module ActiveMetadata
   class History < ActiveRecord::Base
     self.table_name = "active_metadata_histories"
+    include ActiveMetadata::ValueFormatter
   end
 end

data/app/views/active_metadata/attachments/_attachment.html.erb

@@ -3,5 +3,5 @@
     <%= "Path: #{attachment.attach.path}"%>
     <%= "Size: #{attachment.attach.size}"%>
     <%= "Updated at: #{attachment.attach.instance_read(:updated_at)}"%> <br/>
-    <%= link_to "Elimina", active_metadata_destroy_attachment_path(attachment.document_class, attachment.document_id,attachment.label,attachment.id), :method => :delete, :remote => true %>
+    <%= link_to "Elimina", active_metadata_destroy_attachment_path(attachment.model_class, attachment.model_id,attachment.label,attachment.id), :method => :delete, :remote => true %>
 </li>

data/db/migrate/01_active_metadata_migrations.rb

@@ -4,8 +4,8 @@ class ActiveMetadataMigrations < ActiveRecord::Migration
     create_table :active_metadata_notes do |t|
       t.text :note
       t.string :label
-      t.string :document_class
-      t.integer :document_id
+      t.string :model_class
+      t.integer :model_id
       t.integer :created_by
       t.integer :updated_by
       t.boolean :starred
@@ -13,29 +13,29 @@ class ActiveMetadataMigrations < ActiveRecord::Migration
       t.timestamps
     end
 
-    add_index :active_metadata_notes, :document_id
+    add_index :active_metadata_notes, :model_id
     add_index :active_metadata_notes, :label
     add_index :active_metadata_notes, :updated_at
-    add_index :active_metadata_notes, :document_class
+    add_index :active_metadata_notes, :model_class
 
     create_table :active_metadata_histories do |t|
       t.text :value
       t.string :label
-      t.string :document_class
-      t.integer :document_id
+      t.string :model_class
+      t.integer :model_id
       t.integer :created_by
       t.timestamps
     end
 
-    add_index :active_metadata_histories, :document_id
+    add_index :active_metadata_histories, :model_id
     add_index :active_metadata_histories, :label
     add_index :active_metadata_histories, :created_at
-    add_index :active_metadata_histories, :document_class
+    add_index :active_metadata_histories, :model_class
 
     create_table :active_metadata_attachments do |t|
       t.string :label
-      t.integer :document_id
-      t.string :document_class
+      t.integer :model_id
+      t.string :model_class
       t.integer :created_by
       t.integer :updated_by
       t.integer :counter
@@ -48,20 +48,20 @@ class ActiveMetadataMigrations < ActiveRecord::Migration
       t.timestamps
     end
 
-    add_index :active_metadata_attachments, :document_id
+    add_index :active_metadata_attachments, :model_id
     add_index :active_metadata_attachments, :label
     add_index :active_metadata_attachments, :attach_updated_at
-    add_index :active_metadata_attachments, :document_class
+    add_index :active_metadata_attachments, :model_class
 
     create_table :active_metadata_watchers do |t|
       t.integer :owner_id
       t.string :label
-      t.string :document_class
-      t.integer :document_id
+      t.string :model_class
+      t.integer :model_id
       t.timestamps
     end
 
-    add_index :active_metadata_watchers, :document_id
+    add_index :active_metadata_watchers, :model_id
     add_index :active_metadata_watchers, :label
     add_index :active_metadata_watchers, :owner_id
     add_index :active_metadata_watchers, :created_at

data/lib/active_metadata/base.rb

@@ -14,6 +14,7 @@ module ActiveMetadata
     require 'active_metadata/stream'
     require 'paperclip'
     require 'active_metadata/persistence/persistence'
+    require 'active_metadata/value_formatter'
 
     def self.included(klass)
       klass.class_eval do

data/lib/active_metadata/persistence/attachment.rb

@@ -8,8 +8,8 @@ module ActiveMetadata::Persistence::Attachment
 
     def save_attachment_for(field, file, starred=false, group=nil)
       attachment = ActiveMetadata::Attachment.create!(
-              :document_class => metadata_class,
-              :document_id => metadata_id,
+              :model_class => metadata_class,
+              :model_id => metadata_id,
               :label => field,
               :attach => file,
               :starred => !!starred,
@@ -100,7 +100,7 @@ module ActiveMetadata::Persistence::Attachment
     end
 
     def fetch_attachments_for(field, starred=nil, order_by="updated_at DESC")
-      conditions = {:document_class => metadata_class, :document_id => metadata_id}
+      conditions = {:model_class => metadata_class, :model_id => metadata_id}
       conditions[:label] = field unless field.nil?
       conditions[:starred] = starred unless starred.nil?
       ActiveMetadata::Attachment.all(:conditions => conditions, :order => order_by)

data/lib/active_metadata/persistence/history.rb

@@ -10,7 +10,7 @@ module ActiveMetadata::Persistence::History
       return if ActiveMetadata.skip_history?
       self.changes.each do |key, value|
         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
+        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)
       end
@@ -29,7 +29,7 @@ module ActiveMetadata::Persistence::History
     end  
 
     def fetch_histories_for field, order
-      ActiveMetadata::History.all(:conditions => {:document_class => metadata_class, :document_id => metadata_id,:label => field}, :order => order)
+      ActiveMetadata::History.all(:conditions => {:model_class => metadata_class, :model_id => metadata_id,:label => field}, :order => order)
     end  
 
 

data/lib/active_metadata/persistence/note.rb

@@ -8,8 +8,8 @@ module ActiveMetadata::Persistence::Note
 
     def create_note_for(field, note, starred=nil, group=nil)
       ActiveMetadata::Note.create!(
-          :document_id => metadata_id,
-          :document_class => metadata_class,
+          :model_id => metadata_id,
+          :model_class => metadata_class,
           :label => field.to_s,
           :note => note,
           :created_by => current_user_id,
@@ -108,7 +108,7 @@ module ActiveMetadata::Persistence::Note
     end
 
     def fetch_notes_for(field, starred=nil, order_by="updated_at DESC")
-      conditions = {:document_class => metadata_class, :document_id => metadata_id}
+      conditions = {:model_class => metadata_class, :model_id => metadata_id}
       conditions[:label] = field  unless field.nil?
       conditions[:starred] = starred  unless starred.nil?
       ActiveMetadata::Note.all(:conditions => conditions, :order => order_by)

data/lib/active_metadata/persistence/watcher.rb

@@ -7,7 +7,7 @@ module ActiveMetadata::Persistence::Watcher
   module InstanceMethods
     def create_watcher_for(field, owner)
       raise RuntimeError, "The object id MUST be valued" unless self.id
-      ActiveMetadata::Watcher.create! :document_class => metadata_class, :document_id => metadata_id, :label => field, :owner_id => owner.id
+      ActiveMetadata::Watcher.create! :model_class => metadata_class, :model_id => metadata_id, :label => field, :owner_id => owner.id
     end                      
 
     # return all the watches related to a passed field.
@@ -15,19 +15,19 @@ module ActiveMetadata::Persistence::Watcher
     # matches are returned grouped by owner and contains records that define or not a particular model instance watching
     def watchers_for(field)
       ActiveMetadata::Watcher.select("distinct(owner_id)").where(
-          "document_class = :document_class AND label = :label AND (document_id = :document_id OR document_id IS NULL)",
-          { :document_class => metadata_class, :label => field, :document_id => metadata_id }
+          "model_class = :model_class AND label = :label AND (model_id = :model_id OR model_id IS NULL)",
+          { :model_class => metadata_class, :label => field, :model_id => metadata_id }
           )
     end
 
     def delete_watcher_for(field, owner)
-      ActiveMetadata::Watcher.where(:document_id => metadata_id, :label => field, :owner_id => owner.id).each do |watcher|
+      ActiveMetadata::Watcher.where(:model_id => metadata_id, :label => field, :owner_id => owner.id).each do |watcher|
         watcher.destroy
       end   
     end    
     
     def is_watched_by(field,owner)
-      ActiveMetadata::Watcher.where(:document_class => metadata_class, :document_id => metadata_id, :label => field, :owner_id => owner.id).empty? ? false : true
+      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)   

data/lib/active_metadata/value_formatter.rb

@@ -0,0 +1,12 @@
+module ActiveMetadata::ValueFormatter
+  extend ActiveSupport::Concern
+
+  def value
+    instance = model_class.constantize.new
+    return read_attribute(:value).to_s unless instance.respond_to?(label.to_sym)
+    instance.send :write_attribute, label.to_sym, read_attribute(:value)
+    instance.send label
+  end
+
+end
+

data/lib/active_metadata/version.rb

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

data/spec/dummy/db/schema.rb

@@ -15,8 +15,8 @@ ActiveRecord::Schema.define(:version => 1) do
 
   create_table "active_metadata_attachments", :force => true do |t|
     t.string   "label"
-    t.integer  "document_id"
-    t.string   "document_class"
+    t.integer  "model_id"
+    t.string   "model_class"
     t.integer  "created_by"
     t.integer  "updated_by"
     t.integer  "counter"
@@ -31,30 +31,30 @@ ActiveRecord::Schema.define(:version => 1) do
   end
 
   add_index "active_metadata_attachments", ["attach_updated_at"], :name => "index_active_metadata_attachments_on_attach_updated_at"
-  add_index "active_metadata_attachments", ["document_class"], :name => "index_active_metadata_attachments_on_document_class"
-  add_index "active_metadata_attachments", ["document_id"], :name => "index_active_metadata_attachments_on_document_id"
+  add_index "active_metadata_attachments", ["model_class"], :name => "index_active_metadata_attachments_on_model_class"
+  add_index "active_metadata_attachments", ["model_id"], :name => "index_active_metadata_attachments_on_model_id"
   add_index "active_metadata_attachments", ["label"], :name => "index_active_metadata_attachments_on_label"
 
   create_table "active_metadata_histories", :force => true do |t|
     t.text     "value"
     t.string   "label"
-    t.string   "document_class"
-    t.integer  "document_id"
+    t.string   "model_class"
+    t.integer  "model_id"
     t.integer  "created_by"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
   end
 
   add_index "active_metadata_histories", ["created_at"], :name => "index_active_metadata_histories_on_created_at"
-  add_index "active_metadata_histories", ["document_class"], :name => "index_active_metadata_histories_on_document_class"
-  add_index "active_metadata_histories", ["document_id"], :name => "index_active_metadata_histories_on_document_id"
   add_index "active_metadata_histories", ["label"], :name => "index_active_metadata_histories_on_label"
+  add_index "active_metadata_histories", ["model_class"], :name => "index_active_metadata_histories_on_model_class"
+  add_index "active_metadata_histories", ["model_id"], :name => "index_active_metadata_histories_on_model_id"
 
   create_table "active_metadata_notes", :force => true do |t|
     t.text     "note"
     t.string   "label"
-    t.string   "document_class"
-    t.integer  "document_id"
+    t.string   "model_class"
+    t.integer  "model_id"
     t.integer  "created_by"
     t.integer  "updated_by"
     t.boolean  "starred"
@@ -63,23 +63,56 @@ ActiveRecord::Schema.define(:version => 1) do
     t.datetime "updated_at",     :null => false
   end
 
-  add_index "active_metadata_notes", ["document_class"], :name => "index_active_metadata_notes_on_document_class"
-  add_index "active_metadata_notes", ["document_id"], :name => "index_active_metadata_notes_on_document_id"
+  add_index "active_metadata_notes", ["model_class"], :name => "index_active_metadata_notes_on_model_class"
+  add_index "active_metadata_notes", ["model_id"], :name => "index_active_metadata_notes_on_model_id"
   add_index "active_metadata_notes", ["label"], :name => "index_active_metadata_notes_on_label"
   add_index "active_metadata_notes", ["updated_at"], :name => "index_active_metadata_notes_on_updated_at"
 
   create_table "active_metadata_watchers", :force => true do |t|
     t.integer  "owner_id"
     t.string   "label"
-    t.string   "document_class"
-    t.integer  "document_id"
+    t.string   "model_class"
+    t.integer  "model_id"
     t.datetime "created_at",     :null => false
     t.datetime "updated_at",     :null => false
   end
 
   add_index "active_metadata_watchers", ["created_at"], :name => "index_active_metadata_watchers_on_created_at"
-  add_index "active_metadata_watchers", ["document_id"], :name => "index_active_metadata_watchers_on_document_id"
+  add_index "active_metadata_watchers", ["model_id"], :name => "index_active_metadata_watchers_on_model_id"
   add_index "active_metadata_watchers", ["label"], :name => "index_active_metadata_watchers_on_label"
   add_index "active_metadata_watchers", ["owner_id"], :name => "index_active_metadata_watchers_on_owner_id"
 
+  create_table "chapters", :force => true do |t|
+    t.string   "title"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+  create_table "documents", :force => true do |t|
+    t.string   "name"
+    t.string   "surname"
+    t.boolean  "keep_alive"
+    t.datetime "date"
+    t.decimal  "price",      :precision => 6, :scale => 2
+    t.decimal  "average",    :precision => 6, :scale => 3
+    t.datetime "created_at",                               :null => false
+    t.datetime "updated_at",                               :null => false
+  end
+
+  create_table "sections", :force => true do |t|
+    t.string   "title"
+    t.integer  "model_id"
+    t.integer  "chapter_id"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "users", :force => true do |t|
+    t.string   "email"
+    t.string   "firstname"
+    t.string   "lastname"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
 end

data/spec/lib/attachments_spec.rb

@@ -25,7 +25,7 @@ describe ActiveMetadata do
 
       it "should verify that the attachment metadata id refers to the correct self id" do
         @document.save_attachment_for(:name, @attachment)
-        @document.attachments_for(:name).last.document_id.should eq @document.id
+        @document.attachments_for(:name).last.model_id.should eq @document.id
       end
 
       it "should verify that the attachment file name is correctly saved" do
@@ -51,7 +51,7 @@ describe ActiveMetadata do
       it "should verify that the document has been saved in the correct position on filesystem" do
         @document.save_attachment_for(:name, @attachment)
         att = @document.attachments_for(:name).first
-        expected_path = File.expand_path "#{ActiveMetadata::CONFIG['attachment_base_path']}/#{att.document_class}/#{@document.id}/#{:name.to_s}/#{att.id}/#{@attachment.original_filename}"
+        expected_path = File.expand_path "#{ActiveMetadata::CONFIG['attachment_base_path']}/#{att.model_class}/#{@document.id}/#{:name.to_s}/#{att.id}/#{@attachment.original_filename}"
         File.exists?(expected_path).should be_true
       end
 

data/spec/lib/history_spec.rb

@@ -19,7 +19,7 @@ describe ActiveMetadata do
     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)
+      @document.history_for(:name)[0].model_class.should eq(@document.class.to_s)
     end
 
     it "should save the craeted_at datetime anytime an history entry is created" do
@@ -46,10 +46,10 @@ describe ActiveMetadata do
 
       # expectations
       @document.history_for(:name).count.should eq(1)
-      @document.history_for(:name).last.document_id.should eq @document.id
+      @document.history_for(:name).last.model_id.should eq @document.id
 
       @section.history_for(:title).count.should eq(1)
-      @section.history_for(:title).last.document_id.should eq @document.id
+      @section.history_for(:title).last.model_id.should eq @document.id
     end
 
     it "should verify that history_for sort by created_at descending" do

data/spec/lib/notes_spec.rb

@@ -24,7 +24,7 @@ describe ActiveMetadata do
 
       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)
+        @document.notes_for(:name).last.model_class.should eq(@document.class.to_s)
       end
 
       it "should verify the created_by of a note created" do
@@ -101,8 +101,8 @@ describe ActiveMetadata do
         @section.create_note_for(:title, "Very important note for section!")
 
         # expectations
-        @document.notes_for(:name).last.document_id.should eq @document.id
-        @section.notes_for(:title).last.document_id.should eq @document.id
+        @document.notes_for(:name).last.model_id.should eq @document.id
+        @section.notes_for(:title).last.model_id.should eq @document.id
       end
 
       it "should delete a note id" do

data/spec/lib/watchers_spec.rb

@@ -65,7 +65,7 @@ describe ActiveMetadata 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.create_watcher_for(:name, @user)
-        ActiveMetadata::Watcher.create! :document_class => "Document", :label => :name, :owner_id => @another_user.id
+        ActiveMetadata::Watcher.create! :model_class => "Document", :label => :name, :owner_id => @another_user.id
       end
 
       it "should return all the records that match model/field" do
@@ -75,7 +75,7 @@ describe ActiveMetadata do
 
       it "should group result by owner" do
         @document.create_watcher_for(:name, @another_user)
-        ActiveMetadata::Watcher.create! :document_class => "Document", :label => :name, :owner_id => @user.id
+        ActiveMetadata::Watcher.create! :model_class => "Document", :label => :name, :owner_id => @user.id
         docs = @document.watchers_for(:name)
         docs.count.should eq 2
       end

data/spec/models/history_spec.rb

@@ -0,0 +1,30 @@
+require "spec_helper"
+
+
+describe ActiveMetadata::History do
+
+  describe "#value" do
+
+    before do
+      @h1 = ActiveMetadata::History.create! model_class: "Document", label: "name", value: "nome"
+      @h2 = ActiveMetadata::History.create! model_class: "Document", label: "keep_alive", value: true
+      @h3 = ActiveMetadata::History.create! model_class: "Document", label: "date", value: Time.now
+      @h4 = ActiveMetadata::History.create! model_class: "Document", label: "price", value: 10.12
+      @h5 = ActiveMetadata::History.create! model_class: "Document", label: "average", value: 10.123
+      @h6 = ActiveMetadata::History.create! model_class: "Document", label: "does_not_exists", value: "pippo"
+      @h7 = ActiveMetadata::History.create! model_class: "Document", label: "keep_alive", value: nil
+    end
+
+    specify{ @h1.value.should eq "nome" }
+    specify{ @h2.value.should eq true }
+    specify{ @h3.value.should be_kind_of ActiveSupport::TimeWithZone }
+    specify{ @h4.value.should be_kind_of BigDecimal }
+    specify{ @h4.value.to_s.should eq "10.12" }
+    specify{ @h5.value.should be_kind_of BigDecimal }
+    specify{ @h5.value.to_s.should eq "10.123" }
+    specify{ @h6.value.to_s.should eq "pippo" }
+    specify{ @h7.value.should eq nil }
+
+  end
+  
+end

data/spec/spec_helper.rb

@@ -48,7 +48,7 @@ RSpec.configure do |config|
   end
 
   config.after(:suite) do
-    TestDb.down
+    #TestDb.down
   end
 
 end

data/spec/support/migrations.rb

@@ -5,6 +5,9 @@ module TestDb
       t.string :name
       t.string :surname
       t.boolean :keep_alive
+      t.datetime :date
+      t.decimal :price, precision: 6, scale: 2
+      t.decimal :average, precision: 6, scale: 3
       t.timestamps
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_metadata
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000 Z
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -176,6 +176,7 @@ files:
 - lib/active_metadata/persistence/persistence.rb
 - lib/active_metadata/persistence/watcher.rb
 - lib/active_metadata/stream.rb
+- lib/active_metadata/value_formatter.rb
 - lib/active_metadata/version.rb
 - lib/active_metadata.rb
 - lib/tasks/active_metadata_tasks.rake
@@ -235,6 +236,7 @@ files:
 - spec/lib/notes_spec.rb
 - spec/lib/stream_spec.rb
 - spec/lib/watchers_spec.rb
+- spec/models/history_spec.rb
 - spec/routing/active_metadata/stream_controller_routing_spec.rb
 - spec/spec_helper.rb
 - spec/support/chapter.rb
@@ -261,7 +263,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3903981385835603000
+      hash: -3806434619195871137
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -270,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3903981385835603000
+      hash: -3806434619195871137
 requirements: []
 rubyforge_project: active_metadata
 rubygems_version: 1.8.19
@@ -331,6 +333,7 @@ test_files:
 - spec/lib/notes_spec.rb
 - spec/lib/stream_spec.rb
 - spec/lib/watchers_spec.rb
+- spec/models/history_spec.rb
 - spec/routing/active_metadata/stream_controller_routing_spec.rb
 - spec/spec_helper.rb
 - spec/support/chapter.rb