Make sure uuid is assigned before validation

CHANGELOG.md

@@ -1 +1,7 @@
+### Not released yet:
+
+* (exviva) Make sure uuid is assigned before validation
+
+### 0.0.8 (2012-04-27):
+
 * (troessner) Refactor the whole gem and use `class_attribute`.

lib/has_uuid.rb

@@ -20,6 +20,7 @@ def has_uuid(options = {})
           include InstanceMethods
 
           if options[:auto]
+            before_validation(:on => :create) { assign_uuid }
             before_save(:on => :create) { assign_uuid }
           end
 

test/has_uuid_test.rb

@@ -8,6 +8,11 @@ class Thingy < ActiveRecord::Base
   has_uuid :auto => false
 end
 
+class ParanoidWidget < Widget
+  set_table_name 'widgets'
+  validates_presence_of :uuid
+end
+
 class HasUuidTest < Test::Unit::TestCase
   def test_should_generate_a_valid_uuid
     uuid = Widget.generate_uuid
@@ -93,4 +98,11 @@ def test_should_assign_an_uuid_if_we_do_not_validate_the_overall_record
     @widget.reload
     assert @widget.uuid_valid?
   end
+
+  def test_assign_uuid_before_validation
+    paranoid_widget = ParanoidWidget.new
+    assert !paranoid_widget.uuid_valid?
+    assert paranoid_widget.valid?
+    assert paranoid_widget.uuid_valid?
+  end
 end