Ruby 1.9 uses Psych for YAML

Author: avit

lib/ice_cube.rb

@@ -1,13 +1,6 @@
 require 'date'
 require 'ice_cube/deprecated'
 
-# Use psych if we can
-begin
-  require 'psych'
-rescue LoadError
-  require 'yaml'
-end
-
 module IceCube
 
   autoload :VERSION, 'ice_cube/version'
@@ -71,10 +64,6 @@ module Validations
   ONE_DAY =    ONE_HOUR   * 24
   ONE_WEEK =   ONE_DAY    * 7
 
-  def self.use_psych?
-    @use_psych ||= defined?(Psych) && defined?(Psych::VERSION)
-  end
-
   # Defines the format used by IceCube when printing out Schedule#to_s.
   # Defaults to '%B %e, %Y'
   def self.to_s_time_format

lib/ice_cube/rule.rb

@@ -30,12 +30,12 @@ def to_ical
 
     # Yaml implementation
     def to_yaml(*args)
-      IceCube::use_psych? ? Psych::dump(to_hash) : YAML::dump(to_hash, *args)
+      YAML::dump(to_hash, *args)
     end
 
     # From yaml
     def self.from_yaml(yaml)
-      from_hash IceCube::use_psych? ? Psych::load(yaml) : YAML::load(yaml)
+      from_hash YAML::load(yaml)
     end
 
     # Expected to be overridden by subclasses

lib/ice_cube/schedule.rb

@@ -313,12 +313,12 @@ def to_ical(force_utc = false)
 
     # Convert the schedule to yaml
     def to_yaml(*args)
-      IceCube::use_psych? ? Psych::dump(to_hash, *args) : YAML::dump(to_hash, *args)
+      YAML::dump(to_hash, *args)
     end
 
     # Load the schedule from yaml
     def self.from_yaml(yaml, options = {})
-      hash = IceCube::use_psych? ? Psych::load(yaml) : YAML::load(yaml)
+      hash = YAML::load(yaml)
       if match = yaml.match(/start_date: .+((?:-|\+)\d{2}:\d{2})$/)
         TimeUtil.restore_deserialized_offset(hash[:start_date], match[1])
       end