preferring psych if available

jeffkreeftmeijer · Jan 1, 2011 · 663d13e · 663d13e
1 parent e64e5a1
commit 663d13e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/README.rdoc b/README.rdoc
@@ -4,8 +4,6 @@ This is the source code for the rubycommitters.org website.
 
 == Hacking
 
-Ruby 1.9.2 is required!!!!
-
 First clone the repo:
 
     $ git clone git://github.com/tenderlove/rubycommitters.org.git

diff --git a/app/models/account.rb b/app/models/account.rb
@@ -10,9 +10,15 @@ class Account < ActiveRecord::Base
   # Import +io+ object that contains a YAML representation of the
   # ruby-committers
   def self.import io
-    require 'psych'
+    begin
+      require 'psych'
+      yamler = Psych
+    rescue LoadError
+      require 'yaml'
+      yamler = YAML
+    end
 
-    doc = Psych.load io
+    doc = yamler.load io
     doc.each do |record|
       account = Account.create!(:username => record['account'])
       (record['name'] || []).each do |name|