oa-more 0.2.0.beta2 → 0.2.0.beta3

data/README.rdoc

@@ -13,4 +13,10 @@ To install just the providers in the "more" gem:
 
     gem install oa-more
 
+== OmniAuth Builder
 
+If you want to allow multiple providers, use the OmniAuth Builder:
+
+    use OmniAuth::Builder do
+        provider :flickr, 'api_key', 'secret_key', :scope => 'read'
+    end

data/lib/omniauth/more.rb

@@ -2,6 +2,7 @@ require 'omniauth/core'
 
 module OmniAuth
   module Strategies
-    # autoload strategies here
+    autoload :WindowsLive, 'omniauth/strategies/windows_live'
+    autoload :Flickr, 'omniauth/strategies/flickr'
   end
 end

data/lib/omniauth/strategies/flickr.rb

@@ -0,0 +1,77 @@
+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,
+          'extra' => { 'user_hash' => @user }
+        })
+      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

data/lib/omniauth/strategies/windows_live.rb

@@ -22,6 +22,7 @@ module OmniAuth
         super(app, :windows_live, app_id, app_secret, options)
         options[:ssl] ||= true
         options[:locale] ||= 'en-us'
+        options[:force_nonprovisioned] = true unless app_id
       end
 
       protected

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: oa-more
 version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-  - 0
-  - 2
-  - 0
-  - beta2
-  version: 0.2.0.beta2
+  prerelease: 6
+  version: 0.2.0.beta3
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-14 00:00:00 -06:00
+date: 2011-02-03 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,103 +20,98 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 0
-        - beta2
-        version: 0.2.0.beta2
+        version: 0.2.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: rest-client
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: multi_json
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id002
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: mg
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 8
         version: 0.0.8
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 0
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: webmock
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 4
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 4
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: json
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 3
         version: 1.4.3
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id009
 description: Additional strategies for OmniAuth.
 email: michael@intridea.com
 executables: []
@@ -132,6 +122,7 @@ extra_rdoc_files: []
 
 files: 
 - lib/omniauth/more.rb
+- lib/omniauth/strategies/flickr.rb
 - lib/omniauth/strategies/windows_live/windowslivelogin.rb
 - lib/omniauth/strategies/windows_live.rb
 - README.rdoc
@@ -150,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 220420108562034819
+      hash: -2884158219464284428
       segments: 
       - 0
       version: "0"
@@ -159,15 +150,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Additional strategies for OmniAuth.