Permalink
Browse files

upgraded gems and fixed warnings for ruby 1.9.3

  • Loading branch information...
1 parent b705e92 commit 62a49ed3ff103ccff01a90d1ea202102142adbeb @thilo thilo committed Jan 24, 2012
Showing with 40 additions and 41 deletions.
  1. +37 −38 Gemfile.lock
  2. +3 −3 app/helpers/controller.rb
View
@@ -1,16 +1,16 @@
GEM
remote: http://rubygems.org/
specs:
- activemodel (3.1.1)
- activesupport (= 3.1.1)
+ activemodel (3.1.3)
+ activesupport (= 3.1.3)
builder (~> 3.0.0)
i18n (~> 0.6)
- activerecord (3.1.1)
- activemodel (= 3.1.1)
- activesupport (= 3.1.1)
+ activerecord (3.1.3)
+ activemodel (= 3.1.3)
+ activesupport (= 3.1.3)
arel (~> 2.2.1)
tzinfo (~> 0.3.29)
- activesupport (3.1.1)
+ activesupport (3.1.3)
multi_json (~> 1.0)
addressable (2.2.6)
arel (2.2.1)
@@ -22,14 +22,14 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
- childprocess (0.2.5)
+ childprocess (0.3.0)
ffi (~> 1.0.6)
diff-lcs (1.1.3)
erubis (2.7.0)
- faraday (0.7.5)
- addressable (~> 2.2.6)
- multipart-post (~> 1.1.3)
- rack (>= 1.1.0, < 2)
+ faraday (0.7.6)
+ addressable (~> 2.2)
+ multipart-post (~> 1.1)
+ rack (~> 1.1)
ffi (1.0.11)
grit (2.4.1)
diff-lcs (~> 1.1)
@@ -38,21 +38,20 @@ GEM
rack (>= 1.0.0)
url_mount (~> 0.2.1)
i18n (0.6.0)
- json_pure (1.6.4)
- koala (1.2.1)
+ koala (1.3.0)
faraday (~> 0.7.0)
multi_json (~> 1.0)
mail (2.3.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.16)
- multi_json (1.0.3)
- multipart-post (1.1.3)
+ mime-types (1.17.2)
+ multi_json (1.0.4)
+ multipart-post (1.1.4)
nokogiri (1.5.0)
- oauth2 (0.5.1)
- faraday (~> 0.7.4)
- multi_json (~> 1.0.3)
+ oauth2 (0.5.2)
+ faraday (~> 0.7)
+ multi_json (~> 1.0)
padrino (0.10.5)
padrino-admin (= 0.10.5)
padrino-cache (= 0.10.5)
@@ -81,31 +80,31 @@ GEM
padrino-mailer (0.10.5)
mail (~> 2.3.0)
padrino-core (= 0.10.5)
- pg (0.11.0)
- polyglot (0.3.2)
- rack (1.3.4)
- rack-protection (1.1.4)
+ pg (0.12.2)
+ polyglot (0.3.3)
+ rack (1.4.1)
+ rack-protection (1.2.0)
rack
rack-test (0.6.1)
rack (>= 1.0)
- rake (0.9.2)
- rspec (2.6.0)
- rspec-core (~> 2.6.0)
- rspec-expectations (~> 2.6.0)
- rspec-mocks (~> 2.6.0)
- rspec-core (2.6.4)
- rspec-expectations (2.6.0)
+ rake (0.9.2.2)
+ rspec (2.8.0)
+ rspec-core (~> 2.8.0)
+ rspec-expectations (~> 2.8.0)
+ rspec-mocks (~> 2.8.0)
+ rspec-core (2.8.0)
+ rspec-expectations (2.8.0)
diff-lcs (~> 1.1.2)
- rspec-mocks (2.6.0)
+ rspec-mocks (2.8.0)
rubyzip (0.9.5)
- selenium-webdriver (2.13.0)
- childprocess (>= 0.2.1)
+ selenium-webdriver (2.17.0)
+ childprocess (>= 0.2.5)
ffi (~> 1.0.9)
- json_pure
+ multi_json (~> 1.0.4)
rubyzip
- sinatra (1.3.1)
- rack (~> 1.3, >= 1.3.4)
- rack-protection (~> 1.1, >= 1.1.2)
+ sinatra (1.3.2)
+ rack (~> 1.3, >= 1.3.6)
+ rack-protection (~> 1.2)
tilt (~> 1.3, >= 1.3.3)
sinatra-flash (0.3.0)
sinatra (>= 1.0.0)
@@ -114,7 +113,7 @@ GEM
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.30)
+ tzinfo (0.3.31)
url_mount (0.2.1)
rack
xpath (0.1.4)
@@ -1,11 +1,11 @@
CobotFb.helpers do
def auth
- @auth ||= Koala::Facebook::OAuth.new(Config[:fb_app_id], Config[:fb_app_key])
+ @auth ||= Koala::Facebook::OAuth.new(CobotFb::Config[:fb_app_id], CobotFb::Config[:fb_app_key])
end
def oauth_client
- OAuth2::Client.new(Config[:cobot_app_id],
- Config[:cobot_app_key],
+ OAuth2::Client.new(CobotFb::Config[:cobot_app_id],
+ CobotFb::Config[:cobot_app_key],
site: 'https://cobot.me',
token_url: '/oauth2/access_token',
authorize_url: '/oauth2/authorize',

0 comments on commit 62a49ed

Please sign in to comment.