Fixing :if condition on instance creation

lib/acts_as_versioned.rb

@@ -387,11 +387,10 @@ def empty_callback()
         end
 
         #:nodoc:
-
         protected
         # sets the new version before saving, unless you're using optimistic locking.  In that case, let it take care of the version.
         def set_new_version
-          @saving_version = new_record? || save_version?
+          @saving_version = save_version?
           self.send("#{self.class.version_column}=", next_version) if new_record? || (!locking_enabled? && save_version?)
         end
 

test/versioned_test.rb

@@ -136,6 +136,23 @@ def test_version_if_condition
     assert_equal 1, p.version
     Page.feeling_good = true
   end
+
+  def test_version_if_condition_false_on_first_save
+    Page.feeling_good = false
+    p = Page.create! :title => "title"
+    assert p.version.nil?
+    assert p.versions.empty?
+    Page.feeling_good = true
+  end
+
+  def test_version_if_condition_false_on_first_save2
+    Page.feeling_good = false
+    p = Page.create! :title => "title"
+
+    Page.feeling_good = true
+    p.update_attributes(:title => 'new title')
+    assert_equal 1, p.version
+  end
 
   def test_version_if_condition2
     # set new if condition
@@ -146,16 +163,16 @@ def new_feeling_good() title[0..0] == 'a'; end
     end
 
     p = Page.create! :title => "title"
-    assert_equal 1, p.version # version does not increment
-    assert_equal 1, p.versions.count
+    assert p.version.nil? # no version gets saved
+    assert p.versions.empty?
 
     p.update_attributes(:title => 'new title')
-    assert_equal 1, p.version # version does not increment
-    assert_equal 1, p.versions.count
+    assert p.version.nil? # no version gets saved
+    assert p.versions.empty?
 
     p.update_attributes(:title => 'a title')
-    assert_equal 2, p.version
-    assert_equal 2, p.versions.count
+    assert_equal 1, p.version
+    assert_equal 1, p.versions.count
 
     # reset original if condition
     Page.class_eval { alias_method :feeling_good?, :old_feeling_good }
@@ -167,16 +184,16 @@ def test_version_if_condition_with_block
     Page.version_condition = Proc.new { |page| page.title[0..0] == 'b' }
 
     p = Page.create! :title => "title"
-    assert_equal 1, p.version # version does not increment
-    assert_equal 1, p.versions.count
+    assert p.version.nil? # no version gets saved
+    assert p.versions.empty?
 
     p.update_attributes(:title => 'a title')
-    assert_equal 1, p.version # version does not increment
-    assert_equal 1, p.versions.count
+    assert p.version.nil? # no version gets saved
+    assert p.versions.empty?
 
     p.update_attributes(:title => 'b title')
-    assert_equal 2, p.version
-    assert_equal 2, p.versions.count
+    assert_equal 1, p.version
+    assert_equal 1, p.versions.count
 
     # reset original if condition
     Page.version_condition = old_condition