dm-types 0.9.11 → 0.10.0

data/spec/unit/regexp_spec.rb

@@ -1,23 +1,53 @@
-require 'pathname'
-require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
+require 'spec_helper'
 
-describe DataMapper::Types::Regexp, ".load" do
-  it 'should make a Regexp from the value if a string is provided' do
-    Regexp.should_receive(:new).with('regexp_string').once
-    DataMapper::Types::Regexp.load('regexp_string', :property)
-  end
+try_spec do
+  describe DataMapper::Types::Regexp  do
+    describe '.load' do
+      describe 'when argument is a string' do
+        before :all do
+          @input  = '[a-z]\d+'
+          @result = DataMapper::Types::Regexp.load(@input, :property)
+        end
 
-  it 'should return nil otherwise' do
-    DataMapper::Types::Regexp.load(nil, :property).should == nil
-  end
-end
+        it 'create a regexp instance from argument' do
+          @result.should == Regexp.new(@input)
+        end
+      end
 
-describe DataMapper::Types::Regexp, ".dump" do
-  it 'should dump to a string' do
-    DataMapper::Types::Regexp.dump(/\d+/, :property).should == "\\d+"
-  end
+      describe 'when argument is nil' do
+        before :all do
+          @input  = nil
+          @result = DataMapper::Types::Regexp.load(@input, :property)
+        end
+
+        it 'returns nil' do
+          @result.should be_nil
+        end
+      end
+    end
+
+    describe '.dump' do
+      describe 'when argument is a regular expression' do
+        before :all do
+          @input  = /\d+/
+          @result = DataMapper::Types::Regexp.dump(@input, :property)
+        end
+
+        it 'escapes the argument' do
+          @result.should == '\\d+'
+        end
+      end
+
+      describe 'when argument is nil' do
+        before :all do
+          @input = nil
+          @result = DataMapper::Types::Regexp.dump(@input, :property)
+        end
 
-  it 'should return nil if the value is nil' do
-    DataMapper::Types::Regexp.dump(nil, :property).should == nil
+        it 'returns nil' do
+          @result.should be_nil
+        end
+      end
+    end
   end
 end

data/spec/unit/uri_spec.rb

@@ -1,49 +1,60 @@
-require 'pathname'
-require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
-
-describe DataMapper::Types::URI do
-
-  before(:each) do
-    @uri_str = "http://example.com/path/to/resource/"
-    @uri = Addressable::URI.parse(@uri_str)
-  end
-
-  describe ".dump" do
-    it "should return the URI as a String" do
-      DataMapper::Types::URI.dump(@uri, :property).should == @uri_str
-    end
-
-    it "should return nil if the String is nil" do
-      DataMapper::Types::URI.dump(nil, :property).should be_nil
-    end
-
-    it "should return an empty URI if the String is empty" do
-      DataMapper::Types::URI.dump("", :property).should == ""
-    end
-  end
-
-  describe ".load" do
-    it "should return the URI as Addressable" do
-      DataMapper::Types::URI.load(@uri_str, :property).should == @uri
-    end
-
-    it "should return nil if given nil" do
-      DataMapper::Types::URI.load(nil, :property).should be_nil
-    end
-
-    it "should return an empty URI if given an empty String" 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)
+require 'spec_helper'
+
+try_spec do
+  describe DataMapper::Types::URI do
+    before do
+      @uri_str = 'http://example.com/path/to/resource/'
+      @uri     = Addressable::URI.parse(@uri_str)
+    end
+
+    describe '.dump' do
+      it 'returns the URI as a String' do
+        DataMapper::Types::URI.dump(@uri, :property).should == @uri_str
+      end
+
+      describe 'when given nil' do
+        it 'returns nil' do
+          DataMapper::Types::URI.dump(nil, :property).should be_nil
+        end
+      end
+
+      describe 'when given an empty string' do
+        it 'returns an empty URI' do
+          DataMapper::Types::URI.dump('', :property).should == ''
+        end
+      end
+    end
+
+    describe '.load' do
+      it 'returns the URI as Addressable' do
+        DataMapper::Types::URI.load(@uri_str, :property).should == @uri
+      end
+
+      describe 'when given nil' do
+        it 'returns nil' do
+          DataMapper::Types::URI.load(nil, :property).should be_nil
+        end
+      end
+
+      describe 'if given an empty String' do
+        it 'returns an empty URI' do
+          DataMapper::Types::URI.load('', :property).should == Addressable::URI.parse('')
+        end
+      end
+    end
+
+    describe '.typecast' do
+      describe 'given instance of Addressable::URI' do
+        it 'does nothing' do
+          DataMapper::Types::URI.typecast(@uri, :property).should == @uri
+        end
+      end
+
+      describe 'when given a string' do
+        it 'delegates to .load' do
+          DataMapper::Types::URI.typecast(@uri_str, :property).should == @uri
+        end
+      end
     end
   end
 end

data/spec/unit/yaml_spec.rb

@@ -1,58 +1,104 @@
-require 'pathname'
-require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
+require 'spec_helper'
+require 'shared/identity_function_group'
 
-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
+try_spec do
+  describe DataMapper::Types::Yaml do
+    describe '.load' do
+      describe 'when nil is provided' do
+        it 'returns nil' do
+          DataMapper::Types::Yaml.load(nil, :property).should be_nil
+        end
+      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 'when YAML encoded primitive string is provided' do
+        it 'returns decoded value as Ruby string' do
+          DataMapper::Types::Yaml.load("--- yaml string\n", :property).should == 'yaml 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
+      describe 'when something else is provided' do
+        it 'raises ArgumentError with a meaningful message' do
+          lambda {
+            DataMapper::Types::Yaml.load(:sym, :property)
+          }.should raise_error(ArgumentError, '+value+ of a property of YAML type must be nil or a String')
+        end
+      end
+    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
+    describe '.dump' do
+      describe 'when nil is provided' do
+        it 'returns nil' do
+          DataMapper::Types::Yaml.dump(nil, :property).should be_nil
+        end
+      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
+      describe 'when YAML encoded primitive string is provided' do
+        it 'does not do double encoding' do
+          DataMapper::Types::Yaml.dump("--- yaml encoded string\n", :property).should == "--- yaml encoded string\n"
+        end
+      end
 
-  it 'should dump to a YAML string otherwise' do
-    YAML.should_receive(:dump).with([]).once
-    DataMapper::Types::Yaml.dump([], :property)
-  end
-end
+      describe 'when regular Ruby string is provided' do
+        it 'dumps argument to YAML' do
+          DataMapper::Types::Yaml.dump('dump me (to yaml)', :property).should == "--- dump me (to yaml)\n"
+        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]
+      describe 'when Ruby array is provided' do
+        it 'dumps argument to YAML' do
+          DataMapper::Types::Yaml.dump([1, 2, 3], :property).should == "--- \n- 1\n- 2\n- 3\n"
+        end
+      end
 
-    class SerializeMe
-      attr_accessor :name
+      describe 'when Ruby hash is provided' do
+        it 'dumps argument to YAML' do
+          DataMapper::Types::Yaml.dump({ :datamapper => 'Data access layer in Ruby' }, :property).should == "--- \n:datamapper: Data access layer in Ruby\n"
+        end
+      end
     end
 
-    obj = SerializeMe.new
-    obj.name = 'Hello!'
+    describe '.typecast' do
+      class SerializeMe
+        attr_accessor :name
+      end
+
+      describe 'given a number' do
+        before :all do
+          @input  = 15
+          @result = 15
+        end
+
+        it_should_behave_like 'identity function'
+      end
+
+      describe 'given an Array instance' do
+        before :all do
+          @input  = ['dm-core', 'dm-more']
+          @result = ['dm-core', 'dm-more']
+        end
+
+        it_should_behave_like 'identity function'
+      end
 
-    casted = @type.typecast(obj, :property)
-    casted.should be_kind_of(SerializeMe)
-    casted.name.should == 'Hello!'
+      describe 'given a Hash instance' do
+        before :all do
+          @input  = { :format => 'yaml' }
+          @result = { :format => 'yaml' }
+        end
+
+        it_should_behave_like 'identity function'
+      end
+
+      describe 'given a plain old Ruby object' do
+        before :all do
+          @input      = SerializeMe.new
+          @input.name = 'yamly'
+
+          @result = @input
+        end
+
+        it_should_behave_like 'identity function'
+      end
+    end
   end
 end

data/tasks/install.rb

@@ -4,7 +4,7 @@ end
 
 desc "Install #{GEM_NAME} #{GEM_VERSION}"
 task :install => [ :package ] do
-  sudo_gem "install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
+  sudo_gem "install pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
 end
 
 desc "Uninstall #{GEM_NAME} #{GEM_VERSION}"

data/tasks/spec.rb

@@ -1,6 +1,4 @@
 begin
-  gem 'rspec', '~>1.2'
-  require 'spec'
   require 'spec/rake/spectask'
 
   task :default => [ :spec ]
@@ -8,16 +6,18 @@ begin
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
+    t.libs      << 'lib' << 'spec' # needed for CI rake spec task, duplicated in spec_helper
 
     begin
-      gem 'rcov', '~>0.8'
+      require 'rcov'
       t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
       t.rcov_opts << '--exclude' << 'spec'
       t.rcov_opts << '--text-summary'
       t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
     rescue LoadError
       # rcov not installed
+    rescue SyntaxError
+      # rcov syntax invalid
     end
   end
 rescue LoadError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-types
 version: !ruby/object:Gem::Version 
-  version: 0.9.11
+  version: 0.10.0
 platform: ruby
 authors: 
 - Sam Smoot
@@ -9,29 +9,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-29 00:00:00 -07:00
+date: 2009-09-16 00:00:00 -07: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.11
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: addressable
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.0.2
-    version: 
+dependencies: []
+
 description: DataMapper plugin providing extra data types
 email: 
 - ssmoot [a] gmail [d] com
@@ -40,19 +21,20 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.txt
+- README.rdoc
 - LICENSE
 - TODO
-- History.txt
+- History.rdoc
 files: 
-- History.txt
+- History.rdoc
 - LICENSE
 - Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
 - TODO
 - lib/dm-types.rb
 - lib/dm-types/bcrypt_hash.rb
+- lib/dm-types/comma_separated_list.rb
 - lib/dm-types/csv.rb
 - lib/dm-types/enum.rb
 - lib/dm-types/epoch_time.rb
@@ -61,13 +43,21 @@ files:
 - lib/dm-types/ip_address.rb
 - lib/dm-types/json.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
 - lib/dm-types/yaml.rb
+- spec/fixtures/article.rb
+- spec/fixtures/bookmark.rb
+- spec/fixtures/invention.rb
+- spec/fixtures/network_node.rb
+- spec/fixtures/person.rb
+- spec/fixtures/software_package.rb
+- spec/fixtures/ticket.rb
+- spec/fixtures/tshirt.rb
 - spec/integration/bcrypt_hash_spec.rb
+- spec/integration/comma_separated_list_spec.rb
 - spec/integration/enum_spec.rb
 - spec/integration/file_path_spec.rb
 - spec/integration/flag_spec.rb
@@ -77,6 +67,7 @@ files:
 - spec/integration/uri_spec.rb
 - spec/integration/uuid_spec.rb
 - spec/integration/yaml_spec.rb
+- spec/shared/identity_function_group.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/unit/bcrypt_hash_spec.rb
@@ -93,11 +84,13 @@ files:
 - tasks/install.rb
 - tasks/spec.rb
 has_rdoc: true
-homepage: http://github.com/sam/dm-more/tree/master/dm-types
+homepage: http://github.com/datamapper/dm-more/tree/master/dm-types
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -115,9 +108,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: DataMapper plugin providing extra data types
 test_files: []