dm-types 0.10.2 → 1.0.0.rc1

data/spec/integration/uuid_spec.rb

@@ -5,94 +5,96 @@ try_spec do
   require './spec/fixtures/network_node'
 
   describe DataMapper::Types::Fixtures::NetworkNode do
-    describe 'with UUID set as UUID object' do
-      before :all do
-        @uuid_string = 'b0fc632e-d744-4821-afe3-4ea0701859ee'
-        @uuid        = UUIDTools::UUID.parse(@uuid_string)
-        @resource       = DataMapper::Types::Fixtures::NetworkNode.new(:uuid => @uuid)
-
-        @resource.save.should be_true
-      end
-
-      describe 'when reloaded' do
+    supported_by :all do
+      describe 'with UUID set as UUID object' do
         before :all do
-          @resource.reload
-        end
+          @uuid_string = 'b0fc632e-d744-4821-afe3-4ea0701859ee'
+          @uuid        = UUIDTools::UUID.parse(@uuid_string)
+          @resource    = DataMapper::Types::Fixtures::NetworkNode.new(:uuid => @uuid)
 
-        it 'has the same UUID string' do
-          @resource.uuid.to_s.should == @uuid_string
+          @resource.save.should be_true
         end
 
-        it 'returns UUID as an object' do
-          @resource.uuid.should be_an_instance_of(UUIDTools::UUID)
-        end
-      end
-    end
+        describe 'when reloaded' do
+          before :all do
+            @resource.reload
+          end
+
+          it 'has the same UUID string' do
+            @resource.uuid.to_s.should == @uuid_string
+          end
 
-    describe 'with UUID set as a valid UUID string' do
-      before :all do
-        @uuid  = 'b0fc632e-d744-4821-afe3-4ea0701859ee'
-        @resource = DataMapper::Types::Fixtures::NetworkNode.new(:uuid => @uuid)
+          it 'returns UUID as an object' do
+            @resource.uuid.should be_an_instance_of(UUIDTools::UUID)
+          end
+        end
       end
 
-      describe 'when reloaded' do
+      describe 'with UUID set as a valid UUID string' do
         before :all do
-          @resource.reload
+          @uuid  = 'b0fc632e-d744-4821-afe3-4ea0701859ee'
+          @resource = DataMapper::Types::Fixtures::NetworkNode.new(:uuid => @uuid)
         end
 
-        it 'has the same UUID string' do
-          @resource.uuid.to_s.should == @uuid
-        end
+        describe 'when reloaded' do
+          before :all do
+            @resource.reload
+          end
 
-        it 'returns UUID as an object' do
-          @resource.uuid.should be_an_instance_of(UUIDTools::UUID)
-        end
-      end
-    end
+          it 'has the same UUID string' do
+            @resource.uuid.to_s.should == @uuid
+          end
 
-    describe 'with UUID set as invalid UUID string' do
-      before :all do
-        @uuid  = 'meh'
-        @operation = lambda do
-          DataMapper::Types::Fixtures::NetworkNode.new(:uuid => @uuid)
+          it 'returns UUID as an object' do
+            @resource.uuid.should be_an_instance_of(UUIDTools::UUID)
+          end
         end
       end
 
-      describe 'when assigned UUID' do
-        it 'raises ArgumentError' do
-          @operation.should raise_error(ArgumentError, /Invalid UUID format/)
+      describe 'with UUID set as invalid UUID string' do
+        before :all do
+          @uuid  = 'meh'
+          @operation = lambda do
+            DataMapper::Types::Fixtures::NetworkNode.new(:uuid => @uuid)
+          end
         end
-      end
-    end
 
-    describe 'with UUID set as a blank string' do
-      before :all do
-        @uuid  = ''
-        @operation = lambda do
-          DataMapper::Types::Fixtures::NetworkNode.new(:uuid => @uuid)
+        describe 'when assigned UUID' do
+          it 'raises ArgumentError' do
+            @operation.should raise_error(ArgumentError, /Invalid UUID format/)
+          end
         end
       end
 
-      describe 'when assigned UUID' do
-        it 'raises ArgumentError' do
-          @operation.should raise_error(ArgumentError, /Invalid UUID format/)
+      describe 'with UUID set as a blank string' do
+        before :all do
+          @uuid  = ''
+          @operation = lambda do
+            DataMapper::Types::Fixtures::NetworkNode.new(:uuid => @uuid)
+          end
         end
-      end
-    end
 
-    describe 'with missing UUID' do
-      before :all do
-        @uuid  = nil
-        @resource = DataMapper::Types::Fixtures::NetworkNode.new(:uuid => @uuid)
+        describe 'when assigned UUID' do
+          it 'raises ArgumentError' do
+            @operation.should raise_error(ArgumentError, /Invalid UUID format/)
+          end
+        end
       end
 
-      describe 'when reloaded' do
+      describe 'with missing UUID' do
         before :all do
-          @resource.reload
+          @uuid  = nil
+          @resource = DataMapper::Types::Fixtures::NetworkNode.new(:uuid => @uuid)
         end
 
-        it 'has no UUID' do
-          @resource.uuid.should be_nil
+        describe 'when reloaded' do
+          before :all do
+            @resource.reload
+          end
+
+          it 'has no UUID' do
+            @resource.uuid.should be_nil
+          end
         end
       end
     end

data/spec/integration/yaml_spec.rb

@@ -6,60 +6,62 @@ try_spec do
   require './spec/fixtures/invention'
 
   describe DataMapper::Types::Fixtures::Person do
-    before :all do
-      @resource = DataMapper::Types::Fixtures::Person.new(:name => '')
-    end
-
-    describe 'with no inventions information' do
+    supported_by :all do
       before :all do
-        @resource.inventions = nil
+        @resource = DataMapper::Types::Fixtures::Person.new(:name => '')
       end
 
-      describe 'when dumped and loaded again' do
+      describe 'with no inventions information' do
         before :all do
-          @resource.save.should be_true
-          @resource.reload
+          @resource.inventions = nil
         end
 
-        it 'has nil inventions list' do
-          @resource.inventions.should be_nil
-        end
-      end
-    end
+        describe 'when dumped and loaded again' do
+          before :all do
+            @resource.save.should be_true
+            @resource.reload
+          end
 
-    describe 'with a few items on the inventions list' do
-      before :all do
-        @input = [ 'carbon telephone transmitter', 'light bulb', 'electric grid' ].map do |name|
-          DataMapper::Types::Fixtures::Invention.new(name)
+          it 'has nil inventions list' do
+            @resource.inventions.should be_nil
+          end
         end
-        @resource.inventions = @input
       end
 
-      describe 'when dumped and loaded again' do
+      describe 'with a few items on the inventions list' do
         before :all do
-          @resource.save.should be_true
-          @resource.reload
+          @input = [ 'carbon telephone transmitter', 'light bulb', 'electric grid' ].map do |name|
+            DataMapper::Types::Fixtures::Invention.new(name)
+          end
+          @resource.inventions = @input
         end
 
-        it 'loads inventions list to the state when it was dumped/persisted with keys being strings' do
-          @resource.inventions.should == @input
-        end
-      end
-    end
+        describe 'when dumped and loaded again' do
+          before :all do
+            @resource.save.should be_true
+            @resource.reload
+          end
 
-    describe 'with inventions information given as empty list' do
-      before :all do
-        @resource.inventions = []
+          it 'loads inventions list to the state when it was dumped/persisted with keys being strings' do
+            @resource.inventions.should == @input
+          end
+        end
       end
 
-      describe 'when dumped and loaded again' do
+      describe 'with inventions information given as empty list' do
         before :all do
-          @resource.save.should be_true
-          @resource.reload
+          @resource.inventions = []
         end
 
-        it 'has empty inventions list' do
-          @resource.inventions.should == []
+        describe 'when dumped and loaded again' do
+          before :all do
+            @resource.save.should be_true
+            @resource.reload
+          end
+
+          it 'has empty inventions list' do
+            @resource.inventions.should == []
+          end
         end
       end
     end

data/spec/spec_helper.rb

@@ -1,45 +1,16 @@
-require 'rubygems'
-
-# TODO: autovalidation hooks are needed badly,
-#       otherwise plugin devs will have to abuse
-#       alising and load order even further and it kinda makes
-#       me sad -- MK
-
-# use local dm-core if running from a typical dev checkout.
-lib = File.join('..', '..', 'dm-core', 'lib')
-$LOAD_PATH.unshift(lib) if File.directory?(lib)
-require 'dm-core'
-
-# use local dm-validations if running from a typical dev checkout.
-lib = File.join('..', 'dm-validations', 'lib')
-$LOAD_PATH.unshift(lib) if File.directory?(lib)
-require 'dm-validations'
-
-# Support running specs with 'rake spec' and 'spec'
-$LOAD_PATH.unshift('lib') unless $LOAD_PATH.include?('lib')
+require 'dm-core/spec/setup'
+require 'dm-core/spec/lib/adapter_helpers'
 
 require 'dm-types'
+require 'dm-migrations'
+require 'dm-validations'
 
-def load_driver(name, default_uri)
-  return false if ENV['ADAPTER'] != name.to_s
+DataMapper::Spec.setup
 
-  begin
-    DataMapper.setup(name, ENV["#{name.to_s.upcase}_SPEC_URI"] || default_uri)
-    DataMapper::Repository.adapters[:default] =  DataMapper::Repository.adapters[name]
-    true
-  rescue LoadError => e
-    warn "Could not load do_#{name}: #{e}"
-    false
-  end
+Spec::Runner.configure do |config|
+  config.extend(DataMapper::Spec::Adapters::Helpers)
 end
 
-ENV['ADAPTER'] ||= 'sqlite3'
-
-HAS_SQLITE3  = load_driver(:sqlite3,  'sqlite3::memory:')
-HAS_MYSQL    = load_driver(:mysql,    'mysql://localhost/dm_core_test')
-HAS_POSTGRES = load_driver(:postgres, 'postgres://postgres@localhost/dm_core_test')
-
-
 DEPENDENCIES = {
   'bcrypt' => 'bcrypt-ruby',
 }

data/spec/unit/bcrypt_hash_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 try_spec do
-  describe DataMapper::Types::BCryptHash do
+  describe DataMapper::Property::BCryptHash do
     before :all do
       @clear_password   = 'DataMapper R0cks!'
       @crypted_password = BCrypt::Password.create(@clear_password)
@@ -13,13 +13,21 @@ try_spec do
         @b = 'Hi There'
       end
       @nonstandard_type2 = TestType.new
+
+      class User
+        include DataMapper::Resource
+        property :id, Serial
+        property :password, BCryptHash
+      end
+
+      @bcrypt_hash = User.properties[:password]
     end
 
     describe '.dump' do
       describe 'when argument is a string' do
         before :all do
           @input  = 'DataMapper'
-          @result = DataMapper::Types::BCryptHash.dump(@input, :property)
+          @result = @bcrypt_hash.dump(@input)
         end
 
         it 'returns instance of BCrypt::Password' do
@@ -34,7 +42,7 @@ try_spec do
       describe 'when argument is nil' do
         before :all do
           @input  = nil
-          @result = DataMapper::Types::BCryptHash.dump(@input, :property)
+          @result = @bcrypt_hash.dump(@input)
         end
 
         it 'returns nil' do
@@ -47,7 +55,7 @@ try_spec do
       describe 'when argument is a string' do
         before :all do
           @input  = 'DataMapper'
-          @result = DataMapper::Types::BCryptHash.load(@crypted_password, :property)
+          @result = @bcrypt_hash.load(@crypted_password)
         end
 
         it 'returns instance of BCrypt::Password' do
@@ -62,7 +70,7 @@ try_spec do
       describe 'when argument is nil' do
         before :all do
           @input  = nil
-          @result = DataMapper::Types::BCryptHash.load(@input, :property)
+          @result = @bcrypt_hash.load(@input)
         end
 
         it 'returns nil' do
@@ -75,7 +83,7 @@ try_spec do
       describe 'when argument is a string' do
         before :all do
           @input  = 'bcrypt hash'
-          @result = DataMapper::Types::BCryptHash.typecast(@input, :property)
+          @result = @bcrypt_hash.typecast(@input)
         end
 
         it 'casts argument to BCrypt::Password' do
@@ -90,7 +98,7 @@ try_spec do
       describe 'when argument is a blank string' do
         before :all do
           @input  = ''
-          @result = DataMapper::Types::BCryptHash.typecast(@input, :property)
+          @result = @bcrypt_hash.typecast(@input)
         end
 
         it 'casts argument to BCrypt::Password' do
@@ -105,7 +113,7 @@ try_spec do
       describe 'when argument is integer' do
         before :all do
           @input  = 2249
-          @result = DataMapper::Types::BCryptHash.typecast(@input, :property)
+          @result = @bcrypt_hash.typecast(@input)
         end
 
         it 'casts argument to BCrypt::Password' do
@@ -120,7 +128,7 @@ try_spec do
       describe 'when argument is hash' do
         before :all do
           @input  = { :cryptic => 'obscure' }
-          @result = DataMapper::Types::BCryptHash.typecast(@input, :property)
+          @result = @bcrypt_hash.typecast(@input)
         end
 
         it 'casts argument to BCrypt::Password' do
@@ -135,7 +143,7 @@ try_spec do
       describe 'when argument is nil' do
         before :all do
           @input  = nil
-          @result = DataMapper::Types::BCryptHash.typecast(@input, :property)
+          @result = @bcrypt_hash.typecast(@input)
         end
 
         it 'returns nil' do

data/spec/unit/csv_spec.rb

@@ -1,117 +1,129 @@
 require 'spec_helper'
 
 try_spec do
-  describe DataMapper::Types::Csv do
-    describe '.load' do
-      describe 'when argument is a comma separated string' do
-        before :all do
-          @input  = 'uno,due,tre'
-          @result = DataMapper::Types::Csv.load(@input, :property)
+  describe DataMapper::Property::Csv do
+    supported_by :all do
+      before :all do
+        class User
+          include DataMapper::Resource
+          property :id, Serial
+          property :things, Csv
         end
 
-        it 'parses the argument using CVS parser' do
-          @result.should == [ %w[ uno due tre ] ]
-        end
+        @property = User.properties[:things]
       end
 
-      describe 'when argument is an empty array' do
-        before :all do
-          @input    = []
-          @result   = DataMapper::Types::Csv.load(@input, :property)
-        end
+      describe '.load' do
+        describe 'when argument is a comma separated string' do
+          before :all do
+            @input  = 'uno,due,tre'
+            @result = @property.load(@input)
+          end
 
-        it 'does not change the input' do
-          @result.should == @input
+          it 'parses the argument using CVS parser' do
+            @result.should == [ %w[ uno due tre ] ]
+          end
         end
-      end
 
-      describe 'when argument is an empty hash' do
-        before :all do
-          @input    = {}
-          @result   = DataMapper::Types::Csv.load(@input, :property)
-        end
+        describe 'when argument is an empty array' do
+          before :all do
+            @input    = []
+            @result   = @property.load(@input)
+          end
 
-        it 'returns nil' do
-          @result.should be_nil
+          it 'does not change the input' do
+            @result.should == @input
+          end
         end
-      end
 
-      describe 'when argument is nil' do
-        before :all do
-          @input    = nil
-          @result   = DataMapper::Types::Csv.load(@input, :property)
-        end
+        describe 'when argument is an empty hash' do
+          before :all do
+            @input    = {}
+            @result   = @property.load(@input)
+          end
 
-        it 'returns nil' do
-          @result.should be_nil
+          it 'returns nil' do
+            @result.should be_nil
+          end
         end
-      end
 
-      describe 'when argument is an integer' do
-        before :all do
-          @input    = 7
-          @result   = DataMapper::Types::Csv.load(@input, :property)
-        end
+        describe 'when argument is nil' do
+          before :all do
+            @input    = nil
+            @result   = @property.load(@input)
+          end
 
-        it 'returns nil' do
-          @result.should be_nil
+          it 'returns nil' do
+            @result.should be_nil
+          end
         end
-      end
 
-      describe 'when argument is a float' do
-        before :all do
-          @input    = 7.0
-          @result   = DataMapper::Types::Csv.load(@input, :property)
-        end
+        describe 'when argument is an integer' do
+          before :all do
+            @input    = 7
+            @result   = @property.load(@input)
+          end
 
-        it 'returns nil' do
-          @result.should be_nil
+          it 'returns nil' do
+            @result.should be_nil
+          end
         end
-      end
-    end
 
-    describe '.dump' do
-      describe 'when value is a list of lists' do
-        before :all do
-          @input  = [ %w[ uno due tre ], %w[ uno dos tres ] ]
-          @result = DataMapper::Types::Csv.dump(@input, :property)
-        end
+        describe 'when argument is a float' do
+          before :all do
+            @input    = 7.0
+            @result   = @property.load(@input)
+          end
 
-        it 'dumps value to comma separated string' do
-          @result.should == "uno,due,tre\nuno,dos,tres\n"
+          it 'returns nil' do
+            @result.should be_nil
+          end
         end
       end
 
-      describe 'when value is a string' do
-        before :all do
-          @input  = 'beauty hides in the deep'
-          @result = DataMapper::Types::Csv.dump(@input, :property)
-        end
+      describe '.dump' do
+        describe 'when value is a list of lists' do
+          before :all do
+            @input  = [ %w[ uno due tre ], %w[ uno dos tres ] ]
+            @result = @property.dump(@input)
+          end
 
-        it 'returns input as is' do
-          @result.should == @input
+          it 'dumps value to comma separated string' do
+            @result.should == "uno,due,tre\nuno,dos,tres\n"
+          end
         end
-      end
 
-      describe 'when value is nil' do
-        before :all do
-          @input  = nil
-          @result = DataMapper::Types::Csv.dump(@input, :property)
-        end
+        describe 'when value is a string' do
+          before :all do
+            @input  = 'beauty hides in the deep'
+            @result = @property.dump(@input)
+          end
 
-        it 'returns nil' do
-          @result.should be_nil
+          it 'returns input as is' do
+            @result.should == @input
+          end
         end
-      end
 
-      describe 'when value is a hash' do
-        before :all do
-          @input  = { :library => 'DataMapper', :language => 'Ruby' }
-          @result = DataMapper::Types::Csv.dump(@input, :property)
+        describe 'when value is nil' do
+          before :all do
+            @input  = nil
+            @result = @property.dump(@input)
+          end
+
+          it 'returns nil' do
+            @result.should be_nil
+          end
         end
 
-        it 'returns nil' do
-          @result.should be_nil
+        describe 'when value is a hash' do
+          before :all do
+            @input  = { :library => 'DataMapper', :language => 'Ruby' }
+            @result = @property.dump(@input)
+          end
+
+          it 'returns nil' do
+            @result.should be_nil
+          end
         end
       end
     end