tramway-admin 1.18.0.1 → 1.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35b6318151955442c7ad9d91bf827427aa89ab4bc0b6fd62a7d517983cb02a24
-  data.tar.gz: fa995938d701f58e1f9fc04f5ed2970dd3d209795be71342e2f9ebe40b83ead7
+  metadata.gz: 4ae22115d6b8978b050c7b090d9c75a96a34495dfaa6ed27000e5f39b1d09fa9
+  data.tar.gz: 292ab0a60acca87a47584493e0037ca20d1f9a7f2361123d08b674bea5040a85
 SHA512:
-  metadata.gz: 465f44031834545790dc9984b927253f8b69f4356e5c7b6d7144a35bd2a93bf51737a26ea89885c118dac8ef605e2aced92c48aa5b46810eb3c48f3d4f7765f8
-  data.tar.gz: 8151b061193bd620c6b2476ead745afe79d0f2a20c3a9a300df5449e9d0ad7d921b250ac6a1f80a2def3a94954d8037da86550269ad47d8299ee7d2002eecf64
+  metadata.gz: a584a11cc8d7f628c94dd73c449ff181efda27e33164e0f88c38c0290aefac0bf259723c17cc944decabf2f6ec82d5d2d01ebb700c8fabad0fa9053daf888b89
+  data.tar.gz: 8ae159127aee9165412773cc71b361ab75fac67993b5c1d85a1a044d9f9e08a7be46d2594f4c36fdd886436997e2b87d31400291377352dba69f54a5e9023f3d

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/tramway/admin/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tramway/helpers/class_name_helpers'
 
 module Tramway
@@ -57,7 +59,7 @@ module Tramway
       end
 
       def admin_form_class
-        if model_class.to_s.include? "Tramway"
+        if model_class.to_s.include? 'Tramway'
           form_class_name
         else
           "::Admin::#{model_class}Form".constantize

data/app/controllers/tramway/admin/records_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tramway::Admin::RecordsController < ::Tramway::Admin::ApplicationController
   def index
     scope = params[:scope].present? ? params[:scope] : :all
@@ -11,29 +13,29 @@ class Tramway::Admin::RecordsController < ::Tramway::Admin::ApplicationControlle
     @record = decorator_class.decorate model_class.active.find params[:id]
   end
 
-  def edit
-    @record_form = admin_form_class.new model_class.active.find params[:id]
+  def new
+    @record_form = admin_form_class.new model_class.new
   end
 
-  def update
-    @record_form = admin_form_class.new model_class.active.find params[:id]
+  def create
+    @record_form = admin_form_class.new model_class.new
     if @record_form.submit params[:record]
       redirect_to params[:redirect] || record_path(@record_form.model)
     else
-      render :edit
+      render :new
     end
   end
 
-  def new
-    @record_form = admin_form_class.new model_class.new
+  def edit
+    @record_form = admin_form_class.new model_class.active.find params[:id]
   end
 
-  def create
-    @record_form = admin_form_class.new model_class.new
+  def update
+    @record_form = admin_form_class.new model_class.active.find params[:id]
     if @record_form.submit params[:record]
       redirect_to params[:redirect] || record_path(@record_form.model)
     else
-      render :new
+      render :edit
     end
   end
 

data/app/controllers/tramway/admin/singletons_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway::Admin
   class SingletonsController < ApplicationController
     def show
@@ -6,7 +8,7 @@ module Tramway::Admin
       else
         @singleton_form = form_class.new model_class.new
         render :new
-        return
+        nil
       end
     end
 
@@ -35,7 +37,7 @@ module Tramway::Admin
 
   private
 
-  # FIXME replace to module
+  # FIXME: replace to module
   def singleton_path(*args, **options)
     super args, options.merge(model: params[:model])
   end

data/app/controllers/tramway/admin/welcome_controller.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 class Tramway::Admin::WelcomeController < Tramway::Admin::ApplicationController
   skip_before_action :check_available!
 
-  def index
-  end
+  def index; end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tramway::Export::ApplicationController < Tramway::Core::ApplicationController
   before_action :authenticate_admin!
 end

data/app/helpers/tramway/admin/additional_buttons_builder.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Tramway::Admin::AdditionalButtonsBuilder
   def build_buttons(additional_buttons)
     if additional_buttons
-      additional_buttons = additional_buttons.is_a?(Hash) ? [ additional_buttons ] : additional_buttons
+      additional_buttons = additional_buttons.is_a?(Hash) ? [additional_buttons] : additional_buttons
       additional_buttons.each do |button|
         concat(
           link_to(
@@ -16,7 +18,7 @@ module Tramway::Admin::AdditionalButtonsBuilder
         )
       end
     end
-    return
+    nil
   end
 
   private
@@ -27,7 +29,7 @@ module Tramway::Admin::AdditionalButtonsBuilder
     edit: { color: :warning, icon: :pencil },
     update: { color: :warning, icon: :pencil },
     delete: { color: :danger, icon: :remove }
-  }
+  }.freeze
 
   def button_color(action)
     BUTTON_STYLES[action][:color]
@@ -43,9 +45,7 @@ module Tramway::Admin::AdditionalButtonsBuilder
     params.each do |model_name, model_attributes|
       attributes = {}
       model_attributes.each do |name, value|
-        if value.is_a? Proc
-          value = record.model.instance_exec(&value)
-        end
+        value = record.model.instance_exec(&value) if value.is_a? Proc
         attributes.merge! name => value
       end
       param.merge! model_name => attributes

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

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

data/app/helpers/tramway/admin/cases_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway
   module Admin
     module CasesHelper

data/app/helpers/tramway/admin/focus_generator_helper.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module ::Tramway::Admin::FocusGeneratorHelper
-  #FIXME create independent focus generator
+  # FIXME: create independent focus generator
   def focus_selector(index)
     "table:nth-child(2)>tbody>tr:nth-child(#{index - 1})"
   end

data/app/helpers/tramway/admin/inputs_helper.rb

@@ -1,11 +1,14 @@
+# frozen_string_literal: true
+
 module Tramway
   module Admin
     module InputsHelper
       def association_params(form_object:, property:, value:, object:)
         full_class_name_association = form_object.class.full_class_name_association(property)
         unless full_class_name_association
-          raise "It seems you\'ve defined association attributes with `property` method. Please, use `association` method. `association :#{property}`" 
+          raise "It seems you\'ve defined association attributes with `property` method. Please, use `association` method. `association :#{property}`"
         end
+
         {
           label: false,
           input_html: {
@@ -16,7 +19,7 @@ module Tramway
           selected: (form_object.model.send("#{property}_id") || value),
           collection: full_class_name_association.active.map do |obj|
             decorator_class(full_class_name_association).decorate obj
-          end.sort_by { |obj| obj.name }
+          end.sort_by(&:name)
         }
       end
 
@@ -49,7 +52,7 @@ module Tramway
           when :polymorphic_association
             {
               id: params.dig(model_class.to_s.underscore, property.to_s),
-              type: params.dig(model_class.to_s.underscore, "#{property}_type"),
+              type: params.dig(model_class.to_s.underscore, "#{property}_type")
             }
           else
             params.dig(model_class.to_s.underscore, property.to_s)

data/app/helpers/tramway/admin/navbar_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway
   module Admin
     module NavbarHelper

data/app/helpers/tramway/admin/records_helper.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Tramway::Admin
   module RecordsHelper
-    # FIXME replace to module
+    # FIXME: replace to module
     def current_model_record_path(*args, **options)
       record_path args, options.merge(model: params[:model])
     end
@@ -29,7 +31,7 @@ module Tramway::Admin
       "#{model_name || model_class}Decorator".constantize
     end
 
-    def get_collection(model_class)
+    def get_collection(_model_class)
       decorator_class.collections
     end
 
@@ -38,7 +40,7 @@ module Tramway::Admin
     end
 
     def search_tab_title(count)
-      "#{t("helpers.scope.found")} / #{count}"
+      "#{t('helpers.scope.found')} / #{count}"
     end
 
     def searchable_model?(model_class)
@@ -56,12 +58,12 @@ module Tramway::Admin
     def collection_human_name(model_name:, collection_name:)
       if t("default.collections.#{collection_name}").include?('<span')
         t("collections.#{model_name}.#{collection_name}").pluralize(:ru)
-      else 
+      else
         t("default.collections.#{collection_name}")
       end
     end
 
-    def tab_title(model_class, tab, count, state_method = :state)
+    def tab_title(model_class, tab, count, _state_method = :state)
       model = model_class.name.underscore
       name = collection_human_name model_name: model, collection_name: tab
       params[:filter].present? ? name : "#{name} / #{count}"
@@ -73,12 +75,23 @@ module Tramway::Admin
     end
 
     def new_associated_record_path(object:, association:)
-      new_record_path model: association.class_name,
-        redirect: current_model_record_path(object),
-        association.options[:class_name].underscore => {
-          association.options[:as] => object.id,
-          association.type => object.class.model_name
-        }
+      unless association.options[:class_name].present?
+        raise "You should set `class_name` for #{association.name} association"
+      end
+      if association.polymorphic?
+        new_record_path model: association.class_name,
+          redirect: current_model_record_path(object),
+          association.options[:class_name].underscore => {
+            association.options[:as] => object.id,
+            association.type => object.class.model_name
+          }
+      else
+        new_record_path model: association.class_name,
+          redirect: current_model_record_path(object),
+          association.options[:class_name].underscore => {
+            object.model.class.name.underscore => object.id
+          }
+      end
     end
   end
 end

data/app/helpers/tramway/admin/russian_cases_helper.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 module Tramway
   module Admin
     module RussianCasesHelper
       def case_word(model_name, case_name)
         word_case = I18n.t("cases.#{model_name.name.underscore}.#{case_name}")
         return word_case if word_case.present?
+
         raise "There is not #{case_name} implementation for \"#{model_name}\""
       end
 

data/app/helpers/tramway/admin/singleton_helper.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Tramway::Admin::SingletonHelper
-  # FIXME replace to module
+  # FIXME: replace to module
   def current_model_singleton_path(*args, **options)
     singleton_path args, options.merge(model: params[:model])
   end

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

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

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

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

data/app/models/tramway/user/user.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class Tramway::User::User < ::Tramway::Core::ApplicationRecord
-  has_secure_password #FIXME remove repeating from tramway-user
+  has_secure_password # FIXME: remove repeating from tramway-user
 
-  enumerize :role, in: [ :user, :admin ], default: :user
+  enumerize :role, in: %i[user admin], default: :user
 
   def admin?
     role.admin?

data/app/views/tramway/admin/shared/show/_associations.html.haml

@@ -2,7 +2,7 @@
   %tr
     %td
       = model_class.human_attribute_name association.name
-      = link_to "Add #{model_class.human_attribute_name association.name}", new_associated_record_path(association: association, object: object), class: 'btn btn-primary'
+      = link_to "Add #{model_class.human_attribute_name(association.name).singularize}", new_associated_record_path(association: association, object: object), class: 'btn btn-primary'
     %td{ colspan: 2 }
       %table.table.table-striped.table-bordered
         - object.send(association.name)&.each do |association_object|

data/config/initializers/assets.rb

@@ -1 +1,3 @@
-Rails.application.config.assets.precompile += %w( tramway/admin/ckeditor/* )
+# frozen_string_literal: true
+
+Rails.application.config.assets.precompile += %w[tramway/admin/ckeditor/*]

data/config/initializers/ckeditor.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 Ckeditor.setup do |config|
-  require "ckeditor/orm/active_record"
+  require 'ckeditor/orm/active_record'
 
-  config.assets_plugins = [ 'image', 'copyformatting', 'filebrowser', 'sourcedialog' ]
+  config.assets_plugins = %w[image copyformatting filebrowser sourcedialog]
 end

data/config/routes.rb

@@ -1,11 +1,11 @@
+# frozen_string_literal: true
+
 Tramway::Admin::Engine.routes.draw do
   mount Tramway::Auth::Engine, at: '/auth'
-  if defined? Tramway::Export::Engine
-    mount Tramway::Export::Engine, at: '/'
-  end
+  mount Tramway::Export::Engine, at: '/' if defined? Tramway::Export::Engine
 
   root to: 'welcome#index'
 
   resources :records
-  resource :singleton, only: [ :new, :create, :show, :edit, :update ]
+  resource :singleton, only: %i[new create show edit update]
 end

data/lib/tasks/tramway/admin_tasks.rake

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

data/lib/tramway/admin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tramway/admin/engine'
 require 'tramway/error'
 
@@ -35,7 +37,7 @@ module Tramway
         if @available_models
           @available_models.values.flatten
         else
-          error = Tramway::Error.new(plugin: :admin, method: :available_models, message: ('List of available_models is empty. You should add some of them using `::Tramway::Admin.set_available_models(*list_of_classes, project: :your_project_name)` in `config/initializers/tramway.rb`'))
+          error = Tramway::Error.new(plugin: :admin, method: :available_models, message: 'List of available_models is empty. You should add some of them using `::Tramway::Admin.set_available_models(*list_of_classes, project: :your_project_name)` in `config/initializers/tramway.rb`')
           raise error.message
         end
       end
@@ -70,9 +72,7 @@ module Tramway
         @additional_buttons&.dig record, view
       end
 
-      def customized_admin_navbar
-        @customized_admin_navbar
-      end
+      attr_reader :customized_admin_navbar
 
       def engine_class(project)
         class_name = "::Tramway::#{project.to_s.camelize}"

data/lib/tramway/admin/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tramway/admin/record_routes_helper'
 require 'tramway/auth'
 require 'font-awesome-rails'

data/lib/tramway/admin/record_routes_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway
   module Admin
     module RecordRoutesHelper

data/lib/tramway/admin/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Tramway
   module Admin
-    VERSION = '1.18.0.1'
+    VERSION = '1.18.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.18.0.1
+  version: 1.18.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-06 00:00:00.000000000 Z
+date: 2019-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-kaminari-views
@@ -39,45 +39,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.2.4
 - !ruby/object:Gem::Dependency
-  name: font-awesome-rails
+  name: copyright_mafa
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.7.0.1
+        version: 0.1.2
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.7.0.1
+        version: 0.1.2
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
-  name: copyright_mafa
+  name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '4.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.7.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '4.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.7.0.1
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -99,27 +99,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.1
 - !ruby/object:Gem::Dependency
-  name: state_machine_buttons
+  name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: ransack
+  name: selectize-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -133,19 +127,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: selectize-rails
+  name: state_machine_buttons
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 description: Engine for admin
 email:
 - kalashnikovisme@gmail.com