tramway-auth 1.1.0.1 → 1.1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64ccdc8466378b0002ace0e0f152df79325bde856c62e382c32c427749065e4c
-  data.tar.gz: 70b653b4140905942200edbbab6236d9d28229167906a6a601cf0926c139d556
+  metadata.gz: 17e985facc791296ef2dabb8de8ea72f7ede24e1676b86207fcc47537dbfb4d4
+  data.tar.gz: fed766e1558ac7839ceb43e042dafff2a4fe71ab9f2de3d874e10392032caa80
 SHA512:
-  metadata.gz: 47d2136bf2032cdced3e5f838ea63716bd935cad388562218a648369e3429dd318e46c54a6c743d00b1acba376772889645cce0242e5c6f89e15adb857d6ba44
-  data.tar.gz: c3cef2df26ed1220b098096426dc8d9ecece3e4a59c70dbc342c3641595261936aa82574b22cfcb3719ca0506279d0b0a37e128600075294ed591bbb1ed0fb66
+  metadata.gz: 7b18bec956230a0783fb3a8c6104a8a87c2bc1bcdd9dd522af5021095bb9e63f37d38cacda45855faebb647fafc4e57fc40dd1250ad12691a0bba9487a382b9f
+  data.tar.gz: d9c12efdcd5e423365a7e56e7b0504dda55c32cdbd7d4060a984de5c6665f63c00abc6c6447a75b9047f234fde163e4086af3af940d94352c8c9b4908a32f392

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require 'bundler/setup'
 rescue LoadError
@@ -14,14 +16,11 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
 load 'rails/tasks/engine.rake'
 
-
 load 'rails/tasks/statistics.rake'
 
-
-
 require 'bundler/gem_tasks'
 
 require 'rake/testtask'
@@ -32,5 +31,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-
 task default: :test

data/app/controllers/concerns/tramway/auth_management.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Tramway
+  module AuthManagement
+    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::Auth.root_path if !current_user.admin? && request.env['PATH_INFO'] != ::Tramway::Auth.root_path
+      else
+        redirect_to '/auth/session/new'
+      end
+    end
+
+    def current_user
+      @_current_user ||= ::Tramway::User::User.find_by id: session[:user_id]
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway
   module Auth
     class ApplicationController < ActionController::Base

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

@@ -1,5 +1,7 @@
-require_dependency "tramway/auth/application_controller"
+# frozen_string_literal: true
+
+require_dependency 'tramway/auth/application_controller'
 
 class Tramway::Auth::Web::ApplicationController < ::Tramway::Auth::ApplicationController
-  include AuthManagement
+  include Tramway::AuthManagement
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway::Auth
   module Web
     class SessionsController < ::Tramway::Auth::Web::ApplicationController

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

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Tramway::Auth
   class SessionForm < ::Tramway::Core::ApplicationForm
     properties :email
-    attr_accessor :password 
+    attr_accessor :password
 
     def model_name
       User

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway
   module Auth
     module ApplicationHelper

data/app/jobs/tramway/auth/application_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway
   module Auth
     class ApplicationJob < ActiveJob::Base

data/app/mailers/tramway/auth/application_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway
   module Auth
     class ApplicationMailer < ActionMailer::Base

data/app/models/tramway/auth/application_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway
   module Auth
     class ApplicationRecord < ActiveRecord::Base

data/config/routes.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 Tramway::Auth::Engine.routes.draw do
   scope module: :web do
-    resource :session, only: [ :new, :create, :destroy ]
+    resource :session, only: %i[new create destroy]
   end
 end

data/lib/tasks/tramway/auth_tasks.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # desc "Explaining what the task does"
 # task :tramway_auth do
 #   # Task goes here

data/lib/tramway/auth.rb

@@ -1,4 +1,6 @@
-require "tramway/auth/engine"
+# frozen_string_literal: true
+
+require 'tramway/auth/engine'
 
 module Tramway
   module Auth
@@ -15,22 +17,18 @@ module Tramway
           @authenticable_classes << value
         end
       end
-      
+
       def root
         File.dirname __dir__
       end
 
-      def layout_path=(path)
-        @layout_path = path
-      end
+      attr_writer :layout_path
 
       def layout_path
         @layout_path ||= 'tramway/user/application'
       end
 
-      def root_path=(path)
-        @root_path = path
-      end
+      attr_writer :root_path
 
       def root_path
         @root_path || '/'

data/lib/tramway/auth/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway
   module Auth
     class Engine < ::Rails::Engine

data/lib/tramway/auth/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Tramway
   module Auth
-    VERSION = '1.1.0.1'
+    VERSION = '1.1.0.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-auth
 version: !ruby/object:Gem::Version
-  version: 1.1.0.1
+  version: 1.1.0.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-09 00:00:00.000000000 Z
+date: 2019-11-07 00:00:00.000000000 Z
 dependencies: []
 description: Rails engine for auth
 email:
@@ -23,7 +23,7 @@ files:
 - app/assets/config/tramway_auth_manifest.js
 - app/assets/javascripts/tramway/auth/application.js
 - app/assets/stylesheets/tramway/auth/application.css
-- app/controllers/concerns/auth_management.rb
+- app/controllers/concerns/tramway/auth_management.rb
 - app/controllers/tramway/auth/application_controller.rb
 - app/controllers/tramway/auth/web/application_controller.rb
 - app/controllers/tramway/auth/web/sessions_controller.rb

data/app/controllers/concerns/auth_management.rb

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