active_metadata 0.2.4 → 0.3.0

data/lib/active_metadata/base.rb

@@ -7,8 +7,8 @@ module ActiveMetadata
   module Base
 
     require 'paperclip'
-    require "active_metadata/persistence/persistence"
-    require "active_metadata/helpers"
+    require 'active_metadata/persistence/persistence'
+    require 'active_metadata/helpers'
 
     def self.included(klass)
       klass.class_eval do
@@ -37,11 +37,6 @@ module ActiveMetadata
 
       include ActiveMetadata::Helpers
 
-      def attributes=(attributes)
-        attributes.delete(:active_metadata_timestamp) unless attributes[:active_metadata_timestamp].nil?
-        super
-      end
-
       def self.included(klass)
         [:notes, :attachments, :history].each do |item|
           klass.send(:define_method, "#{item.to_s}_cache_key".to_sym) do |field|
@@ -54,8 +49,11 @@ module ActiveMetadata
         metadata_root.id
       end
 
-      def active_metadata_timestamp
-        metadata_root.active_metadata_timestamp || nil
+      # Normalize the active_metadata_timestamp into a float to be comparable with the history
+      def am_timestamp
+        ts = metadata_root.active_metadata_timestamp
+        return nil if ts.nil?
+        ts = ts.to_f
       end
 
       def current_user_id
@@ -78,7 +76,6 @@ module ActiveMetadata
 
       # Resolve concurrency using the provided timestamps and the active_metadata histories.
       # Conflicts are stored into @conflicts instance variable
-      #
       # Timestamp used for versioning can be passed both as :
       # ====
       # * @object.active_metadata_timestamp = ....
@@ -95,7 +92,8 @@ module ActiveMetadata
       #   by the user that is submittig the data
       #
       def manage_concurrency
-        return if active_metadata_timestamp.nil? #if no timestamp no way to check concurrency so just skip
+        timestamp = self.am_timestamp
+        return if timestamp.nil? #if no timestamp no way to check concurrency so just skip
 
         self.conflicts = { :warnings => [], :fatals => [] }
 
@@ -103,15 +101,12 @@ module ActiveMetadata
         self.attributes.each do |key, val|
           # ensure the query order
           histories = history_for key.to_sym, "created_at DESC"
-          latest_history = histories.first
-          timestamp = self.active_metadata_timestamp
+          next if histories.count == 0 #if history does not exists yet cannot be a conflict
 
-          # if form timestamp is subsequent the history last change go on
-          # if history does not exists yet go on
-          next if latest_history.nil? || timestamp > latest_history.created_at
+          latest_history = histories.first
 
           #if the timestamp is previous of the last history change
-          if timestamp < latest_history.created_at
+          if timestamp < latest_history.created_at.to_f
 
             begin
               self[key.to_sym] = self.changes[key][0]
@@ -122,7 +117,7 @@ module ActiveMetadata
             # Check if the actual submission has been modified
             histories.each do |h|
               # Looking for the value that was loaded by the user. First history with a ts that is younger than the form ts
-              next if timestamp > h.created_at
+              next if timestamp > h.created_at.to_f
 
               # History stores values as strings so any boolean is stored as "0" or "1"
               # We need to translate the params passed for a safer comparison.

data/lib/active_metadata/form_helper.rb

@@ -0,0 +1,11 @@
+module ActionView
+  module Helpers
+    class FormBuilder
+
+      def active_metadata_timestamp
+        @template.hidden_field_tag "#{@object_name}[active_metadata_timestamp]", Time.now.to_f
+      end
+
+    end
+  end
+end

data/lib/active_metadata/version.rb

@@ -1,3 +1,3 @@
 module ActiveMetadata
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 end

data/lib/active_metadata.rb

@@ -1,7 +1,7 @@
 module ActiveMetadata
   require 'engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
   require 'active_metadata/base'
-  require "active_metadata/railtie" if defined?(Rails)
   require 'application_controller'
   require "active_metadata/version"
+  require "active_metadata/form_helper"
 end

data/lib/rails/railties/tasks.rake

@@ -1,8 +1,16 @@
-namespace :cheese do
-  
-  desc "example gem rake task"
-  task :report => :environment do
-    puts "you just ran the example gem rake task"
+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('../../templates/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('../../templates/active_metadata_migrations',__FILE__), File.expand_path("db/migrate/#{ts}_active_metadata_migrations.rb")
+    puts "run rake db:migrate to complete the gem installation"    
+
   end
 
-end
+end

data/lib/rake/ci.rb

@@ -0,0 +1,38 @@
+begin
+  require 'ci/reporter/rake/rspec'
+  require 'ci/reporter/rake/cucumber'
+
+  namespace :ci do
+
+    ENV["DATABASE_ENV"] = 'test'
+
+    namespace :setup do
+      
+      @reports_dir = ENV['CI_REPORTS'] || 'features/reports'
+      
+      task :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}"
+      end
+
+    end
+    
+    task "spec" => ["rspec_run"]
+    task "cucumber" => ["cucumber_run"]
+    
+  end
+
+  task "ci" => ["db:migrate", "ci:spec", "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"])

data/spec/concurrency_spec.rb

@@ -19,6 +19,24 @@ describe "Manage Concurrency" do
     @document.conflicts.should be_nil
   end
 
+  describe "am_timestamp" do
+
+    it "should return nil if active_metadata_timestamp has not been provided" do
+      @document.am_timestamp.should be_nil
+    end
+
+    it "should return a float if active_metadata_timestamp is instance of Time" do
+      @document.active_metadata_timestamp = Time.now
+      @document.am_timestamp.should be_an_instance_of Float
+    end
+
+    it "should return a float if active_metadata_timestamp is a String" do
+      @document.active_metadata_timestamp = Time.now.to_f.to_s
+      @document.am_timestamp.should be_an_instance_of Float
+    end
+
+  end
+
   describe "when a field is modified and the form ts is subsequent of the history ts" do
 
     it "should save the new value and history must be updated with the latest change" do

data/spec/spec_helper.rb

@@ -32,8 +32,6 @@ RAILS_CACHE = ActiveSupport::Cache::MemoryStore.new
 require "#{File.dirname(__FILE__)}/../lib/engine.rb"
 Dir["spec/support/*.rb"].each {|f| require "support/#{(File.basename(f, File.extname(f)) )}"}
 
-Dir["app/models/*.rb"].each {|f| require "models/#{(File.basename(f, File.extname(f)) )}"}
-
 RSpec.configure do |config|
   # == Mock Framework
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_metadata
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-19 00:00:00.000000000Z
+date: 2011-10-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2169354520 !ruby/object:Gem::Requirement
+  requirement: &2169814040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169354520
+  version_requirements: *2169814040
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2169353840 !ruby/object:Gem::Requirement
+  requirement: &2169813620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169353840
+  version_requirements: *2169813620
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2169353240 !ruby/object:Gem::Requirement
+  requirement: &2169813200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169353240
+  version_requirements: *2169813200
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2169352820 !ruby/object:Gem::Requirement
+  requirement: &2169812780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169352820
+  version_requirements: *2169812780
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2169352320 !ruby/object:Gem::Requirement
+  requirement: &2169812300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169352320
+  version_requirements: *2169812300
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2169351620 !ruby/object:Gem::Requirement
+  requirement: &2169811520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -77,10 +77,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2169351620
+  version_requirements: *2169811520
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2169350680 !ruby/object:Gem::Requirement
+  requirement: &2169810280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -88,10 +88,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2169350680
+  version_requirements: *2169810280
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &2169350180 !ruby/object:Gem::Requirement
+  requirement: &2169803300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2169350180
+  version_requirements: *2169803300
 - !ruby/object:Gem::Dependency
   name: to_xls
-  requirement: &2169349300 !ruby/object:Gem::Requirement
+  requirement: &2169802640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,7 +110,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2169349300
+  version_requirements: *2169802640
 description: First implementation will write metadata on mongodb
 email:
 - acampolonghi@gmail.com
@@ -120,6 +120,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/active_metadata/base.rb
+- lib/active_metadata/form_helper.rb
 - lib/active_metadata/helpers.rb
 - lib/active_metadata/persistence/active_record/attachment.rb
 - lib/active_metadata/persistence/active_record/history.rb
@@ -127,7 +128,6 @@ files:
 - lib/active_metadata/persistence/active_record/watcher.rb
 - lib/active_metadata/persistence/active_record.rb
 - lib/active_metadata/persistence/persistence.rb
-- lib/active_metadata/railtie.rb
 - lib/active_metadata/version.rb
 - lib/active_metadata.rb
 - lib/application_controller.rb
@@ -139,7 +139,7 @@ files:
 - lib/model/active_record/watcher.rb
 - lib/rails/railties/tasks.rake
 - lib/rake/active_record_tasks.rb
-- lib/rake/task.rb
+- lib/rake/ci.rb
 - lib/templates/active_metadata.yml
 - lib/templates/active_metadata_migrations
 - lib/templates/mongoid.yml
@@ -164,6 +164,7 @@ files:
 - config/initializers/inflections.rb
 - config/mongoid.yml
 - config/routes.rb
+- db/development.sqlite3
 - db/migrate/01_create_test_resources.rb
 - db/migrate/02_active_metadata_migrations.rb
 - db/test.sqlite3

data/lib/active_metadata/railtie.rb

@@ -1,6 +0,0 @@
-require 'rails'
-class Railtie < Rails::Railtie
-  rake_tasks do
-    require_relative '../rake/task.rb'
-  end
-end

data/lib/rake/task.rb

@@ -1,18 +0,0 @@
-require 'rake'
-require 'fileutils'
-
-namespace :active_metadata do
-  task :install do
-    #FileUtils.cp File.expand_path('../../templates/mongoid.yml',__FILE__), File.expand_path('config/')
-    #puts "Installed mongoid.yml"
-
-    FileUtils.cp File.expand_path('../../templates/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('../../templates/active_metadata_migrations',__FILE__), File.expand_path("db/migrate/#{ts}_active_metadata_migrations.rb")
-    puts "run rake db:migrate to complete the gem installation"    
-
-  end
-end