Update the graph rendering example to support Octokit >2.0 (#146)

* Update Gemfile with newer dependency versions

* Update to use access_token config option

* Revert environment variables to their previous values

* Update comment/exmample environment variables to be less confusing

* Revert "Update comment/exmample environment variables to be less confusing"

This reverts commit 50191ab.

* Revert "Revert environment variables to their previous values"

This reverts commit 5594477.

Author: nathos

api/ruby/rendering-data-as-graphs/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "json",        "~> 1.8"
-gem 'sinatra',     '~> 1.3.5'
-gem 'sinatra_auth_github', '~> 0.13.3'
-gem 'octokit', '~> 1.23.0'
+gem "json", "~>2.1.0"
+gem "sinatra", "~>1.4.8"
+gem "sinatra_auth_github", "~>1.2.0"
+gem "octokit", "~>4.7.0"

api/ruby/rendering-data-as-graphs/Gemfile.lock

@@ -1,48 +1,55 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.3)
-    faraday (0.8.6)
-      multipart-post (~> 1.1)
-    faraday_middleware (0.9.0)
-      faraday (>= 0.7.4, < 0.9)
-    hashie (1.2.0)
-    json (1.8.3)
-    multi_json (1.6.1)
-    multipart-post (1.2.0)
-    netrc (0.7.7)
-    octokit (1.23.0)
-      addressable (~> 2.2)
-      faraday (~> 0.8)
-      faraday_middleware (~> 0.9)
-      hashie (~> 1.2)
-      multi_json (~> 1.3)
-      netrc (~> 0.7.7)
-    rack (1.5.2)
-    rack-protection (1.4.0)
+    activesupport (5.1.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    concurrent-ruby (1.0.5)
+    faraday (0.13.1)
+      multipart-post (>= 1.2, < 3)
+    i18n (0.8.6)
+    json (2.1.0)
+    minitest (5.10.3)
+    multipart-post (2.0.0)
+    octokit (4.7.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    public_suffix (3.0.0)
+    rack (1.6.8)
+    rack-protection (1.5.3)
       rack
-    sinatra (1.3.5)
-      rack (~> 1.4)
-      rack-protection (~> 1.3)
-      tilt (~> 1.3, >= 1.3.3)
-    sinatra_auth_github (0.13.3)
+    sawyer (0.8.1)
+      addressable (>= 2.3.5, < 2.6)
+      faraday (~> 0.8, < 1.0)
+    sinatra (1.4.8)
+      rack (~> 1.5)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    sinatra_auth_github (1.2.0)
       sinatra (~> 1.0)
-      warden-github (~> 0.13.1)
-    tilt (1.3.4)
-    warden (1.2.1)
+      warden-github (~> 1.2.0)
+    thread_safe (0.3.6)
+    tilt (2.0.8)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    warden (1.2.7)
       rack (>= 1.0)
-    warden-github (0.13.2)
-      octokit (>= 1.22.0)
+    warden-github (1.2.0)
+      activesupport (> 3.0)
+      octokit (> 2.1.0)
       warden (> 1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  json (~> 1.8)
-  octokit (~> 1.23.0)
-  sinatra (~> 1.3.5)
-  sinatra_auth_github (~> 0.13.3)
+  json (~> 2.1.0)
+  octokit (~> 4.7.0)
+  sinatra (~> 1.4.8)
+  sinatra_auth_github (~> 1.2.0)
 
 BUNDLED WITH
-   1.11.2
+   1.15.4

api/ruby/rendering-data-as-graphs/server.rb

@@ -10,8 +10,8 @@ class MyGraphApp < Sinatra::Base
     #  CLIENT_SECRET    = ENV['GITHUB_CLIENT_SECRET']
     # end
 
-    CLIENT_ID = ENV['GH_GRAPH_CLIENT_ID']
-    CLIENT_SECRET = ENV['GH_GRAPH_SECRET_ID']
+    CLIENT_ID = ENV['GITHUB_CLIENT_ID']
+    CLIENT_SECRET = ENV['GITHUB_CLIENT_SECRET']
 
     enable :sessions
 
@@ -28,7 +28,7 @@ class MyGraphApp < Sinatra::Base
       if !authenticated?
         authenticate!
       else
-        octokit_client = Octokit::Client.new(:login => github_user.login, :oauth_token => github_user.token)
+        octokit_client = Octokit::Client.new(:login => github_user.login, :access_token => github_user.token)
         repos = octokit_client.repositories
         language_obj = {}
         repos.each do |repo|
@@ -79,4 +79,4 @@ class MyGraphApp < Sinatra::Base
       end
     end
   end
-end
+end