mongo_mapper_versioned 0.1.5 → 0.1.6

data/lib/mongo_mapper/plugins/version.rb

@@ -2,7 +2,7 @@
 module MongoMapper
   module Plugins
     module Versioned
-      Version = '0.1.5'
+      Version = '0.1.6'
     end
   end
 end

data/lib/mongo_mapper/plugins/versioned.rb

@@ -5,13 +5,13 @@ module MongoMapper
       module ClassMethods
         def versioned(options={})
           configuration = { :ignored_keys => %w(_id version_number created_at updated_at creator_id updater_id) }
-          configuration.update(options) if options.is_a?(Hash)
+          configuration[:ignored_keys].concat(options[:ignored_keys]).uniq if options.key?(:ignored_keys)
           
           key   :version_number, Integer, :default => 0, :index => true
           many  :versions, :class => MongoMapper::Plugins::Versioned::Version, :foreign_key => :versioned_id, :dependent => :destroy, :order => :version_number.asc
 
-          after_create  :create_version
-          before_update :create_version, :if => Proc.new{ |doc| doc.should_create_version? }
+          after_create :create_version
+          after_update :create_version, :if => Proc.new{ |doc| doc.should_create_version? || doc.should_create_initial_version? }
           
           define_method "ignored_keys" do
             configuration[:ignored_keys]
@@ -24,7 +24,7 @@ module MongoMapper
       module InstanceMethods
         
         def create_version
-          self.version_number = (versions.empty? ? 1 : versions.last.version_number+1)
+          self.version_number = versions.empty? ? 1 : versions.last.version_number+1
           self.versions << current_version
         end
         
@@ -48,6 +48,10 @@ module MongoMapper
         def version_at(target_version_number)
           versions.where(:version_number => target_version_number).first
         end
+        
+        def should_create_initial_version?
+          versions.empty?
+        end
      
         # this method might be overwritten
         # by something more sophisticated (esp. in case of EmbeddedDocuments)

data/test/mongo_mapper_versioned_test.rb

@@ -32,6 +32,41 @@ class VersionedTest < ActiveSupport::TestCase
     should "be last version" do
       assert @doc.last_version?
     end
+    context "after initial save" do
+      setup do
+        @doc.save
+      end
+      should "be on version 1" do
+        assert_equal 1, @doc.version_number
+      end
+      should "have 1 version" do
+        assert_equal 1, @doc.versions.count
+      end
+      should "store version 1" do
+        assert @doc.versions.any?{|v| v.version_number == 1}
+      end
+      should "be last version" do
+        assert @doc.last_version?
+      end
+    end
+    context "after save with changes" do
+      setup do
+        @doc.title = "poof"
+        @doc.save
+      end
+      should "be on version 1" do
+        assert_equal 1, @doc.version_number
+      end
+      should "have 1 version" do
+        assert_equal 1, @doc.versions.count
+      end
+      should "store version 1" do
+        assert @doc.versions.any?{|v| v.version_number == 1}
+      end
+      should "be last version" do
+        assert @doc.last_version?
+      end
+    end
   end
   
   context "when created" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongo_mapper_versioned
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Tomas Celizna
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-26 00:00:00 +01:00
+date: 2010-12-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency