From b9087f95598fe496681cd7eafa3f89e00fde800f Mon Sep 17 00:00:00 2001 From: "zhangyaning1985@gmail.com" Date: Fri, 13 Feb 2015 23:39:09 +0800 Subject: [PATCH] Fixed toplevel constant DateTime referenced by Virtus::Attribute::DateTime --- CHANGELOG.md | 2 +- lib/grape/validations/validators/coerce.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 932d019daf..208ecd524f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ Next Release ============ - +* [#925](https://github.com/intridea/grape/pull/925): Fixed `toplevel constant DateTime referenced by Virtus::Attribute::DateTime` - [@u2](https://github.com/u2). * [#916](https://github.com/intridea/grape/pull/916): Added `DateTime/Date/Numeric/Boolean` type support `allow_blank` - [@u2](https://github.com/u2). * [#871](https://github.com/intridea/grape/pull/871): Fixed `Grape::Middleware::Base#response` - [@galathius](https://github.com/galathius). * [#559](https://github.com/intridea/grape/issues/559): Added support for Rack 1.6.0, which parses requests larger than 128KB - [@myitcv](https://github.com/myitcv). diff --git a/lib/grape/validations/validators/coerce.rb b/lib/grape/validations/validators/coerce.rb index 9e02ad93b1..c2d44f99f2 100644 --- a/lib/grape/validations/validators/coerce.rb +++ b/lib/grape/validations/validators/coerce.rb @@ -32,7 +32,7 @@ def _valid_single_type?(klass, val) val.is_a?(TrueClass) || val.is_a?(FalseClass) || (val.is_a?(String) && val.empty?) elsif klass == Rack::Multipart::UploadedFile val.is_a?(Hashie::Mash) && val.key?(:tempfile) - elsif [Virtus::Attribute::DateTime, Virtus::Attribute::Date, Virtus::Attribute::Numeric].any?{ |vclass| vclass >= klass } + elsif [DateTime, Date, Numeric].any?{ |vclass| vclass >= klass } return true if val.is_a?(String) && val.empty? val.is_a?(klass) else