simple_auth 0.1.6 → 0.1.7

data/Rakefile

@@ -1,5 +1,16 @@
 require 'rake'
-require 'spec/rake/spectask'
+
+if ENV["TARGET"] == "rails3"
+  require 'rspec/core/rake_task'
+  Rspec::Core::RakeTask.new(:spec)
+else
+  require 'spec/rake/spectask'
+  desc 'Run the specs'
+  Spec::Rake::SpecTask.new(:spec) do |t|
+    t.spec_opts = ['--colour --format specdoc --loadby mtime --reverse']
+    t.spec_files = FileList['spec/**/*_spec.rb']
+  end
+end
 
 require 'jeweler'
 require File.dirname(__FILE__) + '/lib/simple_auth/version'
@@ -8,11 +19,6 @@ require File.dirname(__FILE__) + '/lib/simple_auth/version'
 desc 'Default: run specs.'
 task :default => :spec
 
-desc 'Run the specs'
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts = ['--colour --format specdoc --loadby mtime --reverse']
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end
 
 JEWEL = Jeweler::Tasks.new do |gem|
   gem.name = "simple_auth"

data/lib/simple_auth/action_controller.rb

@@ -55,7 +55,14 @@ module SimpleAuth
 
             unless logged_in? && authorized?
               flash[:alert] = I18n.translate("simple_auth.sessions.need_to_be_logged")
-              session[:return_to] = request.request_uri if request.get?
+
+              if request.respond_to?(:fullpath)
+                return_to = request.fullpath
+              else
+                return_to = request.request_uri
+              end
+
+              session[:return_to] = return_to if request.get?
               redirect_to path
             end
           end

data/lib/simple_auth/version.rb

@@ -2,7 +2,7 @@ module SimpleAuth
   module Version
     MAJOR = "0"
     MINOR = "1"
-    PATCH = "6"
+    PATCH = "7"
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/simple_auth.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{simple_auth}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nando Vieira"]
-  s.date = %q{2010-04-09}
+  s.date = %q{2010-05-07}
   s.description = %q{When Authlogic & Devise are just too much.
 }
   s.email = %q{fnando.vieira@gmail.com}
@@ -35,6 +35,8 @@ Gem::Specification.new do |s|
      "simple_auth.gemspec",
      "spec/resources/controllers.rb",
      "spec/resources/user.rb",
+     "spec/resources/views/dashboard/index.erb",
+     "spec/resources/views/session/new.erb",
      "spec/schema.rb",
      "spec/simple_auth/action_controller_spec.rb",
      "spec/simple_auth/active_record_spec.rb",

data/spec/resources/controllers.rb

@@ -1,7 +1,11 @@
 # Add routes
-ActionController::Routing::Routes.add_route "/:controller/:action/:id"
-ActionController::Routing::Routes.add_named_route :login, "/login", :controller => "session", :action => "new"
-ActionController::Routing::Routes.add_named_route :dashboard, "/dashboard", :controller => "dashboard", :action => "index"
+if ENV["TARGET"] == "rails3"
+  # Rails.application.routes.add_route "/:controller/:action/:id"
+else
+  ActionController::Routing::Routes.add_route "/:controller/:action/:id"
+  ActionController::Routing::Routes.add_named_route :login, "/login", :controller => "session", :action => "new"
+  ActionController::Routing::Routes.add_named_route :dashboard, "/dashboard", :controller => "dashboard", :action => "index"
+end
 
 class SampleController < ActionController::Base
 end

data/spec/simple_auth/action_controller_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + "/../spec_helper"
 
-describe SimpleAuth::ActionController, :type => :controller do
+describe DashboardController, :type => :controller do
   before do
     @user = User.create(
       :login => "johndoe",
@@ -11,11 +11,11 @@ describe SimpleAuth::ActionController, :type => :controller do
   end
 
   describe "require_logged_user" do
-    controller_name :dashboard
-
     context "unlogged user" do
       before do
-        DashboardController.filter_chain.pop if DashboardController.filter_chain.count > 1
+        if ENV["TARGET"] != "rails3"
+          DashboardController.filter_chain.pop if DashboardController.filter_chain.count > 1
+        end
       end
 
       context "return to" do
@@ -34,8 +34,8 @@ describe SimpleAuth::ActionController, :type => :controller do
         end
 
         it "should redirect when user is not authorized" do
-          controller.should_receive(:logged_in?).and_return(true)
-          controller.should_receive(:authorized?).and_return(false)
+          @controller.should_receive(:logged_in?).and_return(true)
+          @controller.should_receive(:authorized?).and_return(false)
 
           get :index
           response.should redirect_to("/login")
@@ -46,7 +46,12 @@ describe SimpleAuth::ActionController, :type => :controller do
         DashboardController.require_logged_user :to => {:controller => "session", :action => "new"}
 
         get :index
-        response.should redirect_to("/session/new")
+        
+        if ENV["TARGET"] == "rails3"
+          response.should redirect_to("/login")
+        else
+          response.should redirect_to("/session/new")
+        end
       end
 
       it "should be redirected [block]" do
@@ -75,29 +80,38 @@ describe SimpleAuth::ActionController, :type => :controller do
       end
     end
   end
+end
 
+describe SessionController, :type => :controller do
+  before do
+    @user = User.create(
+      :login => "johndoe",
+      :email => "john@doe.com",
+      :password => "test",
+      :password_confirmation => "test"
+    )
+  end
+  
   describe "redirect_logged_users" do
-    controller_name :session
-
     context "unlogged user" do
       before do
         get :new
       end
-
+  
       it "should render page" do
         response.should render_template(:new)
       end
     end
-
+  
     context "logged user" do
       before do
         session[:record_id] = @user.id
         get :new
       end
-
+  
       it "should be redirected" do
         response.should redirect_to("/dashboard")
       end
     end
   end
-end
+end

data/spec/simple_auth/active_record_spec.rb

@@ -9,28 +9,28 @@ describe SimpleAuth::ActiveRecord do
     end
 
     it "should require password" do
-      subject.should have(1).error_on(:password)
+      [subject.errors[:password]].flatten.should have(1).item
     end
 
     it "should require password to be at least 4-chars long" do
       subject.password = "123"
       subject.should_not be_valid
-      subject.should have(1).error_on(:password)
+      [subject.errors[:password]].flatten.should have(1).item
     end
 
     it "should require password confirmation not to be empty" do
       subject.password_confirmation = ""
-      subject.should have(1).error_on(:password_confirmation)
+      [subject.errors[:password_confirmation]].flatten.should have(1).item
     end
 
     it "should require password confirmation not to be nil" do
       subject.password_confirmation = nil
-      subject.should have(1).error_on(:password_confirmation)
+      [subject.errors[:password_confirmation]].flatten.should have(1).item
     end
 
     it "should unset password after saving" do
       subject = User.new(:password => "test", :password_confirmation => "test")
-      subject.save(false)
+      subject.save
       subject.password.should be_nil
       subject.password_confirmation.should be_nil
     end
@@ -47,7 +47,7 @@ describe SimpleAuth::ActiveRecord do
 
     it "should mark password as unchanged after saving" do
       subject = User.new(:password => "test", :password_confirmation => "test")
-      subject.save(false)
+      subject.save
       subject.password_changed?.should be_false
     end
   end
@@ -75,13 +75,13 @@ describe SimpleAuth::ActiveRecord do
     it "should require password confirmation when it has changed" do
       subject.password = "newpass"
       subject.should_not be_valid
-      subject.should have(1).error_on(:password_confirmation)
+      [subject.errors[:password_confirmation]].flatten.should have(1).item
     end
 
     it "should require password when it has changed to blank" do
       subject.password = nil
       subject.should_not be_valid
-      subject.should have(1).error_on(:password)
+      [subject.errors[:password]].flatten.should have(1).item
     end
 
     it "should authenticate using email" do

data/spec/simple_auth/helper_spec.rb

@@ -1,6 +1,17 @@
 require File.dirname(__FILE__) + "/../spec_helper"
 
 describe SimpleAuth::Helper, :type => :helper do
+  if ENV["TARGET"] == "rails3"
+    attr_accessor :helper
+  
+    before do
+      @helper = Object.new
+      @helper.class_eval { attr_accessor :output_buffer }
+      @helper.extend(SimpleAuth::Helper)
+      @helper.extend(ActionView::Helpers::CaptureHelper)
+    end    
+  end
+  
   it "should include module" do
     ApplicationController.included_modules.include?(SimpleAuth::Helper)
   end

data/spec/simple_auth/session_spec.rb

@@ -11,7 +11,7 @@ describe SimpleAuth::Session do
 
     @session = Hash.new
     @controller = SampleController.new
-    @controller.session = @session
+    @controller.stub!(:session).and_return(@session)
 
     SimpleAuth::Config.controller = @controller
     @user_session = SimpleAuth::Session.new(:credential => "johndoe", :password => "test")

data/spec/spec_helper.rb

@@ -22,9 +22,20 @@ require File.dirname(__FILE__) + "/resources/user"
 require File.dirname(__FILE__) + "/resources/controllers"
 
 # Restore default configuration
-Spec::Runner.configure do |config|
-  config.before :each do
-    load File.dirname(__FILE__) + "/../lib/simple_auth/config.rb"
-    SimpleAuth::Config.model = :user
+if ENV["TARGET"] == "rails3"
+  Rspec.configure do |config|
+    config.before :each do
+      load File.dirname(__FILE__) + "/../lib/simple_auth/config.rb"
+      SimpleAuth::Config.model = :user
+    end
+  end
+
+  ActionController::Base.prepend_view_path File.dirname(__FILE__) + "/resources/views"
+else
+  Spec::Runner.configure do |config|
+    config.before :each do
+      load File.dirname(__FILE__) + "/../lib/simple_auth/config.rb"
+      SimpleAuth::Config.model = :user
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Nando Vieira
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-09 00:00:00 -03:00
+date: 2010-05-07 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -47,6 +47,8 @@ files:
 - simple_auth.gemspec
 - spec/resources/controllers.rb
 - spec/resources/user.rb
+- spec/resources/views/dashboard/index.erb
+- spec/resources/views/session/new.erb
 - spec/schema.rb
 - spec/simple_auth/action_controller_spec.rb
 - spec/simple_auth/active_record_spec.rb