Merge branch 'mattly/master' into mergemattly

2008-12-31 14:54:28 -08:00 · 2008-12-31 14:54:28 -08:00 · 8b34f083c7
commit 8b34f083c7
parent a3ac5fc4e8 ce172cf77b
3 changed files with 15 additions and 3 deletions
--- a/lib/couchrest/core/model.rb
+++ b/lib/couchrest/core/model.rb
@ -522,10 +522,14 @@ module CouchRest
        if target.is_a?(Array)
          klass = ::Extlib::Inflection.constantize(target[0])
          self[k] = self[k].collect do |value|
-            klass.new(value)
+            klass == Time ? Time.parse(value) : klass.new(value)
          end
        else
-          self[k] = ::Extlib::Inflection.constantize(target).new(self[k])
+          self[k] = if target == 'Time'
+            Time.parse(self[k])
+          else
+            ::Extlib::Inflection.constantize(target).new(self[k])
+          end
        end
      end
    end