added concerns and fix types

app/assets/javascripts/application.js

@@ -13,7 +13,6 @@
 //= require jquery
 //= require jquery_ujs
 //= require twitter/bootstrap
-//= require turbolinks
 //= require chosen-jquery
 //= require_self
 

app/controllers/application_controller.rb

@@ -1,6 +1,6 @@
 class ApplicationController < ActionController::Base
-  include AuthHelper
-  include FlashHelper
+  include Concerns::AuthManagment
+  include Concerns::FlashHelper
 
   helper_method :current_user, :signed_in?
 

app/controllers/concerns/auth_managment.rb

@@ -0,0 +1,25 @@
+module Concerns
+  module AuthManagment
+    def sign_in(user)
+      session[:user_id] = user.id
+    end
+
+    def sign_out
+      session[:user_id] = nil
+    end
+
+    def signed_in?
+      current_user
+    end
+
+    def authenticate_user!
+      unless signed_in?
+        redirect_to new_session_path
+      end
+    end
+
+    def current_user
+      @current_user ||= User.active.where(id: session[:user_id]).first
+    end
+  end
+end

app/controllers/concerns/custom_url_helper.rb

@@ -0,0 +1,8 @@
+module Concerns
+  module CustomUrlHelper
+
+    def sign_in_via_social_network_cpath(provider)
+      "/auth/#{provider}"
+    end
+  end
+end

app/controllers/concerns/flash_helper.rb

@@ -0,0 +1,17 @@
+module Concerns
+  module FlashHelper
+    def f(key, options = {})
+      scope = [:flash]
+      scope << params[:controller].split('/')
+      scope << params[:action]
+
+      msg = I18n.t(key, scope: scope)
+      Rails.logger.debug(Term::ANSIColor.green("flash: #{msg}"))
+      if options[:now]
+        flash.now[key] = msg
+      else
+        flash[key] = msg
+      end
+    end
+  end
+end

app/helpers/application_helper.rb

@@ -1,5 +1,5 @@
 module ApplicationHelper
-  include CustomUrlHelper
+  include Concerns::CustomUrlHelper
 
   def ham(model, attribute)
     model.to_s.classify.constantize.human_attribute_name(attribute)

app/models/user.rb

@@ -1,12 +1,13 @@
 class User < ActiveRecord::Base
-  has_secure_password
+  has_secure_password validations: false
 
   has_many :authorizations, dependent: :destroy
   has_many :topics, foreign_key: :creator_id, dependent: :restrict_with_exception
   has_many :topic_comments, dependent: :restrict_with_exception
 
   validates :email, uniqueness: true, presence: true, email: true
   validates :login, uniqueness: true, presence: true
+  validates :password_digest, presence: true
 
   state_machine initial: :waiting_confirmation do
     state :waiting_confirmation

app/types/application_type.rb

@@ -1,4 +1,4 @@
-module BaseType
+module ApplicationType
   extend ActiveSupport::Concern
 
   module ClassMethods

app/types/application_type_without_active_record.rb

@@ -1,4 +1,4 @@
-module BaseTypeWithoutActiveRecord
+module ApplicationTypeWithoutActiveRecord
   extend ActiveSupport::Concern
 
   included do

app/types/password_confirmation_type.rb

@@ -1,5 +1,5 @@
 class PasswordConfirmationType
-  include BaseTypeWithoutActiveRecord
+  include ApplicationTypeWithoutActiveRecord
 
   attribute :email, String
 

app/types/topic_type.rb

@@ -1,5 +1,5 @@
 class TopicType < Topic
-  include BaseType
+  include ApplicationType
 
   permit :name, :body, :state_event, category_hub_ids: []
 end

app/types/user_password_edit_type.rb

@@ -1,5 +1,5 @@
 class UserPasswordEditType < User
-  include BaseType
+  include ApplicationType
 
   permit :password, :password_confirmation
 

app/types/user_registration_type.rb

@@ -1,5 +1,7 @@
 class UserRegistrationType < User
-  include BaseType
+  include ApplicationType
+
+  has_secure_password
 
   permit :login, :email, :password, :password_confirmation
 end

app/types/user_sign_in_type.rb

@@ -1,5 +1,5 @@
 class UserSignInType
-  include BaseTypeWithoutActiveRecord
+  include ApplicationTypeWithoutActiveRecord
 
   attribute :email, String
   attribute :password, String

test/test_helper.rb

@@ -50,7 +50,7 @@ class ActiveSupport::TestCase
   ActiveRecord::Migration.check_pending!
 
   include FactoryGirl::Syntax::Methods
-  include AuthHelper
+  include Concerns::AuthManagment
 
   # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
   #