rails_warden 0.3.0 → 0.5.0

data/CHANGELOG

@@ -0,0 +1,3 @@
+* 0.3.0
+* [roman] Added `response` and `cookies` methods from Rails to the Strategy 
+environment. 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.5.0

data/lib/rails_warden.rb

@@ -11,13 +11,47 @@ module Warden::Mixins::Common
   # Gets the rails request object by default if it's available
   def request
     return @request if @request
-    if env['action_controller.rescue.request']
+    if defined?(ActionDispatch::Request)
+      @request = ActionDispatch::Request.new(env)
+    elsif env['action_controller.rescue.request']
       @request = env['action_controller.rescue.request']
     else
       Rack::Request.new(env)
     end
   end
 
+  def response
+    return @response if @response
+    if env['action_controller.rescue.response']
+      @response = env['action_controller.rescue.response']
+    else
+      Rack::Response.new(env)
+    end
+  end
+
+  def cookies
+    unless defined?('ActionController::Cookies')
+      puts 'cookies was not defined'
+      return
+    end
+    @cookies ||= begin
+      # Duck typing...
+      controller = Struct.new(:request, :response) do
+        def self.helper_method(*args); end
+      end
+      controller.send(:include, ActionController::Cookies)
+      controller.new(self.request, self.response).send(:cookies)
+    end
+  end
+
+  def logger
+    unless defined?('Rails')
+      puts 'logger not defined'
+      return
+    end
+    Rails.logger
+  end
+
   def raw_session
     request.session
   end
@@ -29,18 +63,21 @@ module Warden::Mixins::Common
 end
 
 Warden::Manager.before_failure do |env, opts|
-  env['warden'].request.params['action'] = RailsWarden.unauthenticated_action || "unauthenticated"
+  action = RailsWarden.unauthenticated_action || "unauthenticated"
+  if Rails.respond_to?(:version) && Rails.version >= "3"
+    env['action_dispatch.request.path_parameters'][:action] = action
+  else
+    env['warden'].request.params['action'] = action
+  end
 end
 
 # Rails needs the action to be passed in with the params
 Warden::Manager.before_failure do |env, opts|
-  if request = env["action_controller.rescue.request"]
-    request.params["action"] = RailsWarden.unauthenticated_action
-  end
+  env['warden'].request.params["action"] = RailsWarden.unauthenticated_action
 end
 
 
-if defined?(Rails)
+if !defined?(Rails::Railtie)
   Rails.configuration.after_initialize do
     class ActionController::Base
       include RailsWarden::Mixins::HelperMethods
@@ -51,6 +88,19 @@ if defined?(Rails)
       include RailsWarden::Mixins::HelperMethods
     end
   end
+else
+  class RailsWarden::Railtie < Rails::Railtie
+    initializer :warden do
+      ActionController::Base.class_eval do
+        include RailsWarden::Mixins::HelperMethods
+        include RailsWarden::Mixins::ControllerOnlyMethods
+      end
+
+      module ApplicationHelper
+        include RailsWarden::Mixins::HelperMethods
+      end
+    end
+  end
 end
 
 class Warden::SessionSerializer

data/rails_warden.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails_warden}
-  s.version = "0.3.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Neighman"]
-  s.date = %q{2010-01-22}
+  s.date = %q{2010-03-08}
   s.description = %q{A gem that provides authenitcation via the Warden framework}
   s.email = %q{has.sox@gmail.com}
   s.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "CHANGELOG",
      "LICENSE",
      "README.textile",
      "Rakefile",
@@ -39,7 +40,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{warden}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A gem that provides authenitcation via the Warden framework}
   s.test_files = [
     "spec/controller_mixin_spec.rb",

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rails_warden
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-22 00:00:00 +11:00
+date: 2010-03-08 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -25,6 +30,7 @@ extra_rdoc_files:
 - TODO
 files: 
 - .gitignore
+- CHANGELOG
 - LICENSE
 - README.textile
 - Rakefile
@@ -53,18 +59,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: warden
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A gem that provides authenitcation via the Warden framework