Use Psych to load yaml when it is defined

hron84 · Mar 27, 2012 · a617b01 · a617b01
1 parent ffe455a
commit a617b01
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/lib/i18n-spec.rb b/lib/i18n-spec.rb
@@ -1,4 +1,3 @@
-require 'psych'
 Dir[File.dirname(__FILE__) + '/i18n-spec/models/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/i18n-spec/matchers/*.rb'].each {|file| require file }
 Dir[File.dirname(__FILE__) + '/i18n-spec/shared_examples/*.rb'].each {|file| require file }
diff --git a/lib/i18n-spec/models/locale_file.rb b/lib/i18n-spec/models/locale_file.rb
@@ -15,7 +15,7 @@ def content
     end
 
     def translations
-      @translations ||= Psych.load(content)
+      @translations ||= yaml_load_content
     end
 
     def flattened_translations
@@ -41,7 +41,7 @@ def invalid_pluralization_keys
 
     def is_parseable?
       begin
-        Psych.load(content)
+        yaml_load_content
         true
       rescue Psych::SyntaxError => e
         @errors[:unparseable] = e.to_s
@@ -76,5 +76,13 @@ def pluralization_data?(data)
       keys.any? {|k| PLURALIZATION_KEYS.include?(k) }
     end
 
+    def yaml_load_content
+      if defined? Psych
+        Psych.load(content)
+      else
+        YAML.load(content)
+      end
+    end
+
   end
 end