challah 1.6.1 → 2.0.0.beta1

data/lib/challah/concerns/user/findable.rb

@@ -1,5 +1,6 @@
 module Challah
   module UserFindable
+
     extend ActiveSupport::Concern
 
     module ClassMethods
@@ -15,18 +16,20 @@ module Challah
 
       protected
 
-      def find_by_authorization(uid)
-        authorization = self.authorization_model
-        result = authorization.where(provider: :password, uid: uid).first
-        if result
-          result.user
+        def find_by_authorization(uid)
+          authorization = self.authorization_model
+          result = authorization.where(provider: :password, uid: uid).first
+          if result
+            result.user
+          end
+        end
+
+        def find_by_email(email)
+          return unless email.include?("@")
+          where(email: email).first
         end
-      end
 
-      def find_by_email(email)
-        return unless email.include?('@')
-        where(email: email).first
-      end
     end
+
   end
 end

data/lib/challah/concerns/user/passwordable.rb

@@ -1,5 +1,6 @@
 module Challah
   module UserPasswordable
+
     # Set the password and password_confirmation in one shortcut method.
     def password!(new_password)
       self.password = new_password
@@ -7,7 +8,7 @@ module Challah
     end
 
     def password_provider?
-      return true if @password_updated or @username_updated
+      return true if @password_updated || @username_updated
       !!providers[:password]
     end
 
@@ -37,12 +38,13 @@ module Challah
     end
 
     def username
-      @username ||= password_provider? ? password_provider.fetch(:uid, '') : ''
+      @username ||= password_provider? ? password_provider.fetch(:uid, "") : ""
     end
 
     def username=(value)
       @username_updated = true
       @username = value.to_s.strip.downcase
     end
+
   end
-end
+end

data/lib/challah/concerns/user/provideable.rb

@@ -1,5 +1,6 @@
 module Challah
   module UserProvideable
+
     extend ActiveSupport::Concern
 
     included do
@@ -76,30 +77,31 @@ module Challah
 
     protected
 
-    def clear_cached_providers_after_save
-      @providers = nil
-    end
-
-    # If password or username was changed, update the authorization record
-    def update_modified_providers_after_save
-      # Save password provider
-      if @password_updated or @username_updated
-        Challah.providers[:password].save(self)
-        @password_updated = false
-        @username_updated = false
-        @password = nil
+      def clear_cached_providers_after_save
+        @providers = nil
       end
 
-      # Save any other providers
-      Challah.custom_providers.each do |name, klass|
-        custom_provider_attributes = provider_attributes[name]
+      # If password or username was changed, update the authorization record
+      def update_modified_providers_after_save
+        # Save password provider
+        if @password_updated || @username_updated
+          Challah.providers[:password].save(self)
+          @password_updated = false
+          @username_updated = false
+          @password = nil
+        end
 
-        if custom_provider_attributes.respond_to?(:fetch)
-          if klass.valid?(self)
-            klass.save(self)
+        # Save any other providers
+        Challah.custom_providers.each do |name, klass|
+          custom_provider_attributes = provider_attributes[name]
+
+          if custom_provider_attributes.respond_to?(:fetch)
+            if klass.valid?(self)
+              klass.save(self)
+            end
           end
         end
       end
-    end
+
   end
-end
+end

data/lib/challah/concerns/user/statusable.rb

@@ -1,12 +1,13 @@
 module Challah
   module UserStatusable
+
     extend ActiveSupport::Concern
 
     included do
       begin
         if columns.map(&:name).include?("status")
           additional_statuses = Array(Challah.options[:additional_statuses])
-          enum status: [:active, :inactive, *additional_statuses]
+          enum status: [ :active, :inactive, *additional_statuses ].map(&:to_sym)
         end
       rescue ActiveRecord::StatementInvalid => exception
         raise exception unless exception.message =~ /could not find table/i ||
@@ -14,26 +15,6 @@ module Challah
       end
     end
 
-    # Fallback to pre-enum active column (pre challah 1.4)
-    def active=(enabled)
-      if self.class.columns.map(&:name).include?("status")
-        self.status = (!!enabled ? :active : :inactive)
-      else
-        write_attribute(:active, !!enabled)
-      end
-    end
-
-    def active?
-      # enum-based status
-      if self.class.columns.map(&:name).include?("status")
-        read_attribute(:status).to_s == "active"
-
-      # support for non-enum status column (pre challah 1.4)
-      else
-        !!read_attribute(:active)
-      end
-    end
-
     def active
       active?
     end
@@ -41,5 +22,6 @@ module Challah
     def valid_session?
       active?
     end
+
   end
 end

data/lib/challah/concerns/user/validateable.rb

@@ -1,5 +1,6 @@
 module Challah
   module UserValidateable
+
     extend ActiveSupport::Concern
 
     included do
@@ -17,5 +18,6 @@ module Challah
 
       validates_with Challah.options[:password_validator], force: false
     end
+
   end
-end
+end

data/lib/challah/concerns/userable.rb

@@ -1,5 +1,6 @@
 module Challah
   module Userable
+
     extend ActiveSupport::Concern
 
     include UserAttributeable
@@ -14,8 +15,5 @@ module Challah
       include UserValidateable
     end
 
-    included do
-      Challah.include_user_plugins!
-    end
   end
 end

data/lib/challah/controller.rb

@@ -2,6 +2,7 @@ module Challah
   # These methods are added into ActionController::Base and are available in all
   # of your app's controllers.
   module Controller
+
     extend ActiveSupport::Concern
 
     included do
@@ -9,6 +10,7 @@ module Challah
     end
 
     module ClassMethods
+
       # Restrict the current controller to only users that have authenticated. All actions
       # in the controller will be restricted unless otherwise stated. All normal options
       # for a before_action are observed.
@@ -39,80 +41,82 @@ module Challah
         restrict_to_authenticated(*args)
       end
       alias_method :login_required, :signin_required
+
     end
 
     protected
 
-    # Is there currently a logged in user? Returns true if it is safe to use
-    # the {#current_user current_user} method.
-    #
-    # @note This method is also available as a helper in your views.
-    #
-    # @see #current_user current_user
-    #
-    # @return [Boolean] Is there a user logged in?
-    def current_user?
-      !!current_user
-    end
+      # Is there currently a logged in user? Returns true if it is safe to use
+      # the {#current_user current_user} method.
+      #
+      # @note This method is also available as a helper in your views.
+      #
+      # @see #current_user current_user
+      #
+      # @return [Boolean] Is there a user logged in?
+      def current_user?
+        !!current_user
+      end
 
-    # Alias for current_user?
-    def signed_in?
-      current_user?
-    end
-    alias_method :logged_in?, :signed_in?
+      # Alias for current_user?
+      def signed_in?
+        current_user?
+      end
+      alias_method :logged_in?, :signed_in?
 
-    # The user that is currently logged into this session. If there is no
-    # user logged in, nil will be returned.
-    #
-    # @note This method is also available as a helper in your views.
-    #
-    # @return [User, nil] The current authenticated user.
-    def current_user
-      @current_user ||= current_user_session.user
-    end
+      # The user that is currently logged into this session. If there is no
+      # user logged in, nil will be returned.
+      #
+      # @note This method is also available as a helper in your views.
+      #
+      # @return [User, nil] The current authenticated user.
+      def current_user
+        @current_user ||= current_user_session.user
+      end
 
-    # The current authentication session, if one exists. A {Session} object will be
-    # returned regardless of its valid status. If an invalid session is returned, the
-    # {Session#user user} attribute will be nil.
-    #
-    # @return [Session] The current browser session.
-    def current_user_session
-      @current_user_session ||= Challah::Session.find(request, params, user_model)
-    end
+      # The current authentication session, if one exists. A {Session} object will be
+      # returned regardless of its valid status. If an invalid session is returned, the
+      # {Session#user user} attribute will be nil.
+      #
+      # @return [Session] The current browser session.
+      def current_user_session
+        @current_user_session ||= Challah::Session.find(request, params, user_model)
+      end
 
-    # Restrict a controller to only authenticated users. If someone tries to access
-    # a restricted action and is not logged in, they will be redirected to the
-    # login page.
-    #
-    # This method is an alias for:
-    #
-    #   restrict_to_authenticated
-    #
-    # @example
-    #   class YourController < ApplicationController
-    #     before_action :login_required
-    #
-    #     # ...
-    #   end
-    #
-    # @example Specifing certain actions.
-    #   class YourOtherController < ApplicationController
-    #     before_action :login_required, :only => [ :create, :update, :destroy ]
-    #
-    #     # ...
-    #   end
-    #
-    # @see Controller::ClassMethods#restrict_to_authenticated restrict_to_authenticated
-    def signin_required
-      unless signed_in?
-        session[:return_to] = request.url
-        redirect_to signin_path and return
+      # Restrict a controller to only authenticated users. If someone tries to access
+      # a restricted action and is not logged in, they will be redirected to the
+      # login page.
+      #
+      # This method is an alias for:
+      #
+      #   restrict_to_authenticated
+      #
+      # @example
+      #   class YourController < ApplicationController
+      #     before_action :login_required
+      #
+      #     # ...
+      #   end
+      #
+      # @example Specifing certain actions.
+      #   class YourOtherController < ApplicationController
+      #     before_action :login_required, :only => [ :create, :update, :destroy ]
+      #
+      #     # ...
+      #   end
+      #
+      # @see Controller::ClassMethods#restrict_to_authenticated restrict_to_authenticated
+      def signin_required
+        unless signed_in?
+          session[:return_to] = request.url
+          redirect_to(signin_path) && (return)
+        end
+      end
+      alias_method :login_required, :signin_required
+
+      def user_model
+        @_challah_user_model ||= Challah.user
       end
-    end
-    alias_method :login_required, :signin_required
 
-    def user_model
-      @_challah_user_model ||= Challah.user
-    end
   end
 end

data/lib/challah/cookie_store.rb

@@ -9,15 +9,17 @@ module Challah
   # a new class that responds to +read+, +save+ and +destroy+
   #
   class CookieStore < SimpleCookieStore
+
     def inspect
-      "#<CookieStore:0x#{object_id.to_s(16)} valid=#{existing?}>"
+      "#<CookieStore:0x#{ object_id.to_s(16) } valid=#{ existing? }>"
     end
 
     protected
 
-    def validation_cookie_value(value = nil)
-      value = session_cookie_value unless value
-      Encrypter.md5(value, request.user_agent, request.remote_ip)
-    end
+      def validation_cookie_value(value = nil)
+        value = session_cookie_value unless value
+        Encrypter.md5(value, request.user_agent, request.remote_ip)
+      end
+
   end
 end

data/lib/challah/encrypter.rb

@@ -1,9 +1,10 @@
-require 'digest/sha2'
-require 'bcrypt'
+require "digest/sha2"
+require "bcrypt"
 
 module Challah
   # Handles all encryption, hashing and comparison necessary for tokens and passwords.
   class Encrypter
+
     attr_accessor :cost, :joiner
 
     # The number of times to hash the given password.
@@ -54,5 +55,6 @@ module Challah
     def self.md5(*args)
       new().md5(*args)
     end
+
   end
 end

data/lib/challah/engine.rb

@@ -1,17 +1,17 @@
 module Challah
   class Engine < ::Rails::Engine
 
-    initializer 'challah.router' do |app|
-      app.routes_reloader.paths.insert(0, File.expand_path(File.join(File.dirname(__FILE__), 'routes.rb')))
+    initializer "challah.router" do |app|
+      app.routes_reloader.paths.insert(0, File.expand_path(File.join(File.dirname(__FILE__), "routes.rb")))
     end
 
-    initializer 'challah.active_record' do
+    initializer "challah.active_record" do
       ActiveSupport.on_load :active_record do
         Challah::Engine.setup_active_record!
       end
     end
 
-    initializer 'challah.action_controller' do
+    initializer "challah.action_controller" do
       ActiveSupport.on_load :action_controller do
         Challah::Engine.setup_action_controller!
       end
@@ -33,13 +33,6 @@ module Challah
         if defined?(ActionController::API)
           ActionController::API.send(:include, Challah::Controller)
         end
-
-        # Load any ActionController/Challah plugins
-        Challah.plugins.values.each do |plugin|
-          plugin.action_controller.each do |proc|
-            proc.call
-          end
-        end
       end
     end
 
@@ -49,14 +42,8 @@ module Challah
         Challah.options[:logger] = ActiveRecord::Base.logger
 
         ActiveRecord::Base.send(:include, Challah::Audit)
-
-        # Load any ActiveRecord/Challah plugins
-        Challah.plugins.values.each do |plugin|
-          plugin.active_record.each do |proc|
-            proc.call
-          end
-        end
       end
     end
+
   end
 end