activeadmin-menu_tree 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 915be184b52128a375b2b76397c266148d5a6f27847a704913623b71cec64aaa
-  data.tar.gz: dab0db630d9510882682eb5ca72f6cc268c2f531e17e4f094b2b48aec25ccb61
+  metadata.gz: ae470640145da2a76875e361c8e1a5bb99838ff72894c9fc8f66dd266226004c
+  data.tar.gz: bc6fe3ffe900a9e8a1430ca25a82815c32d67f3b0979df55fe9af4bd25d3e223
 SHA512:
-  metadata.gz: 9dc782fd55db0218d961c296afe543178d0a618708fe8009ed0b0bfcd408c7ecdc7bdbeab19135c0d6ddfa79d2805d118d85d5b30508f67ee0e9bcbdd8bc5192
-  data.tar.gz: 5d8832823ad3112ecf687257e3948e3bc532331ca2dd9ca58e6a7d4c266112c2504f9b6a4054f8a6f720b3815574cadfcfeb7efc4d757885e8efd4d0f13b81da
+  metadata.gz: aa4d16bdde948794cc92965ffa9ec94cfbed5fdcf102c6300d941dbd6f8b80a73b69ced428cd884d37f40c582eab88d283b18299893f97cb8a69ff34a839ebbd
+  data.tar.gz: 53572e64a66d4aadd161f9d4f5c3d0d84ad4d9590d4310ef0c13334b205677ce447d45e4c7d4fbcb462c344d603e515152258b377d828dd829d2ac75bb786eea

data/.github/workflows/main.yml

@@ -18,27 +18,27 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0.0
+          ruby-version: 3.1
       - name: Install bundler
         run: gem install bundler
       - name: Setup
         run: bin/setup
       - name: Rubocop
         run: bundle exec rake rubocop
-  steep:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.0.0
-      - name: Install bundler
-        run: gem install bundler
-      - name: Setup
-        run: bin/setup
-      - name: Steep
-        run: bundle exec steep check
+  # steep:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - name: Set up Ruby
+  #       uses: ruby/setup-ruby@v1
+  #       with:
+  #         ruby-version: 3.1
+  #     - name: Install bundler
+  #       run: gem install bundler
+  #     - name: Setup
+  #       run: bin/setup
+  #     - name: Steep
+  #       run: bundle exec steep check
   rspec:
     runs-on: ubuntu-latest
     strategy:
@@ -46,6 +46,7 @@ jobs:
         ruby:
           - 2.7
           - 3.0
+          - 3.1
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby

data/.rubocop.yml

@@ -11,6 +11,7 @@ AllCops:
   ExtraDetails: true
   Exclude:
     - 'spec/dummy/**/*'
+    - 'vendor/bundle/**/*'
 
 Style/ClassAndModuleChildren:
   Enabled: false

data/Gemfile

@@ -12,4 +12,4 @@ gem "rubocop", "~> 1.0", require: false
 gem "rubocop-rake", require: false
 gem "rubocop-rspec", require: false
 gem "rubocop-rubycw", require: false
-gem "steep"
+gem "steep", ">= 0.47.0"

data/Makefile

@@ -1,7 +1,7 @@
 .PHONY: rake/* rbs/* typeprof/* steep/*
 
 rake/tasks:
-	rake --tasks
+	bundle exec rake --tasks
 
 rbs/prototype: rbs/prototype/lib
 

data/README.md

@@ -46,12 +46,12 @@ Write the configuration in a yaml file.
 # config/activeadmin-menu_tree.yml or anywhere you like
 activeadmin:
   menu_tree:
-    - name: Dashboard
+    - id: Dashboard
     - label: Admin
       children:
-        - name: AdminUser
+        - id: AdminUser
           label: Admin Users
-        - name: Comment
+        - id: Comment
           label: Admin Comments
 ```
 
@@ -86,19 +86,22 @@ end
 
 ### Other ways to load configuration
 
-It is also possible to simply use hash instead of yaml.
+It is also possible to simply use hash instead of yaml.  
+If you want to use dynamic specification using `proc` in menu_tree (instead of in ActiveAdmin Resource), you may want to use this one.
+
 ```ruby
 ActiveAdmin::MenuTree.setup do |config|
-  config.menu_tree = [{
-    name: "Dashboard"
-  }, {
-    label: "Foo",
-    children: [{
-      name: "Bar"
-    }, {
-      name: "Baz"
-    }]
-  }]
+  config.menu_tree = [
+    { id: "Dashboard", label: proc { I18n.t("active_admin.dashboard") } },
+    {
+      label: "Foo",
+      if: proc { "Something dynamic" },
+      children: [
+        { id: "Bar" },
+        { id: "Baz" }
+      ]
+    }
+  ]
 end
 ```
 
@@ -118,36 +121,53 @@ activeadmin:
 Or you can use other configuration gems like [global gem](https://github.com/railsware/global) by converting them to hash as well.
 
 ### Full configuration example
+
 ```yaml
 activeadmin:
   menu_tree:
-    # Specify the resource name with `name`.
-    - name: Dashboard
-    - name: Product
+    # Specify the resource with `id`.
+    - id: Dashboard
+    - id: Product
     # Specify a menu label with `label`.
     - label: User Info
       # Specify child elements with `children`.
       children:
-        - name: User
-        - name: Profile
+        - id: User
+        - id: Profile
     - label: Admin
       children:
-        - name: AdminUser
+        - id: AdminUser
           label: Admin Users
         # Comment resource will be handled specially.
-        - name: Comment
+        - id: Comment
           label: Admin Comments
     - label: Others
       children:
-        - name: Foo
-        - name: Bar
+        - id: Foo
+        - id: Bar
     - label: Example Site
       # You can pass the other options available for `menu` DSL, like `url`, `html_options`.
       url: 'https://example.com'
       html_options:
         target: blank
+    # Nesting of children is also available.
+    - label: Lorem
+      children:
+        - label: ipsum
+          children:
+            - label: dolor
+              children:
+                - label: sit
+                  children:
+                    - label: amet
+                      url: 'https://wikipedia.org/wiki/Lorem_ipsum'
+                      html_options:
+                        target: blank
 ```
 
+<img width="1573" alt="screenshot" src="https://user-images.githubusercontent.com/7542105/153759374-fd516cb8-8022-4e44-aad9-c97f77afc4e7.png">
+
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/activeadmin-menu_tree.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/shuuuuun/activeadmin-menu_tree"
   # spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
+  spec.metadata["rubygems_mfa_required"] = "true"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

data/lib/activeadmin/menu_tree/config.rb

@@ -14,33 +14,34 @@ module ActiveAdmin::MenuTree
       raise ActiveAdmin::MenuTree::Error, "Invalid config" unless new_value.is_a? Array
 
       @menu_tree = new_value.map(&:deep_symbolize_keys)
-      @menu_options = flatten_menu_tree
+      @menu_options = flatten_options(@menu_tree)
     end
 
-    def find_menu_option(name:)
-      menu_options.find { |item| item[:name] == name }
+    def find_menu_option(id:)
+      menu_options.find { |item| item[:id] == id }
     end
 
     private
 
-    def flatten_menu_tree
-      menu_tree.map.with_index(1) do |item, index|
-        options = format_options(item, index: index)
+    def flatten_options(items, parent: nil)
+      items.map.with_index(1) do |item, index|
+        options = format_options(item, index: index, parent: parent)
         next options unless item[:children].is_a? Array
 
-        children =
-          item[:children].map.with_index(1) do |child, child_index|
-            format_options(child, index: child_index, parent: item[:label])
-          end
-
+        next_parent = parent ? [parent, item[:label]].flatten.compact : item[:label]
+        children = flatten_options(item[:children], parent: next_parent)
         [options] + children
       end.flatten.compact
     end
 
     def format_options(item, index:, parent: nil)
+      # TODO: validate option
+      if item.key?(:name)
+        ActiveAdmin::MenuTree.warn_deprecated("Use `id` key, instead of `name`.")
+        options[:id] ||= item[:name]
+      end
       options = item.except(:children)
       options[:priority] = index * 10
-      options[:label] ||= item[:name]&.pluralize&.titleize || ""
       options[:parent] = parent if parent.present?
       options
     end

data/lib/activeadmin/menu_tree/dsl.rb

@@ -4,8 +4,7 @@ module ActiveAdmin::MenuTree
   # ActiveAdmin::MenuTree::DSL class
   module DSL
     def menu_tree(**args)
-      options = menu_tree_config.find_menu_option(name: config.resource_name.name) || {}
-      options = options.except(:name)
+      options = menu_tree_config.find_menu_option(id: config.resource_name.name) || {}
       options = options.merge(args)
       menu(**options)
     end

data/lib/activeadmin/menu_tree/logging.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module ActiveAdmin
+  module MenuTree
+    # ActiveAdmin::MenuTree::Logging module
+    module Logging
+      def debug?
+        ENV["MENU_TREE_DEBUG"]
+      end
+
+      def log_debug(message)
+        warn("[ActiveAdmin::MenuTree] #{message}") if debug?
+      end
+
+      def warn_deprecated(message)
+        warn("[ActiveAdmin::MenuTree] [DEPRECATION] #{message}")
+      end
+    end
+  end
+end

data/lib/activeadmin/menu_tree/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveAdmin
   module MenuTree
-    VERSION = "0.1.1"
+    VERSION = "0.2.1"
   end
 end

data/lib/activeadmin/menu_tree.rb

@@ -4,6 +4,7 @@ require "active_support"
 require "active_support/core_ext"
 
 require_relative "menu_tree/version"
+require_relative "menu_tree/logging"
 require_relative "menu_tree/config"
 require_relative "menu_tree/dsl"
 
@@ -13,6 +14,8 @@ module ActiveAdmin
     class Error < StandardError; end
 
     class << self
+      include ActiveAdmin::MenuTree::Logging
+
       def setup
         raise ActiveAdmin::MenuTree::Error, "No block given, require a block" unless block_given?
 
@@ -32,13 +35,13 @@ module ActiveAdmin
       private
 
       def setup_menu_options(aa_config)
-        comments_menu = config.find_menu_option(name: "Comment")
+        comments_menu = config.find_menu_option(id: "Comment")
         aa_config.comments_menu = comments_menu if comments_menu.present?
 
         menu_options = config.menu_options
-                             .reject{ |item| item[:name] == "Comment" }
-                             .map{ |item| item.except(:name) }
+                             .reject{ |item| item[:id] == "Comment" }
 
+        ActiveAdmin::MenuTree.log_debug("menu_options: #{menu_options.inspect}")
         aa_config.namespace :admin do |admin|
           admin.build_menu do |menu|
             menu_options.each do |options|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-menu_tree
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - shuuuuuny
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-03 00:00:00.000000000 Z
+date: 2022-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -61,6 +61,7 @@ files:
 - lib/activeadmin/menu_tree.rb
 - lib/activeadmin/menu_tree/config.rb
 - lib/activeadmin/menu_tree/dsl.rb
+- lib/activeadmin/menu_tree/logging.rb
 - lib/activeadmin/menu_tree/version.rb
 - rbs_collection.lock.yaml
 - rbs_collection.yaml
@@ -77,6 +78,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/shuuuuun/activeadmin-menu_tree
   source_code_uri: https://github.com/shuuuuun/activeadmin-menu_tree
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -92,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.28
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Allows ActiveAdmin menus to be managed in tree format.