dm-types 0.10.2 → 1.0.0.rc1

data/spec/unit/enum_spec.rb

@@ -1,61 +1,46 @@
 require 'spec_helper'
 
 try_spec do
-  describe DataMapper::Types::Enum do
-    describe '.new' do
-      it 'returns a Class' do
-        DataMapper::Types::Enum.new.should be_instance_of(Class)
-      end
-
-      it 'returns an unique Class each time' do
-        DataMapper::Types::Enum.new.should_not == DataMapper::Types::Enum.new
-      end
-
-      it 'stores enumeration items' do
-        DataMapper::Types::Enum.new(:first, :second, :third).flag_map.values.should == [:first, :second, :third]
-      end
-
-      it 'assigns incremental numeric keys to enumeration items' do
-        DataMapper::Types::Enum.new(:one, :two, :three, :four).flag_map.keys.should == (1..4).to_a
-      end
-
-      it 'uses Integer as a primitive' do
-        DataMapper::Types::Enum.new.primitive.should == Integer
+  describe DataMapper::Property::Enum do
+    before :all do
+      class ::User
+        include DataMapper::Resource
+        property :id, Serial
       end
     end
 
     describe '.dump' do
       before do
-        @enum = DataMapper::Types::Enum[:first, :second, :third]
+        @enum = User.property(:enum, DataMapper::Property::Enum, :flags => [:first, :second, :third])
       end
 
       it 'should return the key of the value match from the flag map' do
-        @enum.dump(:first, :property).should == 1
-        @enum.dump(:second, :property).should == 2
-        @enum.dump(:third, :property).should == 3
+        @enum.dump(:first).should == 1
+        @enum.dump(:second).should == 2
+        @enum.dump(:third).should == 3
       end
 
       describe 'when there is no match' do
         it 'should return nil' do
-          @enum.dump(:zero, :property).should be_nil
+          @enum.dump(:zero).should be_nil
         end
       end
     end
 
     describe '.load' do
       before do
-        @enum = DataMapper::Types::Enum[:uno, :dos, :tres]
+        @enum = User.property(:enum, DataMapper::Property::Enum, :flags => [:uno, :dos, :tres])
       end
 
       it 'returns the value of the key match from the flag map' do
-        @enum.load(1, :property).should == :uno
-        @enum.load(2, :property).should == :dos
-        @enum.load(3, :property).should == :tres
+        @enum.load(1).should == :uno
+        @enum.load(2).should == :dos
+        @enum.load(3).should == :tres
       end
 
       describe 'when there is no key' do
         it 'returns nil' do
-          @enum.load(-1, :property).should be_nil
+          @enum.load(-1).should be_nil
         end
       end
     end
@@ -63,72 +48,72 @@ try_spec do
     describe '.typecast' do
       describe 'of Enum created from a symbol' do
         before :all do
-          @enum = DataMapper::Types::Enum[:uno]
+          @enum = User.property(:enum, DataMapper::Property::Enum, :flags => [:uno])
         end
 
         describe 'when given a symbol' do
           it 'uses Enum type' do
-            @enum.typecast(:uno,  :property).should == :uno
+            @enum.typecast(:uno).should == :uno
           end
         end
 
         describe 'when given a string' do
           it 'uses Enum type' do
-            @enum.typecast('uno', :property).should == :uno
+            @enum.typecast('uno').should == :uno
           end
         end
 
         describe 'when given nil' do
           it 'returns nil' do
-            @enum.typecast( nil, :property).should == nil
+            @enum.typecast( nil).should == nil
           end
         end
       end
 
       describe 'of Enum created from integer list' do
         before :all do
-          @enum = DataMapper::Types::Enum[1, 2, 3]
+          @enum = User.property(:enum, DataMapper::Property::Enum, :flags => [1, 2, 3])
         end
 
         describe 'when given an integer' do
           it 'uses Enum type' do
-            @enum.typecast(1, :property).should == 1
+            @enum.typecast(1).should == 1
           end
         end
 
         describe 'when given a float' do
           it 'uses Enum type' do
-            @enum.typecast(1.1, :property).should == 1
+            @enum.typecast(1.1).should == 1
           end
         end
 
         describe 'when given nil' do
           it 'returns nil' do
-            @enum.typecast( nil, :property).should == nil
+            @enum.typecast( nil).should == nil
           end
         end
       end
 
       describe 'of Enum created from a string' do
         before :all do
-          @enum = DataMapper::Types::Enum['uno']
+          @enum = User.property(:enum, DataMapper::Property::Enum, :flags => ['uno'])
         end
 
         describe 'when given a symbol' do
           it 'uses Enum type' do
-            @enum.typecast(:uno,  :property).should == 'uno'
+            @enum.typecast(:uno).should == 'uno'
           end
         end
 
         describe 'when given a string' do
           it 'uses Enum type' do
-            @enum.typecast('uno', :property).should == 'uno'
+            @enum.typecast('uno').should == 'uno'
           end
         end
 
         describe 'when given nil' do
           it 'returns nil' do
-            @enum.typecast( nil, :property).should == nil
+            @enum.typecast( nil).should == nil
           end
         end
       end

data/spec/unit/epoch_time_spec.rb

@@ -1,7 +1,17 @@
 require 'spec_helper'
 
 try_spec do
-  describe DataMapper::Types::EpochTime do
+  describe DataMapper::Property::EpochTime do
+    before :all do
+      class User
+        include DataMapper::Resource
+        property :id, Serial
+        property :bday, EpochTime
+      end
+
+      @property = User.properties[:bday]
+    end
+
     describe '.dump' do
       describe 'when given Time instance' do
         before :all do
@@ -9,7 +19,7 @@ try_spec do
         end
 
         it 'returns timestamp' do
-          DataMapper::Types::EpochTime.dump(@input, :property).should == @input.to_i
+          @property.dump(@input).should == @input.to_i
         end
       end
 
@@ -19,7 +29,8 @@ try_spec do
         end
 
         it 'returns timestamp' do
-          DataMapper::Types::EpochTime.dump(@input, :property).should == Time.parse(@input.to_s).to_i
+          pending 'Does not work with < 1.8.7, see if backports fixes it' if RUBY_VERSION < '1.8.7'
+          @property.dump(@input).should == Time.parse(@input.to_s).to_i
         end
       end
 
@@ -29,7 +40,7 @@ try_spec do
         end
 
         it 'returns value as is' do
-          DataMapper::Types::EpochTime.dump(@input, :property).should == @input
+          @property.dump(@input).should == @input
         end
       end
 
@@ -39,7 +50,7 @@ try_spec do
         end
 
         it 'returns value as is' do
-          DataMapper::Types::EpochTime.dump(@input, :property).should == @input
+          @property.dump(@input).should == @input
         end
       end
     end
@@ -47,14 +58,14 @@ try_spec do
     describe '.load' do
       describe 'when value is nil' do
         it 'returns nil' do
-          DataMapper::Types::EpochTime.load(nil, :property).should == nil
+          @property.load(nil).should == nil
         end
       end
 
       describe 'when value is an integer' do
         it 'returns time object from timestamp' do
           t = Time.now.to_i
-          DataMapper::Types::EpochTime.load(Time.now.to_i, :property).should == Time.at(t)
+          @property.load(Time.now.to_i).should == Time.at(t)
         end
       end
     end

data/spec/unit/file_path_spec.rb

@@ -1,7 +1,12 @@
 require 'spec_helper'
+require './spec/fixtures/software_package'
 
 try_spec do
-  describe DataMapper::Types::FilePath do
+  describe DataMapper::Property::FilePath do
+    before :all do
+      @property = DataMapper::Types::Fixtures::SoftwarePackage.properties[:source_path]
+    end
+
     before do
       @input = '/usr/bin/ruby'
       @path  = Pathname.new(@input)
@@ -10,19 +15,19 @@ try_spec do
     describe '.dump' do
       describe 'when input is a string' do
         it 'does not modify input' do
-          DataMapper::Types::FilePath.dump(@input, :property).should == @input
+          @property.dump(@input).should == @input
         end
       end
 
       describe 'when input is nil' do
         it 'returns nil' do
-          DataMapper::Types::FilePath.dump(nil, :property).should be_nil
+          @property.dump(nil).should be_nil
         end
       end
 
       describe 'when input is a blank string' do
         it 'returns nil' do
-          DataMapper::Types::FilePath.dump('', :property).should be_nil
+          @property.dump('').should be_nil
         end
       end
     end
@@ -30,19 +35,19 @@ try_spec do
     describe '.load' do
       describe 'when value is a non-blank file path' do
         it 'returns Pathname for a path' do
-          DataMapper::Types::FilePath.load(@input, :property).should == @path
+          @property.load(@input).should == @path
         end
       end
 
       describe 'when value is nil' do
         it 'return nil' do
-          DataMapper::Types::FilePath.load(nil, :property).should be_nil
+          @property.load(nil).should be_nil
         end
       end
 
       describe 'when value is a blank string' do
         it 'returns nil' do
-          DataMapper::Types::FilePath.load('', :property).should be_nil
+          @property.load('').should be_nil
         end
       end
     end
@@ -50,19 +55,19 @@ try_spec do
     describe '.typecast' do
       describe 'when a Pathname is given' do
         it 'does not modify input' do
-          DataMapper::Types::FilePath.typecast(@path, :property).should == @path
+          @property.typecast(@path).should == @path
         end
       end
 
       describe 'when a nil is given' do
         it 'does not modify input' do
-          DataMapper::Types::FilePath.typecast(nil, :property).should == nil
+          @property.typecast(nil).should == nil
         end
       end
 
       describe 'when a string is given' do
         it 'returns Pathname for given path' do
-          DataMapper::Types::FilePath.typecast(@input, :property).should == @path
+          @property.typecast(@input).should == @path
         end
       end
     end

data/spec/unit/flag_spec.rb

@@ -1,41 +1,18 @@
 require 'spec_helper'
 
-describe 'factory method for Flag type', :shared => true do
-  it 'creates a Class' do
-    DataMapper::Types::Flag.new.should be_instance_of(Class)
-  end
-
-  it 'creates unique a Class each call' do
-    DataMapper::Types::Flag.new.should_not == DataMapper::Types::Flag.new
-  end
-
-  it 'builds up flags map from arguments' do
-    DataMapper::Types::Flag.new(:first, :second, :third).flag_map.values.should == [ :first, :second, :third ]
-  end
-
-  it 'should create keys that is +1 for every increment for the @flag_map hash, staring at 0' do
-    DataMapper::Types::Flag.new(:one, :two, :three, :four, :five).flag_map.keys.should include(0, 1, 2, 3, 4)
-  end
-end
+require './spec/fixtures/tshirt'
 
 try_spec do
-  describe DataMapper::Types::Flag do
-    describe '.new' do
-      it_should_behave_like 'factory method for Flag type'
-    end
-
-    describe '.[]' do
-      it_should_behave_like 'factory method for Flag type'
-    end
-
+  describe DataMapper::Property::Flag do
     describe '.dump' do
       before :all do
-        @flag = DataMapper::Types::Flag[:first, :second, :third, :fourth, :fifth]
+        @flag = DataMapper::Types::Fixtures::TShirt.property(
+          :stuff, DataMapper::Property::Flag, :flags => [:first, :second, :third, :fourth, :fifth])
       end
 
       describe 'when argument matches a value in the flag map' do
         before :all do
-          @result = @flag.dump(:first, :property)
+          @result = @flag.dump(:first)
         end
 
         it 'returns flag bit of value' do
@@ -45,7 +22,7 @@ try_spec do
 
       describe 'when argument matches 2nd value in the flag map' do
         before :all do
-          @result = @flag.dump(:second, :property)
+          @result = @flag.dump(:second)
         end
 
         it 'returns flag bit of value' do
@@ -55,7 +32,7 @@ try_spec do
 
       describe 'when argument matches multiple Symbol values in the flag map' do
         before :all do
-          @result = @flag.dump([ :second, :fourth ], :property)
+          @result = @flag.dump([ :second, :fourth ])
         end
 
         it 'builds binary flag from key values of all matches' do
@@ -65,7 +42,7 @@ try_spec do
 
       describe 'when argument matches multiple string values in the flag map' do
         before :all do
-          @result = @flag.dump(['first', 'second', 'third', 'fourth', 'fifth'], :property)
+          @result = @flag.dump(['first', 'second', 'third', 'fourth', 'fifth'])
         end
 
         it 'builds binary flag from key values of all matches' do
@@ -75,7 +52,7 @@ try_spec do
 
       describe 'when argument does not match a single value in the flag map' do
         before :all do
-          @result = @flag.dump(:zero, :property)
+          @result = @flag.dump(:zero)
         end
 
         it 'returns zero' do
@@ -86,12 +63,12 @@ try_spec do
 
     describe '.load' do
       before :all do
-        @flag = DataMapper::Types::Flag[:uno, :dos, :tres, :cuatro, :cinco]
+        @flag = DataMapper::Types::Fixtures::TShirt.property(:stuff, DataMapper::Property::Flag, :flags => [:uno, :dos, :tres, :cuatro, :cinco])
       end
 
       describe 'when argument matches a key in the flag map' do
         before :all do
-          @result = @flag.load(4,  :property)
+          @result = @flag.load(4)
         end
 
         it 'returns array with a single matching element' do
@@ -101,7 +78,7 @@ try_spec do
 
       describe 'when argument matches multiple keys in the flag map' do
         before :all do
-          @result = @flag.load(10, :property)
+          @result = @flag.load(10)
         end
 
         it 'returns array of matching values' do
@@ -111,7 +88,7 @@ try_spec do
 
       describe 'when argument does not match a single key in the flag map' do
         before :all do
-          @result = @flag.load(nil, :property)
+          @result = @flag.load(nil)
         end
 
         it 'returns an empty array' do

data/spec/unit/ip_address_spec.rb

@@ -1,16 +1,19 @@
 require 'spec_helper'
 
+require './spec/fixtures/network_node'
+
 try_spec do
-  describe DataMapper::Types::IPAddress do
+  describe DataMapper::Property::IPAddress do
     before :all do
       @stored = '81.20.130.1'
       @input  = IPAddr.new(@stored)
+      @property = DataMapper::Types::Fixtures::NetworkNode.properties[:ip_address]
     end
 
     describe '.dump' do
       describe 'when argument is an IP address given as Ruby object' do
         before :all do
-          @result = DataMapper::Types::IPAddress.dump(@input, :property)
+          @result = @property.dump(@input)
         end
 
         it 'dumps input into a string' do
@@ -20,7 +23,7 @@ try_spec do
 
       describe 'when argument is nil' do
         before :all do
-          @result = DataMapper::Types::IPAddress.dump(nil, :property)
+          @result = @property.dump(nil)
         end
 
         it 'returns nil' do
@@ -30,7 +33,7 @@ try_spec do
 
       describe 'when input is a blank string' do
         before :all do
-          @result = DataMapper::Types::IPAddress.dump('', :property)
+          @result = @property.dump('')
         end
 
         it 'retuns a blank string' do
@@ -42,7 +45,7 @@ try_spec do
     describe '.load' do
       describe 'when argument is a valid IP address as a string' do
         before :all do
-          @result = DataMapper::Types::IPAddress.load(@stored, :property)
+          @result = @property.load(@stored)
         end
 
         it 'returns IPAddr instance from stored value' do
@@ -52,7 +55,7 @@ try_spec do
 
       describe 'when argument is nil' do
         before :all do
-          @result = DataMapper::Types::IPAddress.load(nil, :property)
+          @result = @property.load(nil)
         end
 
         it 'returns nil' do
@@ -62,7 +65,7 @@ try_spec do
 
       describe 'when argument is a blank string' do
         before :all do
-          @result = DataMapper::Types::IPAddress.load('', :property)
+          @result = @property.load('')
         end
 
         it 'returns IPAddr instance from stored value' do
@@ -72,7 +75,7 @@ try_spec do
 
       describe 'when argument is an Array instance' do
         before :all do
-          @operation = lambda { DataMapper::Types::IPAddress.load([], :property) }
+          @operation = lambda { @property.load([]) }
         end
 
         it 'raises ArgumentError with a meaningful message' do
@@ -84,7 +87,7 @@ try_spec do
     describe '.typecast' do
       describe 'when argument is an IpAddr object' do
         before :all do
-          @result = DataMapper::Types::IPAddress.typecast(@input, :property)
+          @result = @property.typecast(@input)
         end
 
         it 'does not change the value' do
@@ -94,7 +97,7 @@ try_spec do
 
       describe 'when argument is a valid IP address as a string' do
         before :all do
-          @result = DataMapper::Types::IPAddress.typecast(@stored, :property)
+          @result = @property.typecast(@stored)
         end
 
         it 'instantiates IPAddr instance' do