challah 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3d6fd80f0638cb01d51f3160c92792a9d12924c
-  data.tar.gz: 0641b3c92b52c2f8c3e9b1cf47c11c7fa55b6e7d
+  metadata.gz: 23bb94be0e8ab6875dc31cab8fcface51e966048
+  data.tar.gz: f57cf4b2de757c7d23fe36b586b6c7ba8db29e65
 SHA512:
-  metadata.gz: 98dbd14406c791f07ee32a0f053100949cc90ad4dfa33d59a8c2c3e9094bc984c1348ea2e40d7039dec8ee935e0886ca54eb3b110e46146f1c69fc12a3aab9ce
-  data.tar.gz: 719ddddb95e07ce9036b22d04f28132e35a2465f23caaa32f695f4cc6f163c4f43d315b96c680716371e0f8f3575cd1b8db2ab8195e77e1b73c375563393a205
+  metadata.gz: e79dc0f8f687cb192b2d055f9b448998d72228cc11d95ba8a907e6559a49519305fd5a0f86896a362d77a9eae6b02edee80077b6e2386fb20c52440d7c277f8c
+  data.tar.gz: 3f6ec00c9875e628e03b057bd5b5952275b5541c46a4bf8825abdba02bc4e6fbf018bcef0f1da71e4bce61e20adb5284b9a7214a07b0b85770a052aec6f1b524

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

data/app/controllers/sessions_controller.rb

@@ -1,50 +1,51 @@
-if defined?(ApplicationController)
-  class SessionsController < ApplicationController
-    if respond_to?(:before_action)
-      # Rails >= 4.0
-      before_action :destroy_session, except: :create
-    else
-      # Rails <= 3.2
-      before_filter :destroy_session, except: :create
-    end
+if File.exist?(Rails.root.join("controllers/application_controller"))
+  require "application_controller"
+end
 
-    unloadable
+class SessionsController < (defined?(ApplicationController) ? ApplicationController : ActionController::Base)
+  if respond_to?(:before_action)
+    # Rails >= 4.0
+    before_action :destroy_session, except: :create
+  else
+    # Rails <= 3.2
+    before_filter :destroy_session, except: :create
+  end
 
-    # GET /login
-    # GET /sign-in
-    def new
-      @session = Challah::Session.new(request)
-    end
+  # GET /login
+  # GET /sign-in
+  def new
+    @session = Challah::Session.new(request)
+  end
 
-    # POST /login
-    # POST /sign-in
-    def create
-      @session = Challah::Session.new(request, params[:session])
-      @session.ip = request.remote_ip
-
-      if @session.save
-        redirect_to return_to_path
-      else
-        redirect_to signin_path, alert: I18n.translate('sessions.create.failed_login')
-      end
-    end
+  # POST /login
+  # POST /sign-in
+  def create
+    @session = Challah::Session.new(request, params[:session])
+    @session.ip = request.remote_ip
 
-    # GET /logout
-    # GET /sign-out
-    def destroy
-      redirect_to signin_path
+    if @session.save
+      redirect_to return_to_path
+    else
+      redirect_to signin_path, alert: I18n.translate('sessions.create.failed_login')
     end
+  end
 
-    protected
+  # GET /logout
+  # GET /sign-out
+  def destroy
+    redirect_to signin_path
+  end
 
-    def destroy_session
-      current_user_session.destroy
-    end
+  protected
 
-    def return_to_path(default_path = '/')
-      result = session[:return_to]
-      result = nil if result and result == "http://#{request.domain}/"
-      result || default_path
-    end
+  def destroy_session
+    current_user_session.destroy
+  end
+
+  def return_to_path(default_path = '/')
+    result = session[:return_to]
+    result = nil if result and result == "http://#{request.domain}/"
+    result || default_path
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: challah
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - John Tornow
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rails authentication and sessions