YAMLのパースに失敗し例外が発生する不具合を修正

diff --git a/config/boot.rb b/config/boot.rb
index 0fddc9f..8ec392c 100644 (file)
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,9 +1,6 @@
 # Don't change this file!
 # Configure your app in config/environment.rb and config/environments/*.rb
 
-require 'yaml'
-YAML::ENGINE.yamler = 'syck'
-
 RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
 
 module Rails

diff --git a/config/environment.rb b/config/environment.rb
index 9faff2c..34e0fab 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -85,3 +85,8 @@ end
 require "#{RAILS_ROOT}/lib/jpmobile/mobile/smartphone.rb"
 carriers = Jpmobile::Mobile.carriers
 Jpmobile::Mobile.carriers = carriers.push("Smartphone")
+
+# HACK: Ruby1.9のデフォルトパーサpsychだと各所が動かなくなるので
+#       古いsyckを使うようにする (quick and dirty)
+require 'yaml'
+YAML::ENGINE.yamler = 'syck'