oa-core 0.2.0.beta1 → 0.2.0.beta2

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2010-2011 Michael Bleigh and Intridea, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/lib/omniauth/builder.rb

@@ -1,7 +1,7 @@
 require 'omniauth/core'
 
 module OmniAuth
-  class Builder < Rack::Builder
+  class Builder < ::Rack::Builder 
     def initialize(app, &block)
       @app = app
       super(&block)
@@ -30,4 +30,4 @@ module OmniAuth
       to_app.call(env)
     end
   end
-end
+end

data/lib/omniauth/core.rb

@@ -1,12 +1,11 @@
 require 'rack'
 require 'singleton'
-require 'omniauth/form'
 
 module OmniAuth
-
   autoload :Builder,  'omniauth/builder'
   autoload :Strategy, 'omniauth/strategy'
   autoload :Test,     'omniauth/test'
+  autoload :Form,     'omniauth/form'
 
   module Strategies
     autoload :Password, 'omniauth/strategies/password'
@@ -25,7 +24,18 @@ module OmniAuth
         new_path = "#{OmniAuth.config.path_prefix}/failure?message=#{message_key}"
         [302, {'Location' => "#{new_path}", 'Content-Type'=> 'text/html'}, []]
       end,
-      :form_css => Form::DEFAULT_CSS
+      :form_css => Form::DEFAULT_CSS,
+      :test_mode => false,
+      :mock_auth => {
+        :default => {
+          'uid' => '1234',
+          'user_info' => {
+            'name' => 'Bob Example',
+            'email' => 'bob@example.com',
+            'nickname' => 'bob'
+          }
+        }
+      }
     }
 
     def self.defaults
@@ -45,9 +55,9 @@ module OmniAuth
     end
 
     attr_writer :on_failure
-    attr_accessor :path_prefix, :form_css
+    attr_accessor :path_prefix, :form_css, :test_mode, :mock_auth, :full_host
   end
-
+  
   def self.config
     Configuration.instance
   end
@@ -56,6 +66,10 @@ module OmniAuth
     yield config
   end
 
+  def self.mock_auth_for(provider)
+    config.mock_auth[provider.to_sym] || config.mock_auth[:default]
+  end
+
   module Utils
     CAMELIZE_SPECIAL = {
       'oauth' => 'OAuth',
@@ -65,7 +79,8 @@ module OmniAuth
       'github' => 'GitHub',
       'tripit' => 'TripIt',
       'soundcloud' => 'SoundCloud',
-      'smugmug' => 'SmugMug'
+      'smugmug' => 'SmugMug',
+      'cas' => 'CAS'
     }
 
     module_function

data/lib/omniauth/strategy.rb

@@ -25,6 +25,8 @@ module OmniAuth
 
     def call!(env)
       @env = env
+      return mock_call!(env) if OmniAuth.config.test_mode
+
       if request.path == request_path
         status, headers, body = *call_app!
         @response = Rack::Response.new(body, status, headers)
@@ -39,6 +41,17 @@ module OmniAuth
         end
       end
     end
+
+    def mock_call!(env)
+      if request.path == request_path
+        redirect callback_path
+      elsif request.path == callback_path
+        @env['omniauth.auth'] = OmniAuth.mock_auth_for(name.to_sym)
+        call_app!
+      else
+        call_app!
+      end
+    end
     
     def request_phase
       raise NotImplementedError
@@ -46,7 +59,8 @@ module OmniAuth
     
     def callback_phase
       @env['omniauth.auth'] = auth_hash
-      call_app!
+      
+      call_app! 
     end
     
     def path_prefix
@@ -60,11 +74,13 @@ module OmniAuth
     def callback_path
       options[:callback_path] || "#{path_prefix}/#{name}/callback"
     end
+
+    def query_string
+      request.query_string.empty? ? "" : "?#{request.query_string}"
+    end
     
     def call_app!
-      # TODO: Remove this when we get to 0.2.0
-      @env['rack.auth'] = env['omniauth.auth'] if env.key?('omniauth.auth')
-      @env['rack.auth.error'] = env['omniauth.error'] if env.key?('omniauth.error')
+      @env['omniauth.strategy'] = self
       
       @app.call(@env)
     end
@@ -77,14 +93,21 @@ module OmniAuth
     end
     
     def full_host
-      uri = URI.parse(request.url)
-      uri.path = ''
-      uri.query = nil
-      uri.to_s
+      case OmniAuth.config.full_host
+        when String
+          OmniAuth.config.full_host
+        when Proc
+          OmniAuth.config.full_host.call(env)
+        else
+          uri = URI.parse(request.url)
+          uri.path = ''
+          uri.query = nil
+          uri.to_s
+      end
     end
     
     def callback_url
-      full_host + callback_path
+      full_host + callback_path + query_string
     end
     
     def session

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oa-core
 version: !ruby/object:Gem::Version 
-  hash: -1848230051
   prerelease: true
   segments: 
   - 0
   - 2
   - 0
-  - beta1
-  version: 0.2.0.beta1
+  - beta2
+  version: 0.2.0.beta2
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -16,118 +15,111 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-29 00:00:00 -06:00
+date: 2011-01-14 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: rack
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 1
         version: "1.1"
-  requirement: *id001
-  name: rack
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: rake
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id002
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: mg
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 0
         - 0
         - 8
         version: 0.0.8
-  requirement: *id003
-  name: mg
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: rspec
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 1
         - 3
         - 0
         version: 1.3.0
-  requirement: *id004
-  name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: webmock
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 3
         - 4
         version: 1.3.4
-  requirement: *id005
-  name: webmock
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: rack-test
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         - 5
         - 4
         version: 0.5.4
-  requirement: *id006
-  name: rack-test
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  name: json
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 1
         - 4
         - 3
         version: 1.4.3
-  requirement: *id007
-  name: json
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: *id007
 description: HTTP Basic strategies for OmniAuth.
 email: michael@intridea.com
 executables: []
@@ -146,8 +138,7 @@ files:
 - lib/omniauth/test/strategy_macros.rb
 - lib/omniauth/test/strategy_test_case.rb
 - lib/omniauth/test.rb
-- LICENSE.rdoc
-- CHANGELOG.rdoc
+- LICENSE
 has_rdoc: true
 homepage: http://github.com/intridea/omniauth
 licenses: []
@@ -162,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -3598036848001495885
       segments: 
       - 0
       version: "0"
@@ -171,7 +162,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      hash: 25
       segments: 
       - 1
       - 3

data/CHANGELOG.rdoc

@@ -1,3 +0,0 @@
-== 0.0.3
-
-* Added OmniAuth::Form for displaying info forms on systems that will require them.