dm-types 1.1.0.rc2 → 1.1.0.rc3

data/Gemfile

@@ -5,7 +5,7 @@ source 'http://rubygems.org'
 SOURCE         = ENV.fetch('SOURCE', :git).to_sym
 REPO_POSTFIX   = SOURCE == :path ? ''                                : '.git'
 DATAMAPPER     = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
-DM_VERSION     = '~> 1.1.0.rc2'
+DM_VERSION     = '~> 1.1.0.rc3'
 DO_VERSION     = '~> 0.10.2'
 DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 

data/VERSION

@@ -1 +1 @@
-1.1.0.rc2
+1.1.0.rc3

data/dm-types.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-types}
-  s.version = "1.1.0.rc2"
+  s.version = "1.1.0.rc3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Kubb"]
-  s.date = %q{2011-03-01}
+  s.date = %q{2011-03-10}
   s.description = %q{DataMapper plugin providing extra data types}
   s.email = %q{dan.kubb [a] gmail [d] com}
   s.extra_rdoc_files = [
@@ -87,7 +87,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/datamapper/dm-types}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{DataMapper plugin providing extra data types}
   s.test_files = [
     "spec/fixtures/article.rb",
@@ -133,35 +133,35 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<bcrypt-ruby>, ["~> 2.1.4"])
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.1.0.rc2"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.1.0.rc3"])
       s.add_runtime_dependency(%q<fastercsv>, ["~> 1.5.4"])
       s.add_runtime_dependency(%q<json>, ["~> 1.4.6"])
       s.add_runtime_dependency(%q<stringex>, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<uuidtools>, ["~> 2.1.2"])
-      s.add_development_dependency(%q<dm-validations>, ["~> 1.1.0.rc2"])
+      s.add_development_dependency(%q<dm-validations>, ["~> 1.1.0.rc3"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3.1"])
     else
       s.add_dependency(%q<bcrypt-ruby>, ["~> 2.1.4"])
-      s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc2"])
+      s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc3"])
       s.add_dependency(%q<fastercsv>, ["~> 1.5.4"])
       s.add_dependency(%q<json>, ["~> 1.4.6"])
       s.add_dependency(%q<stringex>, ["~> 1.2.0"])
       s.add_dependency(%q<uuidtools>, ["~> 2.1.2"])
-      s.add_dependency(%q<dm-validations>, ["~> 1.1.0.rc2"])
+      s.add_dependency(%q<dm-validations>, ["~> 1.1.0.rc3"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_dependency(%q<rspec>, ["~> 1.3.1"])
     end
   else
     s.add_dependency(%q<bcrypt-ruby>, ["~> 2.1.4"])
-    s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc2"])
+    s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc3"])
     s.add_dependency(%q<fastercsv>, ["~> 1.5.4"])
     s.add_dependency(%q<json>, ["~> 1.4.6"])
     s.add_dependency(%q<stringex>, ["~> 1.2.0"])
     s.add_dependency(%q<uuidtools>, ["~> 2.1.2"])
-    s.add_dependency(%q<dm-validations>, ["~> 1.1.0.rc2"])
+    s.add_dependency(%q<dm-validations>, ["~> 1.1.0.rc3"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rake>, ["~> 0.8.7"])
     s.add_dependency(%q<rspec>, ["~> 1.3.1"])

data/lib/dm-types.rb

@@ -1,11 +1,5 @@
 require 'dm-core'
 
-begin
-  require 'active_support/core_ext/date_time/conversions'
-rescue LoadError
-  require 'extlib/datetime'
-end
-
 module DataMapper
   class Property
     autoload :CommaSeparatedList, 'dm-types/comma_separated_list'

data/lib/dm-types/bcrypt_hash.rb

@@ -4,6 +4,7 @@ require 'bcrypt'
 module DataMapper
   class Property
     class BCryptHash < String
+
       length 60
 
       def primitive?(value)
@@ -11,9 +12,7 @@ module DataMapper
       end
 
       def load(value)
-        if value.nil?
-          nil
-        else
+        unless value.nil?
           begin
             primitive?(value) ? value : BCrypt::Password.new(value)
           rescue BCrypt::Errors::InvalidHash
@@ -29,6 +28,7 @@ module DataMapper
       def typecast_to_primitive(value)
         load(value)
       end
+
     end # class BCryptHash
   end # class Property
 end # module DataMapper

data/lib/dm-types/comma_separated_list.rb

@@ -4,23 +4,26 @@ require 'dm-types/yaml'
 module DataMapper
   class Property
     class CommaSeparatedList < Yaml
+
       def dump(value)
         if value.nil?
           nil
         elsif value.kind_of?(::Array)
           super(value)
         elsif value.kind_of?(::String)
-          v = (value || "").split(",").
-            compact.
-            map { |i| i.downcase.strip }.
-            reject { |i| i.blank? }.
-            uniq
+          v = []
+
+          value.split(',').each do |element|
+            element.strip!
+            v << element unless element.empty?
+          end
+
           super(v)
         else
           raise ArgumentError, "+value+ of CommaSeparatedList must be a string, an array or nil, but given #{value.inspect}"
         end
       end # dump
-    end # CommaSeparatedList
 
+    end # CommaSeparatedList
   end # Property
 end # DataMapper

data/lib/dm-types/csv.rb

@@ -10,27 +10,26 @@ end
 module DataMapper
   class Property
     class Csv < Text
+
       def primitive?(value)
         super || value.kind_of?(::Array)
       end
 
       def load(value)
         case value
-          when ::String then CSV.parse(value)
-          when ::Array  then value
-          else
-            nil
+        when ::String then CSV.parse(value)
+        when ::Array  then value
         end
       end
 
       def dump(value)
         case value
-          when ::Array  then CSV.generate { |csv| value.each { |row| csv << row } }
+          when ::Array
+            CSV.generate { |csv| value.each { |row| csv << row } }
           when ::String then value
-          else
-            nil
         end
       end
+
     end # class Csv
   end # class Property
 end # module DataMapper

data/lib/dm-types/enum.rb

@@ -4,6 +4,7 @@ require 'dm-types/support/flags'
 module DataMapper
   class Property
     class Enum < Integer
+
       include Flags
 
       def initialize(model, name, options = {})
@@ -46,6 +47,7 @@ module DataMapper
         else               value
         end
       end
+
     end # class Enum
   end # class Property
 end # module DataMapper

data/lib/dm-types/epoch_time.rb

@@ -1,18 +1,12 @@
 require 'dm-core'
 
-begin
-  # provide Time#utc_time for DateTime#to_time in AS
-  require 'active_support/core_ext/time/calculations'
-rescue LoadError
-  # do nothing, extlib is being used and does not require this method
-end
-
 module DataMapper
   class Property
     class EpochTime < Integer
+
       def load(value)
-        if value.kind_of?(::Integer)
-          ::Time.at(value)
+        if value.kind_of?(::Numeric)
+          ::Time.at(value.to_i)
         else
           value
         end
@@ -20,10 +14,18 @@ module DataMapper
 
       def dump(value)
         case value
-          when ::Integer, ::Time then value.to_i
-          when ::DateTime        then value.to_time.to_i
+          when ::Numeric, ::Time then value.to_i
+          when ::DateTime        then datetime_to_time(value).to_i
         end
       end
+
+    private
+
+      def datetime_to_time(datetime)
+        utc = datetime.new_offset(0)
+        ::Time.utc(utc.year, utc.month, utc.day, utc.hour, utc.min, utc.sec)
+      end
+
     end # class EpochTime
   end # class Property
 end # module DataMapper

data/lib/dm-types/file_path.rb

@@ -4,6 +4,7 @@ require 'dm-core'
 module DataMapper
   class Property
     class FilePath < String
+
       length 255
 
       def primitive?(value)
@@ -15,21 +16,17 @@ module DataMapper
       end
 
       def load(value)
-        if value.blank?
-          nil
-        else
-          Pathname.new(value)
-        end
+        Pathname.new(value) unless DataMapper::Ext.blank?(value)
       end
 
       def dump(value)
-        return nil if value.blank?
-        value.to_s
+        value.to_s unless DataMapper::Ext.blank?(value)
       end
 
       def typecast_to_primitive(value)
         load(value)
       end
+
     end # class FilePath
   end # class Property
 end # module DataMapper

data/lib/dm-types/flag.rb

@@ -4,6 +4,7 @@ require 'dm-types/support/flags'
 module DataMapper
   class Property
     class Flag < Integer
+
       include Flags
 
       def initialize(model, name, options = {})
@@ -34,18 +35,29 @@ module DataMapper
       end
 
       def dump(value)
-        return if value.nil?
-        flags = Array(value).map { |flag| flag.to_sym }.flatten.uniq
-        flag_map.invert.values_at(*flags).compact.inject(0) { |sum, i| sum += 1 << i }
+        unless value.nil?
+          flags = Array(value).map { |flag| flag.to_sym }
+          flags.uniq!
+
+          flag = 0
+
+          flag_map.invert.values_at(*flags).each do |i|
+            next if i.nil?
+            flag += (1 << i)
+          end
+
+          flag
+        end
       end
 
       def typecast(value)
         case value
-          when nil   then nil
-          when ::Array then value.map {|v| v.to_sym}
+          when nil     then nil
+          when ::Array then value.map { |v| v.to_sym }
           else [value.to_sym]
         end
       end
+
     end # class Flag
   end # class Property
 end # module DataMapper

data/lib/dm-types/ip_address.rb

@@ -4,6 +4,7 @@ require 'dm-core'
 module DataMapper
   class Property
     class IPAddress < String
+
       length 39
 
       def primitive?(value)
@@ -17,23 +18,25 @@ module DataMapper
       def load(value)
         if value.nil?
           nil
-        elsif value.is_a?(::String) && !value.empty?
-          IPAddr.new(value)
-        elsif value.is_a?(::String) && value.empty?
-          IPAddr.new("0.0.0.0")
+        elsif value.is_a?(::String)
+          unless value.empty?
+            IPAddr.new(value)
+          else
+            IPAddr.new("0.0.0.0")
+          end
         else
           raise ArgumentError.new("+value+ must be nil or a String")
         end
       end
 
       def dump(value)
-        return nil if value.nil?
-        value.to_s
+        value.to_s unless value.nil?
       end
 
       def typecast_to_primitive(value)
         load(value)
       end
+
     end # class IPAddress
   end # module Property
 end # module DataMapper

data/lib/dm-types/json.rb

@@ -4,6 +4,7 @@ require 'json' unless defined? JSON
 module DataMapper
   class Property
     class Json < Text
+
       def custom?
         true
       end
@@ -37,7 +38,10 @@ module DataMapper
       def typecast_to_primitive(value)
         ::JSON.load(value.to_s)
       end
+
     end # class Json
+
     JSON = Json
+
   end # class Property
 end # module DataMapper

data/lib/dm-types/regexp.rb

@@ -3,6 +3,7 @@ require 'dm-core'
 module DataMapper
   class Property
     class Regexp < String
+
       def load(value)
         ::Regexp.new(value) unless value.nil?
       end
@@ -14,6 +15,7 @@ module DataMapper
       def typecast(value)
         load(value)
       end
+
     end
   end
 end

data/lib/dm-types/slug.rb

@@ -4,15 +4,16 @@ require 'stringex'
 module DataMapper
   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 typecast(value)
-        return if value.nil?
-
-        if value.respond_to?(:to_str)
+        if value.nil?
+          nil
+        elsif value.respond_to?(:to_str)
           escape(value.to_str)
         else
           raise ArgumentError, '+value+ must be nil or respond to #to_str'
@@ -22,6 +23,7 @@ module DataMapper
       def escape(string)
         string.to_url
       end
+
     end # class Slug
   end # class Property
 end # module DataMapper

data/lib/dm-types/uri.rb

@@ -4,6 +4,7 @@ require 'dm-core'
 module DataMapper
   class Property
     class URI < String
+
       # Maximum length chosen based on recommendation:
       # http://stackoverflow.com/questions/417142/what-is-the-maximum-length-of-an-url
       length 2000
@@ -31,6 +32,7 @@ module DataMapper
       def typecast_to_primitive(value)
         load(value)
       end
+
     end # class URI
   end # class Property
 end # module DataMapper

data/lib/dm-types/uuid.rb

@@ -39,6 +39,7 @@ module DataMapper
     #  -- benburkert Nov 15, 08
     #
     class UUID < String
+
       length 36
 
       # We need to override this method otherwise typecast_to_primitive won't be called.
@@ -67,6 +68,7 @@ module DataMapper
       def typecast_to_primitive(value)
         load(value)
       end
+
     end
   end
 end

data/lib/dm-types/yaml.rb

@@ -4,6 +4,7 @@ require 'dm-core'
 module DataMapper
   class Property
     class Yaml < Text
+
       def custom?
         true
       end
@@ -31,6 +32,7 @@ module DataMapper
       def typecast(value)
         value
       end
+
     end # class Yaml
   end # class Property
 end # module DataMapper

data/spec/integration/comma_separated_list_spec.rb

@@ -78,11 +78,7 @@ try_spec do
           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
+            @resource.interests.any? { |i| DataMapper::Ext.blank?(i) }.should be(false)
           end
         end
       end

data/spec/integration/flag_spec.rb

@@ -64,7 +64,7 @@ try_spec do
         end
 
         it 'has no errors' do
-          @resource.errors.should be_blank
+          @resource.errors.should be_empty
         end
       end
     end

data/spec/integration/uri_spec.rb

@@ -120,7 +120,7 @@ try_spec do
           end
 
           it 'can be found by uri' do
-            DataMapper::TypesFixtures::Bookmark.first(:uri => uri).should_not be_blank
+            DataMapper::TypesFixtures::Bookmark.first(:uri => uri).should_not be_nil
           end
 
           describe 'when reloaded' do

data/spec/unit/epoch_time_spec.rb

@@ -1,73 +1,58 @@
 require 'spec_helper'
 
-try_spec 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]
+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
+    subject { @property.dump(value) }
+
+    describe 'with a Time instance' do
+      let(:value) { Time.now }
+
+      it { should == value.to_i }
+    end
+
+    describe 'with a DateTime instance' do
+      let(:value) { DateTime.now }
+
+      it { should == Time.parse(value.to_s).to_i }
     end
 
-    describe '.dump' do
-      describe 'when given Time instance' do
-        before :all do
-          @input = Time.now
-        end
-
-        it 'returns timestamp' do
-          @property.dump(@input).should == @input.to_i
-        end
-      end
-
-      describe 'when given DateTime instance' do
-        before :all do
-          @input = DateTime.now
-        end
-
-        it 'returns timestamp' do
-          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
-
-      describe 'when given an integer' do
-        before :all do
-          @input = Time.now.to_i
-        end
-
-        it 'returns value as is' do
-          @property.dump(@input).should == @input
-        end
-      end
-
-      describe 'when given nil' do
-        before :all do
-          @input = nil
-        end
-
-        it 'returns value as is' do
-          @property.dump(@input).should == @input
-        end
-      end
+    describe 'with a number' do
+      let(:value) { Time.now.to_i }
+
+      it { should == value }
+    end
+
+    describe 'with nil' do
+      let(:value) { nil }
+
+      it { should == value }
+    end
+  end
+
+  describe '#load' do
+    subject { @property.load(value) }
+
+    describe 'with a number' do
+      let(:value) { Time.now.to_i }
+
+      it { should == Time.at(value) }
     end
 
-    describe '.load' do
-      describe 'when value is nil' do
-        it 'returns nil' do
-          @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
-          @property.load(Time.now.to_i).should == Time.at(t)
-        end
-      end
+    describe 'with nil' do
+      let(:value) { nil }
+
+      it { should == value }
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: dm-types
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.1.0.rc2
+  version: 1.1.0.rc3
 platform: ruby
 authors: 
 - Dan Kubb
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 -08:00
+date: 2011-03-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0.rc2
+        version: 1.1.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -86,7 +86,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0.rc2
+        version: 1.1.0.rc3
   type: :development
   prerelease: false
   version_requirements: *id007
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: DataMapper plugin providing extra data types