uuid_it 0.1.1 → 0.1.2

data/Changelog.md

@@ -0,0 +1,2 @@
+# 0.1.2 (2011-08-25)
+* fixed a bug where uuid_it created multiple Uuids when an unsaved Uuidable already had created one

data/lib/uuid_it.rb

@@ -24,11 +24,10 @@ module ActiveRecord
         end
 
         def assign_uuid
-          return if Uuid.find_by_uuidable_type_and_uuidable_id(self.class.name, self.id)
-          uuid = Uuid.new(:uuidable => self)
-          uuid.uuid = UUID.create.to_s
-          uuid.save
-          self.reload
+          return if self.uuid_object.present?
+
+          self.build_uuid_object(:uuid => UUID.create.to_s)
+          self.save unless self.new_record?
         end
       end
     end

data/test/uuid_it_test.rb

@@ -47,4 +47,20 @@ class UuidItTest < ActiveSupport::TestCase
     assert_equal car, Car.find_by_uuid(car.uuid)
     assert_nil Car.find_by_uuid(scooter.uuid)
   end
+
+  test "should only create one uuid object when a new object with a uuid is saved" do
+    assert_difference "Uuid.count", 1 do
+      c = Car.new
+      assert c.uuid
+      c.save!
+    end
+  end
+
+  test "should not leak Uuid objects on unsaved uuidables" do
+    assert_difference "Uuid.count", 0 do
+      1..3.times do
+        Car.new.uuid
+      end
+    end
+  end
 end

data/test/uuid_it_test.rb~

@@ -0,0 +1,67 @@
+require 'test_helper'
+
+class Car < ActiveRecord::Base
+  uuid_it
+end
+
+class Bike < ActiveRecord::Base
+end
+
+class Scooter < ActiveRecord::Base
+  uuid_it
+end
+
+class UuidItTest < ActiveSupport::TestCase
+  test "should assing Uuids to new objects" do
+    c = Car.create
+    assert c.uuid_object
+    assert c.uuid.present?
+
+    c2 = Car.create
+    assert_not_equal c.uuid, c2.uuid
+  end
+
+  test "should assing Uuid to already existing objects on first access" do
+    b1 = nil
+    assert_difference "Uuid.count", 0 do
+      b1 = Bike.create
+    end
+    Bike.class_eval do
+      uuid_it
+    end
+    assert_nil b1.uuid_object
+    b1.uuid
+    assert b1.uuid_object
+    assert b1.uuid.present?
+
+    b2 = Bike.create
+    assert b2.uuid_object
+    assert b2.uuid.present?
+  end
+
+  test "find_by_uuid" do
+    car = Car.create
+    scooter = Scooter.create
+
+    assert_nil Car.find_by_uuid("bla")
+    assert_equal car, Car.find_by_uuid(car.uuid)
+    assert_nil Car.find_by_uuid(scooter.uuid)
+  end
+
+  test "should only create one uuid object when a new object with a uuid is saved" do
+    assert_difference "Uuid.count", 1 do
+      c = Car.new
+      assert c.uuid
+      c.uuid
+      c.save!
+    end
+  end
+
+  test "should not leak Uuid objects on unsaved uuidables" do
+    assert_difference "Uuid.count", 0 do
+      1..3.times do
+        Car.new.uuid
+      end
+    end
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: uuid_it
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Duffeck"
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-04 00:00:00 +02:00
+date: 2011-08-25 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -28,18 +29,20 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/uuid_it/uuid.rb
+- lib/uuid_it.rb
 - lib/ruby-uuid/uuid.rb
 - lib/generators/uuid_it_generator.rb
-- lib/uuid_it.rb
+- lib/uuid_it/uuid.rb
 - lib/tasks/uuid_it_tasks.rake
+- Changelog.md
 - README.md
 - Rakefile
 - rails/init.rb
 - generators/uuid_it/templates/create_uuids.rb
 - generators/uuid_it/uuid_it_generator.rb
-- test/test_helper.rb
+- test/uuid_it_test.rb~
 - test/uuid_it_test.rb
+- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/aduffeck/uuid_it
 licenses: []
@@ -50,23 +53,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A Rails plugin for easily assigning UUIDs to your models..