RubyGems - oa-core - Versions diffs - 0.2.4 → 0.2.5 - Mend

oa-core 0.2.4 → 0.2.5

Files changed (15) hide show

data/lib/omniauth/builder.rb +6 -6
data/lib/omniauth/core.rb +3 -2
data/lib/omniauth/form.rb +20 -20
data/lib/omniauth/strategy.rb +88 -67
data/lib/omniauth/test.rb +4 -4
data/lib/omniauth/test/strategy_macros.rb +7 -7
data/lib/omniauth/test/strategy_test_case.rb +8 -8
data/lib/omniauth/version.rb +19 -0
data/oa-core.gemspec +6 -4
data/spec/omniauth/builder_spec.rb +2 -2
data/spec/omniauth/core_spec.rb +12 -12
data/spec/omniauth/strategy_spec.rb +44 -28
data/spec/spec_helper.rb +0 -4
metadata +37 -15
data/Gemfile +0 -3

@@ -1,30 +1,30 @@
 require 'omniauth/core'
 module OmniAuth
-  class Builder < ::Rack::Builder
+  class Builder < ::Rack::Builder
     def initialize(app, &block)
       @app = app
       super(&block)
     end
     def on_failure(&block)
       OmniAuth.config.on_failure = block
     end
     def configure(&block)
       OmniAuth.configure(&block)
     end
     def provider(klass, *args, &block)
       if klass.is_a?(Class)
         middleware = klass
       else
         middleware = OmniAuth::Strategies.const_get("#{OmniAuth::Utils.camelize(klass.to_s)}")
       end
       use middleware, *args, &block
     end
     def call(env)
       @ins << @app unless @ins.include?(@app)
       to_app.call(env)

data/lib/omniauth/core.rb CHANGED

@@ -73,7 +73,7 @@ module OmniAuth
     attr_writer :on_failure
     attr_accessor :path_prefix, :allowed_request_methods, :form_css, :test_mode, :mock_auth, :full_host
   end
   def self.config
     Configuration.instance
   end
@@ -97,7 +97,8 @@ module OmniAuth
       'soundcloud' => 'SoundCloud',
       'smugmug' => 'SmugMug',
       'cas' => 'CAS',
-      'trademe' => 'TradeMe'
+      'trademe' => 'TradeMe',
+      'ldap'  => 'LDAP'
     }
     module_function

data/lib/omniauth/form.rb CHANGED

@@ -7,7 +7,7 @@ module OmniAuth
       background: #ccc;
       font-family: "Lucida Grande", "Lucida Sans", Helvetica, Arial, sans-serif;
     }
     h1 {
       text-align: center;
       margin: 30px auto 0px;
@@ -25,12 +25,12 @@ module OmniAuth
       border-top-left-radius: 10px;
       border-top-right-radius: 10px;
     }
     h1, form {
       -moz-box-shadow: 2px 2px 7px rgba(0,0,0,0.3);
       -webkit-box-shadow: 2px 2px 7px rgba(0,0,0,0.3);
     }
     form {
       background: white;
       border: 10px solid #eee;
@@ -45,13 +45,13 @@ module OmniAuth
       border-bottom-left-radius: 10px;
       border-bottom-right-radius: 10px;
     }
     label {
       display: block;
       font-weight: bold;
       margin-bottom: 5px;
     }
     input {
       font-size: 18px;
       padding: 4px 8px;
@@ -59,13 +59,13 @@ module OmniAuth
       margin-bottom: 10px;
       width: 280px;
     }
     input#identifier, input#openid_url {
       background: url(http://openid.net/login-bg.gif) no-repeat;
       background-position: 0 50%;
       padding-left: 18px;
     }
     button {
       font-size: 22px;
       padding: 4px 8px;
@@ -85,7 +85,7 @@ module OmniAuth
       font-size: 16px;
     }
     CSS
     attr_accessor :options
     def initialize(options = {})
@@ -95,28 +95,28 @@ module OmniAuth
       @html = ""
       header(options[:title])
     end
     def self.build(title=nil, &block)
       form = OmniAuth::Form.new(title)
       form.instance_eval(&block)
     end
     def label_field(text, target)
       @html << "\n<label for='#{target}'>#{text}:</label>"
       self
     end
     def input_field(type, name)
       @html << "\n<input type='#{type}' id='#{name}' name='#{name}'/>"
       self
     end
     def text_field(label, name)
       label_field(label, name)
       input_field('text', name)
       self
     end
     def password_field(label, name)
       label_field(label, name)
       input_field('password', name)
@@ -126,7 +126,7 @@ module OmniAuth
     def button(text)
       @html << "\n<button type='submit'>#{text}</button>"
     end
     def html(html)
       @html << html
     end
@@ -137,7 +137,7 @@ module OmniAuth
       @html << "\n</fieldset>"
       self
     end
     def header(title)
       @html << <<-HTML
       <!DOCTYPE html>
@@ -152,7 +152,7 @@ module OmniAuth
       HTML
       self
     end
     def footer
       return self if @footer
       @html << <<-HTML
@@ -164,19 +164,19 @@ module OmniAuth
       @footer = true
       self
     end
     def to_html
       footer
       @html
     end
     def to_response
       footer
       Rack::Response.new(@html).finish
     end
     protected
     def css
       "\n<style type='text/css'>#{OmniAuth.config.form_css}</style>"
     end

data/lib/omniauth/strategy.rb CHANGED

@@ -1,23 +1,27 @@
 require 'omniauth/core'
 module OmniAuth
-  class NoSessionError < StandardError; end
-  module Strategy
+  class NoSessionError < StandardError; end
+  # The Strategy is the base unit of OmniAuth's ability to
+  # wrangle multiple providers. Each strategy provided by
+  # OmniAuth includes this mixin to gain the default functionality
+  # necessary to be compatible with the OmniAuth library.
+  module Strategy
     def self.included(base)
       OmniAuth.strategies << base
       base.class_eval do
         attr_reader :app, :name, :env, :options, :response
       end
     end
     def initialize(app, name, *args, &block)
       @app = app
       @name = name.to_sym
       @options = args.last.is_a?(Hash) ? args.pop : {}
       yield self if block_given?
     end
     def inspect
       "#<#{self.class.to_s}>"
     end
@@ -30,69 +34,86 @@ module OmniAuth
       raise OmniAuth::NoSessionError.new("You must provide a session to use OmniAuth.") unless env['rack.session']
       @env = env
-      @env['omniauth.strategy'] = self
+      @env['omniauth.strategy'] = self if on_auth_path?
       return mock_call!(env) if OmniAuth.config.test_mode
-      if current_path == request_path && OmniAuth.config.allowed_request_methods.include?(request.request_method.downcase.to_sym)
-        setup_phase
-        if response = call_through_to_app
-          response
-        else
-          if request.params['origin']
-            @env['rack.session']['omniauth.origin'] = request.params['origin']
-          elsif env['HTTP_REFERER'] && !env['HTTP_REFERER'].match(/#{request_path}$/)
-            @env['rack.session']['omniauth.origin'] = env['HTTP_REFERER']
-          end
-          request_phase
-        end
-      elsif current_path == callback_path
-        setup_phase
-        @env['omniauth.origin'] = session.delete('omniauth.origin')
-        @env['omniauth.origin'] = nil if env['omniauth.origin'] == ''
-        callback_phase
+      return request_call if on_request_path? && OmniAuth.config.allowed_request_methods.include?(request.request_method.downcase.to_sym)
+      return callback_call if on_callback_path?
+      return other_phase if respond_to?(:other_phase)
+      @app.call(env)
+    end
+    # Performs the steps necessary to run the request phase of a strategy.
+    def request_call
+      setup_phase
+      if response = call_through_to_app
+        response
       else
-        if respond_to?(:other_phase)
-          other_phase
-        else
-          @app.call(env)
+        if request.params['origin']
+          @env['rack.session']['omniauth.origin'] = request.params['origin']
+        elsif env['HTTP_REFERER'] && !env['HTTP_REFERER'].match(/#{request_path}$/)
+          @env['rack.session']['omniauth.origin'] = env['HTTP_REFERER']
         end
+        request_phase
       end
     end
+    # Performs the steps necessary to run the callback phase of a strategy.
+    def callback_call
+      setup_phase
+      @env['omniauth.origin'] = session.delete('omniauth.origin')
+      @env['omniauth.origin'] = nil if env['omniauth.origin'] == ''
+      callback_phase
+    end
+    def on_auth_path?
+      on_request_path? || on_callback_path?
+    end
+    def on_request_path?
+      current_path.casecmp(request_path) == 0
+    end
+    def on_callback_path?
+      current_path.casecmp(callback_path) == 0
+    end
     def mock_call!(env)
-      if current_path == request_path
-        setup_phase
-        if response = call_through_to_app
-          response
-        else
-          if request.params['origin']
-            @env['rack.session']['omniauth.origin'] = request.params['origin']
-          elsif env['HTTP_REFERER'] && !env['HTTP_REFERER'].match(/#{request_path}$/)
-            @env['rack.session']['omniauth.origin'] = env['HTTP_REFERER']
-          end
-          redirect(callback_path)
-        end
-      elsif current_path == callback_path
-        setup_phase
-        mocked_auth = OmniAuth.mock_auth_for(name.to_sym)
-        if mocked_auth.is_a?(Symbol)
-          fail!(mocked_auth)
-        else
-          @env['omniauth.auth'] = mocked_auth
-          @env['omniauth.origin'] = session.delete('omniauth.origin')
-          @env['omniauth.origin'] = nil if env['omniauth.origin'] == ''
-          call_app!
-        end
+      return mock_request_call if on_request_path?
+      return mock_callback_call if on_callback_path?
+      call_app!
+    end
+    def mock_request_call
+      setup_phase
+      return response if response = call_through_to_app
+      if request.params['origin']
+        @env['rack.session']['omniauth.origin'] = request.params['origin']
+      elsif env['HTTP_REFERER'] && !env['HTTP_REFERER'].match(/#{request_path}$/)
+        @env['rack.session']['omniauth.origin'] = env['HTTP_REFERER']
+      end
+      redirect(callback_path)
+    end
+    def mock_callback_call
+      setup_phase
+      mocked_auth = OmniAuth.mock_auth_for(name.to_sym)
+      if mocked_auth.is_a?(Symbol)
+        fail!(mocked_auth)
       else
+        @env['omniauth.auth'] = mocked_auth
+        @env['omniauth.origin'] = session.delete('omniauth.origin')
+        @env['omniauth.origin'] = nil if env['omniauth.origin'] == ''
         call_app!
       end
     end
     def setup_phase
       if options[:setup].respond_to?(:call)
-        options[:setup].call(env)
+        options[:setup].call(env)
       elsif options[:setup]
         setup_env = env.merge('PATH_INFO' => setup_path, 'REQUEST_METHOD' => 'GET')
         call_app!(setup_env)
@@ -102,20 +123,20 @@ module OmniAuth
     def request_phase
       raise NotImplementedError
     end
     def callback_phase
       @env['omniauth.auth'] = auth_hash
-      call_app!
+      call_app!
     end
     def path_prefix
       options[:path_prefix] || OmniAuth.config.path_prefix
     end
     def request_path
       options[:request_path] || "#{path_prefix}/#{name}"
     end
     def callback_path
       options[:callback_path] || "#{path_prefix}/#{name}/callback"
     end
@@ -131,25 +152,25 @@ module OmniAuth
     def query_string
       request.query_string.empty? ? "" : "?#{request.query_string}"
     end
     def call_through_to_app
       status, headers, body = *call_app!
       @response = Rack::Response.new(body, status, headers)
       status == 404 ? nil : @response.finish
     end
     def call_app!(env = @env)
       @app.call(env)
     end
     def auth_hash
       {
         'provider' => name.to_s,
         'uid' => nil
       }
     end
     def full_host
       case OmniAuth.config.full_host
         when String
@@ -179,7 +200,7 @@ module OmniAuth
     def request
       @request ||= Rack::Request.new(@env)
     end
     def redirect(uri)
       r = Rack::Response.new
@@ -189,12 +210,12 @@ module OmniAuth
         r.write("Redirecting to #{uri}...")
         r.redirect(uri)
       end
       r.finish
     end
     def user_info; {} end
     def fail!(message_key, exception = nil)
       self.env['omniauth.error'] = exception
       self.env['omniauth.error.type'] = message_key.to_sym

data/lib/omniauth/test.rb CHANGED

@@ -1,12 +1,12 @@
 module OmniAuth
   # Support for testing OmniAuth strategies.
   module Test
     autoload :PhonySession,     'omniauth/test/phony_session'
     autoload :StrategyMacros,   'omniauth/test/strategy_macros'
     autoload :StrategyTestCase, 'omniauth/test/strategy_test_case'
   end
 end

data/lib/omniauth/test/strategy_macros.rb CHANGED

@@ -1,34 +1,34 @@
 module OmniAuth
   module Test
     module StrategyMacros
       def sets_an_auth_hash
         it 'should set an auth hash' do
           last_request.env['omniauth.auth'].should be_kind_of(Hash)
         end
       end
       def sets_provider_to(provider)
         it "should set the provider to #{provider}" do
           (last_request.env['omniauth.auth'] || {})['provider'].should == provider
         end
       end
       def sets_uid_to(uid)
         it "should set the UID to #{uid}" do
           (last_request.env['omniauth.auth'] || {})['uid'].should == uid
         end
       end
       def sets_user_info_to(user_info)
         it "should set the user_info to #{user_info}" do
           (last_request.env['omniauth.auth'] || {})['user_info'].should == user_info
         end
       end
     end
   end
 end

data/lib/omniauth/test/strategy_test_case.rb CHANGED

@@ -2,9 +2,9 @@ require 'rack'
 require 'omniauth/test'
 module OmniAuth
   module Test
     # Support for testing OmniAuth strategies.
     #
     # @example Usage
@@ -19,7 +19,7 @@ module OmniAuth
     #     end
     #   end
     module StrategyTestCase
       def app
         strat = self.strategy
         resp = self.app_response
@@ -29,7 +29,7 @@ module OmniAuth
           run lambda {|env| [404, {'Content-Type' => 'text/plain'}, [resp || env.key?('omniauth.auth').to_s]] }
         }.to_app
       end
       def app_response
         nil
       end
@@ -37,13 +37,13 @@ module OmniAuth
       def session
         last_request.env['rack.session']
       end
       def strategy
         raise NotImplementedError.new('Including specs must define #strategy')
       end
     end
   end
 end

data/lib/omniauth/version.rb ADDED

@@ -0,0 +1,19 @@
+module OmniAuth
+  module Version
+    unless defined?(::OmniAuth::Version::MAJOR)
+      MAJOR = 0
+    end
+    unless defined?(::OmniAuth::Version::MINOR)
+      MINOR = 2
+    end
+    unless defined?(::OmniAuth::Version::PATCH)
+      PATCH = 5
+    end
+    unless defined?(::OmniAuth::Version::PRE)
+      PRE   = nil
+    end
+    unless defined?(::OmniAuth::Version::STRING)
+      STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
+    end
+  end
+end

data/oa-core.gemspec CHANGED

@@ -1,16 +1,18 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../../omniauth/lib/omniauth/version', __FILE__)
+require File.expand_path('../lib/omniauth/version', __FILE__)
 Gem::Specification.new do |gem|
+  gem.add_development_dependency 'maruku', '~> 0.6'
   gem.add_development_dependency 'simplecov', '~> 0.4'
   gem.add_development_dependency 'rack-test', '~> 0.5'
   gem.add_development_dependency 'rake', '~> 0.8'
   gem.add_development_dependency 'rspec', '~> 2.5'
   gem.add_development_dependency 'yard', '~> 0.6'
+  gem.add_development_dependency 'ZenTest', '~> 4.5'
   gem.name = 'oa-core'
-  gem.version = Omniauth::VERSION.dup
-  gem.summary = %q{HTTP Basic strategies for OmniAuth.}
-  gem.description = %q{HTTP Basic strategies for OmniAuth.}
+  gem.version = OmniAuth::Version::STRING
+  gem.description = %q{Core strategies for OmniAuth.}
+  gem.summary = gem.description
   gem.email = ['michael@intridea.com', 'sferik@gmail.com']
   gem.homepage = 'http://github.com/intridea/omniauth'
   gem.authors = ['Michael Bleigh', 'Erik Michaels-Ober']

data/spec/omniauth/builder_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 describe OmniAuth::Builder do
   describe '#provider' do
@@ -17,4 +17,4 @@ describe OmniAuth::Builder do
       end }.should_not raise_error
     end
   end
-end
+end

data/spec/omniauth/core_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 describe OmniAuth do
   describe '.strategies' do
@@ -9,45 +9,45 @@ describe OmniAuth do
       OmniAuth.strategies.last.should == ExampleStrategy
     end
   end
   context 'configuration' do
     it 'should be callable from .configure' do
       OmniAuth.configure do |c|
         c.should be_kind_of(OmniAuth::Configuration)
       end
     end
     before do
       @old_path_prefix = OmniAuth.config.path_prefix
       @old_on_failure  = OmniAuth.config.on_failure
     end
     after do
       OmniAuth.configure do |config|
         config.path_prefix = @old_path_prefix
         config.on_failure  = @old_on_failure
       end
     end
     it 'should be able to set the path' do
       OmniAuth.configure do |config|
         config.path_prefix = '/awesome'
       end
       OmniAuth.config.path_prefix.should == '/awesome'
     end
     it 'should be able to set the on_failure rack app' do
       OmniAuth.configure do |config|
         config.on_failure do
           'yoyo'
         end
       end
       OmniAuth.config.on_failure.call.should == 'yoyo'
     end
   end
   describe '::Utils' do
     describe '.deep_merge' do
       it 'should combine hashes' do
@@ -56,7 +56,7 @@ describe OmniAuth do
         }
       end
     end
     describe '.camelize' do
       it 'should work on normal cases' do
         {
@@ -66,7 +66,7 @@ describe OmniAuth do
           'three_words_now' => 'ThreeWordsNow'
         }.each_pair{ |k,v| OmniAuth::Utils.camelize(k).should == v }
       end
       it 'should work in special cases' do
         {
           'oauth' => "OAuth",
@@ -76,4 +76,4 @@ describe OmniAuth do
       end
     end
   end
-end
+end

data/spec/omniauth/strategy_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 class ExampleStrategy
   include OmniAuth::Strategy
@@ -6,14 +6,14 @@ class ExampleStrategy
   attr_reader :last_env
   def request_phase
     @fail = fail!(options[:failure]) if options[:failure]
-    @last_env = env
-    return @fail if @fail
+    @last_env = env
+    return @fail if @fail
     raise "Request Phase"
   end
   def callback_phase
     @fail = fail!(options[:failure]) if options[:failure]
     @last_env = env
-    return @fail if @fail
+    return @fail if @fail
     raise "Callback Phase"
   end
 end
@@ -34,7 +34,7 @@ describe OmniAuth::Strategy do
       it 'should be the last argument if the last argument is a Hash' do
         ExampleStrategy.new(app, 'test', :abc => 123).options[:abc].should == 123
       end
       it 'should be a blank hash if none are provided' do
         ExampleStrategy.new(app, 'test').options.should == {}
       end
@@ -48,10 +48,10 @@ describe OmniAuth::Strategy do
       lambda{ strategy.full_host }.should_not raise_error
     end
   end
   describe '#call' do
     let(:strategy){ ExampleStrategy.new(app, 'test', @options) }
     context 'omniauth.origin' do
       it 'should be set on the request phase' do
         lambda{ strategy.call(make_env('/auth/test', 'HTTP_REFERER' => 'http://example.com/origin')) }.should raise_error("Request Phase")
@@ -98,13 +98,21 @@ describe OmniAuth::Strategy do
       it 'should use the default request path' do
         lambda{ strategy.call(make_env) }.should raise_error("Request Phase")
       end
+      it 'should be case insensitive on request path' do
+        lambda{ strategy.call(make_env('/AUTH/Test'))}.should raise_error("Request Phase")
+      end
+      it 'should be case insensitive on callback path' do
+        lambda{ strategy.call(make_env('/AUTH/TeSt/CaLlBAck'))}.should raise_error("Callback Phase")
+      end
       it 'should use the default callback path' do
         lambda{ strategy.call(make_env('/auth/test/callback')) }.should raise_error("Callback Phase")
       end
       it 'should strip trailing spaces on request' do
-        lambda{ strategy.call(make_env('/auth/test/')) }.should raise_error("Request Phase")
+        lambda{ strategy.call(make_env('/auth/test/')) }.should raise_error("Request Phase")
       end
       it 'should strip trailing spaces on callback' do
@@ -137,11 +145,11 @@ describe OmniAuth::Strategy do
         end
       end
     end
-    context 'pre-request call through' do
+    context 'pre-request call through' do
       subject { ExampleStrategy.new(app, 'test') }
       let(:app){ lambda{|env| env['omniauth.boom'] = true; [env['test.status'] || 404, {}, ['Whatev']] } }
-      it 'should be able to modify the env on the fly before the request_phase' do
+      it 'should be able to modify the env on the fly before the request_phase' do
         lambda{ subject.call(make_env) }.should raise_error("Request Phase")
         subject.response.status.should == 404
         subject.last_env.should be_key('omniauth.boom')
@@ -152,13 +160,13 @@ describe OmniAuth::Strategy do
         subject.response.body.should == ['Whatev']
       end
     end
     context 'custom paths' do
       it 'should use a custom request_path if one is provided' do
         @options = {:request_path => '/awesome'}
         lambda{ strategy.call(make_env('/awesome')) }.should raise_error("Request Phase")
       end
       it 'should use a custom callback_path if one is provided' do
         @options = {:callback_path => '/radical'}
         lambda{ strategy.call(make_env('/radical')) }.should raise_error("Callback Phase")
@@ -184,16 +192,16 @@ describe OmniAuth::Strategy do
         end
       end
     end
     context 'custom prefix' do
       before do
         @options = {:path_prefix => '/wowzers'}
       end
       it 'should use a custom prefix for request' do
         lambda{ strategy.call(make_env('/wowzers/test')) }.should raise_error("Request Phase")
       end
       it 'should use a custom prefix for callback' do
         lambda{ strategy.call(make_env('/wowzers/test/callback')) }.should raise_error("Callback Phase")
       end
@@ -216,22 +224,22 @@ describe OmniAuth::Strategy do
         end
       end
     end
     context 'request method restriction' do
       before do
         OmniAuth.config.allowed_request_methods = [:post]
       end
       it 'should not allow a request method of the wrong type' do
         lambda{ strategy.call(make_env)}.should_not raise_error
       end
       it 'should allow a request method of the correct type' do
         lambda{ strategy.call(make_env('/auth/test', 'REQUEST_METHOD' => 'POST'))}.should raise_error("Request Phase")
       end
       after do
-        OmniAuth.config.allowed_request_methods = [:get, :post]
+        OmniAuth.config.allowed_request_methods = [:get, :post]
       end
     end
@@ -246,6 +254,14 @@ describe OmniAuth::Strategy do
         response[1]['Location'].should == '/auth/test/callback'
       end
+      it 'should be case insensitive on request path' do
+        strategy.call(make_env('/AUTH/Test'))[0].should == 302
+      end
+      it 'should be case insensitive on callback path' do
+        strategy.call(make_env('/AUTH/TeSt/CaLlBAck')).should == strategy.call(make_env('/auth/test/callback'))
+      end
       it 'should not short circuit requests outside of authentication' do
         strategy.call(make_env('/')).should == app.call(make_env('/'))
       end
@@ -270,12 +286,12 @@ describe OmniAuth::Strategy do
         strategy.call make_env('/auth/test/callback')
         strategy.env['omniauth.error.type'].should == :invalid_credentials
       end
       it 'should set omniauth.origin on the request phase' do
         strategy.call(make_env('/auth/test', 'HTTP_REFERER' => 'http://example.com/origin'))
         strategy.env['rack.session']['omniauth.origin'].should == 'http://example.com/origin'
       end
       it 'should set omniauth.origin from the params if provided' do
         strategy.call(make_env('/auth/test', 'QUERY_STRING' => 'origin=/foo'))
         strategy.env['rack.session']['omniauth.origin'].should == '/foo'
@@ -283,7 +299,7 @@ describe OmniAuth::Strategy do
       it 'should turn omniauth.origin into an env variable on the callback phase' do
         OmniAuth.config.mock_auth[:test] = {}
         strategy.call(make_env('/auth/test/callback', 'rack.session' => {'omniauth.origin' => 'http://example.com/origin'}))
         strategy.env['omniauth.origin'].should == 'http://example.com/origin'
       end
@@ -305,7 +321,7 @@ describe OmniAuth::Strategy do
   context 'setup phase' do
     context 'when options[:setup] = true' do
-      let(:strategy){ ExampleStrategy.new(app, 'test', :setup => true) }
+      let(:strategy){ ExampleStrategy.new(app, 'test', :setup => true) }
       let(:app){lambda{|env| env['omniauth.strategy'].options[:awesome] = 'sauce' if env['PATH_INFO'] == '/auth/test/setup'; [404, {}, 'Awesome'] }}
       it 'should call through to /auth/:provider/setup' do
@@ -327,7 +343,7 @@ describe OmniAuth::Strategy do
       end
       let(:strategy){ ExampleStrategy.new(app, 'test', :setup => setup_proc) }
       it 'should not call the app on a non-omniauth endpoint' do
         strategy.call(make_env('/somehwere/else'))
         strategy.options[:awesome].should_not == 'sauce'
@@ -335,7 +351,7 @@ describe OmniAuth::Strategy do
       it 'should call the rack app' do
         strategy.call(make_env('/auth/test'))
-        strategy.options[:awesome].should == 'sauce'
+        strategy.options[:awesome].should == 'sauce'
       end
     end
   end

data/spec/spec_helper.rb CHANGED

@@ -1,10 +1,6 @@
 require 'simplecov'
 SimpleCov.start
-require 'rubygems'
-require 'bundler'
-Bundler.setup
 require 'rspec'
-require 'rspec/autorun'
 require 'rack/test'
 require 'omniauth/core'
 require 'omniauth/test'

metadata CHANGED

@@ -2,7 +2,7 @@
 name: oa-core
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Michael Bleigh
@@ -11,64 +11,86 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-04-22 00:00:00 Z
+date: 2011-04-29 00:00:00 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: maruku
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: "0.4"
+        version: "0.6"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: simplecov
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: "0.5"
+        version: "0.4"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rack-test
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: "0.8"
+        version: "0.5"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: "2.5"
+        version: "0.8"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rspec
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: "0.6"
+        version: "2.5"
   type: :development
   version_requirements: *id005
-description: HTTP Basic strategies for OmniAuth.
+- !ruby/object:Gem::Dependency
+  name: yard
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: "0.6"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency
+  name: ZenTest
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: "4.5"
+  type: :development
+  version_requirements: *id007
+description: Core strategies for OmniAuth.
 email:
 - michael@intridea.com
 - sferik@gmail.com
@@ -82,7 +104,6 @@ files:
 - .gemtest
 - .rspec
 - .yardopts
-- Gemfile
 - LICENSE
 - Rakefile
 - autotest/discover.rb
@@ -95,6 +116,7 @@ files:
 - lib/omniauth/test/phony_session.rb
 - lib/omniauth/test/strategy_macros.rb
 - lib/omniauth/test/strategy_test_case.rb
+- lib/omniauth/version.rb
 - oa-core.gemspec
 - spec/omniauth/builder_spec.rb
 - spec/omniauth/core_spec.rb
@@ -126,7 +148,7 @@ rubyforge_project:
 rubygems_version: 1.7.2
 signing_key:
 specification_version: 3
-summary: HTTP Basic strategies for OmniAuth.
+summary: Core strategies for OmniAuth.
 test_files:
 - spec/omniauth/builder_spec.rb
 - spec/omniauth/core_spec.rb

data/Gemfile DELETED

@@ -1,3 +0,0 @@
-source 'http://rubygems.org'
-gemspec