dm-types 0.9.2 → 0.9.3

data/History.txt

@@ -0,0 +1 @@
+

data/Manifest.txt

@@ -0,0 +1,39 @@
+History.txt
+LICENSE
+Manifest.txt
+README.txt
+Rakefile
+TODO
+lib/dm-types.rb
+lib/dm-types/bcrypt_hash.rb
+lib/dm-types/csv.rb
+lib/dm-types/enum.rb
+lib/dm-types/epoch_time.rb
+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/serial.rb
+lib/dm-types/uri.rb
+lib/dm-types/version.rb
+lib/dm-types/yaml.rb
+spec/integration/bcrypt_hash_spec.rb
+spec/integration/enum_spec.rb
+spec/integration/file_path_spec.rb
+spec/integration/flag_spec.rb
+spec/integration/ip_address_spec.rb
+spec/integration/json_spec.rb
+spec/integration/uri_spec.rb
+spec/integration/yaml_spec.rb
+spec/spec.opts
+spec/spec_helper.rb
+spec/unit/bcrypt_hash_spec.rb
+spec/unit/csv_spec.rb
+spec/unit/enum_spec.rb
+spec/unit/epoch_time_spec.rb
+spec/unit/file_path_spec.rb
+spec/unit/flag_spec.rb
+spec/unit/ip_address_spec.rb
+spec/unit/json_spec.rb
+spec/unit/uri_spec.rb
+spec/unit/yaml_spec.rb

data/{README → README.txt}

@@ -1,4 +1,3 @@
-dm-types
-========
+= dm-types
 
 DataMapper plugin providing many extra types for use in data models.

data/Rakefile

@@ -1,51 +1,44 @@
 require 'rubygems'
 require 'spec'
-require 'rake/clean'
-require 'rake/gempackagetask'
 require 'spec/rake/spectask'
 require 'pathname'
 
-CLEAN.include '{log,pkg}/'
+ROOT = Pathname(__FILE__).dirname.expand_path
+require ROOT + 'lib/dm-types/version'
 
-spec = Gem::Specification.new do |s|
-  s.name             = 'dm-types'
-  s.version          = '0.9.2'
-  s.platform         = Gem::Platform::RUBY
-  s.has_rdoc         = true
-  s.extra_rdoc_files = %w[ README LICENSE TODO ]
-  s.summary          = 'DataMapper plugin providing extra data types'
-  s.description      = s.summary
-  s.author           = 'Sam Smoot'
-  s.email            = 'ssmoot@gmail.com'
-  s.homepage         = 'http://github.com/sam/dm-more/tree/master/dm-types'
-  s.require_path     = 'lib'
-  s.files            = FileList[ '{lib,spec}/**/*.rb', 'spec/spec.opts', 'Rakefile', *s.extra_rdoc_files ]
-  s.add_dependency('dm-core', "=#{s.version}")
-end
+AUTHOR = "Sam Smoot"
+EMAIL  = "ssmoot@gmail.com"
+GEM_NAME = "dm-types"
+GEM_VERSION = DataMapper::Types::VERSION
+GEM_DEPENDENCIES = [["dm-core", GEM_VERSION]]
+GEM_CLEAN = ["log", "pkg", "coverage"]
+GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO ] }
+
+PROJECT_NAME = "datamapper"
+PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/dm-types"
+PROJECT_DESCRIPTION = PROJECT_SUMMARY = "DataMapper plugin providing extra data types"
+
+require ROOT.parent + 'tasks/hoe'
 
 task :default => [ :spec ]
 
 WIN32 = (RUBY_PLATFORM =~ /win32|mingw|cygwin/) rescue nil
 SUDO  = WIN32 ? '' : ('sudo' unless ENV['SUDOLESS'])
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-desc "Install #{spec.name} #{spec.version} (default ruby)"
+desc "Install #{GEM_NAME} #{GEM_VERSION} (default ruby)"
 task :install => [ :package ] do
-  sh "#{SUDO} gem install --local pkg/#{spec.name}-#{spec.version} --no-update-sources", :verbose => false
+  sh "#{SUDO} gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources", :verbose => false
 end
 
-desc "Uninstall #{spec.name} #{spec.version} (default ruby)"
+desc "Uninstall #{GEM_NAME} #{GEM_VERSION} (default ruby)"
 task :uninstall => [ :clobber ] do
-  sh "#{SUDO} gem uninstall #{spec.name} -v#{spec.version} -I -x", :verbose => false
+  sh "#{SUDO} gem uninstall #{GEM_NAME} -v#{GEM_VERSION} -I -x", :verbose => false
 end
 
 namespace :jruby do
-  desc "Install #{spec.name} #{spec.version} with JRuby"
+  desc "Install #{GEM_NAME} #{GEM_VERSION} with JRuby"
   task :install => [ :package ] do
-    sh %{#{SUDO} jruby -S gem install --local pkg/#{spec.name}-#{spec.version} --no-update-sources}, :verbose => false
+    sh %{#{SUDO} jruby -S gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources}, :verbose => false
   end
 end
 

data/lib/dm-types.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'pathname'
 
-gem 'dm-core', '=0.9.2'
+gem 'dm-core', '=0.9.3'
 require 'dm-core'
 
 dir = Pathname(__FILE__).dirname.expand_path / 'dm-types'
@@ -16,3 +16,10 @@ require dir / "json"""
 require dir / 'uri'
 require dir / 'yaml'
 require dir / 'serial'
+
+# this looks a little ugly, but everyone who uses dm-types shouldn't have to have ruby-bcrypt installed
+module DataMapper
+  module Types
+    autoload(:BCryptHash, File.join(Pathname(__FILE__).dirname.expand_path, 'dm-types', 'bcrypt_hash'))
+  end
+end

data/lib/dm-types/bcrypt_hash.rb

@@ -0,0 +1,31 @@
+
+require 'bcrypt'
+
+module DataMapper
+  module Types
+    class BCryptHash < DataMapper::Type
+      primitive String
+      size 60
+
+      def self.load(value, property)
+        if value.nil?
+          nil
+        elsif value.is_a?(String)
+          BCrypt::Password.new(value)
+        else
+          raise ArgumentError.new("+value+ must be nil or a String")
+        end
+      end
+
+      def self.dump(value, property)
+        if value.nil?
+          nil
+        elsif value.is_a?(String)
+          BCrypt::Password.create(value, :cost => BCrypt::Engine::DEFAULT_COST)
+        else
+          raise ArgumentError.new("+value+ must be nil or a String")
+        end
+      end
+    end # class BCryptHash
+  end # module Types
+end # module DataMapper

data/lib/dm-types/enum.rb

@@ -35,6 +35,17 @@ module DataMapper
       def self.dump(value, property)
         self.flag_map.invert[value]
       end
+
+      def self.typecast(value, property)
+        # Attempt to typecast using the class of the first item in the map.
+        return value if value.nil?
+        case self.flag_map[1]
+          when Symbol then value.to_sym
+          when String then value.to_s
+          when Fixnum then value.to_i
+          else               value
+        end
+      end
     end # class Enum
   end # module Types
 end # module DataMapper

data/lib/dm-types/file_path.rb

@@ -17,6 +17,11 @@ module DataMapper
         return nil if value.nil?
         value.to_s
       end
+
+      def self.typecast(value, property)
+        # Leave alone if a Pathname is given.
+        value.kind_of?(Pathname) ? value : load(value, property)
+      end
     end # class FilePath
   end # module Types
 end # module DataMapper

data/lib/dm-types/flag.rb

@@ -1,6 +1,9 @@
 module DataMapper
   module Types
     class Flag < DataMapper::Type(Integer)
+      def self.inherited(target)
+        target.instance_variable_set("@primitive", self.primitive)
+      end
 
       def self.flag_map
         @flag_map
@@ -11,7 +14,7 @@ module DataMapper
       end
 
       def self.new(*flags)
-        type = Flag.clone  # cannot dup a Class
+        type = Class.new(Flag)
         type.flag_map = {}
 
         flags.each_with_index do |flag, i|
@@ -46,6 +49,13 @@ module DataMapper
         flags.map!{ |f| f.to_sym }
         flag_map.invert.values_at(*flags.flatten).compact.inject(0) { |sum, i| sum + i }
       end
+
+      def self.typecast(value, property)
+        case value
+        when Array then value.map {|v| v.to_sym}
+        else value.to_sym
+        end
+      end
     end # class Flag
   end # module Types
 end # module DataMapper

data/lib/dm-types/ip_address.rb

@@ -21,6 +21,10 @@ module DataMapper
         return nil if value.nil?
         value.to_s
       end
+
+      def self.typecast(value, property)
+        value.kind_of?(IPAddr) ? value : load(value, property)
+      end
     end # class IPAddress
   end # module Types
 end # module DataMapper

data/lib/dm-types/json.rb

@@ -26,6 +26,15 @@ module DataMapper
           ::JSON.dump(value)
         end
       end
+
+      def self.typecast(value, property)
+        # Arrays and hashes are left alone, while strings are parsed as JSON.
+        if value.kind_of?(Array) || value.kind_of?(Hash)
+          value
+        else
+          ::JSON.load(value.to_s)
+        end
+      end
     end # class Json
   end # module Types
 end # module DataMapper

data/lib/dm-types/uri.rb

@@ -14,6 +14,10 @@ module DataMapper
         return nil if value.nil?
         value.to_s
       end
+
+      def self.typecast(value, property)
+        value.kind_of?(Addressable::URI) ? value : load(value.to_s, property)
+      end
     end # class URI
   end # module Types
 end # module DataMapper

data/lib/dm-types/version.rb

@@ -0,0 +1,5 @@
+module DataMapper
+  module Types
+    VERSION = "0.9.3"
+  end
+end

data/lib/dm-types/yaml.rb

@@ -26,6 +26,11 @@ module DataMapper
           ::YAML.dump(value)
         end
       end
+
+      def self.typecast(value, property)
+        # No typecasting; leave values exactly as they're provided.
+        value
+      end
     end # class Yaml
   end # module Types
 end # module DataMapper

data/spec/integration/bcrypt_hash_spec.rb

@@ -0,0 +1,50 @@
+
+require 'pathname'
+require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
+
+begin
+  require 'bcrypt'
+rescue LoadError
+  skip_tests = true
+end
+
+describe "DataMapper::Types::BCryptHash" do
+  unless skip_tests
+    describe "with no options" do
+      before(:each) do
+        class User
+          include DataMapper::Resource
+
+          property :id, Serial
+          property :password, BCryptHash
+        end
+        User.auto_migrate!
+        User.create!(:password => "DataMapper R0cks!")
+      end
+
+      it "should save a password to the DB on creation" do
+        repository(:default) do
+          User.create!(:password => "password1")
+        end
+        user = User.all
+        user[0].password.should == "DataMapper R0cks!"
+        user[1].password.should == "password1"
+      end
+
+      it "should change the password on attribute update" do
+        @user = User.first
+        @user.attribute_set(:password, "D@t@Mapper R0cks!")
+        @user.save
+        @user.password.should_not == "DataMapper R0cks!"
+        @user.password.should == "D@t@Mapper R0cks!"
+      end
+
+      it "should have a cost of BCrypt::Engine::DEFAULT_COST" do
+        @user = User.first
+        @user.password.cost.should == BCrypt::Engine::DEFAULT_COST
+      end
+    end
+  else
+    it "Needs the bcrypt-ruby gem installed"
+  end
+end

data/spec/integration/enum_spec.rb

@@ -17,8 +17,13 @@ describe DataMapper::Types::Enum do
       Bug.create!(:status => :crit)
       Bug.create!(:status => :warn)
     end
+
     bugs = Bug.all
     bugs[0].status.should == :crit
     bugs[1].status.should == :warn
   end
+
+  it 'should immediately typecast supplied values' do
+    Bug.new(:status => :crit).status.should == :crit
+  end
 end

data/spec/integration/file_path_spec.rb

@@ -0,0 +1,26 @@
+require 'pathname'
+require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
+
+describe DataMapper::Types::FilePath do
+  before(:all) do
+    class FilePathTest
+      include DataMapper::Resource
+
+      property :id, Integer, :serial => true
+      property :path, FilePath
+    end
+    FilePathTest.auto_migrate!
+  end
+
+  it "should work" do
+    repository(:default) do
+      FilePathTest.create!(:path => '/usr')
+    end
+    
+    FilePathTest.first.path.should == Pathname.new('/usr')
+  end
+
+  it 'should immediately typecast supplied values' do
+    FilePathTest.new(:path => '/usr').path.should == Pathname.new('/usr')
+  end
+end

data/spec/integration/flag_spec.rb

@@ -26,4 +26,8 @@ describe DataMapper::Types::Flag do
       Shirt.get(2).sizes.should == [:xs, :small]
     end
   end
+
+  it 'should immediately typecast supplied values' do
+    Shirt.new(:sizes => [:large, :xl]).sizes.should == [:large, :xl]
+  end
 end

data/spec/integration/ip_address_spec.rb

@@ -0,0 +1,26 @@
+require 'pathname'
+require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
+
+describe DataMapper::Types::IPAddress do
+  before(:all) do
+    class IPAddressTest
+      include DataMapper::Resource
+
+      property :id, Serial
+      property :ip, IPAddress
+    end
+    IPAddressTest.auto_migrate!
+  end
+
+  it "should work" do
+    repository(:default) do
+      IPAddressTest.create(:ip => '127.0.0.1')
+    end
+
+    IPAddressTest.first.ip.should == IPAddr.new('127.0.0.1')
+  end
+
+  it 'should immediately typecast supplied values' do
+    IPAddressTest.new(:ip => '10.0.0.1').ip.should == IPAddr.new('10.0.0.1')
+  end
+end

data/spec/integration/json_spec.rb

@@ -0,0 +1,26 @@
+require 'pathname'
+require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
+
+describe DataMapper::Types::Json do
+  before(:all) do
+    class JsonTest
+      include DataMapper::Resource
+
+      property :id, Serial
+      property :json, Json
+    end
+    JsonTest.auto_migrate!
+  end
+
+  it "should work" do
+    repository(:default) do
+      JsonTest.create(:json => '[1, 2, 3]')
+    end
+
+    JsonTest.first.json.should == [1, 2, 3]
+  end
+
+  it 'should immediately typecast supplied values' do
+    JsonTest.new(:json => '[1, 2, 3]').json.should == [1, 2, 3]
+  end
+end

data/spec/integration/uri_spec.rb

@@ -0,0 +1,26 @@
+require 'pathname'
+require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
+
+describe DataMapper::Types::URI do
+  before(:all) do
+    class URITest
+      include DataMapper::Resource
+
+      property :id, Integer, :serial => true
+      property :uri, DM::URI
+    end
+    URITest.auto_migrate!
+  end
+
+  it "should work" do
+    repository(:default) do
+      URITest.create!(:uri => 'http://localhost')
+    end
+
+    URITest.first.uri.should == Addressable::URI.parse('http://localhost')
+  end
+
+  it 'should immediately typecast supplied values' do
+    URITest.new(:uri => 'http://localhost').uri.should == Addressable::URI.parse('http://localhost')
+  end
+end

data/spec/integration/yaml_spec.rb

@@ -0,0 +1,37 @@
+require 'pathname'
+require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
+
+describe DataMapper::Types::Enum do
+  before(:all) do
+    class YamlTest
+      include DataMapper::Resource
+
+      property :id, Serial
+      property :yaml, Yaml
+    end
+    YamlTest.auto_migrate!
+
+    class SerializeMe
+      attr_accessor :name
+    end
+  end
+
+  it "should work" do
+    obj = SerializeMe.new
+    obj.name = 'Hello!'
+
+    repository(:default) do
+      YamlTest.create(:yaml => [1, 2, 3])
+      YamlTest.create(:yaml => obj)
+    end
+
+    tests = YamlTest.all
+    tests.first.yaml.should == [1, 2, 3]
+    tests.last.yaml.should be_kind_of(SerializeMe)
+    tests.last.yaml.name.should == 'Hello!'
+  end
+
+  it 'should immediately typecast supplied values' do
+    YamlTest.new(:yaml => [1, 2, 3]).yaml.should == [1, 2, 3]
+  end
+end

data/spec/unit/bcrypt_hash_spec.rb

@@ -0,0 +1,50 @@
+require 'pathname'
+require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
+
+include DataMapper::Types
+
+begin
+  require 'bcrypt'
+rescue LoadError
+  skip_tests = true
+end
+
+describe "DataMapper::Types::BCryptHash" do
+  unless skip_tests
+
+    before(:each) do
+      @clear_password = "DataMapper R0cks!"
+      @crypted_password = BCrypt::Password.create(@clear_password)
+    end
+
+    describe ".dump" do
+      it "should return a crypted hash as a BCrypt::Password" do
+        BCryptHash.dump(@clear_password, :property).should be_an_instance_of(BCrypt::Password)
+      end
+
+      it "should return a string that is 60 characters long" do
+        BCryptHash.dump(@clear_password, :property).should have(60).characters
+      end
+
+      it "should return nil if nil is passed" do
+        BCryptHash.dump(nil, :property).should be_nil
+      end
+    end
+
+    describe ".load" do
+      it "should return the password as a BCrypt::Password" do
+        BCryptHash.load(@crypted_password, :property).should be_an_instance_of(BCrypt::Password)
+      end
+
+      it "should return the password as a password which matches" do
+        BCryptHash.load(@crypted_password, :property).should == @clear_password
+      end
+
+      it "should return nil if given nil" do
+        FilePath.load(nil, :property).should be_nil
+      end
+    end
+  else
+    it "requires the bcrypt-ruby gem to test"
+  end
+end

data/spec/unit/csv_spec.rb

@@ -0,0 +1,37 @@
+require 'pathname'
+require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
+
+require 'fastercsv'
+
+describe DataMapper::Types::Csv, ".load" do
+  it 'should parse the value if a string is provided' do
+    FasterCSV.should_receive(:parse).with('csv_string').once
+    DataMapper::Types::Csv.load('csv_string', :property)
+  end
+  
+  it 'should do nothing if the value is a string' do
+    FasterCSV.should_not_receive(:parse)
+    DataMapper::Types::Csv.load([], :property).should == []
+  end
+  
+  it 'should return nil otherwise' do
+    DataMapper::Types::Csv.load({},  :property).should == nil
+    DataMapper::Types::Csv.load(nil, :property).should == nil    
+  end
+end
+
+describe DataMapper::Types::Csv, ".dump" do
+  it 'should dump to CSV' do
+    DataMapper::Types::Csv.dump([[1, 2, 3]], :property).should == "1,2,3\n"
+  end
+  
+  it 'should do nothing if the value is a string' do
+    FasterCSV.should_not_receive(:generate)
+    DataMapper::Types::Csv.dump('string', :property).should == 'string'
+  end
+  
+  it 'should return nil otherwise' do
+    DataMapper::Types::Csv.dump({},  :property).should == nil
+    DataMapper::Types::Csv.dump(nil, :property).should == nil    
+  end
+end

data/spec/unit/enum_spec.rb

@@ -63,4 +63,34 @@ describe DataMapper::Types::Enum do
       @enum.load(-1, :property).should be_nil
     end
   end
+
+  describe ".typecast" do
+    it 'should attempt to use the Enum type' do
+      # Symbol.
+      @sym_enum = DataMapper::Types::Enum[:uno]
+      @sym_enum.typecast(:uno,  :property).should == :uno
+      @sym_enum.typecast("uno", :property).should == :uno
+
+      # String
+      @str_enum = DataMapper::Types::Enum["uno"]
+      @str_enum.typecast(:uno,  :property).should == "uno"
+      @str_enum.typecast("uno", :property).should == "uno"
+
+      # Integer
+      @int_enum = DataMapper::Types::Enum[1, 2, 3]
+      @int_enum.typecast(1,   :property).should == 1
+      @int_enum.typecast(1.1, :property).should == 1
+    end
+
+    it "should not throw an error when value is nil" do
+      @sym_enum = DataMapper::Types::Enum[:uno]
+      @sym_enum.typecast( nil, :property).should == nil
+
+      @str_enum = DataMapper::Types::Enum["uno"]
+      @str_enum.typecast( nil, :property).should == nil
+
+      @int_enum = DataMapper::Types::Enum[1, 2, 3]
+      @int_enum.typecast( nil, :property ).should == nil
+    end
+  end
 end

data/spec/unit/file_path_spec.rb

@@ -35,4 +35,15 @@ describe DataMapper::Types::FilePath do
       DataMapper::Types::FilePath.load("", :property).should == Pathname.new("")
     end
   end
+
+  describe '.typecast' do
+    it 'should do nothing if a Pathname is provided' do
+      DataMapper::Types::FilePath.typecast(@path, :property).should == @path
+    end
+
+    it 'should defer to .load if a string is provided' do
+      DataMapper::Types::FilePath.should_receive(:load).with(@path_str, :property)
+      DataMapper::Types::FilePath.typecast(@path_str, :property)
+    end
+  end
 end

data/spec/unit/flag_spec.rb

@@ -64,23 +64,23 @@ describe DataMapper::Types::Flag do
     end
 
     it "should return the value of the key match from the flag map" do
-      @flag.load(1, :property).should == [:uno]
-      @flag.load(2, :property).should == [:dos]
-      @flag.load(4, :property).should == [:tres]
-      @flag.load(8, :property).should == [:cuatro]
+      @flag.load(1,  :property).should == [:uno]
+      @flag.load(2,  :property).should == [:dos]
+      @flag.load(4,  :property).should == [:tres]
+      @flag.load(8,  :property).should == [:cuatro]
       @flag.load(16, :property).should == [:cinco]
     end
 
     it "should return an array of all flags matches" do
-      @flag.load(3, :property).should include(:uno, :dos)
+      @flag.load(3,  :property).should include(:uno, :dos)
       @flag.load(10, :property).should include(:dos, :cuatro)
       @flag.load(31, :property).should include(:uno, :dos, :tres, :cuatro, :cinco)
     end
 
     it "should return an empty array if there is no key" do
-      @flag.load(-1, :property).should == []
+      @flag.load(-1,  :property).should == []
       @flag.load(nil, :property).should == []
-      @flag.load(32, :property).should == []
+      @flag.load(32,  :property).should == []
     end
   end
 end

data/spec/unit/ip_address_spec.rb

@@ -34,6 +34,23 @@ describe DataMapper::Types::IPAddress do
     it "should return an empty IP address if given an empty string" do
       DataMapper::Types::IPAddress.load("", :property).should == IPAddr.new("0.0.0.0")
     end
+
+    it 'should raise an ArgumentError if given something else' do
+      lambda {
+        DataMapper::Types::IPAddress.load([], :property)
+      }.should raise_error(ArgumentError, '+value+ must be nil or a String')
+    end
+  end
+
+  describe '.typecast' do
+    it 'should do nothing if an IpAddr is provided' do
+      DataMapper::Types::IPAddress.typecast(@ip, :property).should == @ip
+    end
+
+    it 'should defer to .load if a string is provided' do
+      DataMapper::Types::IPAddress.should_receive(:load).with(@ip_str, :property)
+      DataMapper::Types::IPAddress.typecast(@ip_str, :property)
+    end
   end
 
 end

data/spec/unit/json_spec.rb

@@ -0,0 +1,53 @@
+require 'pathname'
+require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
+
+describe DataMapper::Types::Json, ".load" do
+  it 'should return nil if nil is provided' do
+    DataMapper::Types::Json.load(nil, :property).should be_nil
+  end
+  
+  it 'should parse the value if a string is provided' do
+    JSON.should_receive(:load).with('json_string').once
+    DataMapper::Types::Json.load('json_string', :property)
+  end
+  
+  it 'should raise an ArgumentError if something else is given' do
+    lambda {
+      DataMapper::Types::Json.load(:sym, :property)
+    }.should raise_error(ArgumentError, '+value+ must be nil or a String')
+  end
+end
+
+describe DataMapper::Types::Json, ".dump" do
+  it 'should return nil if the value is nil' do
+    DataMapper::Types::Json.dump(nil, :property).should be_nil
+  end
+  
+  it 'should do nothing if the value is a string' do
+    JSON.should_not_receive(:dump)
+    DataMapper::Types::Json.dump('', :property).should be_kind_of(String)
+  end
+  
+  it 'should dump to a JSON string otherwise' do
+    JSON.should_receive(:dump).with([]).once
+    DataMapper::Types::Json.dump([], :property)
+  end
+end
+
+describe DataMapper::Types::Json, ".typecast" do
+  it 'should parse the value if a string is provided' do
+    JSON.should_receive(:load).with('json_string')
+
+    DataMapper::Types::Json.typecast('json_string', :property)
+  end
+
+  it 'should leave the value alone if an array is given' do
+    JSON.should_not_receive(:load)
+    DataMapper::Types::Json.typecast([], :property)
+  end
+
+  it 'should leave the value alone if a hash is given' do
+    JSON.should_not_receive(:load)
+    DataMapper::Types::Json.typecast({}, :property)
+  end
+end

data/spec/unit/uri_spec.rb

@@ -35,4 +35,15 @@ describe DataMapper::Types::URI do
       DataMapper::Types::URI.load("", :property).should == Addressable::URI.parse("")
     end
   end
+
+  describe '.typecast' do
+    it 'should do nothing if an Addressable::URI is provided' do
+      DataMapper::Types::URI.typecast(@uri, :property).should == @uri
+    end
+
+    it 'should defer to .load if a string is provided' do
+      DataMapper::Types::URI.should_receive(:load).with(@uri_str, :property)
+      DataMapper::Types::URI.typecast(@uri_str, :property)
+    end
+  end
 end

data/spec/unit/yaml_spec.rb

@@ -0,0 +1,58 @@
+require 'pathname'
+require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
+
+describe DataMapper::Types::Yaml, ".load" do
+  it 'should return nil if nil is provided' do
+    DataMapper::Types::Yaml.load(nil, :property).should be_nil
+  end
+  
+  it 'should parse the value if a string is provided' do
+    YAML.should_receive(:load).with('yaml_string').once
+    DataMapper::Types::Yaml.load('yaml_string', :property)
+  end
+  
+  it 'should raise an ArgumentError if something else is given' do
+    lambda {
+      DataMapper::Types::Yaml.load(:sym, :property)
+    }.should raise_error(ArgumentError, '+value+ must be nil or a String')
+  end
+end
+
+describe DataMapper::Types::Yaml, ".dump" do
+  it 'should return nil if the value is nil' do
+    DataMapper::Types::Yaml.dump(nil, :property).should be_nil
+  end
+  
+  it 'should do nothing if the value is a string which begins with ---' do
+    YAML.should_not_receive(:dump)
+    DataMapper::Types::Yaml.dump('--- str', :property).should be_kind_of(String)
+  end
+  
+  it 'should dump to a YAML string if the value is a normal string' do
+    YAML.should_receive(:dump).with('string').once
+    DataMapper::Types::Yaml.dump('string', :property)
+  end
+  
+  it 'should dump to a YAML string otherwise' do
+    YAML.should_receive(:dump).with([]).once
+    DataMapper::Types::Yaml.dump([], :property)
+  end
+end
+
+describe DataMapper::Types::Yaml, ".typecast" do
+  it 'should leave the value alone' do
+    @type = DataMapper::Types::Yaml
+    @type.typecast([1, 2, 3], :property).should == [1, 2, 3]
+
+    class SerializeMe
+      attr_accessor :name
+    end
+
+    obj = SerializeMe.new
+    obj.name = 'Hello!'
+
+    casted = @type.typecast(obj, :property)
+    casted.should be_kind_of(SerializeMe)
+    casted.name.should == 'Hello!'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-types
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Sam Smoot
@@ -9,29 +9,49 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-25 00:00:00 -05:00
+date: 2008-07-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: 0.9.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.7.0
     version: 
 description: DataMapper plugin providing extra data types
-email: ssmoot@gmail.com
+email: 
+- ssmoot@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.txt
 - LICENSE
 - TODO
 files: 
+- History.txt
+- LICENSE
+- Manifest.txt
+- README.txt
+- Rakefile
+- TODO
+- lib/dm-types.rb
+- lib/dm-types/bcrypt_hash.rb
 - lib/dm-types/csv.rb
 - lib/dm-types/enum.rb
 - lib/dm-types/epoch_time.rb
@@ -41,27 +61,34 @@ files:
 - lib/dm-types/json.rb
 - lib/dm-types/serial.rb
 - lib/dm-types/uri.rb
+- lib/dm-types/version.rb
 - lib/dm-types/yaml.rb
-- lib/dm-types.rb
+- spec/integration/bcrypt_hash_spec.rb
 - spec/integration/enum_spec.rb
+- spec/integration/file_path_spec.rb
 - spec/integration/flag_spec.rb
+- spec/integration/ip_address_spec.rb
+- spec/integration/json_spec.rb
+- spec/integration/uri_spec.rb
+- spec/integration/yaml_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb
+- spec/unit/bcrypt_hash_spec.rb
+- spec/unit/csv_spec.rb
 - spec/unit/enum_spec.rb
 - spec/unit/epoch_time_spec.rb
 - spec/unit/file_path_spec.rb
 - spec/unit/flag_spec.rb
 - spec/unit/ip_address_spec.rb
+- spec/unit/json_spec.rb
 - spec/unit/uri_spec.rb
-- spec/spec.opts
-- Rakefile
-- README
-- LICENSE
-- TODO
+- spec/unit/yaml_spec.rb
 has_rdoc: true
 homepage: http://github.com/sam/dm-more/tree/master/dm-types
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --main
+- README.txt
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -78,8 +105,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.0.1
+rubyforge_project: datamapper
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: DataMapper plugin providing extra data types