Updated Justin.tv api requests to use OAuth authentication

Gemfile

@@ -52,6 +52,6 @@ gem 'prototype_legacy_helper', '0.0.0', :git => 'git://github.com/rails/prototyp
 
 # Omniauth OpenID for Steam Integration
 gem "omniauth-openid", "~> 1.0.1"
-
+gem "oauth", "~> 0.3.6"
 gem "steam-condenser"
 gem "httparty", "~> 0.8.1"

Gemfile.lock

@@ -99,6 +99,8 @@ GEM
     multi_json (1.3.6)
     multi_xml (0.5.1)
     netrc (0.7.2)
+    oauth (0.3.6)
+      ruby-hmac (>= 0.3.1)
     omniauth (1.1.0)
       hashie (~> 1.2)
       rack
@@ -151,6 +153,7 @@ GEM
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
+    ruby-hmac (0.4.0)
     ruby-openid (2.1.8)
     rubyzip (0.9.8)
     sass (3.1.19)
@@ -200,6 +203,7 @@ DEPENDENCIES
   machinist (>= 2.0.0.beta2)
   meta_search (~> 1.1.1)
   mocha (~> 0.9.12)
+  oauth (~> 0.3.6)
   omniauth-openid (~> 1.0.1)
   paperclip (~> 2.4.0)
   pg

app/models/stream.rb

@@ -13,12 +13,24 @@ def perform
     current_status = nil
     is_live = false
 
+    jtv_key = Settings.justintv_consumer_key
+    jtv_secret = Settings.justintv_secret_key
+    jtv_consumer = OAuth::Consumer.new(jtv_key, jtv_secret,
+                                   :site => "http://api.justin.tv",
+                                   :http_method => :get)
+
+    # make the access token from your consumer
+    jtv_access_token = OAuth::AccessToken.new jtv_consumer
+
+
     if self.provider == "justintv"
-      response = HTTParty.get("http://api.justin.tv/api/stream/list.xml?channel=#{identifier}")
+
+      # make a signed request!
+      response = ActiveSupport::JSON.decode(jtv_access_token.get("/api/stream/list.json?channel=#{identifier}").body)
 
       begin
-        current_viewers = response["streams"]["stream"]["channel_count"]
-        current_status = response["streams"]["stream"]["channel"]["status"]
+        current_viewers = response[0]["channel_count"]
+        current_status = response[0]["channel"]["status"]
       rescue Exception => e
         logger.error e
       ensure

config/settings/development.example.yml

@@ -1,4 +1,6 @@
 session_key: eldorado_development
 session_secret: ESl6X3oKM1i1RRrD2QLwUUzz9jr1zxNO
 domain: http://example.com
-steam_api_key:
+steam_api_key:
+justintv_consumer_key:
+justintv_secret_key:

config/settings/production.example.yml

@@ -41,3 +41,7 @@ disabled_tabs: # list tabs that want to hide from users (e.g. "blog events heade
 
 # STEAM
 steam_api_key:
+
+# Justin.tv
+justintv_consumer_key:
+justintv_secret_key:

config/settings/test.example.yml

@@ -1,4 +1,6 @@
 session_key: eldorado_test
 session_secret: vrwPpJTvwnMVLP1wTSgqigSl7PMI7QcE
 domain: http://example.com
-steam_api_key:
+steam_api_key:
+justintv_consumer_key:
+justintv_secret_key: