rggen-core 0.34.0 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86d2fa5fdfb9614f951da1504aba34a38170c0905360b6d18fc494015503a370
-  data.tar.gz: 607f2e2c60a1e6680d93d9bdf93110c47b8c20451e7f5d816b3460c42f1be315
+  metadata.gz: ad164f2506fbd5c91ea5a9340bc69e6fd492b628b38e12a87de290bea0ab6596
+  data.tar.gz: a57b33a6aff4642c98397bbcf6cf1d680cf899cfe83d0eca0dc552b085771ada
 SHA512:
-  metadata.gz: 34cb517f2fd07a2da84be0f9987d783cd4402b82c84f553de23b595bf81691cfae8e2870e95c3cc6e550dd74ab326f717951bf3453ddbf961c8e4f4fca1d4a6a
-  data.tar.gz: 3d2c506953dceb732293a141f6b33e78d5bcf38ea72fab8babe38f0097ec79c1fe8f44410417015a3a07c28f1423bacc4550522e7873e7587ed82215e2043389
+  metadata.gz: a6829f31ec7048843959afa0a84ef5980cc9a4bb8c4d792b631c658ea782ce8433fe46b9cc0cb76310c61b0a5aeaeb44757c845e87ed8a541f75033ba915d27f
+  data.tar.gz: f204f714996fac3302b7638bbdc7e7f83a3a4921e13ebec6c195a09dfdcddc9e1dcfb73cb9b310e092b6c26773de04ffdd3cd61a2b70c2750175412be88e1fd5

data/README.md

@@ -1,6 +1,6 @@
 [![Gem Version](https://badge.fury.io/rb/rggen-core.svg)](https://badge.fury.io/rb/rggen-core)
 [![CI](https://github.com/rggen/rggen-core/workflows/CI/badge.svg)](https://github.com/rggen/rggen-core/actions?query=workflow%3ACI)
-[![Maintainability](https://api.codeclimate.com/v1/badges/53c8e6654c2b5ecb9142/maintainability)](https://codeclimate.com/github/rggen/rggen-core/maintainability)
+[![Maintainability](https://qlty.sh/badges/40f53c48-7f4c-4094-9907-2736e69527b3/maintainability.svg)](https://qlty.sh/gh/rggen/projects/rggen-core)
 [![codecov](https://codecov.io/gh/rggen/rggen-core/branch/master/graph/badge.svg)](https://codecov.io/gh/rggen/rggen-core)
 [![Gitter](https://badges.gitter.im/rggen/rggen.svg)](https://gitter.im/rggen/rggen?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 

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

@@ -19,6 +19,10 @@ module RgGen
             self.class.feature_hash_variable_get(name)
           end
 
+          def feature_hash_variable_fetch(name, key)
+            self.class.feature_hash_variable_fetch(name, key)
+          end
+
           def feature_hash_array_variable_get(name)
             self.class.feature_hash_array_variable_get(name)
           end
@@ -32,12 +36,12 @@ module RgGen
           if instance_variable_defined?(name)
             instance_variable_get(name)
           else
-            parent_feature_variable_get(__method__, name)
+            call_parent_feature_variable_method(__method__, name)
           end
         end
 
         def feature_array_variable_get(name)
-          parent = parent_feature_variable_get(__method__, name)
+          parent = call_parent_feature_variable_method(__method__, name)
           own = instance_variable_get(name)
 
           if [parent, own] in [Array, Array]
@@ -48,7 +52,7 @@ module RgGen
         end
 
         def feature_hash_variable_get(name)
-          parent = parent_feature_variable_get(__method__, name)
+          parent = call_parent_feature_variable_method(__method__, name)
           own = instance_variable_get(name)
 
           if [parent, own] in [Hash, Hash]
@@ -58,8 +62,15 @@ module RgGen
           end
         end
 
+        def feature_hash_variable_fetch(name, key)
+          hash = instance_variable_get(name)
+          return hash[key] if hash&.key?(key)
+
+          call_parent_feature_variable_method(__method__, name, key)
+        end
+
         def feature_hash_array_variable_get(name)
-          parent = parent_feature_variable_get(__method__, name)
+          parent = call_parent_feature_variable_method(__method__, name)
           own = instance_variable_get(name)
 
           if [parent, own] in [Hash, Hash]
@@ -101,10 +112,10 @@ module RgGen
           feature_hash_array_variable_update(name, :prepend, key, value)
         end
 
-        def parent_feature_variable_get(method, name)
+        def call_parent_feature_variable_method(method, ...)
           return unless superclass.respond_to?(method, true)
 
-          superclass.__send__(method, name)
+          superclass.__send__(method, ...)
         end
       end
     end

data/lib/rggen/core/generator.rb

@@ -27,8 +27,6 @@ module RgGen
       end
 
       def load_register_map(builder, files)
-        files.empty? &&
-          (raise Core::LoadError.new('no register map files are given'))
         @register_map =
           builder
             .build_factory(:input, :register_map)

data/lib/rggen/core/input_base/component_factory.rb

@@ -26,26 +26,35 @@ module RgGen
 
         def preprocess(args)
           if root_factory?
-            [*args[0..-2], load_files(args)]
+            [*args[0..-2], load_inputs(args)]
           else
             args
           end
         end
 
-        def load_files(args)
+        def load_inputs(args)
           files = args.last
           create_input_data(*args[0..-2]) do |input_data|
-            files.each { |file| load_file(file, input_data) }
+            if files.empty?
+              handle_empty_input(input_data)
+            else
+              files.each { |file| load_file(input_data, file) }
+            end
           end
         end
 
-        def load_file(file, input_data)
-          find_loader(file).load_file(file, input_data, valid_value_lists)
+        def handle_empty_input(_input_data)
         end
 
-        def find_loader(file)
-          loaders.reverse_each.find { |l| l.support?(file) } ||
-            (raise Core::LoadError.new('unsupported file type', file))
+        def load_file(input_data, file)
+          loader = find_loader { _1.support?(file) }
+          raise Core::LoadError.new('unsupported file type', file) unless loader
+
+          loader.load_data(input_data, valid_value_lists, file)
+        end
+
+        def find_loader(&)
+          loaders.reverse_each.find(&)
         end
 
         def valid_value_lists

data/lib/rggen/core/input_base/feature.rb

@@ -11,7 +11,7 @@ module RgGen
 
         class << self
           def properties
-            feature_array_variable_get(:@properties)
+            feature_hash_variable_get(:@properties)&.keys
           end
 
           def active_feature?
@@ -25,9 +25,10 @@ module RgGen
           private
 
           def property(name, ...)
-            Property.define(self, name, ...)
-            properties&.include?(name) ||
-              feature_array_variable_push(:@properties, name)
+            feature_hash_variable_store(:@properties, name, Property.new(name, ...))
+            return if method_defined?(name)
+
+            public alias_method(name, :property_method)
           end
 
           alias_method :field, :property
@@ -67,7 +68,7 @@ module RgGen
         end
 
         def properties
-          feature_array_variable_get(:@properties)
+          feature_hash_variable_get(:@properties)&.keys
         end
 
         def build(*args)
@@ -119,6 +120,10 @@ module RgGen
 
         private
 
+        def property_method(...)
+          feature_hash_variable_fetch(:@properties, __callee__).evaluate(self, ...)
+        end
+
         def do_build(builders, args)
           @position = args.last.position
           match_automatically? && match_pattern(args.last)

data/lib/rggen/core/input_base/loader.rb

@@ -11,6 +11,10 @@ module RgGen
           @support_types
         end
 
+        def self.require_no_input_file
+          @require_input_file = false
+        end
+
         def initialize(extractors, ignore_values)
           @extractors = extractors
           @ignore_values = ignore_values
@@ -22,19 +26,33 @@ module RgGen
           types&.any? { |type| type.casecmp?(ext) } || false
         end
 
-        def load_file(file, input_data, valid_value_lists)
+        def require_input_file?
+          loader = self.class
+          !loader.instance_variable_defined?(:@require_input_file) ||
+            loader.instance_variable_get(:@require_input_file)
+        end
+
+        def load_data(input_data, valid_value_lists, file = nil)
+          if require_input_file?
+            load_file(input_data, valid_value_lists, file)
+          else
+            load_builtin_data(input_data)
+          end
+        end
+
+        def load_file(input_data, valid_value_lists, file)
           File.readable?(file) ||
             (raise Core::LoadError.new('cannot load such file', file))
           @input_data = input_data
           @valid_value_lists = valid_value_lists
-          format(read_file(file), input_data, input_data.layer, file)
+          format_data(read_file(file), input_data, input_data.layer, file)
         end
 
         private
 
         attr_reader :input_data
 
-        def format(read_data, input_data, layer, file)
+        def format_data(read_data, input_data, layer, file)
           layer_data =
             format_layer_data(read_data, layer, file) ||
             format_layer_data_by_extractors(read_data, layer)
@@ -45,7 +63,7 @@ module RgGen
 
         def format_sub_layer(read_data, input_data, layer, file)
           format_sub_layer_data(read_data, layer, file)&.each do |(sub_layer, data)|
-            format(data, input_data.child(sub_layer), sub_layer, file)
+            format_data(data, input_data.child(sub_layer), sub_layer, file)
           end
         end
 

data/lib/rggen/core/input_base/property.rb

@@ -4,11 +4,7 @@ module RgGen
   module Core
     module InputBase
       class Property
-        def self.define(feature, name, **options, &)
-          new(name, options, &).define(feature)
-        end
-
-        def initialize(name, options, &)
+        def initialize(name, **options, &)
           @name = name
           @options = options
           @costom_property =
@@ -21,14 +17,6 @@ module RgGen
 
         attr_reader :name
 
-        def define(feature)
-          feature.class_exec(self) do |property|
-            define_method(property.name) do |*args, **kwargs, &block|
-              property.evaluate(self, *args, **kwargs, &block)
-            end
-          end
-        end
-
         def evaluate(feature, ...)
           feature.verify(@options[:verify]) if @options.key?(:verify)
           if proxy_property?
@@ -40,9 +28,11 @@ module RgGen
 
         private
 
-        def create_costom_property(&body)
-          body && Module.new.module_eval do
-            define_method(:__costom_property__, &body)
+        def create_costom_property(&)
+          return unless block_given?
+
+          Module.new.module_eval do
+            define_method(:__costom_property__, &)
             instance_method(:__costom_property__)
           end
         end

data/lib/rggen/core/output_base/code_generatable.rb

@@ -13,6 +13,9 @@ module RgGen
             .to_h { |phase| [phase, :"@#{phase}_blocks"] }
             .freeze
 
+        TEMPLATE_PROCESSOR =
+          ->(path, location) { process_template(path, location) }
+
         module Extension
           private
 
@@ -27,9 +30,9 @@ module RgGen
               if options[:from_template]
                 path = extract_template_path(options)
                 location = caller_locations(2, 1).first
-                -> { process_template(path, location) }
-              else
-                body
+                [TEMPLATE_PROCESSOR, path, location]
+              elsif block_given?
+                [body]
               end
             return unless block
 
@@ -55,11 +58,13 @@ module RgGen
           blocks = feature_hash_array_variable_get(VARIABLE_NAMES[phase])
           return unless blocks
 
-          blocks[kind]&.each do |block|
-            if block.arity.zero?
-              code << instance_exec(&block)
+          blocks[kind]&.each do |block_and_args|
+            block = block_and_args[0]
+            args = block_and_args[1..]
+            if block.arity == (args&.size || 0)
+              code << instance_exec(*args, &block)
             else
-              instance_exec(code, &block)
+              instance_exec(code, *args, &block)
             end
           end
         end

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

@@ -14,6 +14,13 @@ module RgGen
           InputData.new(:root, valid_value_lists, configuration, &)
         end
 
+        def handle_empty_input(input_data)
+          loader = find_loader { !_1.require_input_file? }
+          raise LoadError.new('no register map files are given') unless loader
+
+          loader.load_data(input_data, valid_value_lists)
+        end
+
         def find_child_factory(_configuration, register_map)
           component_factories[register_map.layer]
         end

data/lib/rggen/core/version.rb

@@ -2,7 +2,7 @@
 
 module RgGen
   module Core
-    VERSION = '0.34.0'
+    VERSION = '0.35.0'
     MAJOR, MINOR, PATCH = VERSION.split('.').map(&:to_i)
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rggen-core
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.35.0
 platform: ruby
 authors:
 - Taichi Ishitani
 bindir: exe
 cert_chain: []
-date: 2025-01-23 00:00:00.000000000 Z
+date: 2025-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile
@@ -207,5 +207,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.6.2
 specification_version: 4
-summary: rggen-core-0.34.0
+summary: rggen-core-0.35.0
 test_files: []