chairman 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f574c5a7c2fe8289d4fb7dbee4231ca327f1dbc
-  data.tar.gz: 96936cb777824360159bc0e5ddde47411d71ff95
+  metadata.gz: ff20b3104c603e43fc597006def2aec2e11e2934
+  data.tar.gz: 4c1d6f1964604534e8320256241f01a7ebf83b3c
 SHA512:
-  metadata.gz: fefe1b21f6689bc323e7e8727ad98f356a1cea4b919419c6ca6f390cf7fb513c89370cdae5bffce4d854a9d8cddf0a0663f332d7b5567e7ca7ffa88c29110d73
-  data.tar.gz: a5b062fd7cb52a593433dd404d90c56b926fd11d7e265b8ea5bb2f33b1595ee4394d7c0915d190bc01c8079d3a08bc16c68d4cd03bf0418583980637a536991b
+  metadata.gz: 3c7ed4e1d570f628cba20cafc7b0ff34436a62e3fd85e38dc3f94680dafafabef59d0b97101afbfb875313b3a9935b2b222a535ea728513bd7d46e1cc9305abb
+  data.tar.gz: b89bff4b46f9c405f349e32b5cb5ea9066e46443f4a4c139bea9219cadddc37b2f9cbb13630edec0f2b27b5eba6a4a73e19a953c8121657e061ff7983002f8c4

data/lib/chairman.rb

@@ -6,6 +6,7 @@ require 'logger'
 require 'oj'
 require 'dalli'
 require 'memcachier'
+require 'chairman/routes'
 
 module Chairman
   class << self
@@ -14,8 +15,8 @@ module Chairman
     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], serializer: Oj
+      stack = Faraday::RackBuilder.new do |builder|
+        builder.use Faraday::HttpCache, shared_cache: false, logger: Logger.new(STDOUT), store: :mem_cache_store, store_options: [memcache_host], serializer: Oj
         builder.adapter Faraday.default_adapter
       end
       Octokit.middleware = stack
@@ -29,31 +30,5 @@ module Chairman
       @session = Octokit::Client.new :access_token => auth_token, :client_id => @client_id, :client_secret => @client_secret
     end
   end
-
-  class Routes < Sinatra::Base
-    set :protection, :except => :frame_options
-
-    get '/authorize' do
-      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.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.access_token).user
-
-      session[:github_token] = token.access_token
-      session[:github_id] = @user.login
-    end
-
-    get '/logout' do
-      session[:github_token] = nil
-      session[:github_id] = nil
-    end
-  end
 end
+

data/lib/chairman/holmes.rb

@@ -0,0 +1,93 @@
+require 'faraday'
+require 'sawyer'
+
+module Chairman
+  module Holmes
+    class Client
+      attr_accessor :headers, :body
+
+      def initialize(host)
+        @api_client = Sawyer::Agent.new(host, {serializer: Sawyer::Serializer.yajl}) do |http|
+          http.headers['content-type'] = 'application/json'
+        end
+
+        @headers = {}
+        @body = ''
+      end
+
+      def root
+        get '/'
+      end
+
+      def extensions
+        get '/extensions'
+      end
+
+      private
+
+        def passthrough_headers
+          [
+            'content-type',
+            'last-modified',
+            'cache-control'
+          ]
+        end
+
+        def get(path, params = {})
+          call @api_client.call :get, path, params
+        end
+
+        def post(path, params = {})
+          call @api_client.call :post, path, params
+        end
+
+        def call(api_response)
+          api_response.headers.each do |key, value|
+            if passthrough_headers.include? key
+              @headers[key] = value
+            end
+          end
+
+          if api_response.data.respond_to? :to_hash
+            @body = api_response.data.to_attrs.to_json
+          else
+            @body = api_response.data
+          end
+
+          return api_response.status
+        end
+    end
+
+  
+
+    class Routes < Sinatra::Base
+      set :protection, except: :frame_options
+
+      get '/authorize' do
+
+        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.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.access_token).user
+
+        session[:github_token] = token.access_token
+        session[:github_id] = @user.login
+      end
+
+      get '/logout' do
+        session[:github_token] = nil
+        session[:github_id] = nil
+      end
+    end
+
+  end
+end
+

data/lib/chairman/routes.rb

@@ -0,0 +1,29 @@
+module Chairman
+  class Routes < Sinatra::Base
+    set :protection, except: :frame_options
+
+    get '/authorize' do
+      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.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.access_token).user
+
+      session[:github_token] = token.access_token
+      session[:github_id] = @user.login
+    end
+
+    get '/logout' do
+      session[:github_token] = nil
+      session[:github_id] = nil
+    end
+  end
+end
+

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Chairman
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chairman
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Jed Foster
@@ -14,84 +14,84 @@ dependencies:
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: faraday-http-cache
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: dalli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.4
 - !ruby/object:Gem::Dependency
   name: memcachier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.4.0
 description: GitHub authentication routes and tools for Sinatra apps
@@ -100,8 +100,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
 - README.md
+- LICENSE
+- lib/chairman/holmes.rb
+- lib/chairman/routes.rb
 - lib/chairman.rb
 - lib/http_cache/response.rb
 - lib/version.rb
@@ -114,17 +116,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: GitHub authentication for Sinatra