ecm_user_area2 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 614c956b50107960ff26d10c3148f25a91960933
-  data.tar.gz: bdce50d41b9fd97e8077fbd79fafd412a7f00d18
+  metadata.gz: 3628ffd41c3d078ca73eeab43e6f0fae541c141e
+  data.tar.gz: 2d73ad9b91a6a9894ea24571d12f3e295ae79819
 SHA512:
-  metadata.gz: b0c568b9acbc9beb2c69257a8cb934bb61660eeffc1a1202e371ec13661e2733f02a39b4ac8475b7b4c8ccaebaefa87ad5ee90ff56eac2a9bd6816cb3adff7ca
-  data.tar.gz: 7139e1fbdc13d7e152ef91906d21d26d3fd36f5a3b5943cea355640b8a1f6c80269b881f7e706866fcf0bb95ec7843113ce88bc5d28aa24a53eafe40fcabbf46
+  metadata.gz: bae90e472c7a6fe4b701c481da73cf9cf44f6927f951a5baf2649dad053949dc5a8ffa311a1357988ff46884058409805e3587715b566479a4f38c19f4e10b3f
+  data.tar.gz: 60002ccb82b0a05aff68fc27728dd0fa604157051b78884737be8c0eb0c14e62c00fc7cff2ab15aabfc78fecc8d1600f049dc689d9deeafc1f7fa0fa8b71ccbf

data/app/concerns/controller/store_current_user_concern.rb

@@ -0,0 +1,21 @@
+module Controller
+  module StoreCurrentUserConcern
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :store_current_user_id
+      before_action :store_current_user
+    end
+
+    private
+
+    def store_current_user_id
+      RequestLocals.store[:current_user_id] = current_user.try(:id)
+    end
+
+
+    def store_current_user
+      RequestLocals.store[:current_user] = current_user
+    end
+  end
+end

data/app/controllers/ecm/user_area/{users_controller.rb → current_users_controller.rb}

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

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

@@ -24,7 +24,7 @@ module Ecm::UserArea
         redirect_to(new_user_session_path)
         return
       end
-      respond_with @resource, location: edit_user_path
+      respond_with @resource, location: edit_current_user_path
     end
 
     private

data/app/models/ecm/user_area/user_password_reset_request.rb

@@ -19,7 +19,7 @@ module Ecm
       validates :user, presence: true
 
       before_validation :load_user
-      after_validation :delete_error_on_user, if: ->() { errors.get(:email).present? }
+      after_validation :delete_error_on_user, if: ->() { errors.has_key?(:email) }
 
       def save
         return unless valid?

data/app/views/ecm/user_area/_navigation_dropdown.html.haml

@@ -8,9 +8,9 @@
       %span.caret
     %ul.dropdown-menu
       - if user_signed_in?
-        %li= link_to t('.edit'), ecm_user_area.edit_user_path
+        %li= link_to t('.edit'), ecm_user_area.edit_current_user_path
         %li= link_to t('.sign_out'), ecm_user_area.user_session_path, method: :delete
       - else
         %li= link_to t('.sign_in'), ecm_user_area.new_user_session_path
         - if Ecm::UserArea::Configuration.enable_registrations
-          %li= link_to t('.new'), ecm_user_area.new_user_path
+          %li= link_to t('.new'), ecm_user_area.new_current_user_path

data/app/views/ecm/user_area/{users/base → current_users}/edit.html.haml

@@ -2,14 +2,14 @@
   .panel-heading
     %h1= t('.title', inflections)
   .panel-body
-    = simple_form_for(@resource, url: user_path) do |f|
+    = simple_form_for(@resource, url: current_user_path) do |f|
       = render partial: 'form_errors', locals: { resource: f.object }
       = render 'form', form: f
       = f.button :submit, class: 'btn btn-success'
   .panel-footer
 
 .well.well-sm
-  = link_to user_path, class: 'btn btn-primary btn-responsive' do
+  = link_to current_user_path, class: 'btn btn-primary btn-responsive' do
     %span.glyphicon.glyphicon-eye-open
     %span.btn-text= t('.show')
   = link_to main_app.root_path, class: 'btn btn-default btn-responsive pull-right' do

data/app/views/ecm/user_area/{users/base → current_users}/new.html.haml

@@ -2,7 +2,7 @@
   %div.panel-heading
     %h1= t('.title', inflections)
   %div.panel-body
-    = simple_form_for(@resource, url: user_path) do |f|
+    = simple_form_for(@resource, url: current_user_path) do |f|
       = render partial: 'form_errors', locals: { resource: f.object }
       = render 'form', form: f
       = f.button :submit, class: 'btn btn-success'

data/app/views/ecm/user_area/{users/base → current_users}/show.html.haml

@@ -8,7 +8,7 @@
       #page-actions.btn-container-right
         - if Ecm::UserArea::Configuration.allow_users_to_destroy_self
           .pull-right
-            = link_to(ecm_user_area.user_path, method: :delete, class: 'btn btn-danger btn-responsive', 'data-confirm': I18n.t('confirmations.delete')) do
+            = link_to(ecm_user_area.current_user_path, method: :delete, class: 'btn btn-danger btn-responsive', 'data-confirm': I18n.t('confirmations.delete')) do
               %span.glyphicon.glyphicon-fire
               %span.btn-text= t('.destroy')
 
@@ -22,7 +22,10 @@
 = render 'show_extras', resource: @resource
 
 .well.well-sm
-  = link_to(ecm_user_area.edit_user_path, class: 'btn btn-primary btn-responsive') do
+  = link_to(ecm_user_area.user_session_path, class: 'btn btn-warning btn-responsive', method: :delete) do
+    %span.glyphicon.glyphicon-pencil
+    %span.btn-text= t('.sign_out')
+  = link_to(ecm_user_area.edit_current_user_path, class: 'btn btn-primary btn-responsive') do
     %span.glyphicon.glyphicon-pencil
     %span.btn-text= t('.edit')
   = link_to main_app.root_path, class: 'btn btn-default btn-responsive pull-right' do

data/config/locales/de.yml

@@ -57,20 +57,23 @@ de:
             title: Einloggen
             password:
               new: 'Passwort vergessen'
+      current_users:
+        edit:
+          back: Zurück
+          show: Anzeigen
+          title: Mein Account
+        new:
+          back: Zurück
+          title: Registrieren
+        show:
+          back: Zurück
+          destroy: 'Löschen'
+          edit: 'Bearbeiten'
+          sign_out: Ausloggen
       users:
         base:
-          edit:
-            back: Zurück
-            show: Anzeigen
-            title: Mein Account
-          new:
-            back: Zurück
-            title: Registrieren
           show:
-            back: Zurück
-            destroy: 'Löschen'
-            edit: 'Bearbeiten'
-  flash:
+            sign_out: Ausloggen
     ecm:
       user_area:
         user_password_resets:
@@ -85,9 +88,9 @@ de:
         create: 'Weiter'
       user_session:
         create: 'Einloggen'
-      user:
-        create: 'Registrieren'
-        update: 'Aktualisieren'
+      # user:
+      #   create: 'Registrieren'
+      #   update: 'Aktualisieren'
   messages:
     confirmations:
       ecm_user_area:
@@ -101,7 +104,7 @@ de:
         authentication_failed: 'Sie müssen sich anmelden oder registrieren, bevor Sie fortfahren können.'
         perishable_token_invalid: 'Es konnte kein Benutzer mit dem eingegebenen Token gefunden werden oder ihr Token ist zu alt.'
   routes:
-    ecm_user_area: benutzer
-    users: profil
+    ecm_user_area_engine: benutzer
+    current_user: profil
     user_password_reset_request: passwort-reset
     user_session: session

data/config/locales/en.yml

@@ -36,26 +36,30 @@ en:
             title: Sign in
             password:
               new: Forgot password
+      current_users:
+        edit:
+          back: Back
+          show: Show
+          title: My Account
+        new:
+          back: Back
+          title: Register
+        show:
+          back: Back
+          destroy: 'Destroy'
+          edit: 'Edit'
+          sign_out: Sign out
       users:
         base:
-          edit:
-            back: Back
-            show: Show
-            title: My Account
-          new:
-            back: Back
-            title: Register
           show:
-            back: Back
-            destroy: 'Destroy'
-            edit: 'Edit'
+            sign_out: Sign out
   helpers:
     submit:
       user_session:
         create: 'Sign in'
-      user:
-        create: 'Create Account'
-        update: 'Update Account'
+      # user:
+      #   create: 'Create Account'
+      #   update: 'Update Account'
   locales:
     de: Deutsch
     en: English
@@ -71,7 +75,7 @@ en:
       ecm_user_area:
         authentication_failed: 'You need to sign in or sign up before continuing.'
   routes:
-    ecm_user_area: users
-    user: profile
+    ecm_user_area_engine: user
+    current_user: profile
     user_password_reset_request: password-reset
     user_session: session

data/config/routes.rb

@@ -1,9 +1,9 @@
 Ecm::UserArea::Engine.routes.draw do
   localized do
-    scope :ecm_user_area do
-      resource :user, only: [:show, :edit, :update]
-      resource :user, only: [:new, :create] if Ecm::UserArea::Configuration.enable_registrations
-      resource :user, only: [:destroy] if Ecm::UserArea::Configuration.allow_users_to_destroy_self
+    scope :ecm_user_area_engine do
+      resource :current_user, only: [:show, :edit, :update]
+      resource :current_user, only: [:new, :create] if Ecm::UserArea::Configuration.enable_registrations
+      resource :current_user, only: [:destroy] if Ecm::UserArea::Configuration.allow_users_to_destroy_self
       resource :user_password_reset_request, only: [:new, :create]
 
       resource :user_password_reset, only: [] do

data/lib/ecm/user_area/version.rb

@@ -1,5 +1,5 @@
 module Ecm
   module UserArea
-    VERSION = '2.0.0'
+    VERSION = '2.2.0'
   end
 end

data/lib/ecm_user_area2.rb

@@ -5,6 +5,7 @@ require 'itsf_services'
 require 'rails_rad'
 require 'resource_renderer'
 require 'simple_form'
+require 'ecm_core'
 
 require 'ecm/user_area/engine'
 require 'ecm/user_area/configuration'
@@ -16,5 +17,21 @@ module Ecm
     def self.table_name_prefix
       'ecm_user_area_'
     end
+
+    module CurrentUser
+      extend ActiveSupport::Concern
+
+      class_methods do
+        def current_user_id
+          RequestLocals.fetch(:current_user_id) { nil }
+        end
+
+        def current_user
+          RequestLocals.fetch(:current_user) { nil }
+        end
+      end
+    end
+
+    include CurrentUser
   end
 end

data/spec/dummy/db/migrate/20160115192220_create_ecm_user_area_users.ecm_user_area.rb

@@ -1,5 +1,5 @@
 # This migration comes from ecm_user_area (originally 20160115181043)
-class CreateEcmUserAreaUsers < ActiveRecord::Migration
+class CreateEcmUserAreaUsers < ActiveRecord::Migration[4.2]
   def change
     create_table :ecm_user_area_users do |t|
       # Authlogic::ActsAsAuthentic::Email

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecm_user_area2
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-07 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: ecm_core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
   requirement: !ruby/object:Gem::Requirement
@@ -400,6 +414,8 @@ files:
 - Rakefile
 - app/concerns/controller/current_user_concern.rb
 - app/concerns/controller/redirect_back_concern.rb
+- app/concerns/controller/store_current_user_concern.rb
+- app/controllers/ecm/user_area/current_users_controller.rb
 - app/controllers/ecm/user_area/password_reset_requests/base_controller.rb
 - app/controllers/ecm/user_area/password_resets/base_controller.rb
 - app/controllers/ecm/user_area/sessions/base_controller.rb
@@ -407,7 +423,6 @@ files:
 - app/controllers/ecm/user_area/user_password_resets_controller.rb
 - app/controllers/ecm/user_area/user_sessions_controller.rb
 - app/controllers/ecm/user_area/users/base_controller.rb
-- app/controllers/ecm/user_area/users_controller.rb
 - app/helpers/ecm/user_area_helper.rb
 - app/mailers/ecm/user_area/user_mailer.rb
 - app/models/ecm/user_area/user.rb
@@ -418,6 +433,14 @@ files:
 - app/sessions/ecm/user_area/user_session.rb
 - app/views/ecm/user_area/_navigation.html.haml
 - app/views/ecm/user_area/_navigation_dropdown.html.haml
+- app/views/ecm/user_area/current_users/_form.html.haml
+- app/views/ecm/user_area/current_users/_form_errors.html.haml
+- app/views/ecm/user_area/current_users/_head_extras.html.haml
+- app/views/ecm/user_area/current_users/_show.html.haml
+- app/views/ecm/user_area/current_users/_show_extras.html.haml
+- app/views/ecm/user_area/current_users/edit.html.haml
+- app/views/ecm/user_area/current_users/new.html.haml
+- app/views/ecm/user_area/current_users/show.html.haml
 - app/views/ecm/user_area/password_reset_requests/base/_form.html.haml
 - app/views/ecm/user_area/password_reset_requests/base/_form_errors.html.haml
 - app/views/ecm/user_area/password_reset_requests/base/_head_extras.html.haml
@@ -434,14 +457,6 @@ files:
 - app/views/ecm/user_area/user_mailer/password_reset_email.de.text.erb
 - app/views/ecm/user_area/user_mailer/password_reset_email.en.html.erb
 - app/views/ecm/user_area/user_mailer/password_reset_email.en.text.erb
-- app/views/ecm/user_area/users/base/_form.html.haml
-- app/views/ecm/user_area/users/base/_form_errors.html.haml
-- app/views/ecm/user_area/users/base/_head_extras.html.haml
-- app/views/ecm/user_area/users/base/_show.html.haml
-- app/views/ecm/user_area/users/base/_show_extras.html.haml
-- app/views/ecm/user_area/users/base/edit.html.haml
-- app/views/ecm/user_area/users/base/new.html.haml
-- app/views/ecm/user_area/users/base/show.html.haml
 - config/locales/authlogic.de.yml
 - config/locales/de.yml
 - config/locales/en.yml
@@ -504,8 +519,6 @@ files:
 - spec/dummy/db/migrate/20160115192220_create_ecm_user_area_users.ecm_user_area.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/templates/erb/scaffold/_form.html.erb
-- spec/dummy/log/development.log
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -1034,7 +1047,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: ECM User Area.
@@ -1054,8 +1067,6 @@ test_files:
 - spec/dummy/public/404.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/dummy/log/development.log
-- spec/dummy/log/test.log
 - spec/dummy/Guardfile
 - spec/dummy/config.ru
 - spec/dummy/tmp/cache/assets/development/sprockets/v3.0/swT4m4l1Wi06EnJ1MEVGW0K0ghSvNw02bA117VCbp9w.cache
@@ -1597,4 +1608,3 @@ test_files:
 - spec/dummy/bin/rails
 - spec/dummy/bin/bundle
 - spec/dummy/bin/setup
-has_rdoc: