simple_auth 0.1.8 → 1.0.1

data/simple_auth.gemspec

@@ -5,71 +5,85 @@
 
 Gem::Specification.new do |s|
   s.name = %q{simple_auth}
-  s.version = "0.1.8"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nando Vieira"]
-  s.date = %q{2010-05-09}
-  s.description = %q{When Authlogic & Devise are just too much.
-}
+  s.date = %q{2010-10-12}
+  s.description = %q{When Authlogic & Devise are just too much.}
   s.email = %q{fnando.vieira@gmail.com}
   s.extra_rdoc_files = [
     "README.markdown"
   ]
   s.files = [
-    "README.markdown",
+    ".gitignore",
+     ".rspec",
+     "Gemfile",
+     "Gemfile.lock",
+     "README.markdown",
      "Rakefile",
      "config/locales/en.yml",
      "config/locales/pt.yml",
-     "generators/simple_auth/USAGE",
-     "generators/simple_auth/simple_auth_generator.rb",
-     "generators/simple_auth/templates/simple_auth.rb",
-     "init.rb",
      "lib/simple_auth.rb",
      "lib/simple_auth/action_controller.rb",
      "lib/simple_auth/active_record.rb",
      "lib/simple_auth/config.rb",
+     "lib/simple_auth/generator.rb",
      "lib/simple_auth/helper.rb",
+     "lib/simple_auth/railtie.rb",
      "lib/simple_auth/session.rb",
      "lib/simple_auth/version.rb",
      "simple_auth.gemspec",
-     "spec/resources/controllers.rb",
-     "spec/resources/user.rb",
-     "spec/resources/views/dashboard/index.erb",
-     "spec/resources/views/session/new.erb",
+     "spec/controllers/redirect_logged_user_spec.rb",
+     "spec/controllers/require_logged_user_spec.rb",
      "spec/schema.rb",
-     "spec/simple_auth/action_controller_spec.rb",
      "spec/simple_auth/active_record_spec.rb",
      "spec/simple_auth/config_spec.rb",
      "spec/simple_auth/helper_spec.rb",
      "spec/simple_auth/session_spec.rb",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "spec/support/app/controllers/application_controller.rb",
+     "spec/support/app/models/account.rb",
+     "spec/support/app/models/user.rb",
+     "spec/support/app/views/dashboard/index.erb",
+     "spec/support/app/views/session/new.erb",
+     "spec/support/config/boot.rb",
+     "spec/support/config/database.yml",
+     "spec/support/config/routes.rb",
+     "templates/initializer.rb"
   ]
   s.homepage = %q{http://github.com/fnando/simple_auth}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A simple authentication system for Rails apps}
   s.test_files = [
-    "spec/resources/controllers.rb",
-     "spec/resources/user.rb",
+    "spec/controllers/redirect_logged_user_spec.rb",
+     "spec/controllers/require_logged_user_spec.rb",
      "spec/schema.rb",
-     "spec/simple_auth/action_controller_spec.rb",
      "spec/simple_auth/active_record_spec.rb",
      "spec/simple_auth/config_spec.rb",
      "spec/simple_auth/helper_spec.rb",
      "spec/simple_auth/session_spec.rb",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "spec/support/app/controllers/application_controller.rb",
+     "spec/support/app/models/account.rb",
+     "spec/support/app/models/user.rb",
+     "spec/support/config/boot.rb",
+     "spec/support/config/routes.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
     else
+      s.add_dependency(%q<rails>, [">= 3.0.0"])
     end
   else
+    s.add_dependency(%q<rails>, [">= 3.0.0"])
   end
 end
 

data/spec/controllers/redirect_logged_user_spec.rb

@@ -0,0 +1,87 @@
+require "spec_helper"
+
+describe ApplicationController do
+  let(:user) {
+    User.create(
+      :login => "johndoe",
+      :email => "john@doe.com",
+      :password => "test",
+      :password_confirmation => "test"
+    )
+  }
+
+  context "redirecting logged users" do
+    context "using hash" do
+      controller do
+        redirect_logged_user :to => { :controller => "dashboard" }
+
+        def index
+          render :text => "Rendered"
+        end
+      end
+
+      it "should redirect logged users" do
+        session[:record_id] = user.id
+        get :index
+
+        response.code.should match(/302/)
+        response.should redirect_to("/dashboard")
+      end
+    end
+
+    context "using block" do
+      controller do
+        redirect_logged_user :to => proc { dashboard_path }
+
+        def index
+          render :text => "Rendered"
+        end
+      end
+
+      it "should redirect logged users" do
+        session[:record_id] = user.id
+        get :index
+
+        response.code.should match(/302/)
+        response.should redirect_to("/dashboard")
+      end
+    end
+
+    context "using configuration" do
+      controller do
+        redirect_logged_user
+
+        def index
+          render :text => "Rendered"
+        end
+      end
+
+      it "should redirect logged users" do
+        SimpleAuth::Config.logged_url = proc { dashboard_path }
+        session[:record_id] = user.id
+        get :index
+
+        response.code.should match(/302/)
+        response.should redirect_to("/dashboard")
+      end
+    end
+
+    context "when unlogged" do
+      controller do
+        redirect_logged_user :to => { :controller => "dashboard" }
+
+        def index
+          render :text => "Rendered"
+        end
+      end
+
+      it "should render page" do
+        session[:record_id] = nil
+        get :index
+
+        response.code.should match(/200/)
+        response.body.should == "Rendered"
+      end
+    end
+  end
+end

data/spec/controllers/require_logged_user_spec.rb

@@ -0,0 +1,105 @@
+require "spec_helper"
+
+describe ApplicationController do
+  let(:user) {
+    User.create(
+      :login => "johndoe",
+      :email => "john@doe.com",
+      :password => "test",
+      :password_confirmation => "test"
+    )
+  }
+
+  context "redirecting to requested page" do
+    controller do
+      require_logged_user :to => "/login"
+
+      def index
+        render :text => "Rendered"
+      end
+    end
+
+    it "should set return to" do
+      get :index
+      session[:return_to].should == "/stub_resources"
+    end
+
+    it "should set warning message" do
+      get :index
+      flash[:alert].should == "You need to be logged"
+    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)
+
+      get :index
+      response.should redirect_to("/login")
+    end
+
+    context "using hash" do
+      controller do
+        require_logged_user :to => {:controller => "session", :action => "new"}
+
+        def index
+          render :text => "Rendered"
+        end
+      end
+
+      it "should be redirected" do
+        get :index
+        response.should redirect_to("/login")
+      end
+    end
+
+    context "using block" do
+      controller do
+        require_logged_user :to => proc { login_path }
+
+        def index
+          render :text => "Rendered"
+        end
+      end
+
+      it "should be redirected" do
+        get :index
+        response.should redirect_to("/login")
+      end
+    end
+
+    context "using configuration" do
+      controller do
+        require_logged_user
+
+        def index
+          render :text => "Rendered"
+        end
+      end
+
+      it "should be redirected" do
+        SimpleAuth::Config.login_url = "/login"
+        get :index
+        response.should redirect_to("/login")
+      end
+    end
+  end
+
+  context "when logged" do
+    controller do
+      require_logged_user
+
+      def index
+        render :text => "Rendered"
+      end
+    end
+
+    before do
+      session[:record_id] = user.id
+      get :index
+    end
+
+    it "should render page" do
+      response.body.should == "Rendered"
+    end
+  end
+end

data/spec/schema.rb

@@ -2,4 +2,8 @@ ActiveRecord::Schema.define(:version => 0) do
   create_table :users do |t|
     t.string :email, :login, :password_hash, :password_salt, :username
   end
+
+  create_table :accounts do |t|
+    t.string :email, :login, :password_hash, :password_salt, :username
+  end
 end

data/spec/simple_auth/active_record_spec.rb

@@ -1,31 +1,49 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require "spec_helper"
 
 describe SimpleAuth::ActiveRecord do
-  context "new record" do
-    subject { User.new }
+  subject { User.new }
+
+  context "configuration" do
+    it "should set credentials" do
+      User.authentication do |config|
+        config.credentials = ["uid"]
+      end
+
+      SimpleAuth::Config.credentials.should == ["uid"]
+    end
 
+    it "should automatically set model" do
+      User.authentication do |config|
+        config.model = nil
+      end
+
+      SimpleAuth::Config.model.should == :user
+    end
+  end
+
+  context "new record" do
     before do
       subject.should_not be_valid
     end
 
     it "should require password" do
-      [subject.errors[:password]].flatten.should have(1).item
+      subject.errors[:password].should_not be_empty
     end
 
     it "should require password to be at least 4-chars long" do
       subject.password = "123"
       subject.should_not be_valid
-      [subject.errors[:password]].flatten.should have(1).item
+      subject.errors[:password].should_not be_empty
     end
 
     it "should require password confirmation not to be empty" do
       subject.password_confirmation = ""
-      [subject.errors[:password_confirmation]].flatten.should have(1).item
+      subject.errors[:password_confirmation].should_not be_empty
     end
 
     it "should require password confirmation not to be nil" do
       subject.password_confirmation = nil
-      [subject.errors[:password_confirmation]].flatten.should have(1).item
+      subject.errors[:password_confirmation].should_not be_empty
     end
 
     it "should unset password after saving" do
@@ -53,20 +71,19 @@ describe SimpleAuth::ActiveRecord do
   end
 
   context "existing record" do
-    subject {
-      User.new(
+    before do
+      User.delete_all
+      User.create(
         :email => "john@doe.com",
         :login => "johndoe",
         :password => "test",
         :password_confirmation => "test",
         :username => "john"
       )
-    }
-
-    before do
-      subject.save!
     end
 
+    subject { User.first }
+
     it "should not require password when it hasn't changed" do
       subject.login = "john"
       subject.should be_valid
@@ -75,13 +92,13 @@ describe SimpleAuth::ActiveRecord do
     it "should require password confirmation when it has changed" do
       subject.password = "newpass"
       subject.should_not be_valid
-      [subject.errors[:password_confirmation]].flatten.should have(1).item
+      subject.errors[:password_confirmation].should_not be_empty
     end
 
     it "should require password when it has changed to blank" do
       subject.password = nil
       subject.should_not be_valid
-      [subject.errors[:password]].flatten.should have(1).item
+      subject.errors[:password].should_not be_empty
     end
 
     it "should authenticate using email" do

data/spec/simple_auth/config_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require "spec_helper"
 
 describe SimpleAuth::Config do
   it "should yield SimpleAuth::Config class" do
@@ -7,6 +7,12 @@ describe SimpleAuth::Config do
     end
   end
 
+  context "injecting behavior" do
+    it "should not respond to helper methods" do
+      Account.should_not respond_to(:authenticate)
+    end
+  end
+
   it "should use [:email, :login] as credential attributes" do
     SimpleAuth::Config.credentials.should == [:email, :login]
   end

data/spec/simple_auth/helper_spec.rb

@@ -1,28 +1,24 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require "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    
+describe SimpleAuth::Helper do
+  before do
+    @helper = Object.new
+    @helper.class_eval { attr_accessor :output_buffer }
+    @helper.extend(SimpleAuth::Helper)
+    @helper.extend(ActionView::Helpers::CaptureHelper)
   end
-  
+
   it "should include module" do
     ApplicationController.included_modules.include?(SimpleAuth::Helper)
   end
 
   it "should render block when user is logged" do
-    helper.should_receive(:logged_in?).and_return(true)
-    helper.when_logged { "logged" }.should == "logged"
+    @helper.should_receive(:logged_in?).and_return(true)
+    @helper.when_logged { "logged" }.should == "logged"
   end
 
   it "should not render block when user is unlogged" do
-    helper.should_receive(:logged_in?).and_return(false)
-    helper.when_logged { "logged" }.should be_nil
+    @helper.should_receive(:logged_in?).and_return(false)
+    @helper.when_logged { "logged" }.should be_nil
   end
 end

data/spec/simple_auth/session_spec.rb

@@ -1,7 +1,9 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require "spec_helper"
 
 describe SimpleAuth::Session do
   before do
+    User.delete_all
+
     @user = User.create!(
       :login => "johndoe",
       :email => "john@doe.com",
@@ -10,14 +12,14 @@ describe SimpleAuth::Session do
     )
 
     @session = Hash.new
-    @controller = SampleController.new
+    @controller = ActionController::Base.new
     @controller.stub!(:session).and_return(@session)
 
     SimpleAuth::Config.controller = @controller
     @user_session = SimpleAuth::Session.new(:credential => "johndoe", :password => "test")
   end
 
-  context "valid credentials" do
+  context "with valid credentials" do
     before do
       @user_session.save!
     end
@@ -68,7 +70,7 @@ describe SimpleAuth::Session do
     end
   end
 
-  context "invalid credentials" do
+  context "with invalid credentials" do
     before do
       @user_session.credential = "invalid"
       @user_session.save
@@ -130,15 +132,15 @@ describe SimpleAuth::Session do
     end
 
     it "should raise error with save!" do
-      doing { @user_session.save! }.should raise_error(SimpleAuth::NotAuthorized)
+      expect { @user_session.save! }.to raise_error(SimpleAuth::NotAuthorized)
     end
 
     it "should raise error with create!" do
-      doing { SimpleAuth::Session.create!({}) }.should raise_error(SimpleAuth::NotAuthorized)
+      expect { SimpleAuth::Session.create!({}) }.to raise_error(SimpleAuth::NotAuthorized)
     end
   end
 
-  context "destroying valid session" do
+  context "when destroying session" do
     before do
       @user_session.save!
       @user_session.destroy

data/spec/spec_helper.rb

@@ -1,41 +1,16 @@
-# Load application RSpec helper
-begin
-  require File.dirname(__FILE__) + "/../../../../spec/spec_helper"
-rescue LoadError
-  puts "Your application hasn't been bootstraped with RSpec.\nI'll do it on my own!\n\n"
-  system "cd '#{File.dirname(__FILE__) + "/../../../../"}' && script/generate rspec"
-  puts "\n\nRun `rake spec` again."
-  exit
-end
-
-# Establish connection with in memory SQLite 3 database
-ActiveRecord::Base.establish_connection :adapter => "sqlite3", :database => ":memory:"
+ENV["RAILS_ENV"] = "test"
+require "rails"
+require "simple_auth"
+require File.dirname(__FILE__) + "/support/config/boot"
+require "rspec/rails"
 
 # Load database schema
 load File.dirname(__FILE__) + "/schema.rb"
 
-# Create an alias for lambda
-alias :doing :lambda
-
-# Load resources
-require File.dirname(__FILE__) + "/resources/user"
-require File.dirname(__FILE__) + "/resources/controllers"
-
 # Restore default configuration
-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
+RSpec.configure do |config|
+  config.before :each do
+    load File.dirname(__FILE__) + "/../lib/simple_auth/config.rb"
+    SimpleAuth::Config.model = :user
   end
 end

data/spec/support/app/controllers/application_controller.rb

@@ -0,0 +1,2 @@
+class ApplicationController < ActionController::Base
+end

data/spec/support/app/models/account.rb

@@ -0,0 +1,2 @@
+class Account < ActiveRecord::Base
+end

data/spec/{resources → support/app/models}/user.rb

@@ -1,3 +1,3 @@
 class User < ActiveRecord::Base
-  has_authentication
+  authentication
 end

data/spec/support/config/boot.rb

@@ -0,0 +1,14 @@
+ENV["BUNDLE_GEMFILE"] = File.dirname(__FILE__) + "/../../../../Gemfile"
+require "bundler"
+Bundler.setup
+require "rails/all"
+Bundler.require(:default)
+
+module SimpleAuth
+  class Application < Rails::Application
+    config.root = File.dirname(__FILE__) + "/.."
+    config.active_support.deprecation = :log
+  end
+end
+
+SimpleAuth::Application.initialize!

data/spec/support/config/database.yml

@@ -0,0 +1,3 @@
+test:
+  adapter: sqlite3
+  database: ":memory:"

data/spec/support/config/routes.rb

@@ -0,0 +1,4 @@
+SimpleAuth::Application.routes.draw do
+  get "dashboard",  :to => "dashboard#index"
+  get "login",      :to => "session#new"
+end

data/{generators/simple_auth/templates/simple_auth.rb → templates/initializer.rb}

@@ -11,9 +11,10 @@ SimpleAuth.setup do |config|
   # Set which attributes will be used for authentication.
   config.credentials = [:email, :login]
 
-  # Set the User model that should be used
-  config.model = :user
+  # Set the login url.
+  config.login_url = proc { login_path }
 
-  # Set the login url
-  config.redirect_to = proc { login_path }
+  # Logged users will be redirect to this url
+  # when +redirect_logged_user+ helper is used.
+  config.logged_url = proc { root_path }
 end