active_metadata 0.7.4 → 0.7.5

data/features/support/env.rb

@@ -3,6 +3,25 @@ require File.expand_path("../../../spec/dummy/config/environment.rb",  __FILE__)
 ENV["RAILS_ROOT"] ||= File.dirname(__FILE__) + "../../../spec/dummy"
 
 require 'cucumber/rails'
+require_relative "../../spec/support/migrations"
 
 ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../../')
-Dir[File.join(ENGINE_RAILS_ROOT, "spec/support/**/*.rb")].each {|f| require f }
+
+
+Before do
+  TestDb.up
+  Dir[File.join(ENGINE_RAILS_ROOT, "spec/support/**/*.rb")].each {|f| require f }
+end
+
+After do
+  [Document, Section, Chapter, User, ActiveMetadata::Note,
+   ActiveMetadata::Watcher, ActiveMetadata::Attachment, ActiveMetadata::History].each do |i|
+    i.delete_all
+  end
+  FileUtils.remove_dir File.expand_path('public/system/') if Dir.exist?(File.expand_path('public/system/'))
+  Rails.cache.clear
+end
+
+at_exit do
+  TestDb.down
+end

data/lib/active_metadata/base.rb

@@ -3,6 +3,10 @@ module ActiveMetadata
   CONFIG = File.exists?('config/active_metadata.yml') ? YAML.load_file('config/active_metadata.yml')[Rails.env] : {}
   CONFIG['cache_expires_in'] ||= 60
 
+  def self.skip_history?
+    false
+  end
+
   ## Define ModelMethods
   module Base
 
@@ -20,12 +24,16 @@ module ActiveMetadata
     module Config
 
       def acts_as_metadata *args
+        options = args.extract_options!
+        options[:ancestors] ||= []
+        options[:persists_ancestor] ||= false
+
         before_update :manage_concurrency
         after_save :save_history
         attr_accessor :conflicts
         attr_accessor :active_metadata_timestamp
 
-        class_variable_set("@@active_metadata_ancestors", args.empty? ? nil : args[0][:active_metadata_ancestors])
+        instance_variable_set("@active_metadata_options", options)
 
         include ActiveMetadata::Base::InstanceMethods
         include ActiveMetadata::Persistence
@@ -56,12 +64,16 @@ module ActiveMetadata
 
       end
 
-      def metadata_id
-        metadata_root.id
+      # if force is set to true go directly to the private find method
+      # options integrity will not be checked and ancestor will be looked also if option persists_ancestor is false
+      # usefull to get the ancestor instance also if is not persisted
+      def metadata_id force=false
+        force ? find_metadata_ancestor_instance.id : metadata_root.id
       end
 
-      def metadata_class
-        metadata_root.class.to_s
+      # same as #metadata_id
+      def metadata_class force=false
+        force ? find_metadata_ancestor_instance.class.to_s : metadata_root.class.to_s
       end
 
       # Normalize the active_metadata_timestamp into a float to be comparable with the history
@@ -80,14 +92,9 @@ module ActiveMetadata
       end
 
       def metadata_root
-        active_metadata_ancestors = self.class.class_variable_get("@@active_metadata_ancestors")
-        return self if active_metadata_ancestors.nil?
-        receiver = self
-        active_metadata_ancestors.each do |item|
-          receiver = receiver.send item
-        end
-        raise(RuntimeError.new,"[active_metdata] - Ancestor model is not yet persisted") unless receiver
-        receiver
+        options = self.class.instance_variable_get("@active_metadata_options")
+        return self unless (options[:persists_ancestor] && options[:ancestors].size > 0 )
+        find_metadata_ancestor_instance
       end
 
       # Resolve concurrency using the provided timestamps and the active_metadata histories.
@@ -157,6 +164,18 @@ module ActiveMetadata
 
       end
 
+      private
+
+      def find_metadata_ancestor_instance
+        receiver = self
+        self.class.instance_variable_get("@active_metadata_options")[:ancestors].each do |item|
+          res = receiver.send item
+          receiver = res.is_a?(Array) ? res.first : res
+        end
+        raise(RuntimeError.new,"[active_metdata] - Ancestor model is not yet persisted") unless receiver
+        receiver
+      end
+
     end # InstanceMethods
 
   end

data/lib/active_metadata/persistence/history.rb

@@ -7,6 +7,7 @@ module ActiveMetadata::Persistence::History
   module InstanceMethods
 
     def save_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

data/lib/active_metadata/version.rb

@@ -1,3 +1,3 @@
 module ActiveMetadata
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

data/lib/tasks/active_metadata_tasks.rake

@@ -4,8 +4,10 @@ namespace :active_metadata do
     ENV['JCI'] = 'on'
     ENV['RAILS_ENV'] ||= 'test'
 
-    task :migrate do
-      Rake::Task["db:migrate"].invoke
+    task :migrate, :environment do
+      sh "mkdir -p spec/dummy/tmp/cache"
+      Rake::Task["app:db:create"].invoke
+      Rake::Task["app:db:migrate"].invoke
     end
 
     task :rspec do
@@ -32,7 +34,7 @@ namespace :active_metadata do
 
     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/01_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/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 2) do
+ActiveRecord::Schema.define(:version => 1) do
 
   create_table "active_metadata_attachments", :force => true do |t|
     t.string   "label"
@@ -82,33 +82,4 @@ ActiveRecord::Schema.define(:version => 2) do
   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 "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
-  create_table "sections", :force => true do |t|
-    t.string   "title"
-    t.integer  "document_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/active_metadata_spec.rb

@@ -4,19 +4,19 @@ require "time"
 
 describe ActiveMetadata do
 
-  context "model methods" do
+  context "class methods" do
 
     it "should exist a method acts_as_metadata in the model" do
       Document.respond_to?(:acts_as_metadata).should be_true
     end
 
-    it "should find the active_metadata_ancestors if no active_metadata_ancestors params has been provided" do
+    it "should find the ancestors if no ancestors params has been provided" do
       @document = Document.create! { |d| d.name = "John" }
       @document.metadata_id.should eq @document.id
       @document.metadata_class.should eq @document.class.to_s
     end
 
-    it "should find the metadata_root.id if an active_metadata_ancestors params has been specified" do
+    it "should find the metadata_root.id if an ancestors params has been specified and persists_ancestor is true" do
       @document = Document.create! { |d| d.name = "John" }
       @section = @document.create_section :title => "new section"
       @section.metadata_id.should eq @document.id
@@ -33,5 +33,26 @@ describe ActiveMetadata do
 
   end
 
+  context "ancestors" do
+
+    it "should return the base instance class following the ancestor chain" do
+      @document = Document.create! { |d| d.name = "John" }
+      @chapter = Chapter.create(title: "title")
+      @section = @document.create_section
+      @section.metadata_id(true).should eq @document.id
+      @section.metadata_class(true).should eq "Document"
+    end
+
+    it "should return the base instance class following the ancestor chain passing has_many associations" do
+      @document = Document.create! { |d| d.name = "John" }
+      @chapter = Chapter.create(title: "title")
+      @section = @document.create_section chapter_id: @chapter.id
+
+      @chapter.metadata_id(true).should eq @document.id
+      @chapter.metadata_class(true).should eq "Document"
+    end
+
+  end
+
 
 end

data/spec/lib/attachments_spec.rb

@@ -125,9 +125,9 @@ describe ActiveMetadata do
       end
 
       it "should has_notes_for verify if defined field has attachments" do
-        @document.has_attachments_for(:name).should be_false
-        @document.save_attachment_for(:name, @attachment)
-        @document.has_attachments_for(:name).should be_true
+        @document.has_attachments_for(:surname).should be_false
+        @document.save_attachment_for(:surname, @attachment)
+        @document.has_attachments_for(:surname).should be_true
       end
 
     end

data/spec/lib/notes_spec.rb

@@ -5,7 +5,6 @@ describe ActiveMetadata do
 
   before(:each) do
     @document = Document.create! { |d| d.name = "John" }
-    @document.reload
   end
 
   describe "notes" do

data/spec/spec_helper.rb

@@ -8,10 +8,9 @@ require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require 'rails/all'
 require 'active_metadata'
 require 'rack/test/uploaded_file'
+require 'support/migrations'
 
 ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../')
-Dir[File.join(ENGINE_RAILS_ROOT, "spec/support/**/*.rb")].each {|f| require f }
-
 require 'rspec/rails'
 
 
@@ -25,6 +24,11 @@ RSpec.configure do |config|
   # config.mock_with :rr
   config.mock_with :rspec
 
+  config.before(:suite) do
+    TestDb.up
+    Dir[File.join(ENGINE_RAILS_ROOT, "spec/support/**/*.rb")].each {|f| require f }
+  end
+
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
   # config.fixture_path = "#{::Rails.root}/spec/fixtures"
 
@@ -35,17 +39,18 @@ RSpec.configure do |config|
 
 
   config.before(:each) do
-    Document.delete_all
-    ActiveMetadata::Note.delete_all
-    ActiveMetadata::Watcher.delete_all
-    ActiveMetadata::Attachment.delete_all
-    ActiveMetadata::History.delete_all
-    FileUtils.remove_dir File.expand_path('public/system/') if Dir.exist?(File.expand_path('public/system/'))       
+    [Document, Section, Chapter, User, ActiveMetadata::Note,
+     ActiveMetadata::Watcher, ActiveMetadata::Attachment, ActiveMetadata::History].each do |i|
+      i.delete_all
+    end
+    FileUtils.remove_dir File.expand_path('public/system/') if Dir.exist?(File.expand_path('public/system/'))
+    Rails.cache.clear
   end
 
-  config.after(:suite) do  
-    # seems that closing the established connection isn't really necessary
+  config.after(:suite) do
+    TestDb.down
   end
+
 end
 
 def test_pdf name='pdf_test'

data/spec/support/chapter.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
 class Chapter < ActiveRecord::Base
-  acts_as_metadata
+  acts_as_metadata ancestors: [:sections, :document]
+  has_many :sections
 end

data/spec/support/document.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 class Document < ActiveRecord::Base  
   has_one :section
-
   acts_as_metadata
 
 end

data/spec/support/migrations.rb

@@ -0,0 +1,38 @@
+module TestDb
+
+  def self.up
+    ActiveRecord::Base.connection.create_table :documents, force: true do |t|
+      t.string :name
+      t.string :surname
+      t.boolean :keep_alive
+      t.timestamps
+    end
+
+    ActiveRecord::Base.connection.create_table :sections, force: true do |t|
+      t.string :title
+      t.integer :document_id
+      t.integer :chapter_id
+      t.timestamps
+    end
+
+    ActiveRecord::Base.connection.create_table :chapters, force: true do |t|
+      t.string :title
+      t.timestamps
+    end
+
+    ActiveRecord::Base.connection.create_table :users, force: true do |t|
+      t.string :email
+      t.string :firstname
+      t.string :lastname
+      t.timestamps
+    end
+  end
+
+  def self.down
+    ActiveRecord::Base.connection.drop_table :users
+    ActiveRecord::Base.connection.drop_table :chapters
+    ActiveRecord::Base.connection.drop_table :sections
+    ActiveRecord::Base.connection.drop_table :documents
+  end
+
+end

data/spec/support/section.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 class Section < ActiveRecord::Base
   belongs_to :document
-
-  acts_as_metadata :active_metadata_ancestors => [:document]
-
+  acts_as_metadata :ancestors => [:document], :persists_ancestor => true
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_metadata
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-18 00:00:00.000000000 Z
+date: 2012-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -165,8 +165,7 @@ files:
 - config/cucumber.yml
 - config/database.yml
 - config/routes.rb
-- db/migrate/01_create_test_resources.rb
-- db/migrate/02_active_metadata_migrations.rb
+- db/migrate/01_active_metadata_migrations.rb
 - lib/active_metadata/base.rb
 - lib/active_metadata/engine.rb
 - lib/active_metadata/form_helper.rb
@@ -219,9 +218,8 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/db/development.sqlite3
+- spec/dummy/db/.gitkeep
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/log/.gitkeep
 - spec/dummy/public/404.html
@@ -241,6 +239,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/chapter.rb
 - spec/support/document.rb
+- spec/support/migrations.rb
 - spec/support/pdf_test.pdf
 - spec/support/pdf_test_1.pdf
 - spec/support/pdf_test_2.pdf
@@ -262,7 +261,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1577103634899317136
+      hash: -2239752898165764505
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -271,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1577103634899317136
+      hash: -2239752898165764505
 requirements: []
 rubyforge_project: active_metadata
 rubygems_version: 1.8.19
@@ -315,9 +314,8 @@ test_files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/db/development.sqlite3
+- spec/dummy/db/.gitkeep
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/log/.gitkeep
 - spec/dummy/public/404.html
@@ -337,6 +335,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/chapter.rb
 - spec/support/document.rb
+- spec/support/migrations.rb
 - spec/support/pdf_test.pdf
 - spec/support/pdf_test_1.pdf
 - spec/support/pdf_test_2.pdf

data/db/migrate/01_create_test_resources.rb

@@ -1,36 +0,0 @@
-class CreateTestResources < ActiveRecord::Migration
-  def self.up
-    create_table :documents do |t|
-      t.string :name
-      t.string :surname
-      t.boolean :keep_alive
-      t.timestamps
-    end
-
-    create_table :sections do |t|
-      t.string :title
-      t.integer :document_id
-      t.timestamps
-    end
-
-    create_table :chapters do |t|
-      t.string :title
-      t.timestamps
-    end
-
-    create_table :users do |t|
-      t.string :email
-      t.string :firstname
-      t.string :lastname
-      t.timestamps
-    end
-
-  end
-
-  def self.down
-    drop_table :users
-    drop_table :chapters
-    drop_table :sections
-    drop_table :documents
-  end
-end