dm-types 0.9.6 → 0.9.7

data/Manifest.txt

@@ -13,9 +13,9 @@ lib/dm-types/file_path.rb
 lib/dm-types/flag.rb
 lib/dm-types/ip_address.rb
 lib/dm-types/json.rb
-lib/dm-types/slug.rb
 lib/dm-types/regexp.rb
 lib/dm-types/serial.rb
+lib/dm-types/slug.rb
 lib/dm-types/uri.rb
 lib/dm-types/uuid.rb
 lib/dm-types/version.rb
@@ -28,6 +28,7 @@ spec/integration/ip_address_spec.rb
 spec/integration/json_spec.rb
 spec/integration/slug_spec.rb
 spec/integration/uri_spec.rb
+spec/integration/uuid_spec.rb
 spec/integration/yaml_spec.rb
 spec/spec.opts
 spec/spec_helper.rb

data/lib/dm-types.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'pathname'
 
-gem 'dm-core', '=0.9.6'
+gem 'dm-core', '~>0.9.7'
 require 'dm-core'
 
 dir = Pathname(__FILE__).dirname.expand_path / 'dm-types'

data/lib/dm-types/uuid.rb

@@ -17,8 +17,29 @@ module DataMapper
     #
     #  -- Rando Sept 25, 08
     #
+    # Actually, setting the primitive to "UUID" is not neccessary and causes
+    # a segfault when trying to query uuid's from the database.  The primitive
+    # should be a class which has been added to the do driver you are using.
+    # Also, it's only neccessary to add a class to the do drivers to use as a
+    # primitive when a value cannot be represented as a string.  A uuid can be
+    # represented as a string, so setting the primitive to String ensures that
+    # the value argument is a String containing the uuid in string form.
+    #
+    # <strike>It is still neccessary to add the UUID entry to the type map for
+    # each different adapter with their respective database primitive.</strike>
+    #
+    # The method that generates the SQL schema from the typemap currently
+    # ignores the size attribute from the type map if the primitive type
+    # is String.  The causes the generated SQL statement to contain a size for
+    # a UUID column (e.g. id UUID(50)), which causes a syntax error in postgres.
+    # Until this is resolved, you will have to manually change the column type
+    # to UUID in a migration, if you want to use postgres' built in UUID type.
+    #
+    #  -- benburkert Nov 15, 08
+    #
     class UUID < DataMapper::Type
-      primitive 'UUID'
+      primitive String
+      size 36
 
       def self.load(value, property)
         return nil if value.nil?
@@ -34,10 +55,10 @@ module DataMapper
         value.kind_of?(::UUID) ? value : load(value, property)
       end
 
-      ::DataMapper::Property::TYPES << self
-      if defined? DataMapper::Adapters::PostgresAdapter
-        DataMapper::Adapters::PostgresAdapter.type_map.map(self).to('UUID')
-      end
+      #::DataMapper::Property::TYPES << self
+      #if defined? DataMapper::Adapters::PostgresAdapter
+      #  DataMapper::Adapters::PostgresAdapter.type_map.map(self).to('UUID').with(:size => nil)
+      #end
     end
   end
 end

data/lib/dm-types/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Types
-    VERSION = "0.9.6"
+    VERSION = "0.9.7"
   end
 end

data/spec/integration/slug_spec.rb

@@ -22,25 +22,25 @@ describe DataMapper::Types::Slug do
 
     SlugTest.first.name.should == "new-datamapper-type"
   end
-  
+
   it "should find by a slug" do
     repository(:default) do
       SlugTest.create(:name => "This Should Be a Slug")
     end
     slug = "this-should-be-a-slug"
-    
+
     slugged = SlugTest.first(:name => slug)
     slugged.should_not be_nil
     slugged.name.should == slug
   end
-  
+
   [
     ["Iñtërnâtiônàlizætiøn",      "internationalizaetion" ],
     ["Hello World",               "hello-world"],
     ["This is Dan's Blog",        "this-is-dans-blog"],
     ["This is My Site, and Blog", "this-is-my-site-and-blog"]
   ].each do |name, slug|
-      
+
       it "should sluggify #{name}" do
         repository(:default) do
           SlugTest.create(:name => name)
@@ -48,7 +48,7 @@ describe DataMapper::Types::Slug do
         SlugTest.first(:name => slug).should_not be_nil
       end
     end
-    
+
 
 
 end

data/spec/integration/uuid_spec.rb

@@ -0,0 +1,38 @@
+require 'pathname'
+require 'uuidtools'
+require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
+
+describe DataMapper::Types::UUID do
+
+  before(:all) do
+    class UUIDTest
+      include DataMapper::Resource
+
+      property :id, Serial
+      property :uuid, ::DataMapper::Types::UUID
+    end
+
+    UUIDTest.auto_migrate!
+  end
+
+  it "should be settable as a uuid" do
+    u = UUIDTest.create(:uuid => UUID.parse('b0fc632e-d744-4821-afe3-4ea0701859ee'))
+
+    u.uuid.should be_kind_of(UUID)
+    u.uuid.to_s.should == 'b0fc632e-d744-4821-afe3-4ea0701859ee'
+  end
+
+  it "should be settable as a string" do
+    u = UUIDTest.create(:uuid => 'b0fc632e-d744-4821-afe3-4ea0701859ee')
+
+    u.uuid.should be_kind_of(UUID)
+    u.uuid.to_s.should == 'b0fc632e-d744-4821-afe3-4ea0701859ee'
+  end
+
+  it "should be allowed to be null" do
+    u = UUIDTest.create()
+
+    u.uuid.should be_nil
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-types
 version: !ruby/object:Gem::Version 
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors: 
 - Sam Smoot
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-12 00:00:00 -06:00
+date: 2008-11-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.6
+        version: 0.9.7
     version: 
 - !ruby/object:Gem::Dependency 
   name: uuidtools
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.2
     version: 
 description: DataMapper plugin providing extra data types
 email: 
@@ -69,9 +69,9 @@ files:
 - lib/dm-types/flag.rb
 - lib/dm-types/ip_address.rb
 - lib/dm-types/json.rb
-- lib/dm-types/slug.rb
 - lib/dm-types/regexp.rb
 - lib/dm-types/serial.rb
+- lib/dm-types/slug.rb
 - lib/dm-types/uri.rb
 - lib/dm-types/uuid.rb
 - lib/dm-types/version.rb
@@ -84,6 +84,7 @@ files:
 - spec/integration/json_spec.rb
 - spec/integration/slug_spec.rb
 - spec/integration/uri_spec.rb
+- spec/integration/uuid_spec.rb
 - spec/integration/yaml_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -121,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: DataMapper plugin providing extra data types