administrador 0.0.18.pre → 0.0.24.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 431f521918445d34b9f07aabf3b2f549c4369d1d7aff2087025056173237db15
-  data.tar.gz: 76d6e4223f62d62a178778d49ee5b3a336217a0b7887b4e8b17ff6482ded99c7
+  metadata.gz: ae2df99a9d2737e3d0cb4f3340b7425f0fdffd7cfb2351a3697f3c52f76dd969
+  data.tar.gz: ade5053fb15f202ba0977ff92203af5e02bb3289eb06dc03f62cdc8943f3602e
 SHA512:
-  metadata.gz: f0be5c4dd719224c102de42e807176c26c9c9337ccd8281222491409e4eb7802ae400928db4d91b93351f633a6f05f3d62e93909dc9fa12794b0a7f78e977ff1
-  data.tar.gz: 1436c9cb8b7e9674c3db76b06f72250ef1a98296466743b9fc8c32369ad49fcb74a119bf32546d755003d24291c3037fe2984ee5e264a54c5ebaafca5bc89590
+  metadata.gz: 28ac22991ca090d69268b721401274d101331190eae07a49ee465b59351061e268f50f069a5725e98104f0cc0b60bb6e8dbc5cc80ed54af7e82150e2844fc5c6
+  data.tar.gz: bfc1f5e9b6a0698f05016e2036edf79a7ac29ac96d8cfdda2c2d71c89ef290190f04cccbc40bc8e165153a8cca9af1c7a0a2dbdd5cdc781ca3cb23ee4be29f0b

data/app/assets/javascripts/administrador.js

@@ -0,0 +1,6 @@
+//= require rails-ujs
+//= require activestorage
+//= require rao-component/acts_as_list
+//= require rao-component/awesome_nested_set
+//= require simple_sidebar
+//= require administrador/application

data/app/assets/javascripts/administrador/application.js

@@ -10,9 +10,4 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require rails-ujs
-//= require activestorage
-//= require rao-component/acts_as_list
-//= require rao-component/awesome_nested_set
-//= require simple_sidebar
 //= require_tree ./application

data/app/assets/stylesheets/administrador.css

@@ -0,0 +1,4 @@
+/*
+ *= require simple_sidebar
+ *= require administrador/application
+ */

data/app/assets/stylesheets/administrador/application.css

@@ -1,16 +1,4 @@
 /*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
- * files in this directory. Styles in this file should be added after the last require_* statement.
- * It is generally better to create a new file per style scope.
- *
- *= require simple_sidebar
  *= require_tree ./application
  *= require_self
  */

data/app/assets/stylesheets/administrador/application/forms.css

@@ -1,3 +1,5 @@
 body.administrador textarea {
   height: 40vh;
+  font-family: monospace;
+  font-size: 120%;
 }

data/app/concerns/administrador/controller/application_concern.rb

@@ -3,6 +3,8 @@ module Administrador
     module ApplicationConcern
       extend ActiveSupport::Concern
 
+      include Administrador::Controller::EngineConcern
+
       included do
         view_helper Administrador::ApplicationViewHelper, as: :administrador_helper
         view_helper Administrador::BreadcrumbsViewHelper, as: :breadcrumbs

data/app/view_helpers/administrador/breadcrumbs_view_helper.rb

@@ -27,10 +27,14 @@ module Administrador
 
     def generate_breadcrumbs!
       [].tap do |breadcrumbs|
+        # Add breadcrumb to home page
         breadcrumbs << { label: t('.home'), url: c.administrador.root_path, link_html_options: {}, li_html_options: {}}
-     
-        if c.respond_to?(:current_engine, true) && c.current_engine.present?
-          breadcrumbs << { label: t("classes.#{c.current_engine.name.underscore}"), url: send(c.current_engine.engine_name).root_path, link_html_options: {}, li_html_options: {} }
+
+        if c.respond_to?(:engine_class, true) && c.engine_class.present?
+          engine = Administrador::Configuration.engines[c.engine_class.name]
+          if engine.present?
+            breadcrumbs << { label: t("classes.#{engine.engine.name.underscore}"), url: c.send(engine.router_name).root_path, link_html_options: {}, li_html_options: {} }
+          end
         end
 
         # if c.respond_to?(:resource_class, true) && c.respond_to?(:available_rest_actions) && c.available_rest_actions.include?(:index)

data/app/views/administrador/application/sidebars/_engine.html.haml

@@ -3,6 +3,7 @@
     .row
       .col-12
         - administrador_helper(self).engines.each do |_, engine|
+          - next unless engine.options[:show_in_engine_sidebar]
           .administrador-engine.mb-4.text-secondary{ id: dom_id(engine), class: dom_class(engine) }
             %h6.text-uppercase.administrador-engine-name
               %i.fas.fa-home

data/app/views/layouts/administrador/application.html.haml

@@ -29,8 +29,8 @@
     
     = csrf_meta_tags
     = csp_meta_tag
-    = stylesheet_link_tag    "administrador/application", media: "all"
-    = javascript_include_tag "administrador/application"
+    = stylesheet_link_tag    "administrador", media: "all"
+    = javascript_include_tag "administrador"
 
     = render partial: 'html_head_extras'
   %body{ administrador_helper(self).body_html }

data/config/initializers/assets.rb

@@ -0,0 +1 @@
+Rails.application.config.assets.precompile += %w( administrador.js administrador.css )

data/config/locales/de.yml

@@ -40,6 +40,8 @@ de:
           destroy: "Löschen"
     service_controller:
       base:
+        create:
+          title: "%{service_name} ausgeführt"
         new:
           title: "%{service_name} ausführen"
         new_actions:
@@ -55,6 +57,7 @@ de:
           edit: 'Bearbeiten'
           new: 'Erstellen'
         service:
+          create: 'Ausgeführt'
           new: 'Ausführen'
       page: "Seite %{page_number}"
   helpers:

data/config/locales/en.yml

@@ -1,8 +1,19 @@
 en:
   administrador:
     application:
-      engine_navigation:
-        home: 'Home'
+      sidebars:
+        i18n:
+          title: 'Translations'
+        messages:
+          title: 'Messages'
+        notifications:
+          title: 'Notifications'
+        settings:
+          title: 'Settings'
+        search:
+          title: 'Search'
+        user:
+          title: 'Profile'
     controller:
       confirmations:
         destroy: "Are you sure?"
@@ -29,9 +40,12 @@ en:
           destroy: "Delete"
     service_controller:
       base:
+        create:
+          title: "Ran %{service_name}"
         new:
-          back: "Back"
           title: "Run %{service_name}"
+        new_actions:
+          back: "Back"
   administrador/breadcrumbs_view_helper:
     generate_breadcrumbs!:
       home: 'Home'
@@ -39,10 +53,25 @@ en:
     breadcrumbs_concern:
       actions:
         default:
+          create: 'Create'
           edit: 'Edit'
           new: 'New'
         service:
-          new: 'Ausführen'
+          create: 'Ran'
+          new: 'Run'
       page: "Page %{page_number}"
+  helpers:
+    submit:
+      administrador:
+        service:
+          create: 'Run'
+      q:
+        create: 'Filter'
   routes:
-    administrador-engine: backend
+    administrador-engine: backend
+  views:
+    pagination:
+      first: "<<"
+      next: ">"
+      last: ">>"
+      previous: "<"

data/lib/administrador/registered_engine.rb

@@ -1,8 +1,44 @@
 module Administrador
+  # A registered engine represents a rails engine that is registered to
+  # administrador.
+  #
+  # You can register an engine as follows:
+  #
+  #     # blorgh/app/config/initializers/administrador.rb
+  #     Administrador.configure { |c| c.register_engine(Blorgh::Engine', {}) }
+  #
+  # The register_engine methods accepts an option hash. Available options are:
+  #
+  #   * show_in_engine_sidebar:
+  #       default: true
+  #       Controls wether the engine will be shown in the main menu (engine sidebar) or not.
+  #
+  # A special case is when you want to register your rails application into
+  # administrador. You can do that like this:
+  #
+  #    # app/config/initializers/main_app.rb
+  #    require 'example_app/configuration'
+  #    Administrador.configure { |c| c.register_engine('ExampleApp::Application', {}) }
+  #
+  # You will need to add a confifguration module:
+  #
+  #    # lib/example_app/configuration.rb
+  #    module ExampleApp
+  #      module Configuration
+  #        # mattr_accessor(:resources_controllers) { ->{[]} }
+  #        # mattr_accessor(:resource_controllers)  { ->{[]} }
+  #        # mattr_accessor(:service_controllers)   { ->{[]} }
+  #        # mattr_accessor(:sidebar_controllers)   { ->{[]} }
+  #      end
+  #    end
+  #
   class RegisteredEngine
     attr_accessor :options, :name
 
     def initialize(name, options)
+      options.reverse_merge!(
+        show_in_engine_sidebar: true
+      )
       @name, @options = name, options
     end
 
@@ -10,6 +46,10 @@ module Administrador
       @name.constantize
     end
 
+    def main_app?
+      engine.ancestors.include?(::Rails::Application)
+    end
+
     def to_key
       @name.underscore.split("/")
     end
@@ -23,7 +63,11 @@ module Administrador
     end
 
     def router_name
-      @name.deconstantize.underscore.gsub('/', '_')
+      if main_app?
+        :main_app
+      else
+        @name.deconstantize.underscore.gsub('/', '_')
+      end
     end
 
     def configuration

data/lib/administrador/version.rb

@@ -1,3 +1,3 @@
 module Administrador
-  VERSION = '0.0.18.pre'.freeze
+  VERSION = '0.0.24.pre'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administrador
 version: !ruby/object:Gem::Version
-  version: 0.0.18.pre
+  version: 0.0.24.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-15 00:00:00.000000000 Z
+date: 2020-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.23.pre
+        version: 0.0.33.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.23.pre
+        version: 0.0.33.pre
 - !ruby/object:Gem::Dependency
   name: rao-component
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.30.pre
+        version: 0.0.43.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.30.pre
+        version: 0.0.43.pre
 - !ruby/object:Gem::Dependency
   name: rao-resource_controller
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.23.pre
+        version: 0.0.43.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.23.pre
+        version: 0.0.43.pre
 - !ruby/object:Gem::Dependency
   name: rao-service_controller
   requirement: !ruby/object:Gem::Requirement
@@ -385,9 +385,11 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/administrador_manifest.js
+- app/assets/javascripts/administrador.js
 - app/assets/javascripts/administrador/application.js
 - app/assets/javascripts/administrador/application/keep.js
 - app/assets/javascripts/administrador/application/sidebar.js.coffee~
+- app/assets/stylesheets/administrador.css
 - app/assets/stylesheets/administrador/application.css
 - app/assets/stylesheets/administrador/application/bootstrap-btn-responsive.css
 - app/assets/stylesheets/administrador/application/bootstrap-btn-xs.css
@@ -484,6 +486,7 @@ files:
 - app/views/administrador/sidebar_controller/base/show.html.haml
 - app/views/breadcrumbs/_render.html.haml
 - app/views/layouts/administrador/application.html.haml
+- config/initializers/assets.rb
 - config/initializers/localized_engines_fix.rb
 - config/locales/de.yml
 - config/locales/en.yml
@@ -517,7 +520,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Administrador - The rails administration interface.