From 69177f3b10fb2bb46744154adca26048a9dfc15e Mon Sep 17 00:00:00 2001
From: Michael Bleigh <michael@intridea.com>
Date: Thu, 22 Sep 2011 13:25:41 -0500
Subject: [PATCH] Moves omniauth/core to just plain omniauth

---
 lib/oa-core.rb                        | 1 -
 lib/{omniauth/core.rb => omniauth.rb} | 0
 lib/omniauth/builder.rb               | 2 +-
 lib/omniauth/form.rb                  | 2 +-
 lib/omniauth/strategy.rb              | 2 +-
 spec/spec_helper.rb                   | 2 +-
 6 files changed, 4 insertions(+), 5 deletions(-)
 delete mode 100644 lib/oa-core.rb
 rename lib/{omniauth/core.rb => omniauth.rb} (100%)

diff --git a/lib/oa-core.rb b/lib/oa-core.rb
deleted file mode 100644
index cf3f19d54..000000000
--- a/lib/oa-core.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'omniauth/core'
diff --git a/lib/omniauth/core.rb b/lib/omniauth.rb
similarity index 100%
rename from lib/omniauth/core.rb
rename to lib/omniauth.rb
diff --git a/lib/omniauth/builder.rb b/lib/omniauth/builder.rb
index 49dfddc97..f80ebf552 100644
--- a/lib/omniauth/builder.rb
+++ b/lib/omniauth/builder.rb
@@ -1,4 +1,4 @@
-require 'omniauth/core'
+require 'omniauth'
 
 module OmniAuth
   class Builder < ::Rack::Builder
diff --git a/lib/omniauth/form.rb b/lib/omniauth/form.rb
index c488f28dc..09ef89dd9 100644
--- a/lib/omniauth/form.rb
+++ b/lib/omniauth/form.rb
@@ -1,4 +1,4 @@
-require 'omniauth/core'
+require 'omniauth'
 
 module OmniAuth
   class Form
diff --git a/lib/omniauth/strategy.rb b/lib/omniauth/strategy.rb
index 41576e0c6..c32dcf893 100644
--- a/lib/omniauth/strategy.rb
+++ b/lib/omniauth/strategy.rb
@@ -1,4 +1,4 @@
-require 'omniauth/core'
+require 'omniauth'
 
 module OmniAuth
   class NoSessionError < StandardError; end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c9f3ecf21..f502d94db 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,7 +2,7 @@
 SimpleCov.start
 require 'rspec'
 require 'rack/test'
-require 'omniauth/core'
+require 'omniauth'
 require 'omniauth/test'
 
 RSpec.configure do |config|