challah 1.6.1 → 2.0.0.beta1

data/lib/challah/providers/password_provider.rb

@@ -1,20 +1,21 @@
 module Challah
   class PasswordProvider
+
     def self.save(user)
       set(uid: user.username, token: user.password, user_id: user.id, authorization: user.class.authorization_model)
     end
 
     def self.set(options = {})
       user_id     = options.fetch(:user_id)
-      uid         = options.fetch(:uid, '')
-      token       = options.fetch(:token, '')
+      uid         = options.fetch(:uid, "")
+      token       = options.fetch(:token, "")
       auth_model  = options.fetch(:authorization, ::Authorization)
 
       if token.to_s.blank?
-        authorization = auth_model.get({
+        authorization = auth_model.get(
           user_id:  user_id,
           provider: :password
-        })
+        )
 
         if authorization
           token = authorization.token
@@ -23,12 +24,12 @@ module Challah
         token = Challah::Encrypter.encrypt(token)
       end
 
-      auth_model.set({
+      auth_model.set(
         provider: :password,
         user_id:  user_id,
         uid:      uid,
         token:    token
-      })
+      )
     end
 
     def self.valid?(record)
@@ -36,5 +37,6 @@ module Challah
       password_validator.new(force: true).validate(record)
       record.errors[:password].size.zero?
     end
+
   end
-end
+end

data/lib/challah/providers.rb

@@ -1,5 +1,6 @@
 module Challah
   module Providers
+
     # Get a list of all authorization providers other than password provider
     def custom_providers
       providers.reject { |k, v| k == :password }
@@ -18,5 +19,6 @@ module Challah
     def providers
       @providers.dup
     end
+
   end
-end
+end

data/lib/challah/random.rb

@@ -2,17 +2,19 @@ module Challah
   # Random string class, uses ActiveSupport's SecureRandom if possible, otherwise gives a fairly
   # secure random string
   class Random
+
     # Returns a random string for use as a token at the given length.
     def self.token(length = 30)
-      return SecureRandom.hex(length/2) if secure_random?
+      return SecureRandom.hex(length / 2) if secure_random?
 
-      c = [(0..9),('a'..'z'),('A'..'Z')].map {|i| i.to_a }.flatten
-      (1..length).map{ c[rand(c.length)] }.join
+      c = [(0..9), ("a".."z"), ("A".."Z")].map { |i| i.to_a }.flatten
+      (1..length).map { c[rand(c.length)] }.join
     end
 
     # Is ActiveSupport::SecureRandom available. If so, we'll use it.
     def self.secure_random?
       defined?(::SecureRandom)
     end
+
   end
-end
+end

data/lib/challah/routes.rb

@@ -1,11 +1,11 @@
 Rails.application.routes.draw do
   unless Challah.options[:skip_routes]
-    post '/sign-in',    to: 'sessions#create',    as: 'authenticate'
-    get '/sign-in',     to: 'sessions#new',       as: 'signin'
-    get '/sign-out',    to: 'sessions#destroy',   as: 'signout'
+    post "/sign-in",    to: "sessions#create",    as: "authenticate"
+    get "/sign-in",     to: "sessions#new",       as: "signin"
+    get "/sign-out",    to: "sessions#destroy",   as: "signout"
 
-    post '/login',      to: 'sessions#create',    as: 'submit_login'
-    get '/login',       to: 'sessions#new',       as: 'login'
-    get '/logout',      to: 'sessions#destroy',   as: 'logout'
+    post "/login",      to: "sessions#create",    as: "submit_login"
+    get "/login",       to: "sessions#new",       as: "login"
+    get "/logout",      to: "sessions#destroy",   as: "logout"
   end
 end

data/lib/challah/session.rb

@@ -1,5 +1,6 @@
 module Challah
   class Session
+
     extend ActiveModel::Naming
     include ActiveModel::Conversion
 
@@ -34,7 +35,7 @@ module Challah
     end
 
     def inspect
-      "#<Session:0x#{object_id.to_s(16)} valid=#{valid?} store=#{self.store.inspect} user=#{user_id || 'nil'}>"
+      "#<Session:0x#{ object_id.to_s(16) } valid=#{ valid? } store=#{ self.store.inspect } user=#{ user_id || 'nil' }>"
     end
 
     def persist?
@@ -43,7 +44,7 @@ module Challah
 
     def read
       persistence_token, user_id = self.store.read
-      return false if persistence_token.nil? or user_id.nil?
+      return false if persistence_token.nil? || user_id.nil?
 
       store_user = nil
 
@@ -53,7 +54,7 @@ module Challah
         nil
       end
 
-      if store_user and store_user.valid_session? and store_user.persistence_token == persistence_token
+      if store_user && store_user.valid_session? && (store_user.persistence_token == persistence_token)
         if store_user.valid_session?
           self.user = store_user
           @valid = true
@@ -66,7 +67,7 @@ module Challah
     def save
       return false unless valid?
 
-      if self.user and persist?
+      if self.user && persist?
         self.store.save(self.user.persistence_token, user_id)
         return true
       end
@@ -90,7 +91,7 @@ module Challah
     # Returns true if this session has been authenticated and is ready to save.
     def valid?
       return @valid if @valid != nil
-      return true if self.user and self.user.valid_session?
+      return true if self.user && self.user.valid_session?
       authenticate!
     end
 
@@ -126,7 +127,7 @@ module Challah
         end
       end
 
-      if user_record and user_record.valid_session?
+      if user_record && user_record.valid_session?
         session.user = user_record
         session.persist = true
       end
@@ -157,32 +158,33 @@ module Challah
 
     protected
 
-    # Try and authenticate against the various auth techniques. If one
-    # technique works, then just exit and make the session active.
-    def authenticate!
-      Challah.techniques.values.each do |klass|
-        technique = klass.new(self)
-        technique.user_model = user_model if technique.respond_to?(:"user_model=")
+      # Try and authenticate against the various auth techniques. If one
+      # technique works, then just exit and make the session active.
+      def authenticate!
+        Challah.techniques.values.each do |klass|
+          technique = klass.new(self)
+          technique.user_model = user_model if technique.respond_to?(:"user_model=")
 
-        @user = technique.authenticate
+          @user = technique.authenticate
 
-        if @user
-          @persist = technique.respond_to?(:persist?) ? technique.persist? : false
-          break
+          if @user
+            @persist = technique.respond_to?(:persist?) ? technique.persist? : false
+            break
+          end
         end
-      end
 
-      if @user
-        # Only update user record if persistence is on for the technique.
-        # Otherwise this builds up quick (one session for each API call)
-        if @persist
-          @user.successful_authentication!(ip)
+        if @user
+          # Only update user record if persistence is on for the technique.
+          # Otherwise this builds up quick (one session for each API call)
+          if @persist
+            @user.successful_authentication!(ip)
+          end
+
+          return @valid = true
         end
 
-        return @valid = true
+        @valid = false
       end
 
-      @valid = false
-    end
   end
 end

data/lib/challah/signup.rb

@@ -1,5 +1,6 @@
 module Challah
   class Signup
+
     extend ActiveModel::Naming
     include ActiveModel::Conversion
 
@@ -17,7 +18,7 @@ module Challah
       return unless Hash === value
 
       value.each do |key, value|
-        self.send("#{key}=", value)
+        self.send("#{ key }=", value)
       end
     end
 
@@ -60,7 +61,7 @@ module Challah
         user.errors.each { |a, e| @errors.add(a, e) }
       end
 
-      if !provider or !valid_provider?
+      if !provider || !valid_provider?
         result = false
         user.errors.each { |a, e| @errors.add(a, e) unless @errors.added?(a, e) }
       end
@@ -71,5 +72,6 @@ module Challah
     def self.model_name
       ActiveModel::Name.new(Challah::Signup, Challah, "Signup")
     end
+
   end
-end
+end

data/lib/challah/simple_cookie_store.rb

@@ -4,6 +4,7 @@ module Challah
   # To use a different storage method for persisting a session, just create
   # a new class that responds to +read+, +save+ and +destroy+
   class SimpleCookieStore
+
     def initialize(session)
       @session = session
     end
@@ -13,7 +14,7 @@ module Challah
     end
 
     def inspect
-      "#<SimpleCookieStore:0x#{object_id.to_s(16)} valid=#{existing?}>"
+      "#<SimpleCookieStore:0x#{ object_id.to_s(16) } valid=#{ existing? }>"
     end
 
     def read
@@ -29,107 +30,108 @@ module Challah
 
     private
 
-    def clear
-      cookies.delete(session_cookie_name, domain: domain)
-      cookies.delete(validation_cookie_name, domain: domain)
-    end
+      def clear
+        cookies.delete(session_cookie_name, domain: domain)
+        cookies.delete(validation_cookie_name, domain: domain)
+      end
 
-    def cookie_values
-      session_cookie && session_cookie.to_s.split(joiner)
-    end
+      def cookie_values
+        session_cookie && session_cookie.to_s.split(joiner)
+      end
 
-    def cookies
-      request.cookie_jar
-    end
+      def cookies
+        request.cookie_jar
+      end
 
-    def default_cookie_prefix
-      Challah.options[:cookie_prefix]
-    end
+      def default_cookie_prefix
+        Challah.options[:cookie_prefix]
+      end
 
-    def domain
-      request.session_options[:domain]
-    end
+      def domain
+        request.session_options[:domain]
+      end
 
-    # Do the cookies exist, and are they valid?
-    def existing?
-      exists = false
+      # Do the cookies exist, and are they valid?
+      def existing?
+        exists = false
 
-      if session_cookie and validation_cookie
-        session_tmp = session_cookie.to_s
-        validation_tmp = validation_cookie.to_s
+        if session_cookie && validation_cookie
+          session_tmp = session_cookie.to_s
+          validation_tmp = validation_cookie.to_s
 
-        if validation_tmp == validation_cookie_value(session_tmp)
-          exists = true
+          if validation_tmp == validation_cookie_value(session_tmp)
+            exists = true
+          end
         end
+
+        exists
       end
 
-      exists
-    end
+      def expiration
+        @expiration ||= 1.month.from_now
+      end
 
-    def expiration
-      @expiration ||= 1.month.from_now
-    end
+      def joiner
+        "@"
+      end
 
-    def joiner
-      '@'
-    end
+      def prefix
+        @prefix ||= [ default_cookie_prefix, user_model_id ].compact.join("-")
+      end
 
-    def prefix
-      @prefix ||= [ default_cookie_prefix, user_model_id ].compact.join('-')
-    end
+      def request
+        raise "No Request Provided" unless @session && @session.request
+        @session.request
+      end
 
-    def request
-      raise "No Request Provided" unless @session and @session.request
-      @session.request
-    end
+      def session_cookie
+        cookies[session_cookie_name]
+      end
 
-    def session_cookie
-      cookies[session_cookie_name]
-    end
+      def session_cookie_name
+        "#{ prefix }-s"
+      end
 
-    def session_cookie_name
-      "#{prefix}-s"
-    end
+      def session_cookie_value
+        "#@token#{ joiner }#@user_id"
+      end
 
-    def session_cookie_value
-      "#@token#{joiner}#@user_id"
-    end
+      def user_model_id
+        if @session && @session.user_model && @session.user_model.table_name != "users"
+          Encrypter.md5(@session.user_model.table_name).slice(0..5)
+        end
+      end
 
-    def user_model_id
-      if @session && @session.user_model && @session.user_model.table_name != 'users'
-        Encrypter.md5(@session.user_model.table_name).slice(0..5)
+      def validation_cookie
+        cookies[validation_cookie_name]
       end
-    end
 
-    def validation_cookie
-      cookies[validation_cookie_name]
-    end
+      def validation_cookie_name
+        "#{ prefix }-v"
+      end
 
-    def validation_cookie_name
-      "#{prefix}-v"
-    end
+      def validation_cookie_value(value = nil)
+        value = session_cookie_value unless value
+        Encrypter.md5(value)
+      end
 
-    def validation_cookie_value(value = nil)
-      value = session_cookie_value unless value
-      Encrypter.md5(value)
-    end
+      def write_cookies!
+        cookies[session_cookie_name] = {
+          value:      session_cookie_value,
+          expires:    expiration,
+          secure:     false,
+          httponly:   true,
+          domain:     domain
+        }
+
+        cookies[validation_cookie_name] = {
+          value:      validation_cookie_value,
+          expires:    expiration,
+          secure:     false,
+          httponly:   true,
+          domain:     domain
+        }
+      end
 
-    def write_cookies!
-      cookies[session_cookie_name] = {
-        value:      session_cookie_value,
-        expires:    expiration,
-        secure:     false,
-        httponly:   true,
-        domain:     domain
-      }
-
-      cookies[validation_cookie_name] = {
-        value:      validation_cookie_value,
-        expires:    expiration,
-        secure:     false,
-        httponly:   true,
-        domain:     domain
-      }
-    end
   end
 end