simple_auth 2.0.4 → 3.0.0

data/test/controllers/pages_controller_test.rb

@@ -0,0 +1,16 @@
+require "test_helper"
+
+class PagesControllerTest < ActionController::TestCase
+  setup do
+    @routes = Rails.application.routes
+    @controller.reset_session
+
+    User.delete_all
+    User.create!(password: "test", email: "john@example.com")
+  end
+
+  test "sets flash message while redirecting unlogged user" do
+    get :index
+    assert_equal "You must be logged in to access this page.", flash[:alert]
+  end
+end

data/test/generators/install_test.rb

@@ -0,0 +1,13 @@
+require "test_helper"
+
+class InstallTest < Rails::Generators::TestCase
+  tests SimpleAuth::InstallGenerator
+  destination File.expand_path("../../tmp", File.dirname(__FILE__))
+  setup :prepare_destination
+  setup :run_generator
+
+  test "copies initializer" do
+    path = "#{__dir__}/../../tmp/config/initializers/simple_auth.rb"
+    assert_file File.expand_path(path)
+  end
+end

data/test/support/dummy/app/controllers/admin/dashboard_controller.rb

@@ -0,0 +1,35 @@
+require_relative "../application_controller"
+
+module Admin
+  class DashboardController < ::ApplicationController
+    before_action :require_logged_admin, only: "index"
+
+    def index
+      head :ok
+    end
+
+    def log_in_as_user
+      user = User.create!(password: "test")
+      user_session.record = user
+      head :ok
+    end
+
+    def log_in_as_admin
+      user = User.create!(password: "test")
+      admin_session.record = user
+      head :ok
+    end
+
+    def log_in_with_admin_flag
+      user = User.create!(admin: true, password: "test")
+      user_session.record = user
+      head :ok
+    end
+
+    private
+
+    def authorized?
+      current_admin.present? || current_user.admin?
+    end
+  end
+end

data/test/support/dummy/app/controllers/dashboard_controller.rb

@@ -0,0 +1,23 @@
+class DashboardController < ApplicationController
+  before_action :require_logged_user, except: %w[log_in not_logged]
+  before_action :redirect_logged_user, only: "not_logged"
+
+  def index
+    head :ok
+  end
+
+  def log_in
+    user_session.record = User.last!
+    head :ok
+  end
+
+  def not_logged
+    head :ok
+  end
+
+  private
+
+  def authorized_user?
+    current_user.try(:email).to_s.match(/@example.com\z/)
+  end
+end

data/test/support/dummy/app/controllers/pages_controller.rb

@@ -0,0 +1,7 @@
+class PagesController < ApplicationController
+  before_action :require_logged_user
+
+  def index
+    head :ok
+  end
+end

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

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

data/test/support/dummy/config/application.rb

@@ -0,0 +1,17 @@
+ENV["RAILS_ENV"] = "test"
+
+require "rails"
+require "action_controller/railtie"
+
+Bundler.require :default, :test
+
+module Dummy
+  class Application < Rails::Application
+    config.eager_load = false
+    config.active_support.test_order = :random
+    config.secret_key_base = SecureRandom.hex(100)
+    config.i18n.load_path += Dir["#{__dir__}/config/locales/**/*.yml"]
+  end
+end
+
+Dummy::Application.initialize!

data/test/support/dummy/config/initializers/simple_auth.rb

@@ -0,0 +1,23 @@
+SimpleAuth.setup do |config|
+  # Define with scopes will be installed.
+  # This can be useful if you want to have separated sessions
+  # (e.g. regular user and admin user).
+  #
+  # To enable both user and admin sessions, you can define this options
+  # like this:
+  #
+  # config.scopes = %i[user admin]
+  #
+  config.scopes = %i[user admin]
+
+  # Set the login url.
+  # This is where users will be redirected to when they're unlogged.
+  config.login_url = proc { login_path }
+
+  # Logged users will be redirect to this url
+  # when `before_action :redirect_logged_user` filter is used.
+  config.logged_url = proc { dashboard_path }
+
+  # Install SimpleAuth helpers to the controllers.
+  config.install_helpers!
+end

data/test/support/dummy/config/routes.rb

@@ -0,0 +1,23 @@
+Rails.application.routes.draw do
+  get "/dashboard", to: "dashboard#index"
+  get "/admin/dashboard", to: "admin/dashboard#index"
+  get "/login", to: "sessions#new"
+
+  controller :dashboard do
+    get :log_in
+    get :not_logged
+  end
+
+  controller :pages do
+    get :index
+  end
+
+  namespace :admin do
+    controller :dashboard do
+      get :index
+      get :log_in_as_admin
+      get :log_in_as_user
+      get :log_in_with_admin_flag
+    end
+  end
+end

data/test/support/schema.rb

@@ -0,0 +1,6 @@
+ActiveRecord::Schema.define(version: 0) do
+  create_table :users do |t|
+    t.string :email, :password_digest, :username
+    t.boolean :admin, default: false, null: false
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,15 @@
+$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+
+require "bundler/setup"
+require "rack/test"
+require "minitest/utils"
+require "minitest/autorun"
+
+require "./test/support/dummy/config/application"
+require "./test/support/dummy/config/routes"
+
+require "active_record"
+ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
+require "./test/support/schema"
+
+Dir["./test/support/**/*.rb"].each {|file| require file }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_auth
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 3.0.0
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -39,19 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta2
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  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: minitest-utils
+  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: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -83,58 +111,45 @@ dependencies:
 description: A simple authentication system for Rails apps
 email:
 - fnando.vieira@gmail.com
-executables: []
+executables:
+- console
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rspec"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- MIGRATE.md
 - README.md
 - Rakefile
-- gemfiles/rails_3_1.gemfile
-- gemfiles/rails_3_2.gemfile
-- gemfiles/rails_4_0.gemfile
-- gemfiles/rails_4_1.gemfile
+- bin/console
+- gemfiles/rails_4_2.gemfile
+- gemfiles/rails_5_0.gemfile
 - 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/action_controller/require_login_action.rb
 - lib/simple_auth/config.rb
-- lib/simple_auth/exceptions.rb
 - lib/simple_auth/generator.rb
-- lib/simple_auth/helper.rb
 - lib/simple_auth/railtie.rb
-- lib/simple_auth/rspec.rb
 - lib/simple_auth/session.rb
+- lib/simple_auth/templates/install/initializer.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
-- 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/person.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
+- test/controllers/admin/dashboard_controller_test.rb
+- test/controllers/dashboard_controller_test.rb
+- test/controllers/pages_controller_test.rb
+- test/generators/install_test.rb
+- test/support/dummy/app/controllers/admin/dashboard_controller.rb
+- test/support/dummy/app/controllers/application_controller.rb
+- test/support/dummy/app/controllers/dashboard_controller.rb
+- test/support/dummy/app/controllers/pages_controller.rb
+- test/support/dummy/app/models/user.rb
+- test/support/dummy/config/application.rb
+- test/support/dummy/config/initializers/simple_auth.rb
+- test/support/dummy/config/routes.rb
+- test/support/schema.rb
+- test/test_helper.rb
 homepage: http://rubygems.org/gems/simple_auth
 licenses: []
 metadata: {}
@@ -146,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -154,27 +169,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A simple authentication system for Rails apps
 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/person.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
+- test/controllers/admin/dashboard_controller_test.rb
+- test/controllers/dashboard_controller_test.rb
+- test/controllers/pages_controller_test.rb
+- test/generators/install_test.rb
+- test/support/dummy/app/controllers/admin/dashboard_controller.rb
+- test/support/dummy/app/controllers/application_controller.rb
+- test/support/dummy/app/controllers/dashboard_controller.rb
+- test/support/dummy/app/controllers/pages_controller.rb
+- test/support/dummy/app/models/user.rb
+- test/support/dummy/config/application.rb
+- test/support/dummy/config/initializers/simple_auth.rb
+- test/support/dummy/config/routes.rb
+- test/support/schema.rb
+- test/test_helper.rb

data/.rspec

@@ -1 +0,0 @@
---color

data/gemfiles/rails_3_1.gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-gemspec path: ".."
-
-gem "rails", "~> 3.1.0"
-gem "bcrypt-ruby", "~> 3.0.0"

data/gemfiles/rails_3_2.gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-gemspec path: ".."
-
-gem "rails", "~> 3.2.0"
-gem "bcrypt-ruby", "~> 3.0.0"

data/lib/simple_auth/active_record.rb

@@ -1,95 +0,0 @@
-module SimpleAuth
-  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(options = {}, &block)
-        SimpleAuth.setup(&block) if block_given?
-        SimpleAuth::Config.model ||= name.underscore.to_sym
-
-        # Possibly multiple calls in a given model.
-        # So, just return.
-        return if respond_to?(:authenticate)
-
-        macro = method(:has_secure_password)
-
-        if macro.arity.zero?
-          has_secure_password
-        else
-          has_secure_password(options)
-        end
-
-        extend  ClassMethods
-        include InstanceMethods
-
-        if options.fetch(:validations, true)
-          validates_length_of :password, minimum: 4,
-            if: -> { password.present? }
-        end
-      end
-    end
-
-    module InstanceMethods
-    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
-
-      # 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.to_s)
-        record.try(:authenticate, password)
-      end
-    end
-  end
-end