chairman 0.0.2 → 0.0.3.alpha.1

data/lib/chairman.rb

@@ -1,38 +1,50 @@
 require 'sinatra/base'
-require 'github_api'
+require 'faraday/http_cache'
+require 'http_cache/response'
+require 'octokit'
+require 'logger'
 
 module Chairman
   class << self
     attr_reader :session, :client_id, :client_secret, :scope
 
     def config(client_id, client_secret, scope)
+      memcache_host = ENV['MEMCACHIER_SERVERS'] || 'localhost:11211'
+
+      stack = Faraday::Builder.new do |builder|
+        builder.use Faraday::HttpCache, logger: Logger.new(STDOUT), store: :mem_cache_store, store_options: [memcache_host]
+        builder.adapter Faraday.default_adapter
+      end
+      Octokit.middleware = stack
+
       @client_id = client_id
       @client_secret = client_secret
       @scope = scope
     end
 
     def session(auth_token = '')
-      @session = Github.new do |config|
-        config.client_id = @client_id
-        config.client_secret = @client_secret
-        config.oauth_token = auth_token
-      end
+      @session = Octokit::Client.new :access_token => auth_token,
+        :client_id => @client_id,
+        :client_secret => @client_secret
     end
   end
 
   class Routes < Sinatra::Base
     get '/authorize' do
-      redirect to Chairman.session.authorize_url :scope => Chairman.scope
+      redirect to Chairman.session.authorize_url(Chairman.client_id, '', :scope => Chairman.scope.join(','))
     end
 
     get '/authorize/return' do
       halt if params[:error] == 'access_denied'
 
-      token = Chairman.session.get_token(params[:code])
+      token = Chairman.session.exchange_code_for_token(params[:code], Chairman.client_id, Chairman.client_secret, {:accept => 'application/json'})
+
+      # TODO: Verify that returned scope is the same as we requested
+      # See: http://developer.github.com/changes/2013-10-04-oauth-changes-coming/
 
-      @user = Chairman.session(token.token).users.get
+      @user = Chairman.session(token.access_token).user
 
-      session[:github_token] = token.token
+      session[:github_token] = token.access_token
       session[:github_id] = @user.login
       session[:gravatar_id] = @user.gravatar_id
     end

data/lib/http_cache/response.rb

@@ -0,0 +1,15 @@
+module Faraday
+  class HttpCache < Faraday::Middleware
+    # Internal: a class to represent a response from a Faraday request.
+    # It decorates the response hash into a smarter object that queries
+    # the response headers and status informations about how the caching
+    # middleware should handle this specific response.
+    class Response
+      def cacheable?
+        return false if cache_control.no_store?
+      
+        cacheable_status_code? && (validateable? || fresh?)
+      end
+    end
+  end
+end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Chairman
-  VERSION = "0.0.2"
+  VERSION = "0.0.3.alpha.1"
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: chairman
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.3.alpha.1
+  prerelease: 6
 platform: ruby
 authors:
 - Jed Foster
@@ -28,13 +28,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.4.3
 - !ruby/object:Gem::Dependency
-  name: github_api
+  name: octokit
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,55 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: faraday-http-cache
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: dalli
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.4
+- !ruby/object:Gem::Dependency
+  name: memcachier
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 description: GitHub authentication routes and tools for Sinatra apps
 email: jed@jedfoster.com
 executables: []
@@ -52,6 +100,7 @@ files:
 - README.md
 - LICENSE
 - lib/chairman.rb
+- lib/http_cache/response.rb
 - lib/version.rb
 homepage: https://github.com/jedfoster/Chairman
 licenses: []
@@ -68,9 +117,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23