omniauth-untappd 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaa0bf0ab2a94cb9d65e0a3a2ed7b321d45553f6
-  data.tar.gz: 9465866f51cc7bb4ccf5d23776e4b8eeb15f7e62
+  metadata.gz: c3163d5fb4eb4e058eaa19aec1a5bade542c6fda
+  data.tar.gz: 394f945ab90fa2b2d298e63019aa0dc60239ec23
 SHA512:
-  metadata.gz: a9a77fe24a68ac2da31379382c5cc89f0b61b69f4b907843048ce3c54090cfd7c526d69ba2dcaad38d81fecf72165962cf54558a30f5918845582296851b5ae5
-  data.tar.gz: 0ebf49fe5e7341d65f6a66fc795ae982ab31505c03ed72c6537f8155f6eb9637650cf26e45bd706566e14980910ae227138833305cc3b96670f8da0cdc3d458d
+  metadata.gz: 78ac968481f9340e4d4eee8d3165c51e15efa4d9805bc76235f937a28285b7ee17c12dcd03a14030aecd8a2c34bc3fe35c665245b959043fbe01a68588fbe4cd
+  data.tar.gz: 85d0f9a6c4803201831c3d21471daa66ae1826851cc59560bd1ad2e53e269099b37c52eed7873bc460257ac23ed646f1be87cc4fe199ef18284915c2a7ab7266

data/README.md

@@ -1,14 +1,14 @@
 # Omniauth::Untappd
 
-[![Build Status](https://travis-ci.org/sabotatore/omniauth-untappd.png)](https://travis-ci.org/sabotatore/omniauth-untappd) [![Code Climate](https://codeclimate.com/github/sabotatore/omniauth-untappd.png)](https://codeclimate.com/github/sabotatore/omniauth-untappd)
-
 Untappd OAuth2 Strategy for OmniAuth.
 
+[![Gem Version](https://badge.fury.io/rb/omniauth-untappd.png)](http://badge.fury.io/rb/omniauth-untappd) [![Dependency Status](https://gemnasium.com/sabotatore/omniauth-untappd.png)](https://gemnasium.com/sabotatore/omniauth-untappd)
+
 ## Installation
 
 Add to your `Gemfile`:
 
-    gem 'omniauth-untappd', github: 'sabotatore/omniauth-untappd'
+    gem 'omniauth-untappd'
 
 And then execute:
 
@@ -32,7 +32,7 @@ See more details on the omniauth module: https://github.com/intridea/omniauth#re
 
 OmniAuth Untappd is tested under 1.9.2, 1.9.3 and 2.0.0
 
-[![Build Status](https://travis-ci.org/sabotatore/omniauth-untappd.png)](https://travis-ci.org/sabotatore/omniauth-untappd)
+[![Build Status](https://travis-ci.org/sabotatore/omniauth-untappd.png)](https://travis-ci.org/sabotatore/omniauth-untappd) [![Code Climate](https://codeclimate.com/github/sabotatore/omniauth-untappd.png)](https://codeclimate.com/github/sabotatore/omniauth-untappd)
 
 ## License
 

data/lib/oauth2/untappd_client.rb

@@ -0,0 +1,22 @@
+module OAuth2
+  class UntappdClient < OAuth2::Client
+    def get_token(params, access_token_opts = {}, access_token_class = AccessToken)
+      response = request(options[:token_method], token_url, request_token_opts(params))
+      access_token_class.new(self, parse_token(response), access_token_opts)
+    end
+
+    private
+
+    def parse_token(response)
+      access_token = response.parsed.is_a?(Hash) && response.parsed['response']['access_token']
+      raise Error.new(response) if options[:raise_errors] && !access_token
+      access_token
+    end
+
+    def request_token_opts(params)
+      { raise_errors: options[:raise_errors],
+        parse: params.delete(:parse),
+        params: params }
+    end
+  end
+end

data/lib/omniauth/strategies/untappd.rb

@@ -66,15 +66,3 @@ module OmniAuth
     end
   end
 end
-
-module OAuth2
-  class UntappdClient < OAuth2::Client
-    def get_token(params, access_token_opts={}, access_token_class = AccessToken)
-      opts = { raise_errors: options[:raise_errors], parse: params.delete(:parse), params: params }
-      response = request(options[:token_method], token_url, opts)
-      untappd_response = response.parsed['response']
-      raise Error.new(response) if options[:raise_errors] && !(untappd_response.is_a?(Hash) && untappd_response['access_token'])
-      access_token_class.from_hash(self, untappd_response.merge(access_token_opts))
-    end
-  end
-end

data/lib/omniauth-untappd/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Untappd
-    VERSION = "0.0.1"
+    VERSION = "0.1.0"
   end
 end

data/lib/omniauth-untappd.rb

@@ -1,2 +1,3 @@
-require "omniauth-untappd/version"
-require 'omniauth/strategies/untappd'
+require 'omniauth-untappd/version'
+require 'oauth2/untappd_client'
+require 'omniauth/strategies/untappd'

data/spec/oauth2/untappd_client_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe OAuth2::UntappdClient do
+  subject(:client) { OAuth2::UntappdClient.new('abc', 'def') }
+
+  context '#get_token' do
+    subject { client.get_token({}) }
+    let(:response) { double('Response', parsed: parsed_response, body: parsed_response) }
+
+    before { client.stub(request: response) }
+
+    context 'correct response' do
+      let(:parsed_response) {{ 'response' => { 'access_token' => 'ACCESSTOKEN' }}}
+
+      its(:token) { should eql 'ACCESSTOKEN' }
+    end
+
+    context 'incorrect response' do
+      let(:parsed_response) { 'unknown error' }
+      before { response.should_receive(:error=) }
+
+      it { expect { subject }.to raise_error(OAuth2::Error, parsed_response) }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require 'rspec'
 require 'rack/test'
 require 'webmock/rspec'
 require 'omniauth'
+require 'oauth2'
 require 'omniauth-untappd'
 
 RSpec.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-untappd
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Vitali Kulikou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -122,10 +122,12 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- lib/oauth2/untappd_client.rb
 - lib/omniauth-untappd.rb
 - lib/omniauth-untappd/version.rb
 - lib/omniauth/strategies/untappd.rb
 - omniauth-untappd.gemspec
+- spec/oauth2/untappd_client_spec.rb
 - spec/omniauth/strategies/untappd_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/sabotatore/omniauth-untappd