rack-oauth_proxy 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c33bd03642050ec16695d9edd4eb0d128c1b26d
-  data.tar.gz: 18abbeca292daa9d059f18cfa3b13d86d86b04f8
+  metadata.gz: 99386f17d5ddd6f0ddc8308d40ebdeaedfd48e20
+  data.tar.gz: a4c3ddb81f3c181adc915c84ff1f7b3fca6c92f8
 SHA512:
-  metadata.gz: 2834913040a3706d41932e707744bbddec7bc2d522364fe0f8656c8c0c5ef93d12cce00adf69523b3495dc83700dde5d80e6a17125cba5a1a1232872563be432
-  data.tar.gz: b037d89e8c295df21a9c4cc88ccf02dd9807f01442c979d13c2f69784a65735d0fb81ccc3dcfff72b61ca8e06f5a7fb9a628e2b65c62b15884838ccd36eccd06
+  metadata.gz: 4088da5b01435bd30d7160742a260a2f4f2e6069fab7821cb244f8f0c44439d962192ae68753b7c5fe5181ca35b9f07adb21d9037b0901a4dc59713c3e4ef873
+  data.tar.gz: 770fcd4e6ddf166764ce63ea4da869da42aa4d229b16700219196eb6c4b9895359798a4053896a59893cfc849d0f8de7db70e64865974e7aac51dbef0ad53479

data/.travis.yml

@@ -0,0 +1,10 @@
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+branches:
+  only:
+    - master
+env:
+  global:
+    secure: VhmOZev4085aQTNbSgM76VLajpURnOGktBbRkbjrRlIwGckhAXlc6WZ0f8LkQu7ZY9zXggBwGerImNxkEmEi1fvsky4T1Lj9wlnzm8kckrNSEuUO+59T9hag5+dAQLRxyZMoLQyvJalCI+Y1H8aaBJt39VlppmihNzJONf0wiw8=

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.2.0
+* `env["rack-oauth_proxy.response"]` is a Faraday::Response
+
 ## 0.1.0
 * Add `:propagated_header_fields` option
 * Use fadaday

data/README.md

@@ -1,4 +1,5 @@
-# Rack::OauthProxy
+# Rack::OauthProxy [![Build Status](https://travis-ci.org/r7kamura/rack-oauth_proxy.png)](https://travis-ci.org/r7kamura/rack-oauth_proxy) [![Code Climate](https://codeclimate.com/github/r7kamura/rack-oauth_proxy.png)](https://codeclimate.com/github/r7kamura/rack-oauth_proxy) [![Code Climate](https://codeclimate.com/github/r7kamura/rack-oauth_proxy/coverage.png)](https://codeclimate.com/github/r7kamura/rack-oauth_proxy)
+
 Delegates OAuth authentication to other authentication server.
 
 ## Usage

data/Rakefile

@@ -1 +1,5 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+task default: :spec

data/lib/rack/oauth_proxy.rb

@@ -1,6 +1,3 @@
-require "rack/oauth_proxy/access_tokens/base"
-require "rack/oauth_proxy/access_tokens/invalid"
-require "rack/oauth_proxy/access_tokens/valid"
 require "rack/oauth_proxy/client"
 require "rack/oauth_proxy/client/request"
 require "rack/oauth_proxy/version"
@@ -13,7 +10,7 @@ module Rack
     end
 
     def call(env)
-      env["rack-oauth_proxy.access_token"] = client.fetch(env)
+      env["rack-oauth_proxy.response"] = client.fetch(env)
       @app.call(env)
     end
 

data/lib/rack/oauth_proxy/client.rb

@@ -12,10 +12,7 @@ module Rack
 
       def fetch(env)
         request = Request.new(env, options)
-        response = connection.get(url, request.params, request.header)
-        AccessTokens::Valid.new(response.body)
-      rescue
-        AccessTokens::Invalid.new
+        connection.get(url, request.params, request.header)
       end
 
       private
@@ -23,7 +20,6 @@ module Rack
       def connection
         @connection ||= Faraday.new(headers: header) do |connection|
           connection.adapter :net_http
-          connection.response :raise_error
           connection.response :json
         end
       end

data/lib/rack/oauth_proxy/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class OauthProxy
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/rack-oauth_proxy.gemspec

@@ -20,8 +20,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "faraday_middleware"
   spec.add_dependency "rack"
   spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "codeclimate-test-reporter"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "2.14.1"
-  spec.add_development_dependency "webmock"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "webmock", "1.17.4"
 end

data/spec/rack/{oauth_proxy/client_spec.rb → oauth_proxy_spec.rb}

@@ -1,15 +1,19 @@
 require "spec_helper"
-require "securerandom"
-require "stringio"
 
-describe Rack::OauthProxy::Client do
+describe Rack::OauthProxy do
   before do
     stub_request(:get, url).to_return(status: 401, body: {}.to_json)
     stub_request(:get, url).with(headers: { "Authorization" => "Bearer #{token}" }).to_return(response)
   end
 
-  let(:client) do
-    described_class.new(options)
+  let(:application) do
+    opts = options
+    Rack::Builder.app do
+      use Rack::OauthProxy, opts
+      run ->(env) do
+        env
+      end
+    end
   end
 
   let(:options) do
@@ -44,13 +48,25 @@ describe Rack::OauthProxy::Client do
   end
 
   let(:body) do
-    {}.to_json
+    attributes.to_json
+  end
+
+  let(:attributes) do
+    {
+      "token" => token,
+    }
+  end
+
+  let(:result) do
+    application.call(env)["rack-oauth_proxy.response"]
   end
 
-  context "#fetch" do
+  describe "#call" do
     context "when authentication succeeded" do
       it "returns valid access token" do
-        client.fetch(env).should be_a Rack::OauthProxy::AccessTokens::Valid
+        result.should be_a Faraday::Response
+        result.status.should == 200
+        result.body.should == attributes
         a_request(:get, url).with(headers: { "Authorization" => "Bearer #{token}" }).should have_been_made
       end
     end
@@ -61,7 +77,8 @@ describe Rack::OauthProxy::Client do
       end
 
       it "returns invalid access token" do
-        client.fetch(env).should be_a Rack::OauthProxy::AccessTokens::Invalid
+        result.should be_a Faraday::Response
+        result.status.should == 401
         a_request(:get, url).should have_been_made
       end
     end
@@ -72,7 +89,8 @@ describe Rack::OauthProxy::Client do
       end
 
       it "propagates specified fields" do
-        client.fetch(env).should be_a Rack::OauthProxy::AccessTokens::Invalid
+        result.should be_a Faraday::Response
+        result.status.should == 401
         a_request(:get, url).with(headers: { "DUMMY" => "dummy" }).should have_been_made
       end
     end

data/spec/spec_helper.rb

@@ -1,6 +1,16 @@
+require "simplecov"
+SimpleCov.start
+
+require "webmock/rspec"
+
+if ENV["CI"]
+  require "codeclimate-test-reporter"
+  CodeClimate::TestReporter.start
+  WebMock.allow_net_connect!
+end
+
 $LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
 require "rack/oauth_proxy"
-require "webmock/rspec"
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-oauth_proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryo Nakamura
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -122,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.17.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.17.4
 description: 
 email:
 - r7kamura@gmail.com
@@ -130,6 +158,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -137,14 +166,11 @@ files:
 - Rakefile
 - lib/rack-oauth_proxy.rb
 - lib/rack/oauth_proxy.rb
-- lib/rack/oauth_proxy/access_tokens/base.rb
-- lib/rack/oauth_proxy/access_tokens/invalid.rb
-- lib/rack/oauth_proxy/access_tokens/valid.rb
 - lib/rack/oauth_proxy/client.rb
 - lib/rack/oauth_proxy/client/request.rb
 - lib/rack/oauth_proxy/version.rb
 - rack-oauth_proxy.gemspec
-- spec/rack/oauth_proxy/client_spec.rb
+- spec/rack/oauth_proxy_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/r7kamura/rack-oauth_proxy
 licenses:
@@ -171,5 +197,5 @@ signing_key:
 specification_version: 4
 summary: Delegates OAuth authentication to other authentication server
 test_files:
-- spec/rack/oauth_proxy/client_spec.rb
+- spec/rack/oauth_proxy_spec.rb
 - spec/spec_helper.rb

data/lib/rack/oauth_proxy/access_tokens/base.rb

@@ -1,39 +0,0 @@
-module Rack
-  class OauthProxy
-    module AccessTokens
-      class Base
-        ATTRIBUTE_NAMES = %w[
-          application_id
-          expired_at
-          refresh_token
-          resource_owner_id
-          scope
-          token
-          token_type
-        ]
-
-        ATTRIBUTE_NAMES.each {|name| attr_accessor name }
-
-        def initialize(attributes)
-          raise NotImplementedError, "You must implement #{self.class}##{__method__}"
-        end
-
-        def accessible?
-          raise NotImplementedError, "You must implement #{self.class}##{__method__}"
-        end
-
-        def revoked?
-          raise NotImplementedError, "You must implement #{self.class}##{__method__}"
-        end
-
-        def expired?
-          raise NotImplementedError, "You must implement #{self.class}##{__method__}"
-        end
-
-        def scopes
-          scope.split(" ") if scope
-        end
-      end
-    end
-  end
-end

data/lib/rack/oauth_proxy/access_tokens/invalid.rb

@@ -1,22 +0,0 @@
-module Rack
-  class OauthProxy
-    module AccessTokens
-      class Invalid < Base
-        def initialize(attributes = nil)
-        end
-
-        def accessible?
-          false
-        end
-
-        def revoked?
-          false
-        end
-
-        def expired?
-          false
-        end
-      end
-    end
-  end
-end

data/lib/rack/oauth_proxy/access_tokens/valid.rb

@@ -1,23 +0,0 @@
-module Rack
-  class OauthProxy
-    module AccessTokens
-      class Valid < Base
-        def initialize(attributes)
-          ATTRIBUTE_NAMES.each {|name| send("#{name}=", attributes[name]) }
-        end
-
-        def accessible?
-          true
-        end
-
-        def revoked?
-          false
-        end
-
-        def expired?
-          false
-        end
-      end
-    end
-  end
-end