simple_auth 1.0.2 → 1.1.0

data/Gemfile

@@ -1,13 +1,2 @@
 source :rubygems
-
-gem "rspec-rails", "2.0.0"
-gem "rails", "3.0.0"
-gem "sqlite3-ruby", :require => "sqlite3"
-
-platforms :mri_18 do
-  gem "ruby-debug"
-end
-
-platforms :mri_19 do
-  gem "ruby-debug19", :require => "ruby-debug"
-end
+gemspec

data/Gemfile.lock

@@ -1,87 +1,88 @@
+PATH
+  remote: .
+  specs:
+    simple_auth (1.1.0)
+      rails (~> 3.0.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.0)
-      actionpack (= 3.0.0)
-      mail (~> 2.2.5)
-    actionpack (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
+    actionmailer (3.0.3)
+      actionpack (= 3.0.3)
+      mail (~> 2.2.9)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
+      i18n (~> 0.4)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      arel (~> 1.0.0)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-    activesupport (3.0.0)
+    activeresource (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+    activesupport (3.0.3)
     archive-tar-minitar (0.5.2)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
+    arel (2.0.8)
     builder (2.1.2)
-    columnize (0.3.1)
+    columnize (0.3.2)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    i18n (0.4.1)
-    linecache (0.43)
+    i18n (0.5.0)
     linecache19 (0.5.11)
       ruby_core_source (>= 0.1.4)
-    mail (2.2.5)
+    mail (2.2.15)
       activesupport (>= 2.3.6)
-      mime-types
-      treetop (>= 1.4.5)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     mime-types (1.16)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
-    rack-test (0.5.4)
+    rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.0)
-      actionmailer (= 3.0.0)
-      actionpack (= 3.0.0)
-      activerecord (= 3.0.0)
-      activeresource (= 3.0.0)
-      activesupport (= 3.0.0)
-      bundler (~> 1.0.0)
-      railties (= 3.0.0)
-    railties (3.0.0)
-      actionpack (= 3.0.0)
-      activesupport (= 3.0.0)
-      rake (>= 0.8.4)
-      thor (~> 0.14.0)
+    rails (3.0.3)
+      actionmailer (= 3.0.3)
+      actionpack (= 3.0.3)
+      activerecord (= 3.0.3)
+      activeresource (= 3.0.3)
+      activesupport (= 3.0.3)
+      bundler (~> 1.0)
+      railties (= 3.0.3)
+    railties (3.0.3)
+      actionpack (= 3.0.3)
+      activesupport (= 3.0.3)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
     rake (0.8.7)
-    rspec (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
-      rspec-mocks (= 2.0.0)
-    rspec-core (2.0.0)
-    rspec-expectations (2.0.0)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
-    rspec-rails (2.0.0)
-      rspec (= 2.0.0)
-    ruby-debug (0.10.3)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.3.0)
-    ruby-debug-base (0.10.3)
-      linecache (>= 0.3)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+    rspec-rails (2.5.0)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.5.0)
     ruby-debug-base19 (0.11.24)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
@@ -92,18 +93,19 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.4)
       archive-tar-minitar (>= 0.5.2)
-    sqlite3-ruby (1.3.1)
-    thor (0.14.0)
-    treetop (1.4.8)
+    sqlite3 (1.3.3)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    thor (0.14.6)
+    treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
+    tzinfo (0.3.24)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  rails (= 3.0.0)
-  rspec-rails (= 2.0.0)
-  ruby-debug
+  rspec-rails (~> 2.5.0)
   ruby-debug19
+  simple_auth!
   sqlite3-ruby

data/README.markdown

@@ -46,6 +46,23 @@ In your model, use the `authentication` macro.
 
 This will add some callbacks and password validations. It will also inject helper methods like `Model.authenticate`.
 
+Session is valid only when both `Model#authorized?` and `Controller#authorized?` methods return `true`, which is the default behavior. You can override these methods with your own rules:
+
+	class User < ActiveRecord::Base
+	  authentication
+
+	  def authorized?
+	    deleted_at.nil?
+	  end
+	end
+
+	class Admin::DashboardController < ApplicationController
+	  private
+	  def authorized?
+	    current_user.admin?
+	  end
+	end
+
 After you set up the model, you can go to the controller.
 
 	class SessionsController < ApplicationController
@@ -117,12 +134,22 @@ There are some helpers:
 	find_by_credential      # model
 	find_by_credential!     # model
 
-If you're having problems to use any helper, include the module <tt>SimpleAuth::Helper</tt> on your <tt>ApplicationHelper</tt>.
+If you're having problems to use any helper, include the module `SimpleAuth::Helper` on your `ApplicationHelper`.
 
 	module ApplicationHelper
 	  include SimpleAuth::Helper
 	end
 
+### Translations
+
+These are the translations you'll need:
+
+	en:
+	  simple_auth:
+	    sessions:
+	      need_to_be_logged: "You need to be logged"
+	      invalid_credentials: "Invalid username or password"
+
 Troubleshooting
 ---------------
 

data/Rakefile

@@ -1,27 +1,5 @@
-require "rspec/core/rake_task"
-require File.dirname(__FILE__) + "/lib/simple_auth/version"
+require "bundler"
+Bundler::GemHelper.install_tasks
 
+require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new
-
-desc "Default: run specs."
-task :default => :spec
-
-begin
-  require "jeweler"
-
-  JEWEL = Jeweler::Tasks.new do |gem|
-    gem.name = "simple_auth"
-    gem.version = SimpleAuth::Version::STRING
-    gem.summary = "A simple authentication system for Rails apps"
-    gem.description = "When Authlogic & Devise are just too much."
-    gem.authors = ["Nando Vieira"]
-    gem.email = "fnando.vieira@gmail.com"
-    gem.homepage = "http://github.com/fnando/simple_auth"
-    gem.has_rdoc = true
-    gem.add_dependency "rails", ">= 3.0.0"
-  end
-
-  Jeweler::GemcutterTasks.new
-rescue LoadError => e
-  puts "You don't Jeweler installed, so you won't be able to build gems."
-end

data/lib/simple_auth/action_controller.rb

@@ -58,9 +58,7 @@ module SimpleAuth
       def require_logged_user(options = {})
         before_filter options.except(:to) do |controller|
           controller.instance_eval do
-            unless logged_in? && authorized?
-              flash[:alert] = I18n.translate("simple_auth.sessions.need_to_be_logged")
-
+            unless current_session && current_session.valid? && authorized?
               if request.respond_to?(:fullpath)
                 return_to = request.fullpath
               else
@@ -68,7 +66,7 @@ module SimpleAuth
               end
 
               session[:return_to] = return_to if request.get?
-              redirect_to simple_auth_url_for(:login_url, controller, options[:to])
+              redirect_to simple_auth_url_for(:login_url, controller, options[:to]), :alert => t("simple_auth.sessions.need_to_be_logged")
             end
           end
         end

data/lib/simple_auth/active_record.rb

@@ -53,6 +53,10 @@ module SimpleAuth
         @password_changed == true
       end
 
+      def authorized?
+        true
+      end
+
       private
       def encrypt_password
         self.password_salt = SimpleAuth::Config.salt.call(self)

data/lib/simple_auth/session.rb

@@ -37,6 +37,7 @@ module SimpleAuth
 
     def self.find
       session = new
+      return unless session.controller && session.controller.session[:record_id]
       session.record = session.model.find_by_id(session.controller.session[:record_id])
 
       if session.record
@@ -47,13 +48,13 @@ module SimpleAuth
     end
 
     def self.create(options = {})
-      returning new(options) do |session|
+      new(options).tap do |session|
         session.save
       end
     end
 
     def self.create!(options = {})
-      returning new(options) do |session|
+      new(options).tap do |session|
         session.save!
       end
     end
@@ -93,7 +94,7 @@ module SimpleAuth
     end
 
     def valid?
-      if record
+      if record && record.authorized?
         true
       else
         errors.add_to_base I18n.translate("simple_auth.sessions.invalid_credentials")

data/lib/simple_auth/version.rb

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

data/{config/locales/pt.yml → locales/pt-BR.yml}

@@ -1,11 +1,5 @@
-pt: &pt
+pt-BR:
   simple_auth:
     sessions:
       need_to_be_logged: "Você precisa estar logado"
       invalid_credentials: "Usuário ou senha inválidos"
-
-pt-BR:
-  <<: *pt
-
-pt-PT:
-  <<: *pt

data/simple_auth.gemspec

@@ -1,89 +1,24 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "simple_auth/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{simple_auth}
-  s.version = "1.0.2"
+  s.name        = "simple_auth"
+  s.version     = SimpleAuth::Version::STRING
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Nando Vieira"]
+  s.email       = ["fnando.vieira@gmail.com"]
+  s.homepage    = "http://rubygems.org/gems/simple_auth"
+  s.summary     = "A simple authentication system for Rails apps"
+  s.description = s.summary
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Nando Vieira"]
-  s.date = %q{2010-10-14}
-  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 = [
-    ".gitignore",
-     ".rspec",
-     "Gemfile",
-     "Gemfile.lock",
-     "README.markdown",
-     "Rakefile",
-     "config/locales/en.yml",
-     "config/locales/pt.yml",
-     "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/controllers/redirect_logged_user_spec.rb",
-     "spec/controllers/require_logged_user_spec.rb",
-     "spec/schema.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/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.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A simple authentication system for Rails apps}
-  s.test_files = [
-    "spec/controllers/redirect_logged_user_spec.rb",
-     "spec/controllers/require_logged_user_spec.rb",
-     "spec/schema.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/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::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
+  s.add_dependency "rails", "~> 3.0.0"
+  s.add_development_dependency "sqlite3-ruby"
+  s.add_development_dependency "rspec-rails", "~> 2.5.0"
+  s.add_development_dependency "ruby-debug19"
 end
-

data/spec/controllers/require_logged_user_spec.rb

@@ -38,14 +38,21 @@ describe ApplicationController do
       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)
+    it "should redirect when user is not authorized on controller level" do
+      session[:record_id] = user.id
       @controller.should_receive(:authorized?).and_return(false)
 
       get :index
       response.should redirect_to("/login")
     end
 
+    it "should redirect when session is not valid" do
+      session[:record_id] = "invalid"
+
+      get :index
+      response.should redirect_to("/login")
+    end
+
     context "using hash" do
       controller do
         require_logged_user :to => {:controller => "session", :action => "new"}

data/spec/simple_auth/session_spec.rb

@@ -13,12 +13,20 @@ describe SimpleAuth::Session do
 
     @session = Hash.new
     @controller = ActionController::Base.new
-    @controller.stub!(:session).and_return(@session)
+    @controller.stub :session => @session
 
     SimpleAuth::Config.controller = @controller
     @user_session = SimpleAuth::Session.new(:credential => "johndoe", :password => "test")
   end
 
+  it "should not raise when trying to find a session without activating controller" do
+    SimpleAuth::Config.controller = nil
+
+    expect {
+      SimpleAuth::Session.find.should be_nil
+    }.to_not raise_error
+  end
+
   context "with valid credentials" do
     before do
       @user_session.save!
@@ -34,14 +42,20 @@ describe SimpleAuth::Session do
       @user_session.should_not be_new_record
     end
 
-    it "should find record" do
-      @user_session.record.should == @user
+    it "should be invalid when record is not authorized" do
+      @user_session.record.stub :authorized? => false
+      @user_session.should_not be_valid
     end
 
-    it "should be a valid session" do
+    it "should be valid when record is authorized" do
+      @user_session.record.stub :authorized? => true
       @user_session.should be_valid
     end
 
+    it "should find record" do
+      @user_session.record.should == @user
+    end
+
     it "should set record_id on session" do
       @session[:record_id].should == @user.id
     end

data/spec/spec_helper.rb

@@ -7,6 +7,8 @@ require "rspec/rails"
 # Load database schema
 load File.dirname(__FILE__) + "/schema.rb"
 
+I18n.load_path += Dir[File.dirname(__FILE__) + "/../locales/*.yml"]
+
 # Restore default configuration
 RSpec.configure do |config|
   config.before :each do

data/spec/support/config/boot.rb

@@ -1,4 +1,4 @@
-ENV["BUNDLE_GEMFILE"] = File.dirname(__FILE__) + "/../../../../Gemfile"
+ENV["BUNDLE_GEMFILE"] = File.dirname(__FILE__) + "/../../../Gemfile"
 require "bundler"
 Bundler.setup
 require "rails/all"

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: simple_auth
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
+  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors: 
 - Nando Vieira
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 -03:00
+date: 2011-02-08 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,23 +19,53 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id001
-description: When Authlogic & Devise are just too much.
-email: fnando.vieira@gmail.com
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.5.0
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug19
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id004
+description: A simple authentication system for Rails apps
+email: 
+- fnando.vieira@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.markdown
+extra_rdoc_files: []
+
 files: 
 - .gitignore
 - .rspec
@@ -47,8 +73,6 @@ files:
 - Gemfile.lock
 - README.markdown
 - Rakefile
-- config/locales/en.yml
-- config/locales/pt.yml
 - lib/simple_auth.rb
 - lib/simple_auth/action_controller.rb
 - lib/simple_auth/active_record.rb
@@ -58,6 +82,8 @@ files:
 - lib/simple_auth/railtie.rb
 - lib/simple_auth/session.rb
 - lib/simple_auth/version.rb
+- locales/en.yml
+- locales/pt-BR.yml
 - simple_auth.gemspec
 - spec/controllers/redirect_logged_user_spec.rb
 - spec/controllers/require_logged_user_spec.rb
@@ -77,12 +103,12 @@ files:
 - spec/support/config/routes.rb
 - templates/initializer.rb
 has_rdoc: true
-homepage: http://github.com/fnando/simple_auth
+homepage: http://rubygems.org/gems/simple_auth
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -90,21 +116,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: A simple authentication system for Rails apps
@@ -120,5 +142,8 @@ test_files:
 - 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