simple_auth 1.0.1 → 1.0.2

data/Gemfile

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem "rspec-rails", "2.0.0.rc"
+gem "rspec-rails", "2.0.0"
 gem "rails", "3.0.0"
 gem "sqlite3-ruby", :require => "sqlite3"
 

data/Gemfile.lock

@@ -65,18 +65,18 @@ GEM
       rake (>= 0.8.4)
       thor (~> 0.14.0)
     rake (0.8.7)
-    rspec (2.0.0.rc)
-      rspec-core (= 2.0.0.rc)
-      rspec-expectations (= 2.0.0.rc)
-      rspec-mocks (= 2.0.0.rc)
-    rspec-core (2.0.0.rc)
-    rspec-expectations (2.0.0.rc)
+    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.rc)
-      rspec-core (= 2.0.0.rc)
-      rspec-expectations (= 2.0.0.rc)
-    rspec-rails (2.0.0.rc)
-      rspec (= 2.0.0.rc)
+    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)
@@ -103,7 +103,7 @@ PLATFORMS
 
 DEPENDENCIES
   rails (= 3.0.0)
-  rspec-rails (= 2.0.0.rc)
+  rspec-rails (= 2.0.0)
   ruby-debug
   ruby-debug19
   sqlite3-ruby

data/README.markdown

@@ -57,7 +57,7 @@ After you set up the model, you can go to the controller.
 	    @user_session = SimpleAuth::Session.new(params[:session])
 
 	    if @user_session.save
-	      redirect_to dashboard_path
+	      redirect_to return_to(dashboard_path)
 	    else
 	      flash[:alert] = "Invalid username or password"
 	      render :new
@@ -70,6 +70,8 @@ After you set up the model, you can go to the controller.
 	  end
 	end
 
+The `return_to` helper will give you the requested url (before the user logged in) or the default url.
+
 You can restrict access by using 2 macros:
 
 	class SignupController < ApplicationController
@@ -112,6 +114,8 @@ There are some helpers:
 	current_user			# controller & views
 	current_session         # controller & views
 	when_logged(&block)		# views
+	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>.
 

data/lib/simple_auth/action_controller.rb

@@ -9,6 +9,12 @@ module SimpleAuth
 
     module InstanceMethods
       private
+      def return_to(url = nil, &block)
+        url = session.fetch("return_to", url)
+        url = instance_eval(&block) if block_given?
+        url
+      end
+
       def current_session
         @current_session ||= SimpleAuth::Session.find
       end

data/lib/simple_auth/active_record.rb

@@ -74,12 +74,12 @@ module SimpleAuth
     end
 
     module ClassMethods
-      # Receive a credential and a password and try to authenticate the specified user.
-      # If the credential is valid, then an user is returned; otherwise nil is returned.
+      # Find user by its credential.
       #
-      #   User.authenticate "johndoe", "test"
-      #   User.authenticate "john@doe.com", "test"
-      def authenticate(credential, password)
+      #   User.find_by_credential "john@doe.com" # using e-mail
+      #   User.find_by_credential "john" # using username
+      #
+      def find_by_credential(credential)
         # Build a hash that will be passed to the finder
         options = {:conditions => [[], {}]}
 
@@ -94,7 +94,28 @@ module SimpleAuth
         options[:conditions][0] = options[:conditions][0].join(" OR ")
 
         # Find the record using the conditions we built
-        record = SimpleAuth::Config.model_class.first(options)
+        SimpleAuth::Config.model_class.first(options)
+      end
+
+      # Find user by its credential. If no user is found, raise
+      # ActiveRecord::RecordNotFound exception.
+      #
+      #   User.find_by_credential! "john@doe.com"
+      #
+      def find_by_credential!(credential)
+        record = find_by_credential(credential)
+        raise ::ActiveRecord::RecordNotFound, "couldn't find #{SimpleAuth::Config.model} using #{credential.inspect} as credential" unless record
+        record
+      end
+
+      # Receive a credential and a password and try to authenticate the specified user.
+      # If the credential is valid, then an user is returned; otherwise nil is returned.
+      #
+      #   User.authenticate "johndoe", "test"
+      #   User.authenticate "john@doe.com", "test"
+      #
+      def authenticate(credential, password)
+        record = find_by_credential(credential)
 
         # If no record has been found
         return nil unless record

data/lib/simple_auth/railtie.rb

@@ -4,20 +4,18 @@ module SimpleAuth
       require "simple_auth/generator"
     end
 
-    config.after_initialize do
-      ActiveSupport.on_load(:action_controller) do
+    initializer "simple_auth.initialize" do |app|
+      ::ActionController::Base.instance_eval do
         include SimpleAuth::ActionController
         helper SimpleAuth::Helper
         prepend_before_filter :activate_simple_auth
         helper_method :current_user, :current_session, :logged_in?
       end
 
-      ActiveSupport.on_load(:active_record) do
+      ::ActiveRecord::Base.instance_eval do
         include SimpleAuth::ActiveRecord
       end
-    end
 
-    initializer "simple_auth.initialize" do |app|
       ::I18n.load_path += Dir[File.dirname(__FILE__) + "/../../config/locales/*.yml"]
     end
   end

data/lib/simple_auth/version.rb

@@ -2,7 +2,7 @@ module SimpleAuth
   module Version
     MAJOR = "1"
     MINOR = "0"
-    PATCH = "1"
+    PATCH = "2"
     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 = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nando Vieira"]
-  s.date = %q{2010-10-12}
+  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 = [

data/spec/controllers/require_logged_user_spec.rb

@@ -19,9 +19,18 @@ describe ApplicationController do
       end
     end
 
+    it "should return the request url" do
+      get :index, :some => "param"
+      controller.send(:return_to, "/dashboard").should == "/stub_resources?some=param"
+    end
+
+    it "should return the default url" do
+      controller.send(:return_to, "/dashboard").should == "/dashboard"
+    end
+
     it "should set return to" do
-      get :index
-      session[:return_to].should == "/stub_resources"
+      get :index, :some => "param"
+      session[:return_to].should == "/stub_resources?some=param"
     end
 
     it "should set warning message" do

data/spec/simple_auth/active_record_spec.rb

@@ -121,5 +121,20 @@ describe SimpleAuth::ActiveRecord do
     it "should not authenticate using wrong password" do
       User.authenticate("johndoe", "invalid").should be_nil
     end
+
+    it "should return nil when no user has been found" do
+      User.find_by_credential("invalid").should be_nil
+    end
+
+    it "should raise error when no user has been found" do
+      expect {
+        User.find_by_credential!("invalid")
+      }.to raise_error(ActiveRecord::RecordNotFound)
+    end
+
+    it "should return user" do
+      User.find_by_credential(subject.email).should == subject
+      User.find_by_credential!(subject.email).should == subject
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Nando Vieira
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 -03:00
+date: 2010-10-14 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency