oa-more 0.2.6 → 0.3.0.rc3

data/Gemfile

@@ -1,5 +1,9 @@
+require File.expand_path('../lib/omniauth/version', __FILE__)
+
 source 'http://rubygems.org'
 
+gem 'oa-core', OmniAuth::Version::STRING, :path => '../oa-core'
+
 platforms :jruby do
   gem 'jruby-openssl', '~> 0.7'
 end

data/lib/omniauth/more.rb

@@ -2,10 +2,10 @@ require 'omniauth/core'
 
 module OmniAuth
   module Strategies
+    autoload :Draugiem,    'omniauth/strategies/draugiem'
+    autoload :Ign,         'omniauth/strategies/ign'
+    autoload :LastFm,      'omniauth/strategies/last_fm'
     autoload :WindowsLive, 'omniauth/strategies/windows_live'
-    autoload :Flickr, 'omniauth/strategies/flickr'
-    autoload :Yupoo, 'omniauth/strategies/yupoo'
-    autoload :Ign, 'omniauth/strategies/ign'
-    autoload :Draugiem, 'omniauth/strategies/draugiem'
+    autoload :Yupoo,       'omniauth/strategies/yupoo'
   end
 end

data/lib/omniauth/strategies/last_fm.rb

@@ -0,0 +1,93 @@
+require 'omniauth/core'
+require 'digest/md5'
+require 'rest-client'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    #
+    # Authenticate to LastFM
+    #
+    # @example Basic Usage
+    #
+    # use OmniAuth::Strategies::LastFm, 'API Key', 'Secret Key'
+    class LastFm
+      include OmniAuth::Strategy
+      attr_accessor :api_key, :secret_key, :options
+
+      # error catching, based on OAuth2 callback
+      class CallbackError < StandardError
+        attr_accessor :error, :error_reason
+        def initialize(error, error_reason)
+          self.error = error
+          self.error_reason = error_reason
+        end
+      end
+
+      # @param [Rack Application] app standard middleware application parameter
+      # @param [String] api_key the application id as [registered on LastFM](http://www.last.fm/api/account)
+      # @param [String] secret_key the application secret as [registered on LastFM](http://www.last.fm/api/account)
+      # @option options, You can optionally specify a callback URL that is different to your API Account callback url. Include this as a query param cb
+      def initialize(app, api_key, secret_key, options = {})
+        super(app, :last_fm)
+        @api_key = api_key
+        @secret_key = secret_key
+        @options = options
+      end
+
+      protected
+
+      def request_phase
+        params = { :api_key => api_key, :cb => options[:cb] }
+        query_string = params.collect{ |key,value| "#{key}=#{Rack::Utils.escape(value)}" }.join('&')
+        redirect "http://www.last.fm/api/auth/?#{query_string}"
+      end
+      
+      def callback_phase
+        token = request.params['token']
+        params = { :api_key => api_key, :method => 'auth.getSession', :format => 'json' }
+        params[:token] = token
+        params[:api_sig] = signature(token)
+      
+        response = RestClient.get('http://ws.audioscrobbler.com/2.0/', { :params => params })
+        @auth = MultiJson.decode(response.to_s)
+        raise CallbackError.new(@auth['error'],@auth['message']) if @auth['error']
+        
+        user_params = { :method => "user.getInfo", :user => @auth['session']['name'], :api_key => api_key, :format => "json" }
+        user_response = RestClient.get('http://ws.audioscrobbler.com/2.0/', { :params => user_params })
+        @user_auth = MultiJson.decode(user_response.to_s)
+        raise CallbackError.new(@user_auth['error'],@user_auth['message']) if @user_auth['error']
+      
+        super
+      rescue CallbackError => e
+        fail!(:invalid_response, e)
+      end
+      
+      def auth_hash
+        OmniAuth::Utils.deep_merge(super, {
+          'uid' => @user_auth['user']['id'],
+          'credentials' => { 'token' => @auth['session']['key'] },
+          'user_info' => user_info,
+          'extra' => { 'user_hash' => @user_auth }
+        })
+      end
+      
+      def user_info
+        {
+          'name' => @user_auth['user']['realname'],
+          'nickname' => @user_auth['user']['name'],
+          'location' => @user_auth['user']['country'],
+          'image' => @user_auth['user']['image'],
+          'urls' => {
+            'Profile' => @user_auth['user']['url']
+          }
+        }
+      end
+      
+      def signature(token)
+        sign = "api_key#{api_key}methodauth.getSessiontoken#{token}#{secret_key}"
+        Digest::MD5.hexdigest(sign)
+      end      
+    end
+  end
+end

data/lib/omniauth/version.rb

@@ -4,13 +4,13 @@ module OmniAuth
       MAJOR = 0
     end
     unless defined?(::OmniAuth::Version::MINOR)
-      MINOR = 2
+      MINOR = 3
     end
     unless defined?(::OmniAuth::Version::PATCH)
-      PATCH = 6
+      PATCH = 0
     end
     unless defined?(::OmniAuth::Version::PRE)
-      PRE   = nil
+      PRE   = "rc3"
     end
     unless defined?(::OmniAuth::Version::STRING)
       STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

data/oa-more.gemspec

@@ -1,29 +1,27 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 require File.expand_path('../lib/omniauth/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.add_runtime_dependency 'multi_json',   '~> 1.0.0'
-  gem.add_runtime_dependency 'oa-core', OmniAuth::Version::STRING
-  gem.add_runtime_dependency 'rest-client',  '~> 1.6.0'
+  gem.add_dependency 'multi_json',   '~> 1.0.0'
+  gem.add_dependency 'oa-core', OmniAuth::Version::STRING
+  gem.add_dependency 'rest-client',  '~> 1.6.0'
   gem.add_development_dependency 'json_pure', '~> 1.5'
-  gem.add_development_dependency 'maruku', '~> 0.6'
-  gem.add_development_dependency 'rake', '~> 0.8'
   gem.add_development_dependency 'rack-test', '~> 0.5'
+  gem.add_development_dependency 'rake', '~> 0.8'
+  gem.add_development_dependency 'rdiscount', '~> 1.6'
   gem.add_development_dependency 'rspec', '~> 2.5'
   gem.add_development_dependency 'simplecov', '~> 0.4'
-  gem.add_development_dependency 'webmock', '~> 1.6'
+  gem.add_development_dependency 'webmock', '~> 1.7'
   gem.add_development_dependency 'yard', '~> 0.7'
-  gem.add_development_dependency 'ZenTest', '~> 4.5'
-  gem.name = 'oa-more'
-  gem.version = OmniAuth::Version::STRING
+  gem.authors = ['Michael Bleigh', 'Erik Michaels-Ober']
   gem.description = %q{Additional strategies for OmniAuth.}
-  gem.summary = gem.description
   gem.email = 'michael@intridea.com'
-  gem.homepage = 'http://github.com/intridea/omniauth'
-  gem.authors = ['Michael Bleigh', 'Erik Michaels-Ober']
-  gem.executables = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
   gem.files = `git ls-files`.split("\n")
-  gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.homepage = 'http://github.com/intridea/omniauth'
+  gem.name = 'oa-more'
   gem.require_paths = ['lib']
   gem.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if gem.respond_to? :required_rubygems_version=
+  gem.summary = gem.description
+  gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.version = OmniAuth::Version::STRING
 end

data/spec/omniauth/strategies/{flickr_spec.rb → last_fm_spec.rb}

@@ -1,7 +1,7 @@
 require File.expand_path('../../../spec_helper', __FILE__)
 
-describe 'OmniAuth::Strategies::Flickr' do
+describe 'OmniAuth::Strategies::LastFm' do
   it 'should initialize with a consumer key and secret' do
-    lambda{OmniAuth::Strategies::Flickr.new({},'abc','def')}.should_not raise_error
+    lambda{OmniAuth::Strategies::LastFm.new({},'abc','def')}.should_not raise_error
   end
 end

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: oa-more
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.2.6
+  hash: 15424035
+  prerelease: 6
+  segments: 
+  - 0
+  - 3
+  - 0
+  - rc
+  - 3
+  version: 0.3.0.rc3
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -11,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-20 00:00:00 Z
+date: 2011-09-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multi_json
@@ -21,6 +28,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :runtime
   version_requirements: *id001
@@ -32,7 +44,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.2.6
+        hash: 15424035
+        segments: 
+        - 0
+        - 3
+        - 0
+        - rc
+        - 3
+        version: 0.3.0.rc3
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -43,6 +62,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 6
+        - 0
         version: 1.6.0
   type: :runtime
   version_requirements: *id003
@@ -54,18 +78,26 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 5
         version: "1.5"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: maruku
+  name: rack-test
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.6"
+        hash: 1
+        segments: 
+        - 0
+        - 5
+        version: "0.5"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -76,18 +108,26 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 8
         version: "0.8"
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: rdiscount
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.5"
+        hash: 3
+        segments: 
+        - 1
+        - 6
+        version: "1.6"
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -98,6 +138,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 5
         version: "2.5"
   type: :development
   version_requirements: *id008
@@ -109,6 +153,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 4
         version: "0.4"
   type: :development
   version_requirements: *id009
@@ -120,7 +168,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.6"
+        hash: 1
+        segments: 
+        - 1
+        - 7
+        version: "1.7"
   type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
@@ -131,20 +183,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 7
         version: "0.7"
   type: :development
   version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: ZenTest
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "4.5"
-  type: :development
-  version_requirements: *id012
 description: Additional strategies for OmniAuth.
 email: michael@intridea.com
 executables: []
@@ -164,15 +209,15 @@ files:
 - lib/oa-more.rb
 - lib/omniauth/more.rb
 - lib/omniauth/strategies/draugiem.rb
-- lib/omniauth/strategies/flickr.rb
 - lib/omniauth/strategies/ign.rb
+- lib/omniauth/strategies/last_fm.rb
 - lib/omniauth/strategies/windows_live.rb
 - lib/omniauth/strategies/windows_live/windowslivelogin.rb
 - lib/omniauth/strategies/yupoo.rb
 - lib/omniauth/version.rb
 - oa-more.gemspec
 - spec/omniauth/strategies/draugiem_spec.rb
-- spec/omniauth/strategies/flickr_spec.rb
+- spec/omniauth/strategies/last_fm_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/intridea/omniauth
 licenses: []
@@ -187,21 +232,29 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: 1.3.6
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Additional strategies for OmniAuth.
 test_files: 
 - spec/omniauth/strategies/draugiem_spec.rb
-- spec/omniauth/strategies/flickr_spec.rb
+- spec/omniauth/strategies/last_fm_spec.rb
 - spec/spec_helper.rb

data/lib/omniauth/strategies/flickr.rb

@@ -1,86 +0,0 @@
-require 'omniauth/core'
-require 'digest/md5'
-require 'rest-client'
-require 'multi_json'
-
-module OmniAuth
-  module Strategies
-    #
-    # Authenticate to Flickr
-    #
-    # @example Basic Usage
-    #
-    #     use OmniAuth::Strategies::Flickr, 'API Key', 'Secret Key', :scope => 'read'
-    class Flickr
-      include OmniAuth::Strategy
-      attr_accessor :api_key, :secret_key, :options
-
-      # error catching, based on OAuth2 callback
-      class CallbackError < StandardError
-        attr_accessor :error, :error_reason
-        def initialize(error, error_reason)
-          self.error = error
-          self.error_reason = error_reason
-        end
-      end
-
-      # @param [Rack Application] app standard middleware application parameter
-      # @param [String] api_key the application id as [registered on Flickr](http://www.flickr.com/services/apps/)
-      # @param [String] secret_key the application secret as [registered on Flickr](http://www.flickr.com/services/apps/)
-      # @option options ['read','write','delete] :scope ('read') the scope of your authorization request; must be `read` or 'write' or 'delete'
-      def initialize(app, api_key, secret_key, options = {})
-        super(app, :flickr)
-        @api_key = api_key
-        @secret_key = secret_key
-        @options = {:scope => 'read'}.merge(options)
-      end
-
-      protected
-
-      def request_phase
-        params = { :api_key => api_key, :perms => options[:scope] }
-        params[:api_sig] = flickr_sign(params)
-        query_string = params.collect{ |key,value| "#{key}=#{Rack::Utils.escape(value)}" }.join('&')
-        redirect "http://flickr.com/services/auth/?#{query_string}"
-      end
-
-      def callback_phase
-        params = { :api_key => api_key, :method => 'flickr.auth.getToken', :frob => request.params['frob'], :format => 'json', :nojsoncallback => '1' }
-        params[:api_sig] = flickr_sign(params)
-
-        response = RestClient.get('http://api.flickr.com/services/rest/', { :params => params })
-        auth = MultiJson.decode(response.to_s)
-        raise CallbackError.new(auth['code'],auth['message']) if auth['stat'] == 'fail'
-
-        @user = auth['auth']['user']
-        @access_token = auth['auth']['token']['_content']
-
-        super
-      rescue CallbackError => e
-        fail!(:invalid_response, e)
-      end
-
-      def auth_hash
-        OmniAuth::Utils.deep_merge(super, {
-          'uid' => @user['nsid'],
-          'credentials' => { 'token' => @access_token },
-          'user_info' => user_info,
-          'extra' => { 'user_hash' => @user }
-        })
-      end
-
-      def user_info
-        name = @user['fullname']
-        name = @user['username'] if name.nil? || name.empty?
-        {
-          'nickname' => @user['username'],
-          'name' => name,
-        }
-      end
-
-      def flickr_sign(params)
-        Digest::MD5.hexdigest(secret_key + params.sort{|a,b| a[0].to_s <=> b[0].to_s }.flatten.join)
-      end
-    end
-  end
-end