oauth2-client 1.0.0 → 1.1.0

data/spec/oauth2/client_spec.rb

@@ -147,10 +147,10 @@ describe OAuth2::Client do
 
     context "with custom connection options" do
       it "returns custom connection" do
-        # custom_http  = Struct.new('CustomHttpClient')
-        # conn_options = { :connection_client => custom_http }
-        # oauth_client = OAuth2::Client.new('example.com', @client_id, @client_secret, conn_options)
-        # expect(oauth_client.send(:connection)).to be_instance_of custom_http
+        custom_http  = Struct.new('CustomHttpClient', :url, :connection_options)
+        conn_options = { :connection_client => custom_http }
+        oauth_client = OAuth2::Client.new('example.com', @client_id, @client_secret, conn_options)
+        expect(oauth_client.send(:connection)).to be_instance_of custom_http
       end
     end
   end

data/spec/oauth2/connection_spec.rb

@@ -4,26 +4,28 @@ require 'ostruct'
 describe OAuth2::HttpConnection do
 
   subject do
-    @conn = OAuth2::HttpConnection.new('https://yammer.com')
+    @conn = OAuth2::HttpConnection.new('https://example.com')
   end
 
-  context "with user options" do
+  context "with user specified options" do
     before do
-      @conn = OAuth2::HttpConnection.new('https://microsoft.com', {
-        :accept => 'application/xml',
-        :user_agent => "OAuth2 Test Client",
+      @conn_opts = {
+        :headers => {
+          :accept     => 'application/json',
+          :user_agent => 'OAuth2 Test Client'
+        },
         :ssl => {:verify => false},
         :max_redirects => 2
-      })
+      }
+      @conn = OAuth2::HttpConnection.new('https://example.com', @conn_opts)
     end
 
     describe "connection options" do
-      # it " " do
-      #   options = OAuth2::HttpConnection.default_options
-      #   options.keys.each do |key|
-      #     expect(@conn.instance_variable_get(:"@#{key}")).to eq options[key]
-      #   end
-      # end
+      it "sets user options" do
+        OAuth2::HttpConnection.default_options.keys.each do |key|
+          expect(@conn.instance_variable_get(:"@#{key}")).to eq @conn_opts[key]
+        end
+      end
     end
   end
 
@@ -66,7 +68,7 @@ describe OAuth2::HttpConnection do
 
   describe "#host" do
     it "returns the host server" do
-      expect(subject.host).to eq 'yammer.com'
+      expect(subject.host).to eq 'example.com'
     end
   end
 
@@ -104,13 +106,13 @@ describe OAuth2::HttpConnection do
   describe "#absolute_url" do
     context "with no parameters" do
       it "returns a uri without path" do
-        expect(subject.absolute_url).to eq "https://yammer.com"
+        expect(subject.absolute_url).to eq "https://example.com"
       end
     end
 
     context "with parameters" do
       it "returns a uri with path" do
-        expect(subject.absolute_url('/oauth/v2/authorize')).to eq "https://yammer.com/oauth/v2/authorize"
+        expect(subject.absolute_url('/oauth/v2/authorize')).to eq "https://example.com/oauth/v2/authorize"
       end
     end
   end
@@ -150,7 +152,7 @@ describe OAuth2::HttpConnection do
       @http_redirect = OpenStruct.new(
         :code    => '301',
         :body    => 'redirect',
-        :header => {'Location' => "http://yammer.com/members"}
+        :header => {'Location' => "http://example.com/members"}
       )
     end
 
@@ -162,55 +164,66 @@ describe OAuth2::HttpConnection do
 
     context "when method is get" do
       it "returns an http response" do
-        path = '/oauth/authorize'
         params = {:client_id => '001337', :client_secret => 'abcxyz'}
-        method = :get
         
-        normalized_path = '/oauth/authorize?client_id=001337&client_secret=abcxyz'
-
-        Net::HTTP.any_instance.should_receive(:get).with(normalized_path, subject.default_headers).and_return(@http_ok)
-        response = subject.send_request(method, path, :params => params)
-
+        stub_get('/oauth/authorize').with(
+          :query =>  params,
+          :header => { 
+            'Accept'          => 'application/json',
+            'User-Agent'      => "OAuth2 Ruby Gem #{OAuth2::Version}",
+            'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3'
+          }
+        )
+        response = subject.send_request(:get, '/oauth/authorize', :params => params)
         expect(response.code).to eq '200'
       end
     end
 
     context "when method is delete" do
       it "returns an http response" do
-        path = '/users/1'
-        method = 'delete'
-
-        Net::HTTP.any_instance.should_receive(:delete).with(path, subject.default_headers).and_return(@http_ok)
-        response = subject.send_request(method, path)
-
+        stub_delete('/users/1').with(
+          :header => { 
+            'Accept'          => 'application/json',
+            'User-Agent'      => "OAuth2 Ruby Gem #{OAuth2::Version}",
+            'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3'
+          }
+        )
+        response = subject.send_request(:delete, '/users/1')
         expect(response.code).to eq '200'
       end
     end
 
     context "when method is post" do
       it "returns an http response" do
-        path = '/users'
         params = {:first_name => 'john', :last_name => 'smith'}
-        query  = Addressable::URI.form_encode(params)
-        headers = {'Content-Type' => 'application/x-www-form-urlencoded' }.merge(subject.default_headers)
-
-        Net::HTTP.any_instance.should_receive(:post).with(path, query, headers).and_return(@http_ok)
-        response =subject.send_request(:post, path, :params => params)
-
+        stub_post('/users').with(
+          :body   => params,
+          :header => { 
+            'Accept'          => 'application/json',
+            'User-Agent'      => "OAuth2 Ruby Gem #{OAuth2::Version}",
+            'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+            'Content-Type'    => 'application/x-www-form-urlencoded'
+          }
+        )
+        response =subject.send_request(:post, '/users', :params => params)
         expect(response.code).to eq '200'
       end
     end
 
     context "when method is put" do
       it "returns an http response" do
-        path = '/users/1'
         params = {:first_name => 'jane', :last_name => 'doe'}
-        query  = Addressable::URI.form_encode(params)
-        headers = {'Content-Type' => 'application/x-www-form-urlencoded' }.merge(subject.default_headers)
-
-        Net::HTTP.any_instance.should_receive(:put).with(path, query, headers).and_return(@http_ok)
 
-        response = subject.send_request(:put, path, :params => params)
+        stub_put('/users/1').with(
+          :body   => params,
+          :header => { 
+            'Accept'          => 'application/json',
+            'User-Agent'      => "OAuth2 Ruby Gem #{OAuth2::Version}",
+            'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+            'Content-Type'    => 'application/x-www-form-urlencoded'
+          }
+        )
+        response = subject.send_request(:put, '/users/1', :params => params)
 
         expect(response.code).to eq '200'
       end
@@ -253,7 +266,7 @@ describe OAuth2::HttpConnection do
       http_303 = OpenStruct.new(
         :code    => '303',
         :body    => 'redirect',
-        :header => {'Location' => "http://yammer.com/members"}
+        :header => {'Location' => "http://example.com/members"}
       )
       path = '/users'
       params = {:first_name => 'jane', :last_name => 'doe'}

data/spec/oauth2/grant/authorization_code_spec.rb

@@ -75,14 +75,19 @@ describe OAuth2::Grant::AuthorizationCode do
 
   describe "#fetch_authorization_url" do
     it "returns response authorization page from oauth server" do
-      subject.should_receive(:make_request).with(:get, "/oauth2/authorize", {:params=> {:response_type=>"code", :client_id=>"s6BhdRkqt3"}})
+      subject.should_receive(:make_request).with(:get, "/oauth2/authorize", {
+        :params=> {:response_type=>"code", :client_id=>"s6BhdRkqt3"}
+      })
       subject.fetch_authorization_url
     end
   end
 
   describe "#get_token" do
     it "exchanges authorization code for access token" do
-      subject.should_receive(:make_request).with(:post, "/oauth2/token", {:params=>{:scope=>"abc xyz", :state=>"state", :code=>"G3Y6jU3a"}, :authenticate=>:headers})
+      subject.should_receive(:make_request).with(:post, "/oauth2/token", {
+        :params       => {:scope => "abc xyz", :state => "state", :code=>"G3Y6jU3a", :grant_type => "authorization_code"},
+        :authenticate => :headers
+      })
       subject.get_token('G3Y6jU3a', :params => {:scope => 'abc xyz', :state => 'state'})
     end
   end

data/spec/oauth2/grant/client_credentials_spec.rb

@@ -21,7 +21,10 @@ describe OAuth2::Grant::ClientCredentials do
 
   describe "#get_token" do
     it "exchanges authorization code for access token" do
-      subject.should_receive(:make_request).with(:post, "/oauth2/token", {:params=>{:grant_type=>"client_credentials"}, :authenticate=>:headers})
+      subject.should_receive(:make_request).with(:post, "/oauth2/token", {
+        :params => {:grant_type=>"client_credentials"},
+        :authenticate=>:headers
+      })
       subject.get_token
     end
   end

data/spec/oauth2/grant/device_spec.rb

@@ -21,14 +21,19 @@ describe OAuth2::Grant::DeviceCode do
 
   describe "#get_code" do
     it "gets user code" do
-      subject.should_receive(:make_request).with(:post, "/oauth2/device/code", {:params=>{:client_id=>"s6BhdRkqt3"}})
+      subject.should_receive(:make_request).with(:post, "/oauth2/device/code", {
+        :params => {:client_id=>"s6BhdRkqt3"}
+      })
       subject.get_code
     end
   end
 
   describe "#get_token" do
     it "gets access token" do
-      subject.should_receive(:make_request).with(:post, "/oauth2/token", {:params=>{:code=>"G3Y6jU3a", :grant_type=>"http://oauth.net/grant_type/device/1.0"}, :authenticate=>:headers})
+      subject.should_receive(:make_request).with(:post, "/oauth2/token", {
+        :params       => {:code=>"G3Y6jU3a", :grant_type=>"http://oauth.net/grant_type/device/1.0"}, 
+        :authenticate => :headers
+      })
       subject.get_token('G3Y6jU3a')
     end
   end

data/spec/oauth2/grant/implicit_spec.rb

@@ -29,7 +29,10 @@ describe OAuth2::Grant::Implicit do
 
   describe "#get_token" do
     it "gets access token" do
-      subject.should_receive(:make_request).with(:get, "/oauth2/token", {:params=>{:scope=>"xyz", :state=>"abc xyz", :response_type=>"token", :client_id=>"s6BhdRkqt3"}, :authenticate=>:headers})
+      subject.should_receive(:make_request).with(:get, "/oauth2/token", {
+        :params       => {:scope=>"xyz", :state=>"abc xyz", :response_type=>"token", :client_id=>"s6BhdRkqt3"},
+        :authenticate => :headers
+      })
       subject.get_token(:params => {:scope => 'xyz', :state => 'abc xyz'})
     end
   end

data/spec/oauth2/grant/password_spec.rb

@@ -21,7 +21,10 @@ describe OAuth2::Grant::Password do
 
   describe "#get_token" do
     it "gets access token" do
-      subject.should_receive(:make_request).with(:post, "/oauth2/token", {:params=>{:grant_type=>"password", :username=>"benutzername", :password=>"passwort"}, :authenticate=>:headers})
+      subject.should_receive(:make_request).with(:post, "/oauth2/token", {
+        :params => {:grant_type=>"password", :username=>"benutzername", :password=>"passwort"},
+        :authenticate=>:headers
+      })
       subject.get_token('benutzername', 'passwort')
     end
   end

data/spec/oauth2/grant/refresh_token_spec.rb

@@ -20,7 +20,10 @@ describe OAuth2::Grant::RefreshToken do
 
   describe "#get_token" do
     it "gets access token" do
-      subject.should_receive(:make_request).with(:post, "/oauth2/token", {:params=>{:grant_type=>"refresh_token", :refresh_token=>"2YotnFZFEjr1zCsicMWpAA"}, :authenticate=>:headers})
+      subject.should_receive(:make_request).with(:post, "/oauth2/token", {
+        :params       => {:grant_type=>"refresh_token", :refresh_token=>"2YotnFZFEjr1zCsicMWpAA"},
+        :authenticate => :headers
+      })
       subject.get_token('2YotnFZFEjr1zCsicMWpAA')
     end
   end

data/spec/spec_helper.rb

@@ -1,10 +1,11 @@
 $:.unshift File.expand_path('../../examples', __FILE__)
 
 # require 'simplecov'
-# SimpleCov.start 
+# SimpleCov.start
 
 require 'rspec'
 require 'rspec/autorun'
+require 'webmock/rspec'
 require 'oauth2'
 
 RSpec.configure do |config|
@@ -12,4 +13,20 @@ RSpec.configure do |config|
   config.expect_with :rspec do |c|
     c.syntax = :expect
   end
+end
+
+def stub_delete(path)
+  stub_request(:delete, 'https://example.com' + path)
+end
+
+def stub_get(path)
+  stub_request(:get, 'https://example.com' + path)
+end
+
+def stub_post(path)
+  stub_request(:post, 'https://example.com' + path)
+end
+
+def stub_put(path)
+  stub_request(:put, 'https://example.com' + path)
 end

metadata

@@ -1,18 +1,72 @@
 --- !ruby/object:Gem::Specification
 name: oauth2-client
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Kevin Mutyaba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-22 00:00:00.000000000 Z
-dependencies: []
-description: Create quick and dirty OAuth2 clients for many services. Google OAuth2
-  client included
+date: 2013-03-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bcrypt-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+description: Create quick and dirty OAuth2 clients
 email: tiabasnk@gmail.com
 executables: []
 extensions: []
@@ -22,12 +76,13 @@ files:
 - .travis.yml
 - Gemfile
 - Gemfile.lock
-- LICENSE
+- LICENSE.md
 - README.md
 - Rakefile
-- TODO
 - doc/README
+- examples/github_client.rb
 - examples/google_client.rb
+- examples/yammer_client.rb
 - lib/oauth2.rb
 - lib/oauth2/client.rb
 - lib/oauth2/connection.rb
@@ -43,9 +98,9 @@ files:
 - lib/oauth2/helper.rb
 - lib/oauth2/version.rb
 - oauth2-client.gemspec
-- spec/.DS_Store
+- spec/examples/github_client_spec.rb
 - spec/examples/google_client_spec.rb
-- spec/mocks/oauth_client.yml
+- spec/examples/yammer_client_spec.rb
 - spec/oauth2/client_spec.rb
 - spec/oauth2/connection_spec.rb
 - spec/oauth2/grant/authorization_code_spec.rb
@@ -56,28 +111,28 @@ files:
 - spec/oauth2/grant/password_spec.rb
 - spec/oauth2/grant/refresh_token_spec.rb
 - spec/spec_helper.rb
-homepage: ''
-licenses: []
+homepage: http://tiabas.github.com/oauth2-client/
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
-summary: OAuth2 Ruby Client
+specification_version: 4
+summary: OAuth2 client wrapper in Ruby
 test_files: []