ecm_user_area2 2.3.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fd2c1583269f4cd2bb59d30d94946766937d617
-  data.tar.gz: 3aaf58f7cfd78353e96e7affb557b573a9a7bda0
+  metadata.gz: e3664183e064dc53280992b363111124b4c9eb0e
+  data.tar.gz: f0649d6f9c823e97d37530cb208adc9219787bf1
 SHA512:
-  metadata.gz: a969d231bc2d060004ef28269b3172f478019d546c0bedffe75569156171d01a70936af329d598ce310145eb5835b3e640b56417bebda4d4ece5d6f4356d8109
-  data.tar.gz: e0ab2531c4685f789b28718084fbfa115bf306f1a657a06123bdedf227735dba27ad6b5965c162e121774dabd6c135b9e0ac6561941f16fb3446f42b9f61c4e6
+  metadata.gz: 2fe5c7976c8c37906859209988f2ddebce48cdf7bc1946c5cf3bf133f6f78655d988ace1497d87e261ef9fa538a87c178e8c0f210ed18197ccd97eaf2c335aff
+  data.tar.gz: 5c88f59c9ca66da4434e37966dcd392b88407deab9f744ca41b84b471dbdb3807f2ea0b36bf6b879185e34d15c97eeb2406cdccd980ec0aa898e3d3484c89df9

data/app/controllers/ecm/user_area/current_users_controller.rb

@@ -1,7 +1,9 @@
-module Ecm::UserArea
-  class CurrentUsersController < Users::BaseController
-    def self.resource_class
-      User
+module Ecm
+  module UserArea
+    class CurrentUsersController < Users::BaseController
+      def self.resource_class
+        Ecm::UserArea::User
+      end
     end
   end
-end
+end

data/app/controllers/ecm/user_area/password_reset_requests.rb

@@ -0,0 +1,6 @@
+module Ecm
+  module UserArea
+    module PasswordResetRequests
+    end
+  end
+end

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

@@ -1,44 +1,47 @@
-module Ecm::UserArea
-  class PasswordResetRequests::BaseController < Ecm::UserArea::Configuration.base_controller.constantize
-    include Controller::ResourceConcern
-    include Controller::ResourceInflectionsConcern
-    include Controller::ResourceUrlsConcern
-    include Controller::RestActionsConcern
-    include Controller::RedirectBackConcern
-    
-    if Rails.version < '5'
-      skip_before_action :authenticate_user!
-    else
-      skip_before_action :authenticate_user!, raise: false
-    end
+module Ecm
+  module UserArea
+    module PasswordResetRequests
+      class BaseController < Ecm::UserArea::Configuration.base_controller.constantize
+      include Controller::ResourceConcern
+      include Controller::ResourceInflectionsConcern
+      include Controller::ResourceUrlsConcern
+      include Controller::RestActionsConcern
+      include Controller::RedirectBackConcern
+      
+      if Rails.version < '5'
+        skip_before_action :authenticate_user!
+      else
+        skip_before_action :authenticate_user!, raise: false
+      end
 
-    def create
-      @resource = resource_class.new(permitted_params)
-      @resource.host = request.host
-      @resource.save
-      respond_with @resource, location: after_create_location
-    end
+      def create
+        @resource = resource_class.new(permitted_params)
+        @resource.host = request.host
+        @resource.save
+        respond_with @resource, location: after_create_location
+      end
 
-    def edit
-      @resource = load_user_by_token
-      unless @resource
-        flash[:error] = t('.user_not_found')
-        redirect_to new_user_session_path
-        return
+      def edit
+        @resource = load_user_by_token
+        unless @resource
+          flash[:error] = t('.user_not_found')
+          redirect_to new_user_session_path
+          return
+        end
+        respond_with @resource
       end
-      respond_with @resource
-    end
 
 
-    private
+      private
 
-    def load_user_by_token
-      User.find_using_perishable_token(params[:token])
-    end
+      def load_user_by_token
+        User.find_using_perishable_token(params[:token])
+      end
 
 
-    def permitted_params
-      params.require(resource_class.name.demodulize.underscore.to_sym).permit(:email)
+      def permitted_params
+        params.require(resource_class.name.demodulize.underscore.to_sym).permit(:email)
+      end
     end
   end
-end
+end

data/app/controllers/ecm/user_area/password_resets.rb

@@ -0,0 +1,5 @@
+module Ecm
+  module UserArea
+    module PasswordResets
+  end
+end

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

@@ -1,44 +1,47 @@
-module Ecm::UserArea
-  class PasswordResets::BaseController < Ecm::UserArea::Configuration.base_controller.constantize
-    include Controller::ResourceConcern
-    include Controller::ResourceInflectionsConcern
-    include Controller::ResourceUrlsConcern
-    include Controller::RestActionsConcern
-    include Controller::RedirectBackConcern
-    
-    if Rails.version < '5'
-      skip_before_action :authenticate_user!
-    else
-      skip_before_action :authenticate_user!, raise: false
-    end
+module Ecm
+  module UserArea
+    module PasswordResets
+      class BaseController < Ecm::UserArea::Configuration.base_controller.constantize
+      include Controller::ResourceConcern
+      include Controller::ResourceInflectionsConcern
+      include Controller::ResourceUrlsConcern
+      include Controller::RestActionsConcern
+      include Controller::RedirectBackConcern
+      
+      if Rails.version < '5'
+        skip_before_action :authenticate_user!
+      else
+        skip_before_action :authenticate_user!, raise: false
+      end
 
-    before_action :find_using_perishable_token
+      before_action :find_using_perishable_token
 
-    private
+      private
 
-    def load_resource
-      @resource
-    end
+      def load_resource
+        @resource
+      end
 
-    def load_resource
-      User.find_using_perishable_token(params[:token])
-    end
+      def load_resource
+        User.find_using_perishable_token(params[:token])
+      end
 
-    def permitted_params
-      params.require(:user).permit(:password, :password_confirmation)
-    end
+      def permitted_params
+        params.require(:user).permit(:password, :password_confirmation)
+      end
 
-    def after_update_location
-      new_user_session_path
-    end
+      def after_update_location
+        new_user_session_path
+      end
 
-    def handle_user_not_found
-      redirect_to new_user_session_path, notice: t("messages.failures.ecm_user_area.perishable_token_invalid")
-    end
-    
-    def find_using_perishable_token
-      @resource =  User.find_using_perishable_token(params[:token])
-      handle_user_not_found if @resource.nil?
+      def handle_user_not_found
+        redirect_to new_user_session_path, notice: t("messages.failures.ecm_user_area.perishable_token_invalid")
+      end
+      
+      def find_using_perishable_token
+        @resource =  User.find_using_perishable_token(params[:token])
+        handle_user_not_found if @resource.nil?
+      end
     end
   end
 end

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

@@ -0,0 +1,6 @@
+module Ecm
+  module UserArea
+    module Sessions
+    end
+  end
+end

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

@@ -1,56 +1,60 @@
-module Ecm::UserArea
-  class Sessions::BaseController < Ecm::UserArea::Configuration.base_controller.constantize
-    include Controller::ResourceConcern
-    include Controller::ResourceInflectionsConcern
-    include Controller::ResourceUrlsConcern
-    include Controller::RestActionsConcern
-    include Controller::RedirectBackConcern
-
-    skip_before_action :authenticate_user!, only: [:new, :create], raise: false
-
-    def new
-      @session = initialize_resource
-      respond_with @session
-    end
-
-    def create
-      @session = resource_class.new(permitted_params)
+module Ecm
+  module UserArea
+    module Sessions
+      class BaseController < Ecm::UserArea::Configuration.base_controller.constantize
+        include ResourcesController::Resources
+        include ResourcesController::ResourceInflections
+        include ResourcesController::RestResourceUrls
+        include ResourcesController::RestActions
+        include ResourcesController::LocationHistory
+
+        skip_before_action :authenticate_user!, only: [:new, :create], raise: false
+
+        def new
+          @session = initialize_resource
+          respond_with @session
+        end
 
-      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)
+        def create
+          @session = resource_class.new(permitted_params)
+
+          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
+            return
+          else
+            render action: :new
+          end
         end
-        return
-      else
-        render action: :new
-      end
-    end
 
-    def destroy
-      current_session(resource_class.name.demodulize.underscore.to_sym).destroy
-      flash[:notice] = I18n.t('messages.success.ecm_user_area.signed_out') unless request.xhr?
-      redirect_to after_sign_out_url
-    end
+        def destroy
+          current_session(resource_class.name.demodulize.underscore.to_sym).destroy
+          flash[:notice] = I18n.t('messages.success.ecm_user_area.signed_out') unless request.xhr?
+          redirect_to after_sign_out_url
+        end
 
-    def self.resource_class
-      fail 'please define self.session_class in your controller.'
-    end
+        def self.resource_class
+          fail 'please define self.session_class in your controller.'
+        end
 
-    private
+        private
 
-    def after_sign_in_url
-      defined?(super) ? super : main_app.root_path
-    end
+        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)
-      else
-        params.require(resource_class.name.demodulize.underscore.tr('/', '_')).permit(:email, :password).to_h
+        def permitted_params
+          if Rails.version < '5'
+            params.require(resource_class.name.demodulize.underscore.tr('/', '_')).permit(:email, :password)
+          else
+            params.require(resource_class.name.demodulize.underscore.tr('/', '_')).permit(:email, :password).to_h
+          end
+        end
       end
     end
   end
-end
+end

data/app/controllers/ecm/user_area/user_password_reset_requests_controller.rb

@@ -1,13 +1,15 @@
-module Ecm::UserArea
-  class UserPasswordResetRequestsController < PasswordResetRequests::BaseController
-    def self.resource_class
-      UserPasswordResetRequest
-    end
+module Ecm
+  module UserArea
+    class UserPasswordResetRequestsController < PasswordResetRequests::BaseController
+      def self.resource_class
+        Ecm::UserArea::UserPasswordResetRequest
+      end
 
-    private
+      private
 
-    def after_create_location
-      new_user_session_path
+      def after_create_location
+        new_user_session_path
+      end
     end
   end
-end
+end

data/app/controllers/ecm/user_area/user_password_resets_controller.rb

@@ -1,7 +1,9 @@
-module Ecm::UserArea
-  class UserPasswordResetsController < PasswordResets::BaseController
-    def self.resource_class
-      User
+module Ecm
+  module UserArea
+    class UserPasswordResetsController < PasswordResets::BaseController
+      def self.resource_class
+        Ecm::UserArea::User
+      end
     end
   end
-end
+end

data/app/controllers/ecm/user_area/user_sessions_controller.rb

@@ -1,7 +1,9 @@
-module Ecm::UserArea
-  class UserSessionsController < Sessions::BaseController
-    def self.resource_class
-      UserSession
+module Ecm
+  module UserArea
+    class UserSessionsController < Ecm::UserArea::Sessions::BaseController
+      def self.resource_class
+        Ecm::UserArea::UserSession
+      end
     end
   end
-end
+end

data/app/controllers/ecm/user_area/users.rb

@@ -0,0 +1,6 @@
+module Ecm
+  module UserArea
+    module Users
+    end
+  end
+end

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

@@ -1,44 +1,48 @@
-module Ecm::UserArea
-  class Users::BaseController < Ecm::UserArea::Configuration.base_controller.constantize
-    include Controller::ResourceConcern
-    include Controller::ResourceInflectionsConcern
-    include Controller::ResourceUrlsConcern
-    include Controller::RestActionsConcern
-    include Controller::RedirectBackConcern
-
-    before_action :authenticate_user!, except: [:new, :create]
-
-    def create
-      @resource = resource_class.new(permitted_params)
-      flash[:notice] = I18n.t('messages.confirmations.ecm_user_area.send_instructions') if @resource.save && !request.xhr?
-      respond_with @resource, location: after_registration_url
-    end
-
-    def update
-      @resource = load_resource
-      # do not assign password/confirmation if they are empty
-      @resource.attributes = permitted_params.delete_if { |_k, v| v.empty? }
-
-      if @resource.save && (@resource.previous_changes.keys.map(&:to_sym) & [:email, :crypted_password]).any?
-        current_session(:user).destroy
-        redirect_to(new_user_session_path)
-        return
+module Ecm
+  module UserArea
+    module Users
+      class BaseController < Ecm::UserArea::Configuration.base_controller.constantize
+        include ResourcesController::Resources
+        include ResourcesController::ResourceInflections
+        include ResourcesController::RestResourceUrls
+        include ResourcesController::RestActions
+        include ResourcesController::LocationHistory
+
+        before_action :authenticate_user!, except: [:new, :create]
+
+        def create
+          @resource = resource_class.new(permitted_params)
+          flash[:notice] = I18n.t('messages.confirmations.ecm_user_area.send_instructions') if @resource.save && !request.xhr?
+          respond_with @resource, location: after_registration_url
+        end
+
+        def update
+          @resource = load_resource
+          # do not assign password/confirmation if they are empty
+          @resource.attributes = permitted_params.delete_if { |_k, v| v.empty? }
+
+          if @resource.save && (@resource.previous_changes.keys.map(&:to_sym) & [:email, :crypted_password]).any?
+            current_session(:user).destroy
+            redirect_to(new_user_session_path)
+            return
+          end
+          respond_with @resource, location: edit_current_user_path
+        end
+
+        private
+
+        def after_registration_url
+          new_user_session_path
+        end
+
+        def load_resource
+          @resource = send("current_#{resource_class.name.demodulize.underscore}".to_sym)
+        end
+
+        def permitted_params
+          params.require(resource_class.name.demodulize.underscore.to_sym).permit(:email, :password, :password_confirmation)
+        end
       end
-      respond_with @resource, location: edit_current_user_path
-    end
-
-    private
-
-    def after_registration_url
-      new_user_session_path
-    end
-
-    def load_resource
-      send("current_#{resource_class.name.demodulize.underscore}".to_sym)
-    end
-
-    def permitted_params
-      params.require(resource_class.name.demodulize.underscore.to_sym).permit(:email, :password, :password_confirmation)
     end
   end
-end
+end