ecm_user_area2 3.1.2 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aab8847a2b298a6d1918836571a5c62d33697abd
-  data.tar.gz: 66581f93a3a008330a75382b31600047019663d9
+  metadata.gz: b3d0f1b910f4eb57fafede8e7f355f83cc06fab6
+  data.tar.gz: fd7bcfdfcd6f9deb48d763a69401d7f248465164
 SHA512:
-  metadata.gz: 0fa6cad40fcf5c5290131f1802c4a9d617269d3d4fa9b55cba24d5bbc30dcf07de406b350c05abf8681881611848da437beb2bc5aa3ee547e5c75b5df683e414
-  data.tar.gz: 1fe13e22c809ecd72a61d2cc104986b27dd2adbe41782de2a74ebfe7f267995a36fd42141806a82dc88ad7637345f79e463fb26d58eb18cb602d26aa41c26df7
+  metadata.gz: aa468baf9366e264666cd3875cbaa86262444e78b1c6b40086c19a22e469138d788b42c774905195290aa99a533ffb929cd1356e3ab67e33c423ad01f506b71f
+  data.tar.gz: 587ccd6e3f1ce60a8b9bb8ad887bb5fa01b8cb89821fd2250717ef027598300e364bf34763a2e20fdcf335c09268c207300b5d31dbd15dd5236af26c579210d8

data/README.rdoc

@@ -1,5 +1,14 @@
 = ECM User Area
 
+= Migration to 4.0.0
+
+Defining after_sign_in_url in the controller is not supported anymore. Control
+the after sign in location by configuring it in the initializer:
+
+    # config/initalizers/ecm_user_area.rb
+    Ecm::UserArea.configure do |config|
+      config.after_sign_in_url = ->(controller) { last_location || main_app.root_path }
+    end
 
 = Installation
 

data/app/controllers/ecm/user_area/sessions/base_controller.rb

@@ -9,6 +9,7 @@ module Ecm
         include ResourcesController::LocationHistory
 
         skip_before_action :authenticate_user!, only: [:new, :create], raise: false
+        skip_before_action :store_location, only: [:new, :create]
 
         def new
           @session = initialize_resource
@@ -20,11 +21,7 @@ module Ecm
 
           if @session.save
             flash[:notice] = I18n.t('messages.success.ecm_user_area.signed_in') unless request.xhr?
-            if Configuration.force_after_sign_in_url
-              redirect_to(after_sign_in_url)
-            else
-              redirect_back_or(after_sign_in_url)
-            end
+            redirect_to(instance_eval(&Configuration.after_sign_in_url))
             return
           else
             render action: :new
@@ -43,10 +40,6 @@ module Ecm
 
         private
 
-        def after_sign_in_url
-          defined?(super) ? super : main_app.root_path
-        end
-
         def permitted_params
           if Rails.version < '5'
             params.require(resource_class.name.demodulize.underscore.tr('/', '_')).permit(:email, :password)

data/lib/ecm/user_area/configuration.rb

@@ -13,7 +13,6 @@ module Ecm
       mattr_accessor(:allow_users_to_destroy_self) { true }
       mattr_accessor(:base_controller) { 'FrontendController' }
       mattr_accessor(:base_mailer) { 'ApplicationMailer' }
-      mattr_accessor(:force_after_sign_in_url) { false }
       mattr_accessor(:acts_as_authentic_options) do
         ->(config) do
           config.crypto_provider = Authlogic::CryptoProviders::BCrypt
@@ -27,6 +26,7 @@ module Ecm
         end
       end
       mattr_accessor(:current_user_additional_table_rows_proc) { nil }
+      mattr_accessor(:after_sign_in_url) { ->(controller) { main_app.root_path } }
     end
   end
 end

data/lib/ecm/user_area/version.rb

@@ -1,5 +1,5 @@
 module Ecm
   module UserArea
-    VERSION = '3.1.2'.freeze
+    VERSION = '4.0.1'.freeze
   end
 end

data/lib/generators/ecm/user_area/install/templates/initializer.rb

@@ -17,13 +17,11 @@ Ecm::UserArea.configure do |config|
   #
   config.base_mailer = 'ApplicationMailer'
 
-  # Settings this to true forces the after_sign_in_url after sign in.
-  # If set to false, redirect to previous location will happen if 
-  # existent.
-  # 
-  # Default: config.force_after_sign_in_url = false
+  # Where to redirect to after successful login
+  #
+  # Default: config.after_sign_in_url = ->(controller) { main_app.root_path }
   #
-  config.force_after_sign_in_url = false
+  config.after_sign_in_url = ->(controller) { main_app.root_path }
 
   # This is the block, that will be passed to the acts_as_authentic call
   # in the user model.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecm_user_area2
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 4.0.1
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-24 00:00:00.000000000 Z
+date: 2018-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails