Merge pull request #14 from lgn21st/master

Fix "uninitialized constant Rails" exception when using it in Sinatra.
ballantyne · Jun 4, 2012 · ed4df65 · ed4df65
2 parents dd02d62 + 9441152
commit ed4df65
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/weibo.rb b/lib/weibo.rb
@@ -57,12 +57,12 @@ def rubyify_keys!
 
 
 if File.exists?('config/weibo.yml')
-  weibo_oauth = YAML.load_file('config/weibo.yml')[Rails.env || env || 'development']
+  weibo_oauth = YAML.load_file('config/weibo.yml')[ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"]
   Weibo::Config.api_key = weibo_oauth["api_key"]
   Weibo::Config.api_secret = weibo_oauth["api_secret"]
-else 
+else
   puts "\n\n=========================================================\n\n" +
-       "  You haven't made a config/weibo.yml file.\n\n  You should.  \n\n  The weibo gem will work much better if you do\n\n" + 
+       "  You haven't made a config/weibo.yml file.\n\n  You should.  \n\n  The weibo gem will work much better if you do\n\n" +
        "  Please set Weibo::Config.api_key and \n  Weibo::Config.api_secret\n  somewhere in your initialization process\n\n" +
        "=========================================================\n\n"
 end
@@ -72,4 +72,4 @@ def rubyify_keys!
   require 'weibo/railtie'
 end
 rescue
-end
+end