gotime-cassandra_object 0.7.6 → 0.7.7

data/gotime-cassandra_object.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gotime-cassandra_object}
-  s.version = "0.7.6"
+  s.version = "0.7.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Koziarski", "grantr"]
-  s.date = %q{2011-02-11}
+  s.date = %q{2011-02-17}
   s.description = %q{Cassandra ActiveModel}
   s.email = %q{grantr@gmail.com}
   s.extra_rdoc_files = [

data/lib/cassandra_object/types.rb

@@ -3,6 +3,7 @@ module CassandraObject
     REGEX = /\A[-+]?\d+\Z/
     def encode(int)
       return '' if int.nil?
+      int = int.to_i if int.kind_of?(String) && int.match(REGEX)
       raise ArgumentError.new("#{self} requires an Integer. You passed #{int.inspect}") unless int.kind_of?(Integer)
       int.to_s
     end
@@ -20,6 +21,7 @@ module CassandraObject
     REGEX = /\A[-+]?\d+(\.\d+)\Z/
     def encode(float)
       return '' if float.nil?
+      float = float.to_f if float.kind_of?(String) && float.match(REGEX)
       raise ArgumentError.new("#{self} requires a Float") unless float.kind_of?(Float)
       float.to_s
     end
@@ -38,6 +40,7 @@ module CassandraObject
     REGEX = /\A\d{4}-\d{2}-\d{2}\Z/
     def encode(date)
       return '' if date.nil?
+      date = Date.parse(date) if date.kind_of?(String) && date.match(REGEX)
       raise ArgumentError.new("#{self} requires a Date") unless date.kind_of?(Date)
       date.strftime(FORMAT)
     end
@@ -63,6 +66,7 @@ module CassandraObject
 
     def encode(time)
       return '' if time.nil?
+      time = Time.parse(time) if time.kind_of?(String) && time.match(REGEX)
       raise ArgumentError.new("#{self} requires a Time") unless time.kind_of?(Time)
       time.xmlschema(6)
     end
@@ -79,13 +83,16 @@ module CassandraObject
   module TimeWithZoneType
     def encode(time)
       return '' if time.nil?
-      TimeType.encode(time.utc)
+      time = Time.zone.parse(time) if time.kind_of?(String) && time.match(TimeType::REGEX)
+      raise ArgumentError.new("#{self} requires a Time") unless time.kind_of?(Time)
+      time.utc.xmlschema(6)
     end
     module_function :encode
 
     def decode(str)
       return nil if str.empty?
-      TimeType.decode(str).in_time_zone
+      raise ArgumentError.new("#{str} isn't a String that looks like a Time") unless str.kind_of?(String) && str.match(TimeType::REGEX)
+      Time.xmlschema(str).in_time_zone
     end
     module_function :decode
   end
@@ -136,12 +143,13 @@ module CassandraObject
   end
 
   module BooleanType
-    ALLOWED = [true, false, nil]
+    TRUE_VALS = [true, 'true', '1']
+    FALSE_VALS = [false, 'false', '0', nil]
     def encode(bool)
-      unless ALLOWED.any?{ |a| bool == a }
-          raise ArgumentError.new("#{self} requires a Boolean or nil")
+      unless TRUE_VALS.any? { |a| bool == a } || FALSE_VALS.any?{ |a| bool == a }
+        raise ArgumentError.new("#{self} requires a Boolean or nil")
       end
-      bool ? '1' : '0'
+      TRUE_VALS.include?(bool) ? '1' : '0'
     end
     module_function :encode
 

data/lib/cassandra_object/version.rb

@@ -2,7 +2,7 @@ module CassandraObject
   module Version
     MAJOR = 0
     MINOR = 7
-    PATCH = 6
+    PATCH = 7
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 6
-  version: 0.7.6
+  - 7
+  version: 0.7.7
 platform: ruby
 authors: 
 - Michael Koziarski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-11 00:00:00 -08:00
+date: 2011-02-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -213,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2972902042338948118
+      hash: -226474256886539699
       segments: 
       - 0
       version: "0"