active_metadata 0.6.2 → 0.6.3

data/app/helpers/active_metadata/application_helper.rb

@@ -1,4 +1,16 @@
 module ActiveMetadata
   module ApplicationHelper
+	  def markdown(text)
+	    Redcarpet.new(text).to_html.html_safe
+	  end
+
+    def stream_partial_path element
+      class_name_downcase = clean_class_name element.class.to_s.downcase
+      "active_metadata/#{class_name_downcase.pluralize}/#{class_name_downcase}"
+    end
+
+    def clean_class_name name
+      name.split('::').last || nil
+    end
   end
 end

data/app/views/active_metadata/stream/index.html.erb

@@ -1,3 +1 @@
-<ul>
-    <%= render :partial => 'element', :collection => @stream %>
-</ul>
+<%= render :partial => 'element', :collection => @stream %>

data/lib/active_metadata/persistence/attachment.rb

@@ -14,9 +14,9 @@ module ActiveMetadata::Persistence::Attachment
     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)
@@ -44,6 +44,10 @@ module ActiveMetadata::Persistence::Attachment
       attachments_for(field).size == 0 ? false : true
     end
 
+    def count_attachments_for field
+      attachments_for(field).size
+    end
+
     def find_attachment_by_id(id)
       ActiveMetadata::Attachment.find(id)
     end
@@ -66,6 +70,7 @@ module ActiveMetadata::Persistence::Attachment
     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  
     

data/lib/active_metadata/persistence/note.rb

@@ -8,6 +8,7 @@ module ActiveMetadata::Persistence::Note
     
     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
+
       reload_notes_cache_for field
       self.send(:send_notification, field, "", note, :note_message, current_user_id) 
     end
@@ -26,9 +27,9 @@ module ActiveMetadata::Persistence::Note
     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)
@@ -40,17 +41,21 @@ module ActiveMetadata::Persistence::Note
     end
 
     def delete_note(id)
-      n = ActiveMetadata::Note.find(id)
-      old_value = n.note
-      n.destroy
-      reload_notes_cache_for n.label
-      self.send(:send_notification, n.label, old_value, "", :note_message)
+      note = ActiveMetadata::Note.find(id)
+      old_value = note.note
+      note.destroy      
+      reload_notes_cache_for note.label
+      self.send(:send_notification, note.label, old_value, "", :note_message)
     end
     
     def has_notes_for field      
       notes_for(field).size == 0 ? false : true
     end
 
+    def count_notes_for field      
+      notes_for(field).size
+    end
+
     # not cached
     def starred_notes_for(field)
       fetch_notes_for field,true
@@ -68,7 +73,7 @@ module ActiveMetadata::Persistence::Note
 
     private
     
-    def reload_notes_cache_for field
+    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  
     

data/lib/active_metadata/version.rb

@@ -1,3 +1,3 @@
 module ActiveMetadata
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/lib/tasks/active_metadata_tasks.rake

@@ -5,42 +5,34 @@ begin
   require 'ci/reporter/rake/rspec'
   require 'ci/reporter/rake/cucumber'
 
-  namespace :ci do :environment
-
-    ENV["RAILS_ENV"] ||= 'test'
+  namespace :ci do
+    ENV['COVERAGE'] = 'on'
+    ENV['RAILS_ENV'] = 'test'
 
     namespace :setup do
 
       @reports_dir = ENV['CI_REPORTS'] || 'features/reports'
 
-      task :cucumber_report_cleanup do
+      task :ci_cucumber_report_cleanup do
         rm_rf @reports_dir
       end
 
-      task :cucumber => :cucumber_report_cleanup do
-        extra_opts = "--format junit --out #{@reports_dir}"
-        ENV["CUCUMBER_OPTS"] = "features/ #{ENV['CUCUMBER_OPTS']} #{extra_opts}"
+      task :ci_cucumber => :ci_cucumber_report_cleanup do
+        ENV["CUCUMBER_OPTS"] = "--format CI::Reporter::Cucumber --format junit --out #{@reports_dir}"
       end
 
     end
 
-    task "spec" => ["rspec_run"]
-    task "cucumber" => ["cucumber_run"]
+    task "spec" => ["ci:setup:rspec", "^spec"]
+    task "ci_cucumber" => ["ci:setup:ci_cucumber", "^cucumber"]
 
   end
 
-  task "ci" => ["db:migrate", "ci:spec", "ci:cucumber"]
+  task "ci" => ["db:migrate", "ci:spec", "ci:ci_cucumber"]
 rescue LoadError
   # ci_reporter isn't here for some reason
 end
 
-RSpec::Core::RakeTask.new(:rspec_run => ["ci:setup:rspec"]) do |t|
-  t.pattern = '**/*_spec.rb'
-end
-
-Cucumber::Rake::Task.new(:cucumber_run => ["ci:setup:cucumber"])
-
-
 namespace :active_metadata do
 
   desc "Install the active_metadata gem requirements file ***TASK IS ON ALPHA STAGE***"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_metadata
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-02 00:00:00.000000000Z
+date: 2012-02-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70358552850060 !ruby/object:Gem::Requirement
+  requirement: &2164673140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70358552850060
+  version_requirements: *2164673140
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70358552849640 !ruby/object:Gem::Requirement
+  requirement: &2164672040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70358552849640
+  version_requirements: *2164672040
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70358552849180 !ruby/object:Gem::Requirement
+  requirement: &2164670880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70358552849180
+  version_requirements: *2164670880
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70358552848760 !ruby/object:Gem::Requirement
+  requirement: &2164668140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70358552848760
+  version_requirements: *2164668140
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70358552848340 !ruby/object:Gem::Requirement
+  requirement: &2164666740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70358552848340
+  version_requirements: *2164666740
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &70358552847920 !ruby/object:Gem::Requirement
+  requirement: &2164665160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70358552847920
+  version_requirements: *2164665160
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &70358552847500 !ruby/object:Gem::Requirement
+  requirement: &2164663280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70358552847500
+  version_requirements: *2164663280
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70358552847080 !ruby/object:Gem::Requirement
+  requirement: &2164662440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +99,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70358552847080
+  version_requirements: *2164662440
 description: First implementation will write metadata on mongodb
 email:
 - acampolonghi@gmail.com
@@ -141,8 +141,10 @@ 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
@@ -197,7 +199,6 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/log/.gitkeep
 - spec/dummy/public/404.html
@@ -237,7 +238,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 258103541188816538
+      hash: 3624871379951622255
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -246,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 258103541188816538
+      hash: 3624871379951622255
 requirements: []
 rubyforge_project: active_metadata
 rubygems_version: 1.8.10
@@ -292,7 +293,6 @@ test_files:
 - spec/dummy/config/routes.rb
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/log/.gitkeep
 - spec/dummy/public/404.html