omniauth-twitchtv 0.0.2 → 0.1.0

data/.rvmrc

@@ -1 +1 @@
-rvm --create 1.9.3@omniauth-twitchtv
+rvm --create 1.9.3-turbo@omniauth-twitchtv

data/lib/omniauth-twitchtv/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Twitchtv
-    VERSION = "0.0.2"
+    VERSION = "0.1.0"
   end
 end

data/lib/omniauth/strategies/twitchtv.rb

@@ -1,127 +1,20 @@
-require 'omniauth/strategies/oauth'
+require 'omniauth-oauth2'
 
 module OmniAuth
   module Strategies
-    class Twitchtv
-      include OmniAuth::Strategy
-
-      option :name, "twitchtv"
-
-      args [:client_id]
-
-      option :client_id, nil
+    class Twitchtv < OmniAuth::Strategies::OAuth2
       option :client_options, {
-        :site          => 'https://api.twitch.tv',
-        :api_url       => 'https://api.twitch.tv/kraken',
-        :authorize_url => '/kraken/oauth2/authorize',
-        :proxy         => ENV['http_proxy'] ? URI(ENV['http_proxy']) : nil,
-        :callback      => nil
+        :site => 'https://api.twitch.tv',
+        :authorize_url => 'https://api.twitch.tv/kraken/oauth2/authorize',
+        :token_url => 'https://api.twitch.tv/kraken/oauth2/token'
       }
-      option :authorize_params, {}
-      option :authorize_options, [:scope, :response_type]
-      option :response_type, 'token'
-
-      attr_accessor :json
-      attr_accessor :access_token
-
-      def client
-        ::OAuth2::Client.new(options.client_id, nil, deep_symbolize(options.client_options))
-      end
-
-      def callback_url
-        options.client_options.callback || full_host + script_name + callback_path
-      end
-
-      def request_phase
-        redirect client.auth_code.authorize_url({:redirect_uri => callback_url}.merge(authorize_params))
-      end
-
-      def authorize_params
-        options.authorize_params.merge(options.authorize_options.inject({}){|h,k| h[k.to_sym] = options[k] if options[k]; h})
-      end
-
-      def callback_phase
-        if request.params['error'] || request.params['error_reason']
-          raise CallbackError.new(request.params['error'], request.params['error_description'] || request.params['error_reason'], request.params['error_uri'])
-        end
-
-        @json = {}
-        self.access_token = request.params["access_token"]
-        begin
-          response = RestClient.get("#{options.client_options.api_url}/user", { 'Authorization' => "OAuth #{access_token}" })
-          user = MultiJson.decode(response.to_s)
-          #  {
-          #              "name" => "xxx",
-          #        "created_at" => "2011-11-17T02:15:55Z",
-          #        "updated_at" => "2012-09-12T08:40:39Z",
-          #              "logo" => nil,
-          #            "_links" => {
-          #          "self" => "https://api.twitch.tv/kraken/users/xxx"
-          #      },
-          #             "staff" => false,
-          #               "_id" => 23456789,
-          #      "display_name" => "xxx",
-          #             "email" => "xxx@gmail.com"
-          #  }
-          @json.merge!(user)
-          super
-        rescue CallbackError, ::RestClient::Exception => e
-          fail!(:invalid_credentials, e)
-        rescue ::MultiJson::DecodeError => e
-          fail!(:invalid_response, e)
-        rescue ::Timeout::Error, ::Errno::ETIMEDOUT => e
-          fail!(:timeout, e)
-        rescue ::SocketError => e
-          fail!
-        end
-      end
 
-      credentials do
-        {'token' => access_token}
-      end
-
-      uid do
-        @json['_id']
-      end
-
-      info do
-        {
-          :email    => @json['email'],
-          :nickname => @json['display_name']
-        }
-      end
-
-      extra do
-        { 'raw_info' => @json }
-      end
-
-      protected
-
-      def deep_symbolize(hash)
-        hash.inject({}) do |h, (k,v)|
-          h[k.to_sym] = v.is_a?(Hash) ? deep_symbolize(v) : v
-          h
-        end
-      end
-
-      def build_access_token
-        verifier = request.params['code']
-        client.auth_code.get_token(verifier, {:redirect_uri => callback_url}.merge(token_params.to_hash(:symbolize_keys => true)))
-      end
-
-      # An error that is indicated in the OAuth 2.0 callback.
-      # This could be a `redirect_uri_mismatch` or other
-      class CallbackError < StandardError
-        attr_accessor :error, :error_reason, :error_uri
-
-        def initialize(error, error_reason=nil, error_uri=nil)
-          self.error = error
-          self.error_reason = error_reason
-          self.error_uri = error_uri
-        end
-      end
 
+      option :authorize_params, {}
+      option :authorize_options, [:scope, :response_type]
+      option :response_type, 'code'
     end
   end
 end
 OmniAuth.config.add_camelization 'twitchtv', 'Twitchtv'
+

data/omniauth-twitchtv.gemspec

@@ -16,8 +16,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'omniauth-oauth', '~> 1.0'
-  s.add_runtime_dependency 'rest-client'
+  s.add_runtime_dependency 'omniauth-oauth2', '~> 1.1'
 
   s.add_development_dependency 'rspec', '~> 2.7'
   s.add_development_dependency 'rake'

data/spec/omniauth/strategies/twitchtv_spec.rb

@@ -11,21 +11,12 @@ describe "OmniAuth::Strategies::Twitchtv" do
 
   context 'client options' do
     it 'has correct Twitchtv site' do
-      subject.options.client_options.site.should eq('https://api.twitchtv.com')
+      subject.options.client_options.site.should eq('https://api.twitch.tv')
     end
 
     it 'has correct authorize url' do
-      subject.options.client_options.authorize_url.should eq('https://api.twitchtv.com/kraken/oauth2/authorize')
+      subject.options.client_options.authorize_url.should eq('https://api.twitch.tv/kraken/oauth2/authorize')
     end
   end
 
-  context '#uid' do
-    before :each do
-      subject.stub(:raw_info) { { 'id' => '123' } }
-    end
-
-    it 'returns the id from raw_info' do
-      subject.uid.should eq('123')
-    end
-  end
 end

metadata

@@ -1,106 +1,103 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: omniauth-twitchtv
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Claudio Poli
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-17 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: omniauth-oauth
+date: 2013-01-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: omniauth-oauth2
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rest-client
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    none: false
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    none: false
+- !ruby/object:Gem::Dependency
   name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 7
-        version: "2.7"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+    none: false
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.7'
+    none: false
+- !ruby/object:Gem::Dependency
   name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+- !ruby/object:Gem::Dependency
   name: webmock
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+- !ruby/object:Gem::Dependency
   name: rack-test
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
   type: :development
-  version_requirements: *id006
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 description: Twitch.TV strategy for OmniAuth.
-email: 
+email:
 - claudio@audiobox.fm
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .rvmrc
@@ -118,37 +115,31 @@ files:
 - spec/omniauth/.DS_Store
 - spec/omniauth/strategies/twitchtv_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/masterkain/omniauth-twitchtv
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+  none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+  none: false
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Twitch.TV strategy for OmniAuth.
-test_files: 
+test_files:
 - spec/omniauth/.DS_Store
 - spec/omniauth/strategies/twitchtv_spec.rb
 - spec/spec_helper.rb