choices 0.2.1 → 0.2.4

data/lib/choices.rb

@@ -16,7 +16,7 @@ module Choices
   
   def load_settings_hash(filename, env)
     yaml_content = ERB.new(IO.read(filename)).result
-    YAML::load(yaml_content)[env]
+    yaml_load(yaml_content)[env]
   end
   
   def with_local_settings(filename, env, suffix)
@@ -26,6 +26,19 @@ module Choices
       yield hash if hash
     end
   end
+  
+  def yaml_load(content)
+    if defined? YAML::ENGINE
+      # avoid using broken Psych in 1.9.2
+      old_yamler = YAML::ENGINE.yamler
+      YAML::ENGINE.yamler = 'syck'
+    end
+    begin
+      YAML::load(content)
+    ensure
+      YAML::ENGINE.yamler = old_yamler if defined? YAML::ENGINE
+    end
+  end
 end
 
 if defined? Rails

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: choices
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"