summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2016-08-08 08:33:35 -0700
committerGitHub <noreply@github.com>2016-08-08 08:33:35 -0700
commit446b0f905b7949a74395d6265f864d56c9a0b2c4 (patch)
tree1c22e21447e56783623a7483f0946631881d31ff
parente10e35f3e0ef91926dd7ac4b1192e25f24d0f741 (diff)
parent5f027baca5b1e4f23c2c800be083d30f95d5a8a4 (diff)
downloadpsych-446b0f905b7949a74395d6265f864d56c9a0b2c4.tar.gz
Merge pull request #284 from nettopower/master
Skips multiple requires of bigdecimal and date
-rw-r--r--lib/psych/visitors/to_ruby.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/psych/visitors/to_ruby.rb b/lib/psych/visitors/to_ruby.rb
index c061da2..fd1c8e6 100644
--- a/lib/psych/visitors/to_ruby.rb
+++ b/lib/psych/visitors/to_ruby.rb
@@ -70,11 +70,11 @@ module Psych
o.value
end
when '!ruby/object:BigDecimal'
- require 'bigdecimal'
+ require 'bigdecimal' unless defined? BigDecimal
class_loader.big_decimal._load o.value
when "!ruby/object:DateTime"
class_loader.date_time
- require 'date'
+ require 'date' unless defined? DateTime
@ss.parse_time(o.value).to_datetime
when '!ruby/encoding'
::Encoding.find o.value