socialite 0.0.1.beta2 → 0.0.1.beta4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    socialite (0.0.1.beta2)
+    socialite (0.0.1.beta4)
       grackle (~> 0.1.10)
       haml (~> 3.1.2)
       koala (~> 1.2.0beta4)
@@ -74,7 +74,7 @@ GEM
     faraday (0.7.4)
       addressable (~> 2.2.6)
       multipart-post (~> 1.1.0)
-      rack (< 2, >= 1.1.0)
+      rack (>= 1.1.0, < 2)
     ffi (1.0.9)
     gherkin (2.5.1)
       json (>= 1.4.6)
@@ -176,7 +176,7 @@ GEM
     sprockets (2.0.0)
       hike (~> 1.2)
       rack (~> 1.0)
-      tilt (!= 1.3.0, ~> 1.1)
+      tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.4)
     term-ansicolor (1.0.6)
     thor (0.14.6)
@@ -184,7 +184,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
+    tzinfo (0.3.30)
     xpath (0.1.4)
       nokogiri (~> 1.3)
     yard (0.7.2)

data/app/controllers/socialite/{user_controller.rb → users_controller.rb}

@@ -1,5 +1,5 @@
 module Socialite
-  class UserController < ApplicationController
+  class UsersController < ApplicationController
     unloadable
 
     before_filter :ensure_user

data/config/routes.rb

@@ -4,7 +4,7 @@ Socialite::Engine.routes.draw do
   match '/auth/failure'           => 'identities#failure'
   match '/logout'                 => 'session#destroy',  :as => :logout
 
-  resource :user, :controller => 'user', :except => [:new, :create] do
+  resource :user, :except => [:new, :create] do
     resources :identities
   end
 end

data/lib/socialite.rb

@@ -13,9 +13,6 @@ module Socialite
 
   module Controllers
     autoload :Helpers, 'socialite/controllers/helpers'
-    autoload :Identities, 'socialite/controllers/identities'
-    autoload :Session, 'socialite/controllers/session'
-    autoload :User, 'socialite/controllers/user'
   end
 
   module Helpers
@@ -28,7 +25,7 @@ module Socialite
     autoload :FacebookIdentity, 'socialite/models/facebook_identity.rb'
   end
 
-  mattr_accessor :service_configs, :root_path, :mount_prefix
+  mattr_accessor :service_configs, :root_path, :mount_prefix, :mounted_engine
   @@service_configs = {}
 
   def self.generate_token
@@ -39,6 +36,10 @@ module Socialite
     block.call self if block_given?
   end
 
+  def self.mounted_engine?
+    !!mounted_engine
+  end
+
   # config.twitter APP_KEY, APP_SECRET, :scope => ['foo', 'bar']
   def self.twitter(app_key, app_secret, options = {})
     @@service_configs[:twitter] = ServiceConfig.new(app_key, app_secret, options)

data/lib/socialite/engine.rb

@@ -8,16 +8,29 @@ module Socialite
 
     initializer 'socialite.load_middleware', :after => :load_config_initializers do
       if Socialite.service_configs[:twitter]
-        middleware.use OmniAuth::Strategies::Twitter,
-          Socialite.service_configs[:twitter].app_key,
-          Socialite.service_configs[:twitter].app_secret
+        if Socialite.mounted_engine?
+          middleware.use OmniAuth::Strategies::Twitter,
+            Socialite.service_configs[:twitter].app_key,
+            Socialite.service_configs[:twitter].app_secret
+        else
+          config.app_middleware.use OmniAuth::Strategies::Twitter,
+            Socialite.service_configs[:twitter].app_key,
+            Socialite.service_configs[:twitter].app_secret
+        end
       end
 
       if Socialite.service_configs[:facebook]
-        middleware.use OmniAuth::Strategies::Facebook,
-          Socialite.service_configs[:facebook].app_key,
-          Socialite.service_configs[:facebook].app_secret,
-          Socialite.service_configs[:facebook].options
+        if Socialite.mounted_engine?
+          middleware.use OmniAuth::Strategies::Facebook,
+            Socialite.service_configs[:facebook].app_key,
+            Socialite.service_configs[:facebook].app_secret,
+            Socialite.service_configs[:facebook].options
+        else
+          config.app_middleware.use OmniAuth::Strategies::Facebook,
+            Socialite.service_configs[:facebook].app_key,
+            Socialite.service_configs[:facebook].app_secret,
+            Socialite.service_configs[:facebook].options
+        end
       end
     end
 

data/lib/socialite/version.rb

@@ -1,3 +1,3 @@
 module Socialite
-  VERSION = '0.0.1.beta2'
+  VERSION = '0.0.1.beta4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socialite
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta2
+  version: 0.0.1.beta4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-28 00:00:00.000000000Z
+date: 2011-10-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70251593638160 !ruby/object:Gem::Requirement
+  requirement: &70258980161920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70251593638160
+  version_requirements: *70258980161920
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70251593636940 !ruby/object:Gem::Requirement
+  requirement: &70258980161100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70251593636940
+  version_requirements: *70258980161100
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &70251593635780 !ruby/object:Gem::Requirement
+  requirement: &70258980160380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70251593635780
+  version_requirements: *70258980160380
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70251593634700 !ruby/object:Gem::Requirement
+  requirement: &70258980159800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70251593634700
+  version_requirements: *70258980159800
 - !ruby/object:Gem::Dependency
   name: oa-core
-  requirement: &70251593633480 !ruby/object:Gem::Requirement
+  requirement: &70258980159280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.3.0.rc3
   type: :runtime
   prerelease: false
-  version_requirements: *70251593633480
+  version_requirements: *70258980159280
 - !ruby/object:Gem::Dependency
   name: oa-oauth
-  requirement: &70251593632660 !ruby/object:Gem::Requirement
+  requirement: &70258980158660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.3.0.rc3
   type: :runtime
   prerelease: false
-  version_requirements: *70251593632660
+  version_requirements: *70258980158660
 - !ruby/object:Gem::Dependency
   name: koala
-  requirement: &70251593631600 !ruby/object:Gem::Requirement
+  requirement: &70258980157880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.2.0beta4
   type: :runtime
   prerelease: false
-  version_requirements: *70251593631600
+  version_requirements: *70258980157880
 - !ruby/object:Gem::Dependency
   name: grackle
-  requirement: &70251593630500 !ruby/object:Gem::Requirement
+  requirement: &70258980157040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.1.10
   type: :runtime
   prerelease: false
-  version_requirements: *70251593630500
+  version_requirements: *70258980157040
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70251593629640 !ruby/object:Gem::Requirement
+  requirement: &70258980156460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70251593629640
+  version_requirements: *70258980156460
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70251593628640 !ruby/object:Gem::Requirement
+  requirement: &70258980155660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70251593628640
+  version_requirements: *70258980155660
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70251593627640 !ruby/object:Gem::Requirement
+  requirement: &70258980154860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70251593627640
+  version_requirements: *70258980154860
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70251593626460 !ruby/object:Gem::Requirement
+  requirement: &70258980153900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *70251593626460
+  version_requirements: *70258980153900
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70251593625280 !ruby/object:Gem::Requirement
+  requirement: &70258980147880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *70251593625280
+  version_requirements: *70258980147880
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &70251593624400 !ruby/object:Gem::Requirement
+  requirement: &70258980147140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70251593624400
+  version_requirements: *70258980147140
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &70251593623300 !ruby/object:Gem::Requirement
+  requirement: &70258980145900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *70251593623300
+  version_requirements: *70258980145900
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70251593622420 !ruby/object:Gem::Requirement
+  requirement: &70258980145100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: 0.6.7
   type: :development
   prerelease: false
-  version_requirements: *70251593622420
+  version_requirements: *70258980145100
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: &70251593621060 !ruby/object:Gem::Requirement
+  requirement: &70258980144080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *70251593621060
+  version_requirements: *70258980144080
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70251593619900 !ruby/object:Gem::Requirement
+  requirement: &70258980143240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,7 +208,7 @@ dependencies:
         version: 2.0.5
   type: :development
   prerelease: false
-  version_requirements: *70251593619900
+  version_requirements: *70258980143240
 description: Rails engine supporting multiple auth providers per user.
 email: justin.smestad@gmail.com
 executables: []
@@ -231,7 +231,7 @@ files:
 - app/assets/stylesheets/socialite/socialite.css
 - app/controllers/socialite/identities_controller.rb
 - app/controllers/socialite/session_controller.rb
-- app/controllers/socialite/user_controller.rb
+- app/controllers/socialite/users_controller.rb
 - app/models/socialite/facebook_identity.rb
 - app/models/socialite/identity.rb
 - app/models/socialite/user.rb
@@ -338,7 +338,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3505192399675819770
+      hash: -2813799985366239650
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: