tramway-admin 1.19.0.2 → 1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bec6b6c92559c5bd1f19b768e8185ba179bd21a778922761d0ee583788f61d3
-  data.tar.gz: 4172028dda60bf3b081791521d177c60cc9edccb3fb551e882e1315e84a1fa17
+  metadata.gz: 702d94df42264ec7071d530f1ebc90de8ac9aaf381509476b1cb0b3b4761bdfb
+  data.tar.gz: ba7ef0a0220664b4db23509cd29a445cc29c7c7ac39a6ab799a8fe43370fa38c
 SHA512:
-  metadata.gz: 599b34cec359eb6215728bc1dcf1f4d0561447a2a3cfc7126d966002c77ad7cf65575118cd3a7f3f1f1706f513c09f497861732491f9b809cb9eec008c338b12
-  data.tar.gz: 128488fd7c659f216ed11c8c4e7c52cd91c7d715d407db21300ce640609de88835440d5f36c914b79ec9c5276b49b809952dc4a824d9b7106824aae00cc0def8
+  metadata.gz: 007abdd45e940b99aca62a1b0ef3ec6106d9be2a039f2f4a426adb510edd6efb8915ddda257d6d0939edb672427982a6df36b637c7f90b11a7442a768a544dd7
+  data.tar.gz: 60e457aad9172456e90dc276588cd9b80179facd370441e550349c678eba13d108be043a4fa62e63ff2a96523e67a470b5ddd3af4c87e7d12d519b76dff85bf2

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

@@ -31,7 +31,9 @@ module Tramway
 
       def collections_counts
         @counts = decorator_class.collections.reduce({}) do |hash, collection|
-          hash.merge! collection => model_class.active.send(collection).count
+          records = model_class.active.send(collection)
+          records = records.send "#{current_user.role}_scope", current_user.id unless current_user.role.admin?
+          hash.merge! collection => records.count
         end
       end
 
@@ -88,7 +90,8 @@ module Tramway
       end
 
       def available_models_given?
-        ::Tramway::Admin.available_models.any? && params[:model].in?(::Tramway::Admin.available_models.map(&:to_s))
+        models = ::Tramway::Admin.available_models(role: current_user.role)
+        models.any? && params[:model].in?(models.map(&:to_s))
       end
 
       def singleton_models_given?

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

@@ -6,6 +6,7 @@ class Tramway::Admin::RecordsController < ::Tramway::Admin::ApplicationControlle
     records = model_class.active.order(id: :desc).send scope
     records = records.full_text_search params[:search] if params[:search]
     records = records.ransack(params[:filter]).result if params[:filter].present?
+    records = records.send "#{current_user.role}_scope", current_user.id unless current_user.role.admin?
     @records = decorator_class.decorate records.page params[:page]
   end
 

data/app/views/layouts/tramway/admin/shared/_navbar.html.haml

@@ -9,9 +9,9 @@
     .navbar-collapse.collapse#navbar
       - if signed_in?
         %ul.navbar-nav
-          - ::Tramway::Admin.singleton_models_for(@application_engine || @application.name)&.each do |model|
+          - ::Tramway::Admin.singleton_models_for(@application_engine || @application.name, role: current_user.role)&.each do |model|
             = model_menu_item model: model, route: ::Tramway::Admin::Engine.routes.url_helpers.singleton_path(model: model)
-          - ::Tramway::Admin.available_models_for(@application_engine || @application.name)&.each do |model|
+          - ::Tramway::Admin.available_models_for(@application_engine || @application.name, role: current_user.role)&.each do |model|
             = model_menu_item model: model, route: ::Tramway::Admin::Engine.routes.url_helpers.records_path(model: model, scope: decorator_class(model).collections.first)
       %ul.nav.navbar-nav.ml-auto
         - if signed_in?

data/lib/tramway/admin.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 require 'tramway/admin/engine'
+require 'tramway/admin/singleton_models'
+require 'tramway/admin/records_models'
+require 'tramway/admin/additional_buttons'
 require 'tramway/error'
 
 module Tramway
@@ -8,69 +11,10 @@ module Tramway
 
   module Admin
     class << self
-      def set_available_models(*models, project:)
-        @available_models ||= {}
-        @available_models[project] ||= []
-        @available_models[project] += models
-      end
-
-      def available_models_for(project)
-        if project_is_engine?(project)
-          get_models_by_key(@available_models, project) + engine_class(project).dependencies.map do |dependency|
-            if @available_models[dependency].present?
-              @available_models[dependency]
-            else
-              error = Tramway::Error.new(
-                plugin: :admin,
-                method: :available_models_for,
-                message: "There is no dependency `#{dependency}` for plugin: #{project}. Please, check file `tramway-#{project}/lib/tramway/#{project}/#{project}.rb`"
-              )
-              raise error
-            end
-          end.flatten.compact
-        else
-          get_models_by_key(@available_models, project)
-        end
-      end
-
-      def available_models
-        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`')
-          raise error.message
-        end
-      end
-
-      def set_singleton_models(*models, project:)
-        @singleton_models ||= {}
-        @singleton_models[project] ||= []
-        @singleton_models[project] += models
-      end
 
-      def singleton_models_for(project)
-        if project_is_engine?(project)
-          get_models_by_key(@singleton_models, project) + engine_class(project).dependencies.map do |dependency|
-            @singleton_models[dependency]
-          end.flatten.compact
-        else
-          get_models_by_key(@singleton_models, project)
-        end
-      end
-
-      def singleton_models
-        @singleton_models&.values&.flatten || []
-      end
-
-      def set_additional_buttons(buttons, project:)
-        @additional_buttons ||= {}
-        @additional_buttons[project] ||= {}
-        @additional_buttons[project].merge! buttons
-      end
-
-      def additional_buttons(view: nil, record: nil, project: nil)
-        @additional_buttons&.dig record, view
-      end
+      include ::Tramway::Admin::RecordsModels
+      include ::Tramway::Admin::SingletonModels
+      include ::Tramway::Admin::AdditionalButtons
 
       attr_reader :customized_admin_navbar
 
@@ -83,8 +27,8 @@ module Tramway
         engine_class(project)
       end
 
-      def get_models_by_key(checked_models, project)
-        checked_models && checked_models != [] && checked_models[project.to_sym] || []
+      def get_models_by_key(checked_models, project, role)
+        checked_models && checked_models != [] && checked_models[project][role] || []
       end
 
       def set_notificable_queries(**queries)

data/lib/tramway/admin/additional_buttons.rb

@@ -0,0 +1,11 @@
+module Tramway::Admin::AdditionalButtons
+  def set_additional_buttons(buttons, project:)
+    @additional_buttons ||= {}
+    @additional_buttons[project] ||= {}
+    @additional_buttons[project].merge! buttons
+  end
+
+  def additional_buttons(view: nil, record: nil, project: nil)
+    @additional_buttons&.dig record, view
+  end
+end

data/lib/tramway/admin/records_models.rb

@@ -0,0 +1,39 @@
+module Tramway::Admin::RecordsModels
+  def set_available_models(*models, project:, role: :admin)
+    @available_models ||= {}
+    @available_models[project] ||= {}
+    @available_models[project][role] ||= []
+    @available_models[project][role] += models
+    @available_models = @available_models.with_indifferent_access
+  end
+
+  def available_models_for(project, role: :admin)
+    models = get_models_by_key(@available_models, project, role)
+    if project_is_engine?(project)
+      models += engine_class(project).dependencies.map do |dependency|
+        if @available_models[dependency].present?
+          @available_models[dependency]
+        else
+          error = Tramway::Error.new(
+            plugin: :admin,
+            method: :available_models_for,
+            message: "There is no dependency `#{dependency}` for plugin: #{project}. Please, check file `tramway-#{project}/lib/tramway/#{project}/#{project}.rb`"
+          )
+          raise error
+        end
+      end.flatten.compact
+    end
+    models
+  end
+
+  def available_models(role:)
+    if @available_models
+      @available_models.map do |projects|
+        projects[1][role]
+      end.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`')
+      raise error.message
+    end
+  end
+end

data/lib/tramway/admin/singleton_models.rb

@@ -0,0 +1,22 @@
+module Tramway::Admin::SingletonModels
+  def set_singleton_models(*models, project:, role: :admin)
+    @singleton_models ||= {}
+    @singleton_models[project] ||= {}
+    @singleton_models[project][role] ||= []
+    @singleton_models[project][role] += models
+  end
+
+  def singleton_models_for(project, role: :admin)
+    models = get_models_by_key(@singleton_models, project, role)
+    if project_is_engine?(project)
+      models += engine_class(project).dependencies.map do |dependency|
+        @singleton_models[dependency]
+      end.flatten.compact
+    end
+    models
+  end
+
+  def singleton_models
+    @singleton_models&.values&.flatten || []
+  end
+end

data/lib/tramway/admin/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Admin
-    VERSION = '1.19.0.2'
+    VERSION = '1.20'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-admin
 version: !ruby/object:Gem::Version
-  version: 1.19.0.2
+  version: '1.20'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-17 00:00:00.000000000 Z
+date: 2020-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-kaminari-views
@@ -28,20 +28,20 @@ dependencies:
   name: copyright_mafa
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         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: 0.1.2
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.2
 - !ruby/object:Gem::Dependency
@@ -68,20 +68,20 @@ dependencies:
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.1
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.1
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.1
 - !ruby/object:Gem::Dependency
@@ -116,20 +116,20 @@ dependencies:
   name: state_machine_buttons
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         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.4.1
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.1
 description: Engine for admin
@@ -268,8 +268,11 @@ files:
 - config/routes.rb
 - lib/tasks/tramway/admin_tasks.rake
 - lib/tramway/admin.rb
+- lib/tramway/admin/additional_buttons.rb
 - lib/tramway/admin/engine.rb
 - lib/tramway/admin/record_routes_helper.rb
+- lib/tramway/admin/records_models.rb
+- lib/tramway/admin/singleton_models.rb
 - lib/tramway/admin/version.rb
 homepage: https://github.com/kalashnikovisme/tramway-dev
 licenses:
@@ -290,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Engine for admin