tramway-user 1.1.8 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52554de74bdeb3f23649eca7c1c601a332d7aef94169c05afa8bc80c750af0d3
-  data.tar.gz: e91e191bd0a0c872c459b42e7fe9a2a1fd56a4ec13c6d4f1843fb61409aefd17
+  metadata.gz: 4f172fc71da227bb6eecfa53e019a7275a8ff17ff78fc08911c9b79071adc08c
+  data.tar.gz: 4ee42e45e106fe3270902ab3f776568d823587af490ff25a5a35096d5b355c39
 SHA512:
-  metadata.gz: f1b303f599836906e3c4303821c5a4296fd51de0b278f3b018450c81bb2a1899e87a812560a47ea18abf564270b4a5a2bd3b132f8c7bc701cb9f7a678f83a005
-  data.tar.gz: 71814f19adf0a5ebf20605ed39bd5889587481c6aad4fe3067f57c0118ae7426e59a5ecc5b5aadfbf8ac8c217b504544ed0a56f78c707a07c6acd17401a98f9a
+  metadata.gz: f5608b665b8ee8d9d5f65770d55e518173e1b1320b069b0e7c30533f574ae00b67374062cf9b1822a85dba02a6ff6281b59e76fc0a0660a935b20ba62ec33db8
+  data.tar.gz: 0eeff16e6f881af9b748037ce706ff885617ef63e0c70dae14b7df45aec17c5e40260697de6d9963ac35e3582c7d6245c7ed1bc7eb84f1aa26c0cec7049380bf

data/lib/tramway/user/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module User
-    VERSION = '1.1.8'
+    VERSION = '2.0'
   end
 end

data/lib/tramway/user.rb

@@ -3,26 +3,5 @@ require 'tramway/user/generators/install_generator'
 
 module Tramway
   module User
-    class << self
-      def root
-        File.dirname __dir__
-      end
-
-      def layout_path=(path)
-        @layout_path = path
-      end
-
-      def layout_path
-        @layout_path ||= 'tramway/user/application'
-      end
-
-      def root_path=(path)
-        @root_path = path
-      end
-
-      def root_path
-        @root_path || '/'
-      end
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-user
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: '2.0'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-10 00:00:00.000000000 Z
+date: 2019-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -64,22 +64,12 @@ files:
 - app/assets/javascripts/tramway/user/application.js
 - app/assets/javascripts/tramway/user/web/application.js
 - app/assets/stylesheets/tramway/user/application.sass
-- app/controllers/concerns/auth_managment.rb
-- app/controllers/tramway/user/application_controller.rb
-- app/controllers/tramway/user/web/application_controller.rb
-- app/controllers/tramway/user/web/sessions_controller.rb
 - app/decorators/tramway/user/user_decorator.rb
-- app/forms/tramway/user/session_form.rb
 - app/forms/tramway/user/user_form.rb
-- app/helpers/tramway/user/application_helper.rb
 - app/jobs/tramway/user/application_job.rb
 - app/mailers/tramway/user/application_mailer.rb
 - app/models/tramway/user/user.rb
-- app/views/tramway/user/web/sessions/new.html.haml
-- config/locales/helpers.yml
 - config/locales/models.yml
-- config/locales/ru.yml
-- config/routes.rb
 - lib/tasks/tramway/user_tasks.rake
 - lib/tramway/user.rb
 - lib/tramway/user/engine.rb
@@ -87,7 +77,7 @@ files:
 - lib/tramway/user/generators/templates/create_tramway_user_users.rb
 - lib/tramway/user/generators/templates/tramway_user.rb
 - lib/tramway/user/version.rb
-homepage: https://github.com/kalashnikovisme/tramway-user
+homepage: https://github.com/ulmic/tramway-dev
 licenses:
 - MIT
 metadata: {}
@@ -107,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Engine for users in your Rails app

data/app/controllers/concerns/auth_managment.rb

@@ -1,29 +0,0 @@
-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!
-    redirect_to new_session_path unless signed_in?
-  end
-
-  def authenticate_admin!
-    if signed_in?
-      redirect_to ::Tramway::User.root_path if !current_user.admin? && request.env['PATH_INFO'] != ::Tramway::User.root_path
-    else
-      redirect_to '/users/session/new'
-    end
-  end
-
-  def current_user
-    @_current_user ||= ::Tramway::User::User.find_by id: session[:user_id]
-  end
-end

data/app/controllers/tramway/user/application_controller.rb

@@ -1,15 +0,0 @@
-module Tramway
-  module User
-    class ApplicationController < ActionController::Base
-      layout ::Tramway::User.layout_path
-      protect_from_forgery with: :exception
-      before_action :application
-
-      def application
-        if ::Tramway::Core.application
-          @application = Tramway::Core.application&.model_class&.first || Tramway::Core.application
-        end
-      end
-    end
-  end
-end

data/app/controllers/tramway/user/web/application_controller.rb

@@ -1,5 +0,0 @@
-require_dependency "tramway/user/application_controller"
-
-class Tramway::User::Web::ApplicationController < ::Tramway::User::ApplicationController
-  include AuthManagment
-end

data/app/controllers/tramway/user/web/sessions_controller.rb

@@ -1,32 +0,0 @@
-module Tramway::User
-  module Web
-    class SessionsController < ::Tramway::User::Web::ApplicationController
-      before_action :redirect_if_signed_in, except: :destroy
-
-      def new
-        @session_form = ::Tramway::User::SessionForm.new ::Tramway::User::User.new
-      end
-
-      def create
-        @session_form = ::Tramway::User::SessionForm.new User.find_or_initialize_by email: params[:user][:email]
-        if @session_form.validate params[:user]
-          sign_in @session_form.model
-          redirect_to ::Tramway::User.root_path
-        else
-          render :new
-        end
-      end
-
-      def destroy
-        sign_out
-        redirect_to root_path
-      end
-
-      private
-
-      def redirect_if_signed_in
-        redirect_to ::Tramway::User.root_path if signed_in? && request.env['PATH_INFO'] != ::Tramway::User.root_path
-      end
-    end
-  end
-end

data/app/forms/tramway/user/session_form.rb

@@ -1,14 +0,0 @@
-module Tramway::User
-  class SessionForm < ::Tramway::Core::ApplicationForm
-    properties :email
-    attr_accessor :password 
-
-    def model_name
-      User
-    end
-
-    def validate(params)
-      self.model.authenticate params[:password]
-    end
-  end
-end

data/app/helpers/tramway/user/application_helper.rb

@@ -1,10 +0,0 @@
-module Tramway
-  module User
-    module ApplicationHelper
-      include AuthManagment
-      include ::FontAwesome::Rails::IconHelper
-      include Tramway::Core::TitleHelper
-      include Tramway::Admin::NavbarHelper
-    end
-  end
-end

data/app/views/tramway/user/web/sessions/new.html.haml

@@ -1,7 +0,0 @@
-- title
-.row
-  .col-md-6
-    = simple_form_for @session_form.model, url: session_path, method: :post, html: { class: 'form-horizontal' } do |f|
-      = f.input :email, as: :string
-      = f.input :password
-      = f.button :submit, t('helpers.links.enter'), class: 'btn btn-success'

data/config/locales/helpers.yml

@@ -1,4 +0,0 @@
-ru:
-  helpers:
-    links:
-      enter: Войти

data/config/locales/ru.yml

@@ -1,7 +0,0 @@
-ru:
-  tramway:
-    user:
-      web:
-        sessions:
-          new:
-            title: Авторизация

data/config/routes.rb

@@ -1,5 +0,0 @@
-Tramway::User::Engine.routes.draw do
-  scope module: :web do
-    resource :session, only: [ :new, :create, :destroy ]
-  end
-end