simple_auth 1.5.0 → 2.0.0

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

@@ -0,0 +1,3 @@
+class Customer < ActiveRecord::Base
+  authentication
+end

data/templates/initializer.rb

@@ -1,13 +1,5 @@
 # Use this file to setup SimpleAuth.
 SimpleAuth.setup do |config|
-  # Generate the password hash. The specified block should expected
-  # the plain password and the password hash as block parameters.
-  # config.crypter = proc {|password, salt| Digest::SHA256.hexdigest("#{password}--#{salt}") }
-
-  # Generate the password salt. The specified block should expect
-  # the ActiveRecord instance as block parameter.
-  # config.salt = proc {|r| Digest::SHA256.hexdigest("#{Time.now.to_s}--#{r.email}")}
-
   # Set which attributes will be used for authentication.
   config.credentials = [:email, :login]
 

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: simple_auth
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-04 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :development
+        version: 3.1.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0.beta2
 - !ruby/object:Gem::Dependency
-  name: mongo_mapper
+  name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.7
 - !ruby/object:Gem::Dependency
-  name: bson_ext
+  name: pry-meta
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A simple authentication system for Rails apps
@@ -87,21 +87,32 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
-- README.markdown
+- README.md
 - Rakefile
+- gemfiles/rails_3_1.gemfile
+- gemfiles/rails_3_1.gemfile.lock
+- gemfiles/rails_3_2.gemfile
+- gemfiles/rails_3_2.gemfile.lock
+- gemfiles/rails_4_0.gemfile
+- gemfiles/rails_4_0.gemfile.lock
+- gemfiles/rails_4_1.gemfile
+- gemfiles/rails_4_1.gemfile.lock
 - lib/simple_auth.rb
 - lib/simple_auth/action_controller.rb
+- lib/simple_auth/active_record.rb
+- lib/simple_auth/compat.rb
+- lib/simple_auth/compat/active_record.rb
+- lib/simple_auth/compat/config.rb
 - lib/simple_auth/config.rb
 - lib/simple_auth/exceptions.rb
 - lib/simple_auth/generator.rb
 - lib/simple_auth/helper.rb
-- lib/simple_auth/orm/active_record.rb
-- lib/simple_auth/orm/base.rb
-- lib/simple_auth/orm/mongo_mapper.rb
 - lib/simple_auth/railtie.rb
 - lib/simple_auth/rspec.rb
 - lib/simple_auth/session.rb
@@ -113,14 +124,14 @@ files:
 - spec/controllers/require_logged_user_spec.rb
 - spec/schema.rb
 - spec/simple_auth/active_record_spec.rb
+- spec/simple_auth/compat_spec.rb
 - spec/simple_auth/config_spec.rb
 - spec/simple_auth/helper_spec.rb
 - spec/simple_auth/initializer_spec.rb
-- spec/simple_auth/mongo_mapper_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/customer.rb
 - spec/support/app/models/user.rb
 - spec/support/app/views/dashboard/index.erb
 - spec/support/app/views/session/new.erb
@@ -137,18 +148,36 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A simple authentication system for Rails apps
-test_files: []
+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/compat_spec.rb
+- spec/simple_auth/config_spec.rb
+- spec/simple_auth/helper_spec.rb
+- spec/simple_auth/initializer_spec.rb
+- spec/simple_auth/session_spec.rb
+- spec/spec_helper.rb
+- spec/support/app/controllers/application_controller.rb
+- spec/support/app/models/customer.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

data/README.markdown

@@ -1,202 +0,0 @@
-Simple Auth
-===========
-
-SimpleAuth is an authentication library to be used when Authlogic & Devise are just too complicated.
-
-This library only supports in-site authentication and won't implement OpenID, Facebook Connect and like. Rails 3.0+ required.
-
-Installation
-------------
-
-	sudo gem install simple_auth
-
-Then run `rails generate simple_auth:install` to copy the initializer file.
-
-Usage
------
-
-Your user model should have the attributes `password_hash` and `password_salt`. The credential field can be anything you want, but SimpleAuth uses `[:email, :login]` by default.
-
-	class CreateUsers < ActiveRecord::Migration
-	  def self.up
-	    create_table :users do |t|
-	      t.string :email
-	      t.string :login
-	      t.string :password_hash
-	      t.string :password_salt
-
-	      t.timestamps
-	    end
-
-		add_index :users, :email
-		add_index :users, :login
-		add_index :users, [:email, :login]
-	  end
-
-	  def self.down
-	    drop_table :users
-	  end
-	end
-
-In your model, use the `authentication` macro.
-
-	class User < ActiveRecord::Base
-	  authentication
-	end
-
-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
-	  def new
-	    @user_session = SimpleAuth::Session.new
-	  end
-
-	  def create
-	    @user_session = SimpleAuth::Session.new(params[:session])
-
-	    if @user_session.save
-	      redirect_to return_to(dashboard_path)
-	    else
-	      flash[:alert] = "Invalid username or password"
-	      render :new
-	    end
-	  end
-
-	  def destroy
-	    current_session.destroy if logged_in?
-	    redirect_to root_path
-	  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
-	  redirect_logged_user :to => "/"
-	end
-
-Here's some usage examples:
-
-	redirect_logged_user :to => proc { login_path }
-	redirect_logged_user :to => {:controller => "dashboard"}
-	redirect_logged_user :only => [:index], :to => login_path
-	redirect_logged_user :except => [:public], :to => login_path
-
-You can skip the `:to` option if you set it globally on your initializer:
-
-	SimpleAuth::Config.logged_url = {:controller => "session", :action => "new"}
-	SimpleAuth::Config.logged_url = proc { login_path }
-
-To require a logged user, use the `require_logged_user` macro:
-
-	class DashboardController < ApplicationController
-	  require_logged_user :to => proc { login_path }
-	end
-
-Here's some usage examples:
-
-	require_logged_user :to => proc { login_path }
-	require_logged_user :to => {:controller => "session", :action => "new"}
-	require_logged_user :only => [:index], :to => login_path
-	require_logged_user :except => [:public], :to => login_path
-
-You can skip the `:to` option if you set it globally on your initializer:
-
-	SimpleAuth::Config.login_url = {:controller => "session", :action => "new"}
-	SimpleAuth::Config.login_url = proc { login_path }
-
-There are some helpers:
-
-	logged_in?				# controller & views
-	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 `SimpleAuth::Helper` on your `ApplicationHelper`.
-
-	module ApplicationHelper
-	  include SimpleAuth::Helper
-	end
-
-### MongoMapper support
-
-You can use SimpleAuth with MongoMapper. Just include the module `SimpleAuth::Orm::MongoMapper` and
-set up your model with the `authentication` macro.
-
-	class User
-	  include MongoMapper::Document
-	  include SimpleAuth::Orm::MongoMapper
-
-	  authentication
-	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
----------------
-
-You may receive strange errors related to `can't dup NilClass` or `You have a nil object when you didn't expect it!`. This will occur only on development mode and is an ActiveRecord bug that hasn't been fixed. Open the ActiveRecord file  `activerecord-2.3.5/lib/active_record/base.rb` and comment the lines 411-412:
-
-	klass.instance_variables.each { |var| klass.send(:remove_instance_variable, var) }
-	klass.instance_methods(false).each { |m| klass.send :undef_method, m }
-
-Dirty, but it works. Here's the ticket for this issue: [Issue #1290](https://rails.lighthouseapp.com/projects/8994/tickets/1290-activerecord-raises-randomly-apparently-a-timezone-issue#ticket-1290-30)
-
-Maintainer
-----------
-
-* Nando Vieira (<http://simplesideias.com.br>)
-
-License:
---------
-
-(The MIT License)
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/simple_auth/orm/active_record.rb

@@ -1,80 +0,0 @@
-module SimpleAuth
-  module Orm
-    module ActiveRecord
-      def self.included(base)
-        base.class_eval { extend Macro }
-      end
-
-      module Macro
-        # Set virtual attributes, callbacks and validations.
-        # Is called automatically after setting up configuration with
-        # `SimpleAuth.setup {|config| config.model = :user}`.
-        #
-        #   class User < ActiveRecord::Base
-        #     authentication
-        #   end
-        #
-        # Can set configuration when a block is provided.
-        #
-        #   class User < ActiveRecord::Base
-        #     authentication do |config|
-        #       config.credentials = ["email"]
-        #     end
-        #   end
-        #
-        def authentication(&block)
-          SimpleAuth.setup(&block) if block_given?
-          SimpleAuth::Config.model ||= name.underscore.to_sym
-
-          return if respond_to?(:authenticate)
-
-          attr_reader :password
-          attr_accessor :password_confirmation
-
-          include SimpleAuth::Orm::Base::InstanceMethods
-          extend  SimpleAuth::Orm::Base::ClassMethods
-          extend  SimpleAuth::Orm::ActiveRecord::ClassMethods
-
-          before_save :encrypt_password, :if => :validate_password?
-          after_save  :erase_password
-
-          validates_presence_of     :password,              :if => :validate_password?
-          validates_length_of       :password,              :if => :validate_password?, :minimum => 4, :allow_blank => true
-          validates_presence_of     :password_confirmation, :if => :validate_password?
-          validates_confirmation_of :password,              :if => :validate_password?
-        end
-      end
-
-      module ClassMethods
-        # Find user by its credential.
-        #
-        #   User.find_by_credential "john@doe.com" # using e-mail
-        #   User.find_by_credential "john" # using username
-        #
-        def find_by_credential(credential)
-          # Collect each attribute that should be used as credential.
-          query = SimpleAuth::Config.credentials.each_with_object([]) do |attr_name, buffer|
-            buffer << "#{attr_name} = :credential"
-          end.join(" or ")
-
-          # Set the scope.
-          scope = SimpleAuth::Config.model_class.where(query, credential: credential.to_s)
-
-          # Find the record using the conditions we built
-          scope.first
-        end
-
-        # Find user by its credential. If no user is found, raise
-        # SimpleAuth::RecordNotFound exception.
-        #
-        #   User.find_by_credential! "john@doe.com"
-        #
-        def find_by_credential!(credential)
-          record = find_by_credential(credential)
-          raise SimpleAuth::RecordNotFound, "couldn't find #{SimpleAuth::Config.model} using #{credential.inspect} as credential" unless record
-          record
-        end
-      end
-    end
-  end
-end