active_metadata 0.2.0 → 0.2.1

data/lib/active_metadata/base.rb

@@ -1,7 +1,8 @@
 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
     
@@ -29,6 +30,14 @@ module ActiveMetadata
     end
 
     module InstanceMethods
+      
+      def self.included(klass)
+        [:notes,:attachments,:history].each do |item|
+          klass.send(:define_method,"#{item.to_s}_cache_key".to_sym) do |field|
+            "active_metadata/#{item.to_s}/#{self.class}/#{metadata_id}/#{field}/"            
+          end  
+        end          
+      end
 
       def metadata_id
         metadata_id_from = self.class.class_variable_get("@@metadata_id_from")
@@ -46,7 +55,7 @@ module ActiveMetadata
         else
           nil
         end      
-      end  
+      end        
                 
     end # InstanceMethods
   end

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

@@ -8,17 +8,21 @@ module ActiveMetadata::Persistence::ActiveRecord::Attachment
 
     def save_attachment_for(field, file)      
       attachment = Attachment.create! :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
 
     def attachments_for(field)
-      Attachment.all(:conditions => {:document_id => metadata_id,:label => field}, :order => "attach_updated_at DESC")
+      Rails.cache.fetch(attachments_cache_key(field), :expires_in => ActiveMetadata::CONFIG['cache_expires_in'].minutes) do
+        fetch_attachments_for field   
+      end  
     end
 
     def delete_attachment_for(field,id)
       a = Attachment.find(id)
       filename = a.attach.original_filename
       a.destroy      
+      reload_attachments_cache_for field 
       self.send(:send_notification, field, filename, "", :attachment_message)
     end
 
@@ -29,13 +33,25 @@ module ActiveMetadata::Persistence::ActiveRecord::Attachment
       a.updated_by = current_user_id
       a.save                                            
       new_filename = a.attach.original_filename
-      
+
+      reload_attachments_cache_for field       
       self.send(:send_notification, field, old_filename, new_filename, :attachment_message, current_user_id)
     end
 
     def has_attachments_for field
-      Attachment.count(:conditions => {:label => field, :document_id => metadata_id}) == 0 ? false : true
+      attachments_for(field).size == 0 ? false : true
     end
+    
+    private
+    
+    def reload_attachments_cache_for field
+      Rails.cache.write(attachments_cache_key(field),fetch_attachments_for(field), :expires_in => ActiveMetadata::CONFIG['cache_expires_in'].minutes )     
+    end  
+    
+    def fetch_attachments_for field
+      Attachment.all(:conditions => {:document_id => metadata_id,:label => field}, :order => "attach_updated_at DESC")
+    end  
+    
 
   end
 

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

@@ -10,13 +10,27 @@ module ActiveMetadata::Persistence::ActiveRecord::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 
+        invalidate_history_cache_for key.to_s
         self.send(:send_notification, key, value[0], value[1], :history_message,current_user_id) 
       end
     end
 
     def history_for field
-      History.all(:conditions => {:document_id => metadata_id,:label => 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
+      end  
     end
 
+    private
+
+    def invalidate_history_cache_for field
+      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")
+    end  
+
+
   end
 end

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

@@ -7,20 +7,23 @@ 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,: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
 
     def update_note(id, note)
       n = Note.find(id)
       old_value = n.note
-      n.update_attributes! :note => note, :updated_by => current_user_id, :updated_at => Time.now.utc
-      
+      n.update_attributes! :note => note, :updated_by => current_user_id, :updated_at => Time.now.utc     
+      reload_notes_cache_for n.label 
       self.send(:send_notification, n.label, old_value, note, :note_message, current_user_id)
     end
 
     def notes_for(field)
-      Note.all(:conditions => {:label => field, :document_id => metadata_id}, :order => "updated_at DESC" )
+      Rails.cache.fetch(notes_cache_key(field), :expires_in => ActiveMetadata::CONFIG['cache_expires_in'].minutes) do
+        fetch_notes_for field       
+      end    
     end
 
     def note_for(field,id)
@@ -35,11 +38,23 @@ module ActiveMetadata::Persistence::ActiveRecord::Note
       n = Note.find(id)
       old_value = n.note
       n.destroy
+      reload_notes_cache_for field 
       self.send(:send_notification, field, old_value, "", :note_message)
     end
     
-    def has_notes_for field
-      Note.count(:conditions => {:label => field, :document_id => metadata_id}) == 0 ? false : true
+    def has_notes_for field      
+      notes_for(field).size == 0 ? false : true
     end
+    
+    private
+    
+    def reload_notes_cache_for field
+      Rails.cache.write(notes_cache_key(field),fetch_notes_for(field), :expires_in => ActiveMetadata::CONFIG['cache_expires_in'].minutes )     
+    end  
+    
+    def fetch_notes_for field
+      Note.all(:conditions => {:label => field, :document_id => metadata_id}, :order => "updated_at DESC" )              
+    end  
+        
   end
 end

data/lib/active_metadata/version.rb

@@ -1,3 +1,3 @@
 module ActiveMetadata
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/active_metadata_spec.rb

@@ -314,7 +314,6 @@ describe ActiveMetadata do
     it "should update an attachment" do
       @document.save_attachment_for(:name,@attachment)
       att = @document.attachments_for(:name).last
-
       @document.update_attachment_for :name,att.id,@attachment2
       att2 = @document.attachments_for(:name).last
 

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require "logger"
 require 'rspec/core'
 require "sqlite3"
 require "rack/test/uploaded_file"
+require 'active_support/cache'
 
 $: << File.expand_path(File.dirname(__FILE__) + "/../app")
 gemfile = File.expand_path('../Gemfile', __FILE__)
@@ -25,6 +26,7 @@ ENV["ACTIVE_METADATA_ENV"] ||= 'test'
 ActiveRecord::Base.establish_connection YAML.load_file("config/database.yml")[ENV["RAILS_ENV"]]
 ActiveRecord::Base.logger = Logger.new "log/test.log"
 Rails.logger = ActiveRecord::Base.logger  
+RAILS_CACHE = ActiveSupport::Cache::MemoryStore.new
                                                                       
 # loading ruby files
 require "#{File.dirname(__FILE__)}/../lib/engine.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_metadata
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-11 00:00:00.000000000Z
+date: 2011-10-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2156180700 !ruby/object:Gem::Requirement
+  requirement: &2154095180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156180700
+  version_requirements: *2154095180
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2156178420 !ruby/object:Gem::Requirement
+  requirement: &2154154560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156178420
+  version_requirements: *2154154560
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2156154920 !ruby/object:Gem::Requirement
+  requirement: &2154205940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156154920
+  version_requirements: *2154205940
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2156100000 !ruby/object:Gem::Requirement
+  requirement: &2154241320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156100000
+  version_requirements: *2154241320
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2156079680 !ruby/object:Gem::Requirement
+  requirement: &2154310080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156079680
+  version_requirements: *2154310080
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2156049960 !ruby/object:Gem::Requirement
+  requirement: &2154507860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -77,10 +77,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156049960
+  version_requirements: *2154507860
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2156032700 !ruby/object:Gem::Requirement
+  requirement: &2154597420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -88,10 +88,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156032700
+  version_requirements: *2154597420
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &2156029320 !ruby/object:Gem::Requirement
+  requirement: &2154656840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156029320
+  version_requirements: *2154656840
 - !ruby/object:Gem::Dependency
   name: to_xls
-  requirement: &2156024620 !ruby/object:Gem::Requirement
+  requirement: &2154806000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,7 +110,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156024620
+  version_requirements: *2154806000
 description: First implementation will write metadata on mongodb
 email:
 - acampolonghi@gmail.com