dm-types 0.10.2 → 1.0.0.rc1

data/lib/dm-types/paranoid_datetime.rb

@@ -0,0 +1,22 @@
+require 'dm-types/paranoid/base'
+
+module DataMapper
+  class Property
+    class ParanoidDateTime < DateTime
+      lazy      true
+
+      # @api private
+      def bind
+        property_name = name.inspect
+
+        model.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          include Paranoid::Base
+
+          set_paranoid_property(#{property_name}) { ::DateTime.now }
+
+          default_scope(#{repository_name.inspect}).update(#{property_name} => nil)
+        RUBY
+      end
+    end # class ParanoidDateTime
+  end # module Property
+end # module DataMapper

data/lib/dm-types/regexp.rb

@@ -1,18 +1,18 @@
-module DataMapper
-  module Types
-    class Regexp < DataMapper::Type
-      primitive String
+require 'dm-core'
 
-      def self.load(value, property)
+module DataMapper
+  class Property
+    class Regexp < String
+      def load(value)
         ::Regexp.new(value) unless value.nil?
       end
 
-      def self.dump(value, property)
+      def dump(value)
         value.source unless value.nil?
       end
 
-      def self.typecast(value, property)
-        load(value, property)
+      def typecast(value)
+        load(value)
       end
     end
   end

data/lib/dm-types/slug.rb

@@ -1,20 +1,15 @@
+require 'dm-core'
 require 'stringex'
 
 module DataMapper
-  module Types
-    class Slug < DataMapper::Type
-      primitive String
-      length    2000
-
+  class Property
+    class Slug < String
       # Maximum length chosen because URI type is limited to 2000
       # characters, and a slug is a component of a URI, so it should
       # not exceed the maximum URI length either.
+      length 2000
 
-      def self.load(value, property)
-        value
-      end
-
-      def self.dump(value, property)
+      def dump(value)
         return if value.nil?
 
         if value.respond_to?(:to_str)
@@ -24,9 +19,9 @@ module DataMapper
         end
       end
 
-      def self.escape(string)
+      def escape(string)
         string.to_url
       end
     end # class Slug
-  end # module Types
+  end # class Property
 end # module DataMapper

data/lib/dm-types/uri.rb

@@ -1,25 +1,37 @@
 require 'addressable/uri'
+require 'dm-core'
 
 module DataMapper
-  module Types
-    class URI < DataMapper::Type
-      primitive String
-      length    2000
+  class Property
+    class URI < String
+      length 2000
+
+      def custom?
+        true
+      end
+
+      def primitive?(value)
+        value.kind_of?(Addressable::URI)
+      end
+
+      def valid?(value, negated = false)
+        super || primitive?(value) || value.kind_of?(::String)
+      end
 
       # Maximum length chosen based on recommendation:
       # http://stackoverflow.com/questions/417142/what-is-the-maximum-length-of-an-url
 
-      def self.load(value, property)
+      def load(value)
         Addressable::URI.parse(value)
       end
 
-      def self.dump(value, property)
+      def dump(value)
         value.to_s unless value.nil?
       end
 
-      def self.typecast(value, property)
-        load(value, property)
+      def typecast_to_primitive(value)
+        load(value)
       end
     end # class URI
-  end # module Types
+  end # class Property
 end # module DataMapper

data/lib/dm-types/uuid.rb

@@ -1,7 +1,8 @@
+require 'dm-core'
 require 'uuidtools'  # must be ~>2.0
 
 module DataMapper
-  module Types
+  class Property
     # UUID Type
     # First run at this, because I need it. A few caveats:
     #  * Only works on postgres, using the built-in native uuid type.
@@ -37,25 +38,31 @@ module DataMapper
     #
     #  -- benburkert Nov 15, 08
     #
-    class UUID < DataMapper::Type
-      primitive String
-      length    36
+    class UUID < String
+      length 36
 
-      def self.load(value, property)
-        UUIDTools::UUID.parse(value) unless value.nil?
+      # We need to override this method otherwise typecast_to_primitive won't be called.
+      # In the future we will set primitive to UUIDTools::UUID but this can happen only
+      # when adapters can handle it
+      def primitive?(value)
+        value.kind_of?(UUIDTools::UUID)
       end
 
-      def self.dump(value, property)
+      def dump(value)
         value.to_s unless value.nil?
       end
 
-      def self.typecast(value, property)
-        if value.kind_of?(UUIDTools::UUID)
+      def load(value)
+        if primitive?(value)
           value
-        else
-          load(value, property)
+        elsif !value.nil?
+          UUIDTools::UUID.parse(value)
         end
       end
+
+      def typecast_to_primitive(value)
+        load(value)
+      end
     end
   end
 end

data/lib/dm-types/yaml.rb

@@ -1,34 +1,36 @@
 require 'yaml'
+require 'dm-core'
 
 module DataMapper
-  module Types
-    class Yaml < DataMapper::Type
-      primitive Text
+  class Property
+    class Yaml < Text
+      def custom?
+        true
+      end
 
-      def self.load(value, property)
+      def load(value)
         if value.nil?
           nil
-        elsif value.is_a?(String)
+        elsif value.is_a?(::String)
           ::YAML.load(value)
         else
           raise ArgumentError.new("+value+ of a property of YAML type must be nil or a String")
         end
       end
 
-      def self.dump(value, property)
+      def dump(value)
         if value.nil?
           nil
-        elsif value.is_a?(String) && value =~ /^---/
+        elsif value.is_a?(::String) && value =~ /^---/
           value
         else
           ::YAML.dump(value)
         end
       end
 
-      def self.typecast(value, property)
-        # No typecasting; leave values exactly as they're provided.
+      def typecast(value)
         value
       end
     end # class Yaml
-  end # module Types
+  end # class Property
 end # module DataMapper

data/spec/fixtures/article.rb

@@ -31,8 +31,6 @@ module DataMapper
         before :valid? do
           self.slug = self.title
         end
-
-        auto_migrate!
       end # Article
     end
   end

data/spec/fixtures/bookmark.rb

@@ -19,8 +19,6 @@ module DataMapper
         property :shared, Boolean
         property :uri,    URI
         property :tags,   Yaml
-
-        auto_migrate!
       end # Bookmark
     end
   end

data/spec/fixtures/network_node.rb

@@ -32,8 +32,6 @@ module DataMapper
         def runs_ipv4?
           self.ip_address.ipv4?
         end
-
-        auto_migrate!
       end # NetworkNode
     end # Fixtures
   end # Types

data/spec/fixtures/person.rb

@@ -21,8 +21,6 @@ module DataMapper
         property :interests, CommaSeparatedList
 
         property :password, BCryptHash
-
-        auto_migrate!
       end
     end
   end

data/spec/fixtures/software_package.rb

@@ -29,8 +29,6 @@ module DataMapper
           property :installed_at,     DateTime
           property :installed_by,     String
         end
-
-        auto_migrate!
       end # SoftwarePackage
     end # Fixtures
   end # Types

data/spec/fixtures/ticket.rb

@@ -7,7 +7,7 @@ module DataMapper
         #
 
         include DataMapper::Resource
-        include DataMapper::Validate
+        include DataMapper::Validations
 
         #
         # Properties
@@ -16,9 +16,7 @@ module DataMapper
         property :id,     Serial
         property :title,  String, :length => 255
         property :body,   Text
-        property :status, Enum[:unconfirmed, :confirmed, :assigned, :resolved, :not_applicable]
-
-        auto_migrate!
+        property :status, Enum, :flags => [:unconfirmed, :confirmed, :assigned, :resolved, :not_applicable]
       end # Ticket
     end
   end

data/spec/fixtures/tshirt.rb

@@ -16,12 +16,10 @@ module DataMapper
         property :id,          Serial
         property :writing,     String
         property :has_picture, Boolean, :default => false
-        property :picture,     Enum[:octocat, :fork_you, :git_down]
+        property :picture,     Enum, :flags => [:octocat, :fork_you, :git_down]
 
-        property :color, Enum[:white, :black, :red, :orange, :yellow, :green, :cyan, :blue, :purple]
-        property :size,  Flag[:xs, :small, :medium, :large, :xl, :xxl]
-
-        auto_migrate!
+        property :color, Enum, :flags => [:white, :black, :red, :orange, :yellow, :green, :cyan, :blue, :purple]
+        property :size,  Flag, :flags => [:xs, :small, :medium, :large, :xl, :xxl]
       end # Shirt
     end # Fixtures
   end # Types

data/spec/integration/bcrypt_hash_spec.rb

@@ -5,37 +5,39 @@ try_spec do
   require './spec/fixtures/person'
 
   describe DataMapper::Types::Fixtures::Person do
-    before :all  do
-      @resource  = DataMapper::Types::Fixtures::Person.create(:password => 'DataMapper R0cks!')
-      DataMapper::Types::Fixtures::Person.create(:password => 'password1')
-
-      @people = DataMapper::Types::Fixtures::Person.all
-      @resource.reload
-    end
-
-    it 'persists the password on initial save' do
-      @resource.password.should       == 'DataMapper R0cks!'
-      @people.last.password.should == 'password1'
-    end
-
-    it 'recalculates password hash on attribute update' do
-      @resource.attribute_set(:password, 'bcryptic obscure')
-      @resource.save
-
-      @resource.reload
-      @resource.password.should     == 'bcryptic obscure'
-      @resource.password.should_not == 'DataMapper R0cks!'
-    end
-
-    it 'does not change password value on reload' do
-      resource = @people.last
-      original = resource.password.to_s
-      resource.reload
-      resource.password.to_s.should == original
-    end
-
-    it 'uses cost of BCrypt::Engine::DEFAULT_COST' do
-      @resource.password.cost.should == BCrypt::Engine::DEFAULT_COST
+    supported_by :all do
+      before :all  do
+        @resource  = DataMapper::Types::Fixtures::Person.create(:password => 'DataMapper R0cks!')
+        DataMapper::Types::Fixtures::Person.create(:password => 'password1')
+
+        @people = DataMapper::Types::Fixtures::Person.all
+        @resource.reload
+      end
+
+      it 'persists the password on initial save' do
+        @resource.password.should       == 'DataMapper R0cks!'
+        @people.last.password.should == 'password1'
+      end
+
+      it 'recalculates password hash on attribute update' do
+        @resource.attribute_set(:password, 'bcryptic obscure')
+        @resource.save
+
+        @resource.reload
+        @resource.password.should     == 'bcryptic obscure'
+        @resource.password.should_not == 'DataMapper R0cks!'
+      end
+
+      it 'does not change password value on reload' do
+        resource = @people.last
+        original = resource.password.to_s
+        resource.reload
+        resource.password.to_s.should == original
+      end
+
+      it 'uses cost of BCrypt::Engine::DEFAULT_COST' do
+        @resource.password.cost.should == BCrypt::Engine::DEFAULT_COST
+      end
     end
   end
 end

data/spec/integration/comma_separated_list_spec.rb

@@ -5,83 +5,85 @@ try_spec do
   require './spec/fixtures/person'
 
   describe DataMapper::Types::Fixtures::Person do
-    before :all do
-      @resource = DataMapper::Types::Fixtures::Person.new(:name => '')
-    end
-
-    describe 'with no interests information' do
+    supported_by :all do
       before :all do
-        @resource.interests = nil
+        @resource = DataMapper::Types::Fixtures::Person.new(:name => '')
       end
 
-      describe 'when dumped and loaded again' do
+      describe 'with no interests information' do
         before :all do
-          @resource.save.should be_true
-          @resource.reload
+          @resource.interests = nil
         end
 
-        it 'has no interests' do
-          @resource.interests.should == nil
-        end
-      end
-    end
+        describe 'when dumped and loaded again' do
+          before :all do
+            @resource.save.should be_true
+            @resource.reload
+          end
 
-    describe 'with no interests information' do
-      before :all do
-        @resource.interests = []
+          it 'has no interests' do
+            @resource.interests.should == nil
+          end
+        end
       end
 
-      describe 'when dumped and loaded again' do
+      describe 'with no interests information' do
         before :all do
-          @resource.save.should be_true
-          @resource.reload
+          @resource.interests = []
         end
 
-        it 'has empty interests list' do
-          @resource.interests.should == []
-        end
-      end
-    end
+        describe 'when dumped and loaded again' do
+          before :all do
+            @resource.save.should be_true
+            @resource.reload
+          end
 
-    describe 'with interests information given as a Hash' do
-      it 'raises ArgumentError' do
-        lambda do
-          @resource.interests = { :hash => 'value' }
-          @resource.save
-        end.should raise_error(ArgumentError, /must be a string, an array or nil/)
+          it 'has empty interests list' do
+            @resource.interests.should == []
+          end
+        end
       end
-    end
 
-    describe 'with a few items on the interests list' do
-      before :all do
-        @input = 'fire, water, fire, a whole lot of other interesting things, ,,,'
-        @resource.interests = @input
+      describe 'with interests information given as a Hash' do
+        it 'raises ArgumentError' do
+          lambda do
+            @resource.interests = { :hash => 'value' }
+            @resource.save
+          end.should raise_error(ArgumentError, /must be a string, an array or nil/)
+        end
       end
 
-      describe 'when dumped and loaded again' do
+      describe 'with a few items on the interests list' do
         before :all do
-          @resource.save.should be_true
-          @resource.reload
+          @input = 'fire, water, fire, a whole lot of other interesting things, ,,,'
+          @resource.interests = @input
         end
 
-        it 'includes "fire" in interests' do
-          @resource.interests.should include('fire')
-        end
+        describe 'when dumped and loaded again' do
+          before :all do
+            @resource.save.should be_true
+            @resource.reload
+          end
 
-        it 'includes "water" in interests' do
-          @resource.interests.should include('water')
-        end
+          it 'includes "fire" in interests' do
+            @resource.interests.should include('fire')
+          end
 
-        it 'includes "a whole lot of other interesting things" in interests' do
-          @resource.interests.should include('a whole lot of other interesting things')
-        end
+          it 'includes "water" in interests' do
+            @resource.interests.should include('water')
+          end
 
-        it 'has blank entries removed' do
-          @resource.interests.any? { |i| i.blank? }.should be_false
-        end
+          it 'includes "a whole lot of other interesting things" in interests' do
+            @resource.interests.should include('a whole lot of other interesting things')
+          end
+
+          it 'has blank entries removed' do
+            @resource.interests.any? { |i| i.blank? }.should be_false
+          end
 
-        it 'has duplicates removed' do
-          @resource.interests.select { |i| i == 'fire' }.size.should == 1
+          it 'has duplicates removed' do
+            @resource.interests.select { |i| i == 'fire' }.size.should == 1
+          end
         end
       end
     end