exvo-auth 0.2.2 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/exvo-auth.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{exvo-auth}
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jacek Becela"]
-  s.date = %q{2010-06-29}
+  s.date = %q{2010-07-01}
   s.description = %q{Sign in with Exvo account}
   s.email = %q{jacek.becela@gmail.com}
   s.extra_rdoc_files = [
@@ -25,9 +25,10 @@ Gem::Specification.new do |s|
      "exvo-auth.gemspec",
      "lib/exvo-auth.rb",
      "lib/exvo_auth/config.rb",
+     "lib/exvo_auth/controllers/base.rb",
+     "lib/exvo_auth/controllers/merb.rb",
+     "lib/exvo_auth/controllers/rails.rb",
      "lib/exvo_auth/oauth2.rb",
-     "lib/exvo_auth/path_helpers.rb",
-     "lib/exvo_auth/rails/controller_helpers.rb",
      "lib/exvo_auth/strategies/base.rb",
      "lib/exvo_auth/strategies/interactive.rb",
      "lib/exvo_auth/strategies/non_interactive.rb",

data/lib/exvo-auth.rb

@@ -2,9 +2,8 @@ require 'omniauth/oauth'
 require 'multi_json'
 
 module ExvoAuth
-  autoload :PathHelpers, 'exvo_auth/path_helpers'
-  autoload :Config,      'exvo_auth/config'
-
+  autoload :Config, 'exvo_auth/config'
+  
   module OAuth2
     module Strategy
       autoload :NonInteractive, 'exvo_auth/oauth2'
@@ -17,8 +16,10 @@ module ExvoAuth
     autoload :NonInteractive, 'exvo_auth/strategies/non_interactive'
   end
 
-  module Rails
-    autoload :ControllerHelpers, 'exvo_auth/rails/controller_helpers'
+  module Controllers
+    autoload :Base,  'exvo_auth/controllers/base'
+    autoload :Rails, 'exvo_auth/controllers/rails'
+    autoload :Merb,  'exvo_auth/controllers/merb'
   end
 end
 

data/lib/exvo_auth/{rails/controller_helpers.rb → controllers/base.rb}

@@ -1,9 +1,4 @@
-module ExvoAuth::Rails::ControllerHelpers
-  def self.included(base)
-    base.send :include, ExvoAuth::PathHelpers
-    base.helper_method :current_user, :signed_in?
-  end
-  
+module ExvoAuth::Controllers::Base
   def authenticate_user!
     if !signed_in?
       store_location!
@@ -11,19 +6,23 @@ module ExvoAuth::Rails::ControllerHelpers
       callback_key   = ExvoAuth::Config.callback_key
       callback_value = params[callback_key]
 
-      if request.xhr?
-        redirect_to non_interactive_sign_in_path
-      elsif callback_value.present?
+      if callback_value
         redirect_to non_interactive_sign_in_path(callback_key => callback_value)
       else
-        redirect_to interactive_sign_in_path
+        redirect_to sign_in_path
       end
     end
   end
   
+  def sign_out_and_redirect!(url = sign_out_url)
+    session.delete(:user_id)
+    @current_user = nil
+    redirect_to url
+  end
+  
   def current_user
     return @current_user if defined?(@current_user)
-    @current_user = session[:user_id] && User.find_by_id(session[:user_id])
+    @current_user = session[:user_id] && find_user_by_id(session[:user_id])
   end
 
   def signed_in?
@@ -31,24 +30,27 @@ module ExvoAuth::Rails::ControllerHelpers
   end
   
   def store_location!
-    session[:return_to] = request.url if request.get?
+    session[:return_to] = current_url
   end
   
   def stored_location
     session.delete(:return_to)
   end
+
+  def sign_in_path
+    "/auth/interactive"
+  end
   
-  private
-  
-  def interactive_sign_in_path(params = {})
-    path_with_query("/auth/interactive", params)
+  def sign_up_path
+    "/auth/interactive"
   end
 
-  def non_interactive_sign_in_path(params = {})
-    path_with_query("/auth/non_interactive", params)
+  def sign_out_url
+    ExvoAuth::Config.host + "/users/sign_out"
   end
-  
-  def path_with_query(path, params = {})
+
+  def non_interactive_sign_in_path(params = {})
+    path  = "/auth/non_interactive"
     query = Rack::Utils.build_query(params)
     query.empty? ? path : "#{path}?#{query}"
   end

data/lib/exvo_auth/controllers/merb.rb

@@ -0,0 +1,17 @@
+module ExvoAuth::Controllers::Merb
+  def self.included(base)
+    base.send :include, ExvoAuth::Controllers::Base
+  end
+  
+  def redirect_to(*args)
+    redirect(*args)
+  end
+  
+  def find_user_by_id(id)
+    User[id]
+  end
+  
+  def current_url
+    request.full_uri if request.method == :get
+  end
+end

data/lib/exvo_auth/controllers/rails.rb

@@ -0,0 +1,14 @@
+module ExvoAuth::Controllers::Rails
+  def self.included(base)
+    base.send :include, ExvoAuth::Controllers::Base
+    helper_method :current_user, :signed_in?, :sign_in_path, :sign_up_path
+  end
+    
+  def find_user_by_id(id)
+    User.find(id)
+  end
+  
+  def current_url
+    request.url if request.get?
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jacek Becela
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-29 00:00:00 +02:00
+date: 2010-07-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,9 +49,10 @@ files:
 - exvo-auth.gemspec
 - lib/exvo-auth.rb
 - lib/exvo_auth/config.rb
+- lib/exvo_auth/controllers/base.rb
+- lib/exvo_auth/controllers/merb.rb
+- lib/exvo_auth/controllers/rails.rb
 - lib/exvo_auth/oauth2.rb
-- lib/exvo_auth/path_helpers.rb
-- lib/exvo_auth/rails/controller_helpers.rb
 - lib/exvo_auth/strategies/base.rb
 - lib/exvo_auth/strategies/interactive.rb
 - lib/exvo_auth/strategies/non_interactive.rb

data/lib/exvo_auth/path_helpers.rb

@@ -1,17 +0,0 @@
-module ExvoAuth::PathHelpers
-  def self.included(base)
-    if base.respond_to?(:helper_method)
-      base.helper_method :auth_sign_out_url, :auth_sign_in_path
-    end
-  end
-    
-  # Redirect users after logout there
-  def auth_sign_out_url
-    ExvoAuth::Config.host + "/users/sign_out"
-  end
-
-  # Redirect users to sign in / sign up
-  def auth_sign_in_path
-    "/auth/interactive"
-  end
-end