omniauth 1.0.0.beta1 → 1.0.0.pr1

data/README.md

@@ -18,13 +18,7 @@ one or more strategies. These strategies are generally released
 individually as RubyGems, and you can see a [community maintained list](https://github.com/intridea/omniauth/wiki/List-of-Strategies) 
 on the wiki for this project.
 
-One strategy, called `Developer`, is included with OmniAuth and provides
-a completely unsecure, non-production-usable strategy that directly
-prompts a user for authentication information and then passes it
-straight through. You can use it as a placeholder when you start
-development and easily swap in other strategies later.
-
-## Getting Started
+## Adding OmniAuth to Your Application
 
 Each OmniAuth strategy is a Rack Middleware. That means that you can use
 it the same way that you use any other Rack middleware. For example, to
@@ -85,7 +79,7 @@ something like this:
 
     class SessionsController < ApplicationController
       def create
-        @user = User.find_or_create_from_auth_hash(auth_hash)
+        @user = ̈User.find_or_create_from_auth_hash(auth_hash)
         self.current_user = @user
         redirect_to '/'
       end

data/lib/omniauth.rb

@@ -2,9 +2,7 @@ require 'rack'
 require 'singleton'
 
 module OmniAuth
-  module Strategies
-    autoload :Developer, 'omniauth/strategies/developer'
-  end
+  module Strategies; end
 
   autoload :Builder,  'omniauth/builder'
   autoload :Strategy, 'omniauth/strategy'

data/lib/omniauth/auth_hash.rb

@@ -6,8 +6,6 @@ module OmniAuth
   # is able to provide into the InfoHash (stored as the `'info'`
   # key).
   class AuthHash < Hashie::Mash
-    def self.subkey_class; Hashie::Mash end
-
     # Tells you if this is considered to be a valid
     # OmniAuth AuthHash. The requirements for that
     # are that it has a provider name, a uid, and a
@@ -25,8 +23,6 @@ module OmniAuth
     end
 
     class InfoHash < Hashie::Mash
-      def self.subkey_class; Hashie::Mash end
-
       def name
         return self[:name] if self[:name]
         return "#{first_name} #{last_name}".strip if first_name? || last_name?

data/lib/omniauth/version.rb

@@ -1,3 +1,3 @@
 module OmniAuth
-  VERSION = "1.0.0.beta1"
+  VERSION = "1.0.0.pr1"
 end

data/omniauth.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
   gem.email = ['michael@intridea.com', 'sferik@gmail.com']
 
   gem.add_runtime_dependency 'rack'
-  gem.add_runtime_dependency 'hashie', '~> 1.2'
+  gem.add_runtime_dependency 'hashie'
 
   gem.add_development_dependency 'maruku', '~> 0.6'
   gem.add_development_dependency 'simplecov', '~> 0.4'

data/spec/omniauth/auth_hash_spec.rb

@@ -91,11 +91,6 @@ describe OmniAuth::AuthHash do
       subject.info = {:first_name => 'Bob', :last_name => 'Examplar'}
       hash['info']['name'].should == 'Bob Examplar'
     end
-
-    it 'should not pollute the URL hash with "name" etc' do
-      subject.info = {'urls' => {'Homepage' => "http://homepage.com"}}
-      subject.to_hash['info']['urls'].should == {'Homepage' => "http://homepage.com"}
-    end
   end
 
   describe OmniAuth::AuthHash::InfoHash do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0.pr1
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-19 00:00:00.000000000Z
+date: 2011-10-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70214948162300 !ruby/object:Gem::Requirement
+  requirement: &70237240831600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,21 +22,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70214948162300
+  version_requirements: *70237240831600
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70214948161800 !ruby/object:Gem::Requirement
+  requirement: &70237240831180 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70214948161800
+  version_requirements: *70237240831180
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &70214948161300 !ruby/object:Gem::Requirement
+  requirement: &70237240860880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70214948161300
+  version_requirements: *70237240860880
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70214948160840 !ruby/object:Gem::Requirement
+  requirement: &70237240860380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70214948160840
+  version_requirements: *70237240860380
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70214948160380 !ruby/object:Gem::Requirement
+  requirement: &70237240859920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: '0.5'
   type: :development
   prerelease: false
-  version_requirements: *70214948160380
+  version_requirements: *70237240859920
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70214948159920 !ruby/object:Gem::Requirement
+  requirement: &70237240859460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *70214948159920
+  version_requirements: *70237240859460
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70214948159460 !ruby/object:Gem::Requirement
+  requirement: &70237240859000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *70214948159460
+  version_requirements: *70237240859000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70214948159000 !ruby/object:Gem::Requirement
+  requirement: &70237240858540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70214948159000
+  version_requirements: *70237240858540
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70214948158540 !ruby/object:Gem::Requirement
+  requirement: &70237240858080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,7 +110,7 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *70214948158540
+  version_requirements: *70237240858080
 description: A generalized Rack framework for multiple-provider authentication.
 email:
 - michael@intridea.com
@@ -133,7 +133,6 @@ files:
 - lib/omniauth/auth_hash.rb
 - lib/omniauth/builder.rb
 - lib/omniauth/form.rb
-- lib/omniauth/strategies/developer.rb
 - lib/omniauth/strategy.rb
 - lib/omniauth/test.rb
 - lib/omniauth/test/phony_session.rb
@@ -143,7 +142,6 @@ files:
 - omniauth.gemspec
 - spec/omniauth/auth_hash_spec.rb
 - spec/omniauth/builder_spec.rb
-- spec/omniauth/strategies/developer_spec.rb
 - spec/omniauth/strategy_spec.rb
 - spec/omniauth_spec.rb
 - spec/spec_helper.rb
@@ -174,7 +172,6 @@ summary: A generalized Rack framework for multiple-provider authentication.
 test_files:
 - spec/omniauth/auth_hash_spec.rb
 - spec/omniauth/builder_spec.rb
-- spec/omniauth/strategies/developer_spec.rb
 - spec/omniauth/strategy_spec.rb
 - spec/omniauth_spec.rb
 - spec/spec_helper.rb

data/lib/omniauth/strategies/developer.rb

@@ -1,60 +0,0 @@
-require 'omniauth'
-
-module OmniAuth
-  module Strategies
-    # The Developer strategy is a very simple strategy that can be used as a
-    # placeholder in your application until a different authentication strategy
-    # is swapped in. It has zero security and should *never* be used in a
-    # production setting.
-    #
-    # ## Usage
-    #
-    # To use the Developer strategy, all you need to do is put it in like any
-    # other strategy:
-    #
-    # @example Basic Usage
-    #
-    #   use OmniAuth::Builder do
-    #     provider :developer
-    #   end
-    #
-    # @example Custom Fields
-    #
-    #   use OmniAuth::Builder do
-    #     provider :developer, 
-    #       :fields => [:first_name, :last_name],
-    #       :uid_field => :last_name
-    #   end
-    #
-    # This will create a strategy that, when the user visits `/auth/developer`
-    # they will be presented a form that prompts for (by default) their name
-    # and email address. The auth hash will be populated with these fields and
-    # the `uid` will simply be set to the provided email.
-    class Developer
-      include OmniAuth::Strategy
-
-      option :fields, [:name, :email]
-      option :uid_field, :email
-
-      def request_phase
-        form = OmniAuth::Form.new(:title => "User Info", :url => callback_path)
-        options.fields.each do |field|
-          form.text_field field.to_s.capitalize.gsub("_", " "), field.to_s
-        end
-        form.button "Sign In"
-        form.to_response
-      end
-
-      uid do
-        request.params[options.uid_field.to_s]
-      end
-
-      info do
-        options.fields.inject({}) do |hash, field|
-          hash[field] = request.params[field.to_s]
-          hash
-        end
-      end
-    end
-  end
-end

data/spec/omniauth/strategies/developer_spec.rb

@@ -1,69 +0,0 @@
-require 'spec_helper'
-
-describe OmniAuth::Strategies::Developer do
-  let(:app){ Rack::Builder.new do |b|
-    b.use Rack::Session::Cookie
-    b.use OmniAuth::Strategies::Developer
-    b.run lambda{|env| [200, {}, ['Not Found']]}
-  end.to_app }
-
-  context 'request phase' do
-    before(:each){ get '/auth/developer' }
-
-    it 'should display a form' do
-      last_response.status.should == 200
-      last_response.body.should be_include("<form")
-    end
-
-    it 'should have the callback as the action for the form' do
-      last_response.body.should be_include("action='/auth/developer/callback'")
-    end
-
-    it 'should have a text field for each of the fields' do
-      last_response.body.scan('<input').size.should == 2
-    end
-  end
-
-  context 'callback phase' do
-    let(:auth_hash){ last_request.env['omniauth.auth'] }
-
-    context 'with default options' do
-      before do
-        post '/auth/developer/callback', :name => 'Example User', :email => 'user@example.com'
-      end
-
-      it 'should set the name in the auth hash' do
-        auth_hash.info.name.should == 'Example User'
-      end
-
-      it 'should set the email in the auth hash' do
-        auth_hash.info.email.should == 'user@example.com'
-      end
-
-      it 'should set the uid to the email' do
-        auth_hash.uid.should == 'user@example.com'
-      end
-    end
-
-    context 'with custom options' do
-      let(:app){ Rack::Builder.new do |b|
-        b.use Rack::Session::Cookie
-        b.use OmniAuth::Strategies::Developer, :fields => [:first_name, :last_name], :uid_field => :last_name
-        b.run lambda{|env| [200, {}, ['Not Found']]}
-      end.to_app }
-
-      before do
-        @options = {:uid_field => :last_name, :fields => [:first_name, :last_name]}
-        post '/auth/developer/callback', :first_name => 'Example', :last_name => 'User'
-      end
-
-      it 'should set info fields properly' do
-        auth_hash.info.name.should == 'Example User'
-      end
-
-      it 'should set the uid properly' do
-        auth_hash.uid.should == 'User'
-      end
-    end
-  end
-end