active_metadata 0.6.4 → 0.6.5

data/app/models/active_metadata/attachment.rb

@@ -1,6 +1,7 @@
 module ActiveMetadata
 
   class Attachment < ActiveRecord::Base
+    self.table_name = "active_metadata_attachments"
 
     include ::Paperclip
     include ::Paperclip::Glue

data/app/models/active_metadata/history.rb

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

data/app/models/active_metadata/note.rb

@@ -1,4 +1,5 @@
 module ActiveMetadata
   class Note < ActiveRecord::Base
+    self.table_name = "active_metadata_notes"
   end
 end

data/app/models/active_metadata/watcher.rb

@@ -1,5 +1,6 @@
 module ActiveMetadata
   class Watcher < ActiveRecord::Base
+    self.table_name = "active_metadata_watchers"
     attr_reader :notifier
 
   end

data/config/routes.rb

@@ -1,35 +1,37 @@
-ActiveMetadata::Engine.routes.draw do
+Rails.application.routes.draw do
 
+  namespace :active_metadata do
     #stream
-    get ":model_name/:model_id/:field_name/stream" => 'stream#index', :as => 'active_metadata_stream'
+    get ":model_name/:model_id/:field_name/stream" => 'stream#index', :as => 'stream'
 
     #notes
-    match ':model_name/:model_id/:field_name/notes' => 'notes#index', :via => :get, :as => "active_metadata_notes"
-    match ':model_name/:model_id/:field_name/notes' => 'notes#create', :via => :post, :as => "active_metadata_create_note"
-    match ':model_name/:model_id/:field_name/notes/:id' => 'notes#destroy', :via => :delete, :as => "active_metadata_destroy_note"
-    match ':model_name/:model_id/:field_name/notes/:id/edit' => 'notes#edit', :via => :get, :as => "active_metadata_edit_note"
-    match ':model_name/:model_id/:field_name/notes/:id' => 'notes#update', :via => :put, :as => "active_metadata_update_note"
-    match ':model_name/:model_id/:field_name/notes/:id' => 'notes#show', :via => :get, :as => "active_metadata_show_note"
-    match ':model_name/:model_id/:field_name/notes/starred' => 'notes#starred', :via => :get, :as => "active_metadata_starred_notes"
-    match ':model_name/:model_id/:field_name/notes/:id/star' => 'notes#star', :via => :put, :as => "active_metadata_star_note"
-    match ':model_name/:model_id/:field_name/notes/:id/unstar' => 'notes#unstar', :via => :put, :as => "active_metadata_unstar_note"
+    match ':model_name/:model_id/:field_name/notes' => 'notes#index', :via => :get, :as => "notes"
+    match ':model_name/:model_id/:field_name/notes' => 'notes#create', :via => :post, :as => "create_note"
+    match ':model_name/:model_id/:field_name/notes/:id' => 'notes#destroy', :via => :delete, :as => "destroy_note"
+    match ':model_name/:model_id/:field_name/notes/:id/edit' => 'notes#edit', :via => :get, :as => "edit_note"
+    match ':model_name/:model_id/:field_name/notes/:id' => 'notes#update', :via => :put, :as => "update_note"
+    match ':model_name/:model_id/:field_name/notes/:id' => 'notes#show', :via => :get, :as => "show_note"
+    match ':model_name/:model_id/:field_name/notes/starred' => 'notes#starred', :via => :get, :as => "starred_notes"
+    match ':model_name/:model_id/:field_name/notes/:id/star' => 'notes#star', :via => :put, :as => "star_note"
+    match ':model_name/:model_id/:field_name/notes/:id/unstar' => 'notes#unstar', :via => :put, :as => "unstar_note"
 
     #history
-    match ':model_name/:model_id/:field_name/histories' => 'histories#index', :via => :get, :as => "active_metadata_histories"
+    match ':model_name/:model_id/:field_name/histories' => 'histories#index', :via => :get, :as => "histories"
 
     #attachments
-    match ':model_name/:model_id/:field_name/attachments' => 'attachments#index', :via => :get, :as => "active_metadata_attachments"
-    match ':model_name/:model_id/:field_name/attachments' => 'attachments#create', :via => :post, :as => "active_metadata_create_attachment"
-    match ':model_name/:model_id/:field_name/attachments/:id' => 'attachments#destroy', :via => :delete, :as => "active_metadata_destroy_attachment"
-    match ':model_name/:model_id/:field_name/attachments/:id' => 'attachments#update', :via => :put, :as => "active_metadata_update_attachment"
-    match ':model_name/:model_id/:field_name/attachments/starred' => 'attachments#starred', :via => :get, :as => "active_metadata_starred_attachments"
-    match ':model_name/:model_id/:field_name/attachments/:id/star' => 'attachments#star', :via => :put, :as => "active_metadata_star_attachments"
-    match ':model_name/:model_id/:field_name/attachments/:id/unstar' => 'attachments#unstar', :via => :put, :as => "active_metadata_unstar_attachments"
+    match ':model_name/:model_id/:field_name/attachments' => 'attachments#index', :via => :get, :as => "attachments"
+    match ':model_name/:model_id/:field_name/attachments' => 'attachments#create', :via => :post, :as => "create_attachment"
+    match ':model_name/:model_id/:field_name/attachments/:id' => 'attachments#destroy', :via => :delete, :as => "destroy_attachment"
+    match ':model_name/:model_id/:field_name/attachments/:id' => 'attachments#update', :via => :put, :as => "update_attachment"
+    match ':model_name/:model_id/:field_name/attachments/starred' => 'attachments#starred', :via => :get, :as => "starred_attachments"
+    match ':model_name/:model_id/:field_name/attachments/:id/star' => 'attachments#star', :via => :put, :as => "star_attachments"
+    match ':model_name/:model_id/:field_name/attachments/:id/unstar' => 'attachments#unstar', :via => :put, :as => "unstar_attachments"
 
     #alerts
-    get ':model_name/:model_id/:field_name/watchers' => 'watchers#index', :as => "active_metadata_watchers"
-    post ':model_name/:model_id/:field_name/watchers/:user_id' => 'watchers#create', :as => "active_metadata_set_watcher"
-    delete ':model_name/:model_id/:field_name/watchers/:user_id' => 'watchers#destroy', :as => "active_metadata_unset_watcher"
+    get ':model_name/:model_id/:field_name/watchers' => 'watchers#index', :as => "watchers"
+    post ':model_name/:model_id/:field_name/watchers/:user_id' => 'watchers#create', :as => "set_watcher"
+    delete ':model_name/:model_id/:field_name/watchers/:user_id' => 'watchers#destroy', :as => "unset_watcher"
     # TODO missing routes to notice of a read message
+  end
 
 end

data/lib/active_metadata/engine.rb

@@ -1,6 +1,6 @@
 module ActiveMetadata
   class Engine < ::Rails::Engine
-    isolate_namespace ActiveMetadata
+    #isolate_namespace ActiveMetadata
 
     config.generators do |g|
       g.test_framework :rspec

data/lib/active_metadata/persistence/attachment.rb

@@ -70,7 +70,7 @@ module ActiveMetadata::Persistence::Attachment
     private
     
     def reload_attachments_cache_for field
-      Rails.cache.clear
+      #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/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/version.rb

@@ -1,3 +1,3 @@
 module ActiveMetadata
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

data/lib/tasks/active_metadata_tasks.rake

@@ -1,49 +1,49 @@
 require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
 
-begin
-  require 'ci/reporter/rake/rspec'
-  require 'ci/reporter/rake/cucumber'
+namespace :jenkins do :environment
 
-  namespace :ci do
-    ENV['COVERAGE'] = 'on'
-    ENV['RAILS_ENV'] = 'test'
+  ENV['COVERAGE'] = 'on'
+  ENV["RAILS_ENV"] ||= 'test'
 
-    namespace :setup do
-
-      @reports_dir = ENV['CI_REPORTS'] || 'features/reports'
+  task :clean_rspec_reports do
+    rm_rf "spec/reports"
+  end
 
-      task :ci_cucumber_report_cleanup do
-        rm_rf @reports_dir
-      end
+  task :clean_cucumber_reports do
+    rm_rf "features/reports"
+  end
 
-      task :ci_cucumber => :ci_cucumber_report_cleanup do
-        ENV["CUCUMBER_OPTS"] = "--format CI::Reporter::Cucumber --format junit --out #{@reports_dir}"
-      end
+  task :clean_reports => ["jenkins:clean_rspec_reports", "jenkins:clean_cucumber_reports"]
 
-    end
+  task :migrate do
+    sh "bundle exec rake db:migrate RAILS_ENV=#{ENV['RAILS_ENV']} "
+  end
 
-    task "spec" => ["ci:setup:rspec", "^spec"]
-    task "ci_cucumber" => ["ci:setup:ci_cucumber", "^cucumber"]
+  task :rspec => "jenkins:clean_rspec_reports" do
+    sh "bundle exec rspec spec --format CI::Reporter::RSpec"
+  end
 
+  task :cucumber => "jenkins:clean_cucumber_reports" do
+    ENV["CUCUMBER_OPTS"] = "--format CI::Reporter::Cucumber --format junit --out features/reports"
+    Rake::Task["app:cucumber"].invoke
   end
 
-  task "ci" => ["db:migrate", "ci:spec", "ci:ci_cucumber"]
-rescue LoadError
-  # ci_reporter isn't here for some reason
 end
 
+task :jenkins => ["jenkins:clean_reports", "jenkins:migrate", "jenkins:rspec", "jenkins:cucumber"]
+
 namespace :active_metadata do
 
   desc "Install the active_metadata gem requirements file ***TASK IS ON ALPHA STAGE***"
   task :install do
 
-    FileUtils.cp File.expand_path('../../../config/active_metadata.yml',__FILE__), File.expand_path('config/')
+    FileUtils.cp File.expand_path('../../../config/active_metadata.yml', __FILE__), File.expand_path('config/')
     puts "Installed active_metadata.yml"
 
     puts "Copying migrations"
     ts = Time.now.utc.strftime('%Y%m%d%H%M%S')
-    FileUtils.cp File.expand_path('../../../db/migrate/02_active_metadata_migrations.rb',__FILE__), File.expand_path("db/migrate/#{ts}_active_metadata_migrations.rb")
+    FileUtils.cp File.expand_path('../../../db/migrate/02_active_metadata_migrations.rb', __FILE__), File.expand_path("db/migrate/#{ts}_active_metadata_migrations.rb")
     puts "run rake db:migrate to complete the gem installation"
 
   end

data/spec/routing/active_metadata/stream_controller_routing_spec.rb

@@ -4,10 +4,10 @@ describe ActiveMetadata::StreamController do
 
   describe "routing" do
 
-    before(:each) { @routes = ActiveMetadata::Engine.routes }
+    before(:each) { @routes = Rails.application.routes }
 
     it "recognizes and generate :model_name/:model_id/:field_name/stream" do
-      { :get => "/model/12/field/stream" }.should route_to(:controller => 'active_metadata/stream', :action => 'index', :model_name => 'model', :model_id => '12',
+      { :get => "/active_metadata/model/12/field/stream" }.should route_to(:controller => 'active_metadata/stream', :action => 'index', :model_name => 'model', :model_id => '12',
                                                            :field_name =>'field')
     end
 

data/spec/spec_helper.rb

@@ -3,10 +3,11 @@ require 'rubygems'
 
 ENV["RAILS_ENV"] ||= 'test'
 
+require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+
 require 'rails/all'
 require 'active_metadata'
 require 'rack/test/uploaded_file'
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 
 ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../')
 Dir[File.join(ENGINE_RAILS_ROOT, "spec/support/**/*.rb")].each {|f| require f }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_metadata
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-02-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2168694320 !ruby/object:Gem::Requirement
+  requirement: &70187306435640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2168694320
+  version_requirements: *70187306435640
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2168693900 !ruby/object:Gem::Requirement
+  requirement: &70187306435220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168693900
+  version_requirements: *70187306435220
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2168693440 !ruby/object:Gem::Requirement
+  requirement: &70187306434760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168693440
+  version_requirements: *70187306434760
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2168693020 !ruby/object:Gem::Requirement
+  requirement: &70187306434340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168693020
+  version_requirements: *70187306434340
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2168692600 !ruby/object:Gem::Requirement
+  requirement: &70187306433920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168692600
+  version_requirements: *70187306433920
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &2168692180 !ruby/object:Gem::Requirement
+  requirement: &70187306433500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168692180
+  version_requirements: *70187306433500
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2168691760 !ruby/object:Gem::Requirement
+  requirement: &70187306433080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168691760
+  version_requirements: *70187306433080
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &2168691340 !ruby/object:Gem::Requirement
+  requirement: &70187306432660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +99,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168691340
+  version_requirements: *70187306432660
 description: First implementation will write metadata on mongodb
 email:
 - acampolonghi@gmail.com
@@ -110,13 +110,11 @@ extra_rdoc_files: []
 files:
 - app/assets/javascripts/active_metadata/application.js
 - app/assets/stylesheets/active_metadata/application.css
-- app/controllers/active_metadata/application_controller.rb
 - app/controllers/active_metadata/attachments_controller.rb
 - app/controllers/active_metadata/histories_controller.rb
 - app/controllers/active_metadata/notes_controller.rb
 - app/controllers/active_metadata/stream_controller.rb
 - app/controllers/active_metadata/watchers_controller.rb
-- app/helpers/active_metadata/application_helper.rb
 - app/helpers/active_metadata/stream_helper.rb
 - app/models/active_metadata/attachment.rb
 - app/models/active_metadata/history.rb
@@ -141,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
@@ -199,6 +195,7 @@ 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
@@ -238,7 +235,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1826999645130259224
+      hash: -1914788532259041381
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -247,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1826999645130259224
+      hash: -1914788532259041381
 requirements: []
 rubyforge_project: active_metadata
 rubygems_version: 1.8.10
@@ -293,6 +290,7 @@ 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

data/app/controllers/active_metadata/application_controller.rb

@@ -1,4 +0,0 @@
-module ActiveMetadata
-  class ApplicationController < ActionController::Base
-  end
-end

data/app/helpers/active_metadata/application_helper.rb

@@ -1,13 +0,0 @@
-module ActiveMetadata
-  module ApplicationHelper
-
-    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