Permalink
Browse files

Moved HttpBasic to oa-more. Closes #327

  • Loading branch information...
1 parent ab45e0f commit 2f77d46ce739c0ea110234361dd930d3d7188670 James A. Rosen committed Jun 6, 2011
View
@@ -4,7 +4,6 @@ platforms :jruby do
gem 'jruby-openssl', '~> 0.7'
end
-gemspec :path => 'oa-basic'
gemspec :path => 'oa-core'
gemspec :path => 'oa-enterprise'
gemspec :path => 'oa-more'
View
@@ -1,5 +1,4 @@
require 'omniauth/core'
-require 'omniauth/basic'
require 'omniauth/oauth'
require 'omniauth/openid'
require 'omniauth/enterprise'
View
No changes.
View
@@ -1,3 +0,0 @@
---color
---format=nested
---backtrace
View
@@ -1,4 +0,0 @@
---markup markdown
---markup-provider maruku
--
-LICENSE
View
@@ -1,7 +0,0 @@
-source 'http://rubygems.org'
-
-platforms :jruby do
- gem 'jruby-openssl', '~> 0.7'
-end
-
-gemspec
View
@@ -1,19 +0,0 @@
-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.
View
@@ -1,34 +0,0 @@
-= OmniAuth::Basic
-
-OmniAuth stratgies for APIs that have HTTP Basic authentication (such as Campfire and Basecamp).
-
-== Installation
-
-To get just HTTP Basic functionality:
-
- gem install oa-basic
-
-For the full auth suite:
-
- gem install omniauth
-
-== Stand-Alone Example
-
-Use the strategy as a middleware in your application:
-
- require 'omniauth/basic'
-
- use OmniAuth::Strategies::Campfire
-
-Then simply direct users to '/auth/campfire' to prompt them for their Campfire credentials. You may also pre-set the credentials by POSTing to the URL with appropriate parameters (in the case of Campfire and Basecamp, the parameters are <tt>subdomain</tt>, <tt>user</tt>, and <tt>password</tt>).
-
-== OmniAuth Builder
-
-If you want to allow multiple providers, use the OmniAuth Builder:
-
- require 'omniauth/basic'
-
- use OmniAuth::Builder do
- provider :campfire
- provider :basecamp
- end
View
@@ -1,6 +0,0 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
-task :default => :spec
-task :test => :spec
View
@@ -1 +0,0 @@
-require 'omniauth/basic'
@@ -1,8 +0,0 @@
-require 'omniauth/core'
-
-module OmniAuth
- module Strategies
- autoload :HttpBasic, 'omniauth/strategies/http_basic'
- # autoload :Gowalla, 'omniauth/strategies/gowalla'
- end
-end
@@ -1,19 +0,0 @@
-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 = 6
- end
- unless defined?(::OmniAuth::Version::PRE)
- PRE = nil
- end
- unless defined?(::OmniAuth::Version::STRING)
- STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
- end
- end
-end
View
@@ -1,27 +0,0 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/omniauth/version', __FILE__)
-
-Gem::Specification.new do |gem|
- gem.add_runtime_dependency 'oa-core', OmniAuth::Version::STRING
- gem.add_runtime_dependency 'rest-client', '~> 1.6.0'
- 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 'webmock', '~> 1.6'
- gem.add_development_dependency 'yard', '~> 0.7'
- gem.add_development_dependency 'ZenTest', '~> 4.5'
- gem.name = 'oa-basic'
- gem.version = OmniAuth::Version::STRING
- gem.description = %q{HTTP Basic 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']
- 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.require_paths = ['lib']
- gem.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if gem.respond_to? :required_rubygems_version=
-end
@@ -1,11 +0,0 @@
-require 'simplecov'
-SimpleCov.start
-require 'rspec'
-require 'rack/test'
-require 'webmock/rspec'
-require 'omniauth/basic'
-
-RSpec.configure do |config|
- config.include Rack::Test::Methods
- config.include WebMock::API
-end
@@ -7,5 +7,6 @@ module Strategies
autoload :Yupoo, 'omniauth/strategies/yupoo'
autoload :Ign, 'omniauth/strategies/ign'
autoload :Draugiem, 'omniauth/strategies/draugiem'
+ autoload :HttpBasic, 'omniauth/strategies/http_basic'
end
end
@@ -1,5 +1,5 @@
require 'rest-client'
-require 'omniauth/basic'
+require 'omniauth/more'
module OmniAuth
module Strategies
@@ -33,7 +33,7 @@ module OmniAuth
# If OpenID is one of several authentication strategies, use the OmniAuth Builder:
#
# require 'omniauth/openid'
- # require 'omniauth/basic' # for Campfire
+ # require 'omniauth/oauth' # for Campfire
# require 'openid/store/filesystem'
#
# use OmniAuth::Builder do
View
@@ -2,7 +2,7 @@
require File.expand_path('../lib/omniauth/version', __FILE__)
Gem::Specification.new do |gem|
- %w(oa-core oa-oauth oa-identity oa-basic oa-openid oa-enterprise oa-more).each do |subgem|
+ %w(oa-core oa-oauth oa-identity oa-openid oa-enterprise oa-more).each do |subgem|
gem.add_runtime_dependency subgem, OmniAuth::Version::STRING
end
gem.authors = ['Michael Bleigh', 'Erik Michaels-Ober']
View
@@ -1,6 +1,6 @@
require 'fileutils'
-PROJECTS = %w(oa-core oa-basic oa-enterprise oa-identity oa-more oa-oauth oa-openid omniauth)
+PROJECTS = %w(oa-core oa-enterprise oa-identity oa-more oa-oauth oa-openid omniauth)
def root
File.expand_path('../../', __FILE__)

0 comments on commit 2f77d46

Please sign in to comment.