rggen-core 0.22.0 → 0.25.1

data/lib/rggen/core/register_map.rb

@@ -5,16 +5,15 @@ module RgGen
     module RegisterMap
       def self.setup(builder)
         builder.input_component_registry(:register_map) do
-          register_component [
-            :root, :register_block, :register_file, :register, :bit_field
-          ] do |layer|
+          register_component do
             component Component, ComponentFactory
-            feature Feature, FeatureFactory if layer != :root
+            feature Feature, FeatureFactory
           end
 
           register_loader :ruby, RubyLoader
-          register_loader :yaml, YAMLLoader
           register_loader :json, JSONLoader
+          register_loader :toml, TOMLLoader
+          register_loader :yaml, YAMLLoader
         end
       end
     end

data/lib/rggen/core/register_map/hash_loader.rb

@@ -29,14 +29,13 @@ module RgGen
         end
 
         def format_array_layer_data(read_data, layer, file)
-          read_data.each_with_object({}) do |data, layer_data|
-            layer_data.merge!(fomrat_hash_layer_data(data, layer, file))
-          end
+          read_data
+            .map { |data| fomrat_hash_layer_data(data, layer, file) }
+            .inject(&:merge)
         end
 
         def fomrat_hash_layer_data(read_data, layer, file)
-          convert_to_hash(read_data, file)
-            .reject { |key, _| SUB_LAYER_KEYS[layer]&.include?(key) }
+          convert_to_hash(read_data, file).except(*SUB_LAYER_KEYS[layer])
         end
 
         def format_sub_layer_data(read_data, layer, file)
@@ -55,10 +54,8 @@ module RgGen
 
         def format_hash_sub_layer_data(read_data, layer, file, sub_layer_data = {})
           convert_to_hash(read_data, file)
-            .select { |key, _| SUB_LAYER_KEYS[layer]&.include?(key) }
-            .each do |key, value|
-              merge_sub_layer_data(sub_layer_data, layer, key, value)
-            end
+            .slice(*SUB_LAYER_KEYS[layer])
+            .each { |k, v| merge_sub_layer_data(sub_layer_data, layer, k, v) }
           sub_layer_data
         end
 

data/lib/rggen/core/register_map/toml_loader.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module RgGen
+  module Core
+    module RegisterMap
+      class TOMLLoader < Loader
+        include HashLoader
+        include InputBase::TOMLLoader
+
+        support_types [:toml]
+
+        def read_file(file)
+          load_toml(file)
+        end
+      end
+    end
+  end
+end

data/lib/rggen/core/utility/attribute_setter.rb

@@ -24,6 +24,11 @@ module RgGen
               end
             end
           end
+
+          def inherited(subclass)
+            super
+            export_instance_variable(:@attributes, subclass, &:dup)
+          end
         end
 
         def self.included(class_or_module)

data/lib/rggen/core/utility/code_utility/code_block.rb

@@ -15,11 +15,13 @@ module RgGen
           attr_reader :indent
 
           def <<(rhs)
-            return push_string(rhs) if rhs.is_a?(String)
-            return push_code_block(rhs) if rhs.is_a?(CodeBlock)
-            return rhs.inject(self, :<<) if rhs.is_a?(Array)
-            return self << rhs.to_code if rhs.respond_to?(:to_code)
-            push_word(rhs)
+            case rhs
+            when String then push_string(rhs)
+            when CodeBlock then push_code_block(rhs)
+            when Array then rhs.inject(self, :<<)
+            when code? then self << rhs.to_code
+            else push_word(rhs)
+            end
           end
 
           def indent=(indent)
@@ -74,6 +76,10 @@ module RgGen
             self
           end
 
+          def code?
+            ->(rhs) { rhs.respond_to?(:to_code) }
+          end
+
           def newline
             "\n"
           end

data/lib/rggen/core/utility/error_utility.rb

@@ -4,14 +4,41 @@ module RgGen
   module Core
     module Utility
       module ErrorUtility
-        module_function
+        class MessageComposer
+          def compose(error, verbose, backtrace)
+            lines = []
+            add_basic_info(error, lines)
+            add_verbose_info(error, lines) if verbose
+            add_backtrace(error, lines) if backtrace
+            lines.join("\n")
+          end
+
+          private
+
+          def add_basic_info(error, lines)
+            lines << "[#{error.class.lastname}] #{error}"
+          end
+
+          def add_verbose_info(error, lines)
+            return unless error.respond_to?(:verbose_info)
+            return unless error.verbose_info
+
+            lines << 'verbose information:'
+            error
+              .verbose_info.lines(chomp: true)
+              .each { |info| lines << "    #{info}" }
+          end
 
-        def compose_error_message(error, verbose)
-          lines = []
-          lines << "[#{error.class.lastname}] #{error.message}"
-          verbose &&
+          def add_backtrace(error, lines)
+            lines << 'backtrace:'
             error.backtrace.each { |trace| lines << "    #{trace}" }
-          lines.join("\n")
+          end
+        end
+
+        module_function
+
+        def compose_error_message(error, verbose, backtrace)
+          MessageComposer.new.compose(error, verbose, backtrace)
         end
       end
     end

data/lib/rggen/core/version.rb

@@ -2,9 +2,7 @@
 
 module RgGen
   module Core
-    MAJOR = 0
-    MINOR = 22
-    PATCH = 0
-    VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}"
+    VERSION = '0.25.1'
+    MAJOR, MINOR, PATCH = VERSION.split('.').map(&:to_i)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rggen-core
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.25.1
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-17 00:00:00.000000000 Z
+date: 2021-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.5
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.5
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: erubi
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +58,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: tomlrb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +106,6 @@ files:
 - lib/rggen/core/base/feature_factory.rb
 - lib/rggen/core/base/feature_layer_extension.rb
 - lib/rggen/core/base/internal_struct.rb
-- lib/rggen/core/base/proxy_call.rb
 - lib/rggen/core/base/shared_context.rb
 - lib/rggen/core/builder.rb
 - lib/rggen/core/builder/builder.rb
@@ -99,6 +118,7 @@ files:
 - lib/rggen/core/builder/loader_registry.rb
 - lib/rggen/core/builder/output_component_registry.rb
 - lib/rggen/core/builder/plugin_manager.rb
+- lib/rggen/core/builder/plugin_spec.rb
 - lib/rggen/core/builder/simple_feature_entry.rb
 - lib/rggen/core/cli.rb
 - lib/rggen/core/configuration.rb
@@ -112,6 +132,7 @@ files:
 - lib/rggen/core/configuration/json_loader.rb
 - lib/rggen/core/configuration/loader.rb
 - lib/rggen/core/configuration/ruby_loader.rb
+- lib/rggen/core/configuration/toml_loader.rb
 - lib/rggen/core/configuration/yaml_loader.rb
 - lib/rggen/core/core_extensions/object.rb
 - lib/rggen/core/dsl.rb
@@ -129,18 +150,22 @@ files:
 - lib/rggen/core/input_base/json_loader.rb
 - lib/rggen/core/input_base/loader.rb
 - lib/rggen/core/input_base/property.rb
+- lib/rggen/core/input_base/toml_loader.rb
 - lib/rggen/core/input_base/verifier.rb
 - lib/rggen/core/input_base/yaml_loader.rb
 - lib/rggen/core/options.rb
 - lib/rggen/core/output_base/code_generator.rb
 - lib/rggen/core/output_base/component.rb
 - lib/rggen/core/output_base/component_factory.rb
+- lib/rggen/core/output_base/document_component_factory.rb
 - lib/rggen/core/output_base/erb_engine.rb
 - lib/rggen/core/output_base/feature.rb
 - lib/rggen/core/output_base/feature_factory.rb
 - lib/rggen/core/output_base/file_writer.rb
 - lib/rggen/core/output_base/raise_error.rb
+- lib/rggen/core/output_base/source_file_component_factory.rb
 - lib/rggen/core/output_base/template_engine.rb
+- lib/rggen/core/plugin.rb
 - lib/rggen/core/printers.rb
 - lib/rggen/core/register_map.rb
 - lib/rggen/core/register_map/component.rb
@@ -153,6 +178,7 @@ files:
 - lib/rggen/core/register_map/json_loader.rb
 - lib/rggen/core/register_map/loader.rb
 - lib/rggen/core/register_map/ruby_loader.rb
+- lib/rggen/core/register_map/toml_loader.rb
 - lib/rggen/core/register_map/yaml_loader.rb
 - lib/rggen/core/utility/attribute_setter.rb
 - lib/rggen/core/utility/code_utility.rb
@@ -179,15 +205,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
-summary: rggen-core-0.22.0
+summary: rggen-core-0.25.1
 test_files: []

data/lib/rggen/core/base/proxy_call.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module RgGen
-  module Core
-    module Base
-      class ProxyCall
-        def initialize(receiver, method)
-          @receiver = receiver
-          @method = method
-        end
-
-        def call(*args, &block)
-          @receiver.__send__(@method, *args, &block)
-        end
-      end
-    end
-  end
-end