active_metadata 0.6.6 → 0.6.7

data/README.md

@@ -4,6 +4,8 @@ I task di rake vengono invocati via il namespace app.
     rake app:ci
 
 ## Issues
-* The install rake task is destructive. Needs to be refactored as a raila generator using Thor actions.
+* The install rake task is destructive. Needs to be refactored as a rails generator using Thor actions.
 * The install task should automount the engine as /active_metadata
+* Migrations should be available to the rails app that mount the engine and not copied.
+* Move the test db creation into before suite rspec callback and remove the migration from the db folder
 

data/lib/active_metadata/persistence/attachment.rb

@@ -8,21 +8,21 @@ module ActiveMetadata::Persistence::Attachment
 
     def save_attachment_for(field, file, starred=false)
       attachment = ActiveMetadata::Attachment.create! :document_class => metadata_class, :document_id => metadata_id, :label => field, :attach => file,
-                                      :starred => starred, :created_by => current_user_id
-      reload_attachments_cache_for field 
+                                                      :starred => starred, :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, order_by="updated_at DESC")
-      # Rails.cache.fetch(attachments_cache_key(field), :expires_in => ActiveMetadata::CONFIG['cache_expires_in'].minutes) do
+      Rails.cache.fetch(attachments_cache_key(field), :expires_in => ActiveMetadata::CONFIG['cache_expires_in'].minutes) do
         fetch_attachments_for field, nil, order_by
-      # end  
+      end
     end
 
     def delete_attachment(id)
       a = ActiveMetadata::Attachment.find(id)
       filename = a.attach.original_filename
-      a.destroy      
+      a.destroy
       reload_attachments_cache_for a.label
       self.send(:send_notification, a.label, filename, "", :attachment_message)
     end
@@ -54,31 +54,31 @@ module ActiveMetadata::Persistence::Attachment
 
     # not cached
     def starred_attachments_for(field)
-      fetch_attachments_for field,true
+      fetch_attachments_for field, true
     end
 
     def star_attachment(id)
       n = ActiveMetadata::Attachment.find(id)
-      update_attachment id,n.attach,true
+      update_attachment id, n.attach, true
     end
 
     def unstar_attachment(id)
       n = ActiveMetadata::Attachment.find(id)
-      update_attachment id,n.attach,false
+      update_attachment id, n.attach, false
     end
 
     private
-    
+
     def reload_attachments_cache_for field
       #Rails.cache.clear
-      Rails.cache.write(attachments_cache_key(field),fetch_attachments_for(field), :expires_in => ActiveMetadata::CONFIG['cache_expires_in'].minutes )     
-    end  
-    
+      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, starred=nil, order_by="updated_at DESC")
-      conditions = {:document_class => metadata_class, :document_id => metadata_id,:label => field}
+      conditions = {:document_class => metadata_class, :document_id => metadata_id, :label => field}
       conditions[:starred] = starred if !starred.nil?
-      ActiveMetadata::Attachment.all(:conditions => conditions , :order => order_by)
-    end  
+      ActiveMetadata::Attachment.all(:conditions => conditions, :order => order_by)
+    end
 
   end
 

data/lib/active_metadata/persistence/history.rb

@@ -16,15 +16,15 @@ module ActiveMetadata::Persistence::History
     end
 
     def history_for field, order="created_at DESC"
-      #Rails.cache.fetch(history_cache_key(field), :expires_in => ActiveMetadata::CONFIG['cache_expires_in'].minutes) do
+      Rails.cache.fetch(history_cache_key(field), :expires_in => ActiveMetadata::CONFIG['cache_expires_in'].minutes) do
         fetch_histories_for field, order
-      #end
+      end
     end
 
     private
 
     def invalidate_history_cache_for field
-      #Rails.cache.delete history_cache_key(field)
+      Rails.cache.delete history_cache_key(field)
     end  
 
     def fetch_histories_for field, order

data/lib/active_metadata/persistence/note.rb

@@ -5,85 +5,85 @@ module ActiveMetadata::Persistence::Note
   end
 
   module InstanceMethods
-    
+
     def create_note_for(field, note, starred=false)
-      ActiveMetadata::Note.create! :document_id => metadata_id, :document_class => metadata_class, :label => field.to_s,:note => note, :created_by => current_user_id, :starred => starred
+      ActiveMetadata::Note.create! :document_id => metadata_id, :document_class => metadata_class, :label => field.to_s, :note => note, :created_by => current_user_id, :starred => starred
 
       reload_notes_cache_for field
-      self.send(:send_notification, field, "", note, :note_message, current_user_id) 
+      self.send(:send_notification, field, "", note, :note_message, current_user_id)
     end
 
     def update_note(id, note, starred=nil)
       n = ActiveMetadata::Note.find(id)
       old_value = n.note
-      attributes =  {:note => note, :updated_by => current_user_id, :updated_at => Time.now.utc}
+      attributes = {:note => note, :updated_by => current_user_id, :updated_at => Time.now.utc}
       #mass assign starred inly if provided
       unless starred.nil?
         attributes[:starred] = starred
       end
       n.update_attributes! attributes
-      reload_notes_cache_for n.label 
+      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, order_by="updated_at DESC")
-      # Rails.cache.fetch(notes_cache_key(field), :expires_in => ActiveMetadata::CONFIG['cache_expires_in'].minutes) do
+      Rails.cache.fetch(notes_cache_key(field), :expires_in => ActiveMetadata::CONFIG['cache_expires_in'].minutes) do
         fetch_notes_for field, nil, order_by
-      # end    
+      end
     end
 
     def find_note_by_id(id)
       ActiveMetadata::Note.find(id)
-    end      
-    
-    def create_notes_for(field,notes)
+    end
+
+    def create_notes_for(field, notes)
       notes.each { |note| create_note_for field, note }
     end
 
     def delete_note(id)
       note = ActiveMetadata::Note.find(id)
       old_value = note.note
-      note.destroy      
+      note.destroy
       reload_notes_cache_for note.label
       self.send(:send_notification, note.label, old_value, "", :note_message)
     end
-    
-    def has_notes_for field      
+
+    def has_notes_for field
       notes_for(field).size == 0 ? false : true
     end
 
-    def count_notes_for field      
+    def count_notes_for field
       notes_for(field).size
     end
 
     # not cached
     def starred_notes_for(field)
-      fetch_notes_for field,true
+      fetch_notes_for field, true
     end
 
     def star_note(id)
       n = ActiveMetadata::Note.find(id)
-      update_note id,n.note,true
+      update_note id, n.note, true
     end
 
     def unstar_note(id)
       n = ActiveMetadata::Note.find(id)
-      update_note id,n.note,false
+      update_note id, n.note, false
     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 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, starred=nil, order_by="updated_at DESC")
       conditions = {:label => field, :document_class => metadata_class, :document_id => metadata_id}
       unless starred.nil?
         conditions[:starred] = starred
       end
       ActiveMetadata::Note.all(:conditions => conditions, :order => order_by)
-    end  
-        
+    end
+
   end
 end

data/lib/active_metadata/streamable.rb

@@ -1,12 +1,12 @@
 module ActiveMetadata::Streamable
 
-  def stream_for field
-    sort_stream(collect_stream_data(field))
+  def stream_for(field, order_by = :created_at)
+    sort_stream(collect_stream_data(field), order_by)
   end
 
   private
-  def sort_stream stream
-    stream.sort{|a,b| b.updated_at <=> a.updated_at}
+  def sort_stream stream, order_by
+    stream.sort{ |a,b| b.send(order_by) <=> a.send(order_by) }
   end
 
   def collect_stream_data field

data/lib/active_metadata/version.rb

@@ -1,3 +1,3 @@
 module ActiveMetadata
-  VERSION = "0.6.6"
+  VERSION = "0.6.7"
 end

data/spec/lib/streamable_spec.rb

@@ -76,7 +76,7 @@ describe ActiveMetadata::Streamable do
         end
 
 
-        it "should sort the stream data by updated_at DESC by default" do
+        it "should sort the stream by updated_at DESC" do
           @document.save_attachment_for(:surname,test_pdf("pdf_test_1"))
           sleep 2.seconds
           @document.create_note_for(:surname, "surname note")
@@ -84,13 +84,28 @@ describe ActiveMetadata::Streamable do
           @document.save_attachment_for(:surname,test_pdf("pdf_test_2"))
 
           stream = @document.send(:collect_stream_data, :surname)
-          res = @document.send(:sort_stream, stream)
+          res = @document.send(:sort_stream, stream, :updated_at)
 
           res[0].attach_file_name.should eq 'pdf_test_2.pdf'
           res[1].note.should eq 'surname note'
           res[2].attach_file_name.should eq 'pdf_test_1.pdf'
         end
 
+        it "should sort the stream by updated_at DESC" do
+          @document.create_note_for(:surname, "surname note")
+          sleep 2.seconds
+          @document.save_attachment_for(:surname,test_pdf("pdf_test_2"))
+          sleep 2.seconds
+          @document.save_attachment_for(:surname,test_pdf("pdf_test_1"))
+
+          stream = @document.send(:collect_stream_data, :surname)
+          res = @document.send(:sort_stream, stream, :created_at)
+
+          res[0].attach_file_name.should eq 'pdf_test_1.pdf'
+          res[1].attach_file_name.should eq 'pdf_test_2.pdf'
+          res[2].note.should eq 'surname note'
+        end
+
       end
 
       describe "stream_for" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_metadata
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-27 00:00:00.000000000Z
+date: 2012-03-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2169860620 !ruby/object:Gem::Requirement
+  requirement: &70220537360720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2169860620
+  version_requirements: *70220537360720
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2169860200 !ruby/object:Gem::Requirement
+  requirement: &70220537360160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169860200
+  version_requirements: *70220537360160
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2169859740 !ruby/object:Gem::Requirement
+  requirement: &70220537359380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169859740
+  version_requirements: *70220537359380
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2169859320 !ruby/object:Gem::Requirement
+  requirement: &70220537358200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169859320
+  version_requirements: *70220537358200
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2169858900 !ruby/object:Gem::Requirement
+  requirement: &70220537357200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169858900
+  version_requirements: *70220537357200
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &2169858480 !ruby/object:Gem::Requirement
+  requirement: &70220537356660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169858480
+  version_requirements: *70220537356660
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2169858060 !ruby/object:Gem::Requirement
+  requirement: &70220537355860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169858060
+  version_requirements: *70220537355860
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &2169857640 !ruby/object:Gem::Requirement
+  requirement: &70220537354840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +99,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2169857640
+  version_requirements: *70220537354840
 description: First implementation will write metadata on mongodb
 email:
 - acampolonghi@gmail.com
@@ -139,10 +139,8 @@ files:
 - config/cucumber.yml
 - config/database.yml
 - config/routes.rb
-- db/development.sqlite3
 - db/migrate/01_create_test_resources.rb
 - db/migrate/02_active_metadata_migrations.rb
-- db/test.sqlite3
 - lib/active_metadata/base.rb
 - lib/active_metadata/engine.rb
 - lib/active_metadata/form_helper.rb
@@ -237,7 +235,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4305454113259867413
+      hash: 4276269757751504892
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -246,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4305454113259867413
+      hash: 4276269757751504892
 requirements: []
 rubyforge_project: active_metadata
 rubygems_version: 1.8.10