dm-types 0.9.7 → 0.9.8

data/History.txt

@@ -1 +1,6 @@
+=== 0.9.8 / 2008-12-07
 
+* 2 bug fixes:
+
+  * Corrected BCryptHash type behavior (previously, value would be repeated saved
+  * tightened uuidtools requirement for the uuid type

data/Manifest.txt

@@ -43,3 +43,5 @@ spec/unit/json_spec.rb
 spec/unit/regexp_spec.rb
 spec/unit/uri_spec.rb
 spec/unit/yaml_spec.rb
+tasks/install.rb
+tasks/spec.rb

data/Rakefile

@@ -1,58 +1,25 @@
-require 'rubygems'
-require 'spec'
-require 'spec/rake/spectask'
 require 'pathname'
+require 'rubygems'
+
+ROOT    = Pathname(__FILE__).dirname.expand_path
+JRUBY   = RUBY_PLATFORM =~ /java/
+WINDOWS = Gem.win_platform?
+SUDO    = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS'])
 
-ROOT = Pathname(__FILE__).dirname.expand_path
 require ROOT + 'lib/dm-types/version'
 
-AUTHOR = "Sam Smoot"
-EMAIL  = "ssmoot@gmail.com"
-GEM_NAME = "dm-types"
+AUTHOR = 'Sam Smoot'
+EMAIL  = 'ssmoot [a] gmail [d] com'
+GEM_NAME = 'dm-types'
 GEM_VERSION = DataMapper::Types::VERSION
-GEM_DEPENDENCIES = [["dm-core", GEM_VERSION], "uuidtools"]
-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'])
-
-desc "Install #{GEM_NAME} #{GEM_VERSION} (default ruby)"
-task :install => [ :package ] do
-  sh "#{SUDO} gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources", :verbose => false
-end
-
-desc "Uninstall #{GEM_NAME} #{GEM_VERSION} (default ruby)"
-task :uninstall => [ :clobber ] do
-  sh "#{SUDO} gem uninstall #{GEM_NAME} -v#{GEM_VERSION} -I -x", :verbose => false
-end
-
-namespace :jruby do
-  desc "Install #{GEM_NAME} #{GEM_VERSION} with JRuby"
-  task :install => [ :package ] do
-    sh %{#{SUDO} jruby -S gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources}, :verbose => false
-  end
-end
+GEM_DEPENDENCIES = [['dm-core', "~>#{GEM_VERSION}"], ['addressable', '~>2.0.1']]
+GEM_CLEAN = %w[ log pkg coverage ]
+GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO History.txt ] }
 
-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)
+PROJECT_NAME = 'datamapper'
+PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/#{GEM_NAME}"
+PROJECT_DESCRIPTION = PROJECT_SUMMARY = 'DataMapper plugin providing extra data types'
 
-  begin
-    t.rcov = 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 Exception
-    # rcov not installed
-  end
+[ ROOT, ROOT.parent ].each do |dir|
+  Pathname.glob(dir.join('tasks/**/*.rb').to_s).each { |f| require f }
 end

data/TODO

@@ -1,8 +0,0 @@
-TODO
-====
-
-
-
----
-TODO tickets may also be found in the DataMapper Issue Tracker:
-http://wm.lighthouseapp.com/projects/4819-datamapper/overview

data/lib/dm-types.rb

@@ -1,28 +1,26 @@
-require 'rubygems'
 require 'pathname'
+require 'rubygems'
 
-gem 'dm-core', '~>0.9.7'
+gem 'dm-core', '~>0.9.8'
 require 'dm-core'
 
-dir = Pathname(__FILE__).dirname.expand_path / 'dm-types'
-
-require dir / 'csv'
-require dir / 'enum'
-require dir / 'epoch_time'
-require dir / 'file_path'
-require dir / 'flag'
-require dir / 'ip_address'
-require dir / "json"""
-require dir / 'uri'
-require dir / 'uuid'
-require dir / 'yaml'
-require dir / 'serial'
-require dir / 'regexp'
-require dir / 'slug'
-
-# 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'))
+    dir = (Pathname(__FILE__).dirname.expand_path / 'dm-types').to_s
+
+    autoload :BCryptHash, dir / 'bcrypt_hash'
+    autoload :Csv,        dir / 'csv'
+    autoload :Enum,       dir / 'enum'
+    autoload :EpochTime,  dir / 'epoch_time'
+    autoload :FilePath,   dir / 'file_path'
+    autoload :Flag,       dir / 'flag'
+    autoload :IPAddress,  dir / 'ip_address'
+    autoload :Json,       dir / 'json'
+    autoload :Regexp,     dir / 'regexp'
+    autoload :Serial,     dir / 'serial'
+    autoload :Slug,       dir / 'slug'
+    autoload :URI,        dir / 'uri'
+    autoload :UUID,       dir / 'uuid'
+    autoload :Yaml,       dir / 'yaml'
   end
 end

data/lib/dm-types/bcrypt_hash.rb

@@ -1,4 +1,6 @@
+require 'rubygems'
 
+gem 'bcrypt-ruby', '~>2.0.3'
 require 'bcrypt'
 
 module DataMapper
@@ -8,22 +10,22 @@ module DataMapper
       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
+        typecast(value, property)
       end
 
       def self.dump(value, property)
+        typecast(value, property)
+      end
+
+      def self.typecast(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")
+          begin
+            value.is_a?(BCrypt::Password) ? value : BCrypt::Password.new(value)
+          rescue BCrypt::Errors::InvalidHash
+            BCrypt::Password.create(value, :cost => BCrypt::Engine::DEFAULT_COST)
+          end
         end
       end
     end # class BCryptHash

data/lib/dm-types/uri.rb

@@ -1,4 +1,6 @@
 require 'rubygems'
+
+gem 'addressable', '~>2.0.1'
 require 'addressable/uri'
 
 module DataMapper

data/lib/dm-types/uuid.rb

@@ -1,3 +1,6 @@
+require 'rubygems'
+
+gem 'uuidtools', '~>1.0.7'
 require 'uuidtools'
 
 module DataMapper

data/lib/dm-types/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Types
-    VERSION = "0.9.7"
+    VERSION = '0.9.8'
   end
 end

data/spec/integration/bcrypt_hash_spec.rb

@@ -1,14 +1,14 @@
-
 require 'pathname'
 require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
 
 begin
+  gem 'bcrypt-ruby', '~>2.0.3'
   require 'bcrypt'
 rescue LoadError
   skip_tests = true
 end
 
-describe "DataMapper::Types::BCryptHash" do
+describe 'DataMapper::Types::BCryptHash' do
   unless skip_tests
     describe "with no options" do
       before(:each) do
@@ -19,12 +19,12 @@ describe "DataMapper::Types::BCryptHash" do
           property :password, BCryptHash
         end
         User.auto_migrate!
-        User.create!(:password => "DataMapper R0cks!")
+        User.create(:password => "DataMapper R0cks!")
       end
 
       it "should save a password to the DB on creation" do
         repository(:default) do
-          User.create!(:password => "password1")
+          User.create(:password => "password1")
         end
         user = User.all
         user[0].password.should == "DataMapper R0cks!"
@@ -39,6 +39,15 @@ describe "DataMapper::Types::BCryptHash" do
         @user.password.should == "D@t@Mapper R0cks!"
       end
 
+      it "should not change the password on save and reload" do
+        @user = User.first
+        v1 = @user.password.to_s
+        @user.save
+        @user.reload
+        v2 = @user.password.to_s
+        v1.should == v2
+      end
+
       it "should have a cost of BCrypt::Engine::DEFAULT_COST" do
         @user = User.first
         @user.password.cost.should == BCrypt::Engine::DEFAULT_COST

data/spec/integration/file_path_spec.rb

@@ -14,7 +14,7 @@ describe DataMapper::Types::FilePath do
 
   it "should work" do
     repository(:default) do
-      FilePathTest.create!(:path => '/usr')
+      FilePathTest.create(:path => '/usr')
     end
 
     FilePathTest.first.path.should == Pathname.new('/usr')

data/spec/integration/uri_spec.rb

@@ -14,7 +14,7 @@ describe DataMapper::Types::URI do
 
   it "should work" do
     repository(:default) do
-      URITest.create!(:uri => 'http://localhost')
+      URITest.create(:uri => 'http://localhost')
     end
 
     URITest.first.uri.should == Addressable::URI.parse('http://localhost')

data/spec/integration/uuid_spec.rb

@@ -1,38 +1,46 @@
 require 'pathname'
-require 'uuidtools'
 require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
 
-describe DataMapper::Types::UUID do
+begin
+  gem 'uuidtools', '~>1.0.7'
+  require 'uuidtools'
+rescue LoadError
+  skip_tests = true
+end
 
-  before(:all) do
-    class UUIDTest
-      include DataMapper::Resource
+describe 'DataMapper::Types::UUID' do
+  unless skip_tests
+    before(:all) do
+      class UUIDTest
+        include DataMapper::Resource
 
-      property :id, Serial
-      property :uuid, ::DataMapper::Types::UUID
-    end
+        property :id, Serial
+        property :uuid, ::DataMapper::Types::UUID
+      end
 
-    UUIDTest.auto_migrate!
-  end
+      UUIDTest.auto_migrate!
+    end
 
-  it "should be settable as a uuid" do
-    u = UUIDTest.create(:uuid => UUID.parse('b0fc632e-d744-4821-afe3-4ea0701859ee'))
+    it "should be settable as a uuid" do
+      u = UUIDTest.create(:uuid => UUID.parse('b0fc632e-d744-4821-afe3-4ea0701859ee'))
 
-    u.uuid.should be_kind_of(UUID)
-    u.uuid.to_s.should == 'b0fc632e-d744-4821-afe3-4ea0701859ee'
-  end
+      u.uuid.should be_kind_of(UUID)
+      u.uuid.to_s.should == 'b0fc632e-d744-4821-afe3-4ea0701859ee'
+    end
 
-  it "should be settable as a string" do
-    u = UUIDTest.create(:uuid => 'b0fc632e-d744-4821-afe3-4ea0701859ee')
+    it "should be settable as a string" do
+      u = UUIDTest.create(:uuid => 'b0fc632e-d744-4821-afe3-4ea0701859ee')
 
-    u.uuid.should be_kind_of(UUID)
-    u.uuid.to_s.should == 'b0fc632e-d744-4821-afe3-4ea0701859ee'
-  end
+      u.uuid.should be_kind_of(UUID)
+      u.uuid.to_s.should == 'b0fc632e-d744-4821-afe3-4ea0701859ee'
+    end
 
-  it "should be allowed to be null" do
-    u = UUIDTest.create()
+    it "should be allowed to be null" do
+      u = UUIDTest.create()
 
-    u.uuid.should be_nil
+      u.uuid.should be_nil
+    end
+  else
+    it 'requires the uuidtools gem to test'
   end
-
 end

data/spec/spec.opts

@@ -1,2 +1 @@
---format specdoc
 --colour

data/spec/spec_helper.rb

@@ -1,7 +1,9 @@
+require 'pathname'
 require 'rubygems'
-gem 'rspec', '>=1.1.3'
+
+gem 'rspec', '~>1.1.11'
 require 'spec'
-require 'pathname'
+
 require Pathname(__FILE__).dirname.parent.expand_path + 'lib/dm-types'
 
 ENV["SQLITE3_SPEC_URI"]   ||= 'sqlite3::memory:'
@@ -18,7 +20,7 @@ def setup_adapter(name, default_uri = nil)
   rescue Exception => e
     if name.to_s == ENV['ADAPTER']
       Object.const_set('ADAPTER', nil)
-      warn "Could not load #{name} adapter: #{e}"
+      warn "Could not load do_#{name}: #{e}"
     end
     false
   end

data/spec/unit/bcrypt_hash_spec.rb

@@ -4,6 +4,7 @@ require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
 include DataMapper::Types
 
 begin
+  gem 'bcrypt-ruby', '~>2.0.3'
   require 'bcrypt'
 rescue LoadError
   skip_tests = true
@@ -15,6 +16,13 @@ describe "DataMapper::Types::BCryptHash" do
     before(:each) do
       @clear_password = "DataMapper R0cks!"
       @crypted_password = BCrypt::Password.create(@clear_password)
+      @nonstandard_type = 1
+
+      class TestType
+        @a = 1
+        @b = "Hi There"
+      end
+      @nonstandard_type2 = TestType.new
     end
 
     describe ".dump" do
@@ -23,7 +31,7 @@ describe "DataMapper::Types::BCryptHash" do
       end
 
       it "should return a string that is 60 characters long" do
-        BCryptHash.dump(@clear_password, :property).should have(60).characters
+        BCryptHash.dump(@clear_password, :property).to_s.should have(60).characters
       end
 
       it "should return nil if nil is passed" do
@@ -41,7 +49,53 @@ describe "DataMapper::Types::BCryptHash" do
       end
 
       it "should return nil if given nil" do
-        FilePath.load(nil, :property).should be_nil
+        BCryptHash.load(nil, :property).should be_nil
+      end
+    end
+
+    describe ".typecast" do
+      it "should return the crypted_password as a BCrypt::Password" do
+        BCryptHash.typecast(@crypted_password, :property).should be_an_instance_of(BCrypt::Password)
+      end
+
+      it "should match the password as a BCrypt::Password" do
+        BCryptHash.typecast(@crypted_password, :property).should == @clear_password
+      end
+
+      it "should return the string value of crypted_password as a BCrypt::Password" do
+        BCryptHash.typecast(@crypted_password.to_s, :property).should be_an_instance_of(BCrypt::Password)
+      end
+
+      it "should match the password as a string of the crypted_password" do
+        BCryptHash.typecast(@crypted_password.to_s, :property).should == @clear_password
+      end
+
+      it "should return the password as a BCrypt::Password" do
+        BCryptHash.typecast(@clear_password, :property).should be_an_instance_of(BCrypt::Password)
+      end
+
+      it "should match the password as clear_password" do
+        BCryptHash.typecast(@clear_password, :property).should == @clear_password
+      end
+
+      it "should encrypt any type that has to_s" do
+        BCryptHash.typecast(@nonstandard_type, :property).should be_an_instance_of(BCrypt::Password)
+      end
+
+      it "should match the non-standard type" do
+        BCryptHash.typecast(@nonstandard_type, :property).should == @nonstandard_type
+      end
+
+      it "should encrypt anything passed to it" do
+        BCryptHash.typecast(@nonstandard_type2, :property).should be_an_instance_of(BCrypt::Password)
+      end
+
+      it "should match user-defined types" do
+        BCryptHash.typecast(@nonstandard_type2, :property).should == @nonstandard_type2
+      end
+
+      it "should return nil if given nil" do
+        BCryptHash.typecast(nil, :property).should be_nil
       end
     end
   else

data/tasks/install.rb

@@ -0,0 +1,13 @@
+def sudo_gem(cmd)
+  sh "#{SUDO} #{RUBY} -S gem #{cmd}", :verbose => false
+end
+
+desc "Install #{GEM_NAME} #{GEM_VERSION}"
+task :install => [ :package ] do
+  sudo_gem "install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
+end
+
+desc "Uninstall #{GEM_NAME} #{GEM_VERSION}"
+task :uninstall => [ :clobber ] do
+  sudo_gem "uninstall #{GEM_NAME} -v#{GEM_VERSION} -Ix"
+end

data/tasks/spec.rb

@@ -0,0 +1,25 @@
+begin
+  gem 'rspec', '~>1.1.11'
+  require 'spec'
+  require 'spec/rake/spectask'
+
+  task :default => [ :spec ]
+
+  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)
+
+    begin
+      gem 'rcov', '~>0.8'
+      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
+    end
+  end
+rescue LoadError
+  # rspec not installed
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-types
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Sam Smoot
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-18 00:00:00 -08:00
+date: 2008-12-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,33 +18,23 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.7
+        version: 0.9.8
     version: 
 - !ruby/object:Gem::Dependency 
-  name: uuidtools
+  name: addressable
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: 2.0.1
     version: 
 description: DataMapper plugin providing extra data types
 email: 
-- ssmoot@gmail.com
+- ssmoot [a] gmail [d] com
 executables: []
 
 extensions: []
@@ -53,6 +43,7 @@ extra_rdoc_files:
 - README.txt
 - LICENSE
 - TODO
+- History.txt
 files: 
 - History.txt
 - LICENSE
@@ -99,6 +90,8 @@ files:
 - spec/unit/regexp_spec.rb
 - spec/unit/uri_spec.rb
 - spec/unit/yaml_spec.rb
+- tasks/install.rb
+- tasks/spec.rb
 has_rdoc: true
 homepage: http://github.com/sam/dm-more/tree/master/dm-types
 post_install_message: