dm-types 0.9.8 → 0.9.9

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.9.9 / 2009-01-04
+
+* 1 bug fix:
+
+  * Updated DM::Json.typecast to handle nil values
+
 === 0.9.8 / 2008-12-07
 
 * 2 bug fixes:

data/lib/dm-types.rb

@@ -1,7 +1,7 @@
 require 'pathname'
 require 'rubygems'
 
-gem 'dm-core', '~>0.9.8'
+gem 'dm-core', '~>0.9.9'
 require 'dm-core'
 
 module DataMapper

data/lib/dm-types/enum.rb

@@ -34,8 +34,8 @@ module DataMapper
 
       def self.dump(value, property)
         case value
-        when Array then value.collect { |v| self.dump(v, property) }
-        else            self.flag_map.invert[value]
+          when Array then value.collect { |v| self.dump(v, property) }
+          else            self.flag_map.invert[value]
         end
       end
 
@@ -46,7 +46,7 @@ module DataMapper
           when Symbol then value.to_sym
           when String then value.to_s
           when Fixnum then value.to_i
-          else               value
+          else             value
         end
       end
     end # class Enum
@@ -61,7 +61,7 @@ module DataMapper
           return unless property.options[:auto_validation]
 
           if property.type.ancestors.include?(Types::Enum)
-           validates_within property.name, options_with_message({:set => property.type.flag_map.values}, property, :within)
+            validates_within property.name, options_with_message({:set => property.type.flag_map.values}, property, :within)
           end
         end
       end

data/lib/dm-types/json.rb

@@ -13,14 +13,12 @@ module DataMapper
         elsif value.is_a?(String)
           ::JSON.load(value)
         else
-          raise ArgumentError.new("+value+ must be nil or a String")
+          raise ArgumentError, '+value+ must be nil or a String'
         end
       end
 
       def self.dump(value, property)
-        if value.nil?
-          nil
-        elsif value.is_a?(String)
+        if value.nil? || value.is_a?(String)
           value
         else
           ::JSON.dump(value)
@@ -28,8 +26,7 @@ module DataMapper
       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)
+        if value.nil? || value.kind_of?(Array) || value.kind_of?(Hash)
           value
         else
           ::JSON.load(value.to_s)

data/lib/dm-types/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-types
 version: !ruby/object:Gem::Version 
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors: 
 - Sam Smoot
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-07 00:00:00 -08:00
+date: 2009-01-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.8
+        version: 0.9.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: addressable