rggen-markdown 0.19.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74f441746a3221e735ff47c68e7534b4b511c392464aaaaf91d0da828c6b3d6c
-  data.tar.gz: b27e26a57feb347c43a7f569ffed3a6cd455eca9b4382d3a133c702ff0b0cf39
+  metadata.gz: c3ae3495f980639a7db1ffc2f53a79dfc26e9c5b50fa19509f39bc53edf28002
+  data.tar.gz: 32667aa4de67539bc42f53aecfb6a19a7231b5352b08a0f77ad88b8024e81510
 SHA512:
-  metadata.gz: d355b73c415baf3d9903ec3770b696de7598b85be1231ed80e718f9f6c7b863541835057a9363f97e5e4b7966f76d2de27592188b86534f47a7997380259ef23
-  data.tar.gz: 19131d462371e4b1f5590052afaf32fcc90ea7f029117553ead2e0198fbda5a55bf54d86836103cc4ccd19fc8103daf2f90cf2aa33bd242e6e41ccc1720a0840
+  metadata.gz: ae83be4c35e52d31028d0be63d0a1f5bd6759037464307c0d7a7ade5f11f2fa47da40272de3913e6fc2bd0c916a45e1a588e8228a6c8b1c88dba5aef99b5f24c
+  data.tar.gz: bbef244e569df6dbae34a407cb6ca42c985355392f8b8e774258d6376f85bceaeff5a0863993c595a48366a08fa3e2befba8e78444d5876caf7831b6a4d680f6

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019-2020 Taichi Ishitani
+Copyright (c) 2019-2022 Taichi Ishitani
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -34,7 +34,7 @@ Feedbacks, bug reports, questions and etc. are wellcome! You can post them by us
 
 ## Copyright & License
 
-Copyright © 2019-2020 Taichi Ishitani. RgGen::Markdown is licensed under the [MIT License](https://opensource.org/licenses/MIT), see [LICENSE](LICENSE) for futher details.
+Copyright © 2019-2022 Taichi Ishitani. RgGen::Markdown is licensed under the [MIT License](https://opensource.org/licenses/MIT), see [LICENSE](LICENSE) for futher details.
 
 ## Code of Conduct
 

data/lib/rggen/markdown/factories.rb

@@ -2,7 +2,7 @@
 
 module RgGen
   module Markdown
-    class ComponentFactory < Core::OutputBase::ComponentFactory
+    class ComponentFactory < Core::OutputBase::DocumentComponentFactory
     end
 
     class FeatureFactory < Core::OutputBase::FeatureFactory

data/lib/rggen/markdown/register/markdown.rb

@@ -16,9 +16,7 @@ RgGen.define_simple_feature(:register, :markdown) do
     end
 
     def register_printables
-      register.printables
-        .reject { |key, _| [:name, :layer_name].include?(key) }
-        .compact
+      register.printables.except(:name, :layer_name).compact
     end
 
     def bit_field_table

data/lib/rggen/markdown/register_block/markdown.rb

@@ -21,13 +21,11 @@ RgGen.define_simple_feature(:register_block, :markdown) do
     end
 
     def register_block_printables
-      register_block.printables
-        .reject { |key, _| key == :name }
-        .compact
+      register_block.printables.except(:name).compact
     end
 
     def register_table
-      table([:name], table_rows)
+      table([:name, :offset_address], table_rows)
     end
 
     def table_rows
@@ -37,7 +35,8 @@ RgGen.define_simple_feature(:register_block, :markdown) do
     def table_row(register)
       name = register.printables[:layer_name]
       id = register.anchor_id
-      [anchor_link(name, id)]
+      offset_address = register.printables[:offset_address].join("\n")
+      [anchor_link(name, id), offset_address]
     end
   end
 end

data/lib/rggen/markdown/setup.rb

@@ -2,7 +2,7 @@
 
 require 'rggen/markdown'
 
-RgGen.setup RgGen::Markdown do |builder|
+RgGen.register_plugin RgGen::Markdown do |builder|
   builder.enable :register_block, [:markdown]
   builder.enable :register, [:markdown]
 end

data/lib/rggen/markdown/utility/table_formatter.rb

@@ -18,11 +18,9 @@ module RgGen
         private
 
         def build_md_lines(labels, table)
-          lines = []
-          build_md_line(lines, labels)
-          build_md_line(lines, alignment_marks(labels.size))
-          table.each { |row| build_md_line(lines, row) }
-          lines
+          [
+            labels, alignment_marks(labels.size), *table
+          ].each_with_object([]) { |row, lines| build_md_line(lines, row) }
         end
 
         def build_md_line(lines, row)

data/lib/rggen/markdown/version.rb

@@ -2,6 +2,6 @@
 
 module RgGen
   module Markdown
-    VERSION = '0.19.0'
+    VERSION = '0.22.0'
   end
 end

data/lib/rggen/markdown.rb

@@ -10,31 +10,18 @@ require_relative 'markdown/factories'
 
 module RgGen
   module Markdown
-    PLUGIN_NAME = :'rggen-markdown'
+    extend Core::Plugin
 
-    FEATURES = [
-      'markdown/register/markdown',
-      'markdown/register_block/markdown'
-    ].freeze
-
-    def self.register_component(builder)
-      builder.output_component_registry(:markdown) do
-        register_component [
-          :root, :register_block, :register_file, :register, :bit_field
-        ] do |category|
-          component Component, ComponentFactory
-          feature Feature, FeatureFactory if category != :root
-        end
+    setup_plugin :'rggen-markdown' do |plugin|
+      plugin.register_component :markdown do
+        component Component, ComponentFactory
+        feature Feature, FeatureFactory
       end
-    end
-
-    def self.load_features
-      FEATURES.each { |feature| require_relative feature }
-    end
 
-    def self.default_setup(builder)
-      register_component(builder)
-      load_features
+      plugin.files [
+        'markdown/register/markdown',
+        'markdown/register_block/markdown'
+      ]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rggen-markdown
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-17 00:00:00.000000000 Z
+date: 2022-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,6 +54,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/rggen/rggen-markdown/issues
   mailing_list_uri: https://groups.google.com/d/forum/rggen
+  rubygems_mfa_required: 'true'
   source_code_uri: https://github.com/rggen/rggen-markdown
   wiki_uri: https://github.com/rggen/rggen/wiki
 post_install_message: 
@@ -64,15 +65,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
-summary: rggen-markdown-0.19.0
+summary: rggen-markdown-0.22.0
 test_files: []