constructor-core 0.4.0 → 0.5.0

data/app/assets/stylesheets/constructor_core/main.css.scss

@@ -186,6 +186,7 @@ h3 {
     list-style: none;
     margin-top: 15px;
     margin-left: 60px;
+    margin-bottom: 25px;
 
     &:first-child {
       margin-left: 0;

data/app/controllers/constructor_core/application_controller.rb

@@ -3,5 +3,27 @@
 module ConstructorCore
   class ApplicationController < ApplicationController
     helper_method :current_user
+
+    private
+
+    def authenticate_user!
+      warden.authenticate!
+    end
+
+    def user_signed_in?
+      !!current_user
+    end
+
+    def current_user
+      @current_user ||= warden.authenticate
+    end
+
+    def user_session
+      current_user && warden.session
+    end
+
+    def warden
+      request.env['warden']
+    end
   end
 end

data/app/controllers/constructor_core/users_controller.rb

@@ -0,0 +1,26 @@
+# encoding: utf-8
+
+module ConstructorCore
+  class UsersController < ApplicationController
+    layout 'constructor_core/application_admin'
+
+    def profile
+      @user = current_user
+    end
+
+    def update_password
+      @user = current_user
+
+      if params[:user][:password] == params[:user][:password_confirm]
+        @user.password = params[:user][:password]
+
+        if @user.save
+          redirect_to '/login', :notice => t(:password_changed)
+          return
+        end
+      end
+
+      redirect_to :back, :notice => t(:password_error_confirm)
+    end
+  end
+end

data/app/helpers/constructor_core/application_helper.rb

@@ -1,25 +1,5 @@
 module ConstructorCore
   module ApplicationHelper
-    def authenticate_user!
-      warden.authenticate!
-    end
-
-    def user_signed_in?
-      !!current_user
-    end
-
-    def current_user
-      @current_user ||= warden.authenticate
-    end
-
-    def user_session
-      current_user && warden.session
-    end
-
-    def warden
-      request.env['warden']
-    end
-
     def gravatar_icon(user_email = '', size = 40)
       gravatar_url = 'http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm'
       user_email.strip!

data/app/models/constructor_core/user.rb

@@ -2,7 +2,7 @@
 
 module ConstructorCore
   class User < ActiveRecord::Base
-    devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable, :token_authenticatable, :timeoutable  #:confirmable, :registerable, :omniauthable, :lockable, :encryptable
+    devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable, :token_authenticatable, :timeoutable, :registerable  #:confirmable,  :omniauthable, :lockable, :encryptable
     attr_accessible :email, :password, :password_confirmation, :remember_me
   end
 end

data/app/views/constructor_core/sessions/new.html.haml

@@ -11,6 +11,7 @@
       = f.label :password, :class => 'control-label'
       .controls
         = f.password_field :password
+
     - if devise_mapping.rememberable?
       .control-group
         .controls

data/app/views/constructor_core/users/profile.haml

@@ -0,0 +1,16 @@
+- content_for :page_title do
+  =t :profile
+
+= form_for @current_user, method: :post do |f|
+  .form-horizontal
+    .control-group
+      = f.label :password, :class => 'control-label'
+      .controls
+        = f.password_field :password, required: true
+    .control-group
+      = f.label :password_confirmation, :class => 'control-label'
+      .controls
+        = f.password_field :password_confirm, required: true
+    .control-group
+      .controls
+        = f.submit t(:save_password), :class => "btn btn-primary"

data/app/views/layouts/constructor_core/application_admin.haml

@@ -39,20 +39,15 @@
                 = link_to '/admin/templates' do
                   %i.icon-film
                   =t :templates
-              /
-                %li
-                  = link_to '/admin/users' do
-                    %i.icon-group
-                    =t :users
 
-            - if user_signed_in?
+            - if current_user
               %ul.nav.pull-right
                 %li
-                  = link_to @current_user do
+                  = link_to core.user_path(current_user.id) do
                     = image_tag gravatar_icon(current_user.email, 48), width: 24, height: 24, class: 'avatar'
                     %span= current_user.email
                 %li
-                  = link_to @current_user, class: 'logout', method: :delete do
+                  = link_to core.destroy_user_session_path, method: :delete do
                     %i.icon-signout
                     =t :logout
 

data/config/locales/en.yml

@@ -7,4 +7,8 @@ en:
   no: 'No'
   error: 'Error'
   sitemap: 'Site map'
-  remember_me: 'Remember me'
+  remember_me: 'Remember me'
+  profile: 'Profile'
+  password_error_confirm: 'Password confirmation failed'
+  save_password: 'Save password'
+  password_changed: 'Password changed'

data/config/locales/ru.yml

@@ -8,6 +8,10 @@ ru:
   error: 'Ошибка'
   sitemap: 'Карта сайта'
   remember_me: 'Запомнить меня'
+  profile: 'Профиль'
+  save_password: 'Сохранить пароль'
+  password_changed: 'Пароль успешно изменен'
+  password_error_confirm: 'Пароли не совпадают'
 
   activerecord:
     attributes:

data/config/routes.rb

@@ -1,14 +1,18 @@
 ConstructorCore::Engine.routes.draw do
-  devise_for :users, {
-      class_name: 'ConstructorCore::User',
-      skip: [:sessions, :passwords],
-      module: :devise
-  }
+  scope 'admin' do
+    get 'profile/:id' => 'users#profile', as: :user
+    post 'profile/:id' => 'users#update_password'
+
+    devise_for :users, {
+        class_name: 'ConstructorCore::User',
+        module: :devise
+    }
+  end
 
   as :user do
     get '/admin' => 'sessions#new'
     get '/login' => 'sessions#new'
     post '/login' => 'sessions#create'
-    get '/logout' => 'sessions#destroy'
+    delete '/logout' => 'sessions#destroy'
   end
 end

data/db/migrate/1_devise_users.rb

@@ -1,56 +1,24 @@
 class DeviseUsers < ActiveRecord::Migration
   def self.up
     create_table ConstructorCore::User.table_name do |t|
-      ## Database authenticatable
       t.string :email,              :null => false, :default => ""
       t.string :encrypted_password, :null => false, :default => ""
-
-      ## Recoverable
       t.string   :reset_password_token
       t.datetime :reset_password_sent_at
-
-      ## Rememberable
       t.datetime :remember_created_at
-
-      ## Trackable
       t.integer  :sign_in_count, :default => 0
       t.datetime :current_sign_in_at
       t.datetime :last_sign_in_at
       t.string   :current_sign_in_ip
       t.string   :last_sign_in_ip
-
-      ## Encryptable
-      # t.string :password_salt
-
-      ## Confirmable
-      # t.string   :confirmation_token
-      # t.datetime :confirmed_at
-      # t.datetime :confirmation_sent_at
-      # t.string   :unconfirmed_email # Only if using reconfirmable
-
-      ## Lockable
-      # t.integer  :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts
-      # t.string   :unlock_token # Only if unlock strategy is :email or :both
-      # t.datetime :locked_at
-
-      ## Token authenticatable
       t.string :authentication_token
-
-
-      # Uncomment below if timestamps were not included in your original model.
-      # t.timestamps
     end
 
     add_index ConstructorCore::User.table_name, :email,                :unique => true
     add_index ConstructorCore::User.table_name, :reset_password_token, :unique => true
-    # add_index :users, :confirmation_token,   :unique => true
-    # add_index :users, :unlock_token,         :unique => true
-    # add_index :users, :authentication_token, :unique => true
   end
 
   def self.down
-    # By default, we don't want to make any assumption about how to roll back a migration when your
-    # model already existed. Please edit below which fields you would like to remove in this migration.
     drop_table ConstructorCore::User.table_name
   end
 end

data/lib/constructor_core/version.rb

@@ -1,3 +1,3 @@
 module ConstructorCore
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: constructor-core
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -110,6 +110,7 @@ files:
 - app/assets/stylesheets/constructor_core/main.css.scss
 - app/controllers/constructor_core/application_controller.rb
 - app/controllers/constructor_core/sessions_controller.rb
+- app/controllers/constructor_core/users_controller.rb
 - app/helpers/constructor_core/application_helper.rb
 - app/models/constructor_core/user.rb
 - app/views/constructor_core/devise/confirmations/new.html.haml
@@ -123,6 +124,7 @@ files:
 - app/views/constructor_core/devise/shared/_links.html.haml
 - app/views/constructor_core/devise/unlocks/new.html.haml
 - app/views/constructor_core/sessions/new.html.haml
+- app/views/constructor_core/users/profile.haml
 - app/views/layouts/constructor_core/application_admin.haml
 - config/environments/production.rb
 - config/initializers/devise.rb