rggen-core 0.26.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe3a65999b49b800216dea110ca47e81c71cf4fe0a65626f50526be374647713
-  data.tar.gz: 160dbda800f4fef46bbe18ef34810851082d09271eb7754b6b4508eb4f56c8fd
+  metadata.gz: 30286c1aefc400e1d6cda52dddc797fca2ad3a35fcf3a43578371a5b9a8fc4b0
+  data.tar.gz: e7bb012b70a143c1412eab481febce79e7083ab83c22136f3e52540a41e67c69
 SHA512:
-  metadata.gz: eae55af6cdaa6eff67f15ef508dcd32af950d72f18621d0b8769011957c9c6a72c9f3c41557d197a0c1e9fec25ecaff34364f3518cd04c12f22bdb6ee8efa6af
-  data.tar.gz: 3d030a72ade1067dbb7450ff30ef4cffc3d97430e73a4ea96f9fb310a5cb633e314f1a9b280d4c4e615b1fce2ace5f5456f2881bd76a18fa05cef60420989ada
+  metadata.gz: a14bd1ce40c782d0628e55f23a6acffa1578598a421bae4a7127c4464800078ac3181504e0a53b829581cfba4820b56fbc07803cf3fe338097479f4d3aca646a
+  data.tar.gz: 524360603dae2839afe73e23a8c2cbedac3e2373e70a24e671d006977caf08dea6a5813d50a99a1724b3ab1a098b38134b0f653cbde2f9c6ee341d12596a73d0

data/README.md

@@ -37,7 +37,8 @@ $ gem install rggen-core
 
 Feedbacks, bug reports, questions and etc. are wellcome! You can post them by using following ways:
 
-* [GitHub Issue Tracker](https://github.com/rggen/rggen-core/issues)
+* [GitHub Issue Tracker](https://github.com/rggen/rggen/issues)
+* [GitHub Discussions](https://github.com/rggen/rggen/discussions)
 * [Chat Room](https://gitter.im/rggen/rggen)
 * [Mailing List](https://groups.google.com/d/forum/rggen)
 * [Mail](mailto:rggen@googlegroups.com)

data/lib/rggen/core/builder/builder.rb

@@ -24,11 +24,10 @@ module RgGen
 
         [
           :register_loader, :register_loaders,
-          :define_value_extractor, :ignore_value, :ignore_values
+          :setup_loader, :define_value_extractor
         ].each do |method_name|
           define_method(method_name) do |component, *args, &block|
-            @component_registries[:input][component]
-              .__send__(__method__, *args, &block)
+            @component_registries[:input][component].__send__(__method__, *args, &block)
           end
         end
 
@@ -61,12 +60,8 @@ module RgGen
           @layers[layer].enable(*args)
         end
 
-        def disable_all
-          @layers.each_value(&:disable)
-        end
-
-        def disable(layer, *args)
-          @layers.key?(layer) && @layers[layer].disable(*args)
+        def enable_all
+          @layers.each_value(&:enable_all)
         end
 
         def build_factory(type, component)
@@ -94,7 +89,7 @@ module RgGen
 
         def_delegator :plugin_manager, :load_plugin
         def_delegator :plugin_manager, :load_plugins
-        def_delegator :plugin_manager, :register_plugin
+        def_delegator :plugin_manager, :setup_plugin
 
         private
 

data/lib/rggen/core/builder/feature_registry.rb

@@ -28,68 +28,61 @@ module RgGen
 
         def enable(feature_or_list_names, feature_names = nil)
           if feature_names
-            @enabled_features[feature_or_list_names]
-              &.merge!(Array(feature_names))
+            list_name = feature_or_list_names
+            (@enabled_features[list_name] ||= []).merge!(Array(feature_names))
           else
             Array(feature_or_list_names).each do |name|
-              @enabled_features[name] ||= []
+              @enabled_features.key?(name) || (@enabled_features[name] = nil)
             end
           end
         end
 
-        def enabled_features(list_name = nil)
-          if list_name
-            @enabled_features[list_name] || []
-          else
-            @enabled_features.keys
-          end
-        end
-
-        def disable(feature_or_list_names = nil, feature_names = nil)
-          if feature_names
-            @enabled_features[feature_or_list_names]
-              &.delete_if { |key, _| Array(feature_names).include?(key) }
-          elsif feature_or_list_names
-            Array(feature_or_list_names)
-              .each(&@enabled_features.method(:delete))
-          else
-            @enabled_features.clear
-          end
+        def enable_all
+          @enabled_features.clear
         end
 
         def delete(feature_or_list_names = nil, feature_names = nil)
           if feature_names
             @feature_entries[feature_or_list_names]&.delete(feature_names)
           elsif feature_or_list_names
-            Array(feature_or_list_names)
-              .each(&@feature_entries.method(:delete))
+            Array(feature_or_list_names).each(&@feature_entries.method(:delete))
           else
             @feature_entries.clear
           end
         end
 
         def simple_feature?(feature_name)
-          enabled_feature?(feature_name, :simple)
+          @feature_entries[feature_name]&.match_entry_type?(:simple) || false
         end
 
         def list_feature?(list_name, feature_name = nil)
-          return false unless enabled_feature?(list_name, :list)
+          return false unless @feature_entries[list_name]&.match_entry_type?(:list)
           return true unless feature_name
-          enabled_list_item_feature?(list_name, feature_name)
+          @feature_entries[list_name].feature?(feature_name)
         end
 
         def feature?(feature_or_list_name, feature_name = nil)
           if feature_name
             list_feature?(feature_or_list_name, feature_name)
           else
-            simple_feature?(feature_or_list_name) ||
-              list_feature?(feature_or_list_name)
+            simple_feature?(feature_or_list_name) || list_feature?(feature_or_list_name)
+          end
+        end
+
+        def enabled_features(list_name = nil)
+          if list_name
+            enabled_list_features(list_name)
+          else
+            @enabled_features.empty? && @feature_entries.keys ||
+              @enabled_features.keys & @feature_entries.keys
           end
         end
 
         def build_factories
+          target_features =
+            (@enabled_features.empty? && @feature_entries || @enabled_features).keys
           @feature_entries
-            .slice(*@enabled_features.keys)
+            .slice(*target_features)
             .transform_values(&method(:build_factory))
         end
 
@@ -105,16 +98,17 @@ module RgGen
           @feature_entries[name] = entry
         end
 
-        def enabled_feature?(name, entry_type)
-          return false unless @feature_entries[name]
-                                &.match_entry_type?(entry_type)
-          @enabled_features.key?(name)
+        def enabled_list_features(list_name)
+          return [] unless enabled_list?(list_name)
+          features = @feature_entries[list_name].features
+          (@enabled_features[list_name] || features) & features
         end
 
-        def enabled_list_item_feature?(list_name, feature_name)
-          return false unless @feature_entries[list_name]
-                                .feature?(feature_name)
-          @enabled_features[list_name].include?(feature_name)
+        def enabled_list?(list_name)
+          return false unless list_feature?(list_name)
+          return true if @enabled_features.empty?
+          return true if @enabled_features.key?(list_name)
+          false
         end
 
         def build_factory(entry)

data/lib/rggen/core/builder/input_component_registry.rb

@@ -6,45 +6,26 @@ module RgGen
       class InputComponentRegistry < ComponentRegistry
         def initialize(name, builder)
           super
-          @loader_registries = {}
+          @loader_registries = Hash.new do |h, k|
+            h[k] = LoaderRegistry.new
+          end
         end
 
         def register_loader(loader_type, loader)
-          loader_registry(loader_type).register_loader(loader)
+          @loader_registries[loader_type].register_loader(loader)
         end
 
         def register_loaders(loader_type, loaders)
-          loader_registry(loader_type).register_loaders(loaders)
+          @loader_registries[loader_type].register_loaders(loaders)
         end
 
-        def define_value_extractor(loader_type, layers_or_value, value = nil, &body)
-          layers, value =
-            if value
-              [layers_or_value, value]
-            else
-              [nil, layers_or_value]
-            end
-          loader_registry(loader_type).define_value_extractor(layers, value, &body)
-        end
-
-        def ignore_value(loader_type, layers_or_value, value = nil)
-          layers, value =
-            if value
-              [layers_or_value, value]
-            else
-              [nil, layers_or_value]
-            end
-          loader_registry(loader_type).ignore_value(layers, value)
+        def setup_loader(loader_type)
+          block_given? && yield(@loader_registries[loader_type])
         end
 
-        def ignore_values(loader_type, layers_or_values, values = nil)
-          layers, values =
-            if values
-              [layers_or_values, values]
-            else
-              [nil, layers_or_values]
-            end
-          loader_registry(loader_type).ignore_values(layers, values)
+        def define_value_extractor(loader_type, layers_or_value, value = nil, &body)
+          @loader_registries[loader_type]
+            .define_value_extractor(layers_or_value, value, &body)
         end
 
         def build_factory
@@ -55,10 +36,6 @@ module RgGen
 
         private
 
-        def loader_registry(loader_type)
-          @loader_registries[loader_type] ||= LoaderRegistry.new
-        end
-
         def build_loaders
           @loader_registries.values.flat_map(&:create_loaders)
         end

data/lib/rggen/core/builder/layer.rb

@@ -90,10 +90,8 @@ module RgGen
           end
         end
 
-        def disable(feature_or_list_names = nil, feature_names = nil)
-          @feature_registries.each_value do |registry|
-            registry.disable(*[feature_or_list_names, feature_names].compact)
-          end
+        def enable_all
+          @feature_registries.each_value(&:enable_all)
         end
 
         def delete(feature_or_list_names = nil, feature_names = nil)

data/lib/rggen/core/builder/list_feature_entry.rb

@@ -32,9 +32,9 @@ module RgGen
 
         alias_method :factory, :define_factory
 
-        def build_factory(enabled_features)
+        def build_factory(targets)
           @factory.new(@name) do |f|
-            f.target_features(target_features(enabled_features))
+            f.target_features(target_features(targets))
             f.target_feature(@default_feature)
           end
         end
@@ -77,6 +77,10 @@ module RgGen
           @features.key?(feature)
         end
 
+        def features
+          @features.keys
+        end
+
         private
 
         def attach_shared_context(context)
@@ -85,8 +89,8 @@ module RgGen
           end
         end
 
-        def target_features(enabled_features)
-          @features.slice(*enabled_features)
+        def target_features(targets)
+          targets && @features.slice(*targets) || @features
         end
       end
     end

data/lib/rggen/core/builder/loader_registry.rb

@@ -11,22 +11,25 @@ module RgGen
         end
 
         def register_loader(loader)
-          register_loaders([loader])
+          @loaders << loader
         end
 
         def register_loaders(loaders)
           @loaders.concat(Array(loaders))
         end
 
-        def define_value_extractor(layers, value, &body)
+        def define_value_extractor(layers_or_value, value = nil, &body)
+          value, layers = [value, layers_or_value].compact
           @extractors << create_extractor(layers, value, &body)
         end
 
-        def ignore_value(layers, value)
+        def ignore_value(layers_or_value, value = nil)
+          value, layers = [value, layers_or_value].compact
           ignore_values(layers, [value])
         end
 
-        def ignore_values(layers, values)
+        def ignore_values(layers_or_values, values = nil)
+          values, layers = [values, layers_or_values].compact
           [layers].flatten.each do |layer|
             (@ignore_values[layer] ||= []).concat(Array(values))
           end

data/lib/rggen/core/builder/plugin_manager.rb

@@ -3,81 +3,65 @@
 module RgGen
   module Core
     module Builder
-      class PluginRegistry
-        def initialize(plugin_module, &block)
-          @plugin_module = plugin_module
-          @block = block
-        end
-
-        def default_setup(builder)
-          @plugin_module.plugin_spec.activate(builder)
-        end
-
-        def optional_setup(builder)
-          @block && @plugin_module.instance_exec(builder, &@block)
-        end
-
-        def version_info
-          @plugin_module.plugin_spec.version_info
-        end
-      end
+      DEFAULT_PLUGSINS = 'rggen/default'
 
       class PluginInfo
-        attr_reader :name
-        attr_reader :setup_path
-        attr_reader :gem_name
+        attr_reader :path
+        attr_reader :gemname
         attr_reader :version
 
-        def parse(setup_path_or_name, version)
-          setup_path_or_name = setup_path_or_name.to_s.strip
-          @name, @setup_path, @gem_name, @version =
-            if setup_file_directly_given?(setup_path_or_name)
-              [nil, setup_path_or_name, *find_plugin_gem(setup_path_or_name)]
+        def self.parse(path_or_name, version)
+          info = new
+          info.parse(path_or_name.to_s.strip, version)
+          info
+        end
+
+        def parse(path_or_name, version)
+          @name, @path, @gemname, @version =
+            if plugin_path?(path_or_name)
+              [nil, path_or_name, *find_gemspec_by_path(path_or_name)]
             else
               [
-                setup_path_or_name, get_setup_path(setup_path_or_name),
-                extract_gem_name(setup_path_or_name), version
+                path_or_name, get_plugin_path(path_or_name),
+                get_gemname(path_or_name), version
               ]
             end
-          self
         end
 
         def to_s
-          if name && version
-            "#{name} (#{version})"
-          elsif name
-            name
+          if @name && @version
+            "#{@name} (#{@version})"
+          elsif @name
+            @name
           else
-            setup_path
+            @path
           end
         end
 
         private
 
-        def setup_file_directly_given?(setup_path_or_name)
-          File.ext(setup_path_or_name) == 'rb' ||
-            File.basename(setup_path_or_name, '.*') == 'setup'
+        def plugin_path?(path_or_name)
+          path_or_name == DEFAULT_PLUGSINS || File.ext(path_or_name) == 'rb'
         end
 
-        def find_plugin_gem(setup_path)
-          gemspec =
-            Gem::Specification
-              .each.find { |spec| match_gemspec?(spec, setup_path) }
-          gemspec && [gemspec.name, gemspec.version]
+        def find_gemspec_by_path(path)
+          Gem::Specification
+            .each.find { |spec| match_gemspec_path?(spec, path) }
+            .then { |spec| spec && [spec.name, spec.version] }
         end
 
-        def match_gemspec?(gemspec, setup_path)
-          gemspec.full_require_paths.any?(&setup_path.method(:start_with?))
+        def match_gemspec_path?(gemspec, path)
+          gemspec.full_require_paths.any?(&path.method(:start_with?))
         end
 
-        def extract_gem_name(plugin_name)
-          plugin_name.split('/', 2).first
+        def get_plugin_path(name)
+          base_name, sub_name = name.split('/', 2)
+          base_name = base_name.sub(/^rggen[-_]/, '').tr('-', '_')
+          File.join(*['rggen', base_name, sub_name].compact)
         end
 
-        def get_setup_path(plugin_name)
-          base, sub_directory = plugin_name.split('/', 2)
-          base = base.sub(/^rggen[-_]/, '').tr('-', '_')
-          File.join(*['rggen', base, sub_directory, 'setup'].compact)
+        def get_gemname(name)
+          name.split('/', 2).first
         end
       end
 
@@ -87,9 +71,9 @@ module RgGen
           @plugins = []
         end
 
-        def load_plugin(setup_path_or_name, version = nil)
-          info = PluginInfo.new.parse(setup_path_or_name, version)
-          read_setup_file(info)
+        def load_plugin(path_or_name, version = nil)
+          info = PluginInfo.parse(path_or_name, version)
+          read_plugin_file(info)
         end
 
         def load_plugins(plugins, no_default_plugins, activation = true)
@@ -99,17 +83,19 @@ module RgGen
           activation && activate_plugins
         end
 
-        def register_plugin(plugin_module, &block)
-          plugin?(plugin_module) ||
-            (raise Core::PluginError.new('no plugin spec is given'))
-          @plugins << PluginRegistry.new(plugin_module, &block)
+        def setup_plugin(plugin_name, &block)
+          @plugins << PluginSpec.new(plugin_name, &block)
+        end
+
+        def activate_plugins
+          do_normal_activation
+          do_addtional_activation
         end
 
-        def activate_plugins(**options)
-          options[:no_default_setup] ||
-            @plugins.each { |plugin| plugin.default_setup(@builder) }
-          options[:no_optional_setup] ||
-            @plugins.each { |plugin| plugin.optional_setup(@builder) }
+        def activate_plugin_by_name(plugin_name)
+          target_plugin = @plugins.find { |plugin| plugin.name == plugin_name }
+          target_plugin&.activate(@builder)
+          target_plugin&.activate_additionally(@builder)
         end
 
         def version_info
@@ -118,9 +104,9 @@ module RgGen
 
         private
 
-        def read_setup_file(info)
-          info.gem_name && gem(info.gem_name, info.version)
-          require info.setup_path
+        def read_plugin_file(info)
+          info.gemname && gem(info.gemname, info.version)
+          require info.path
         rescue ::LoadError
           raise Core::PluginError.new("cannot load such plugin: #{info}")
         end
@@ -133,8 +119,6 @@ module RgGen
           ]
         end
 
-        DEFAULT_PLUGSINS = 'rggen/setup'
-
         def default_plugins(no_default_plugins)
           load_default_plugins?(no_default_plugins) && DEFAULT_PLUGSINS || nil
         end
@@ -153,8 +137,12 @@ module RgGen
             &.map { |entry| entry.split(',', 2) }
         end
 
-        def plugin?(plugin_module)
-          plugin_module.respond_to?(:plugin_spec) && plugin_module.plugin_spec
+        def do_normal_activation
+          @plugins.each { |plugin| plugin.activate(@builder) }
+        end
+
+        def do_addtional_activation
+          @plugins.each { |plugin| plugin.activate_additionally(@builder) }
         end
       end
     end

data/lib/rggen/core/builder/plugin_spec.rb

@@ -4,14 +4,16 @@ module RgGen
   module Core
     module Builder
       class PluginSpec
-        def initialize(name, plugin_module)
+        def initialize(name)
           @name = name
-          @plugin_module = plugin_module
           @component_registrations = []
           @loader_registrations = []
           @files = []
+          block_given? && yield(self)
         end
 
+        attr_reader :name
+
         def version(value = nil)
           @version = value if value
           version_value
@@ -25,13 +27,8 @@ module RgGen
           @component_registrations << [component, layers, body]
         end
 
-        def register_loader(component, loader_type, loader)
-          @loader_registrations << [component, loader_type, loader]
-        end
-
-        def register_loaders(component, loader_type, loaders)
-          Array(loaders)
-            .each { |loader| register_loader(component, loader_type, loader) }
+        def setup_loader(component, loader_type, &body)
+          @loader_registrations << [component, loader_type, body]
         end
 
         def register_files(files)
@@ -41,23 +38,26 @@ module RgGen
 
         alias_method :files, :register_files
 
+        def addtional_setup(&body)
+          @addtional_setup = body
+        end
+
         def activate(builder)
           activate_components(builder)
           activate_loaders(builder)
           load_files
         end
 
+        def activate_additionally(builder)
+          @addtional_setup&.call(builder)
+        end
+
         private
 
         DEFAULT_VERSION = '0.0.0'
 
         def version_value
-          @version || const_version || DEFAULT_VERSION
-        end
-
-        def const_version
-          @plugin_module.const_defined?(:VERSION) &&
-            @plugin_module.const_get(:VERSION)
+          @version || DEFAULT_VERSION
         end
 
         def activate_components(builder)
@@ -69,8 +69,10 @@ module RgGen
         end
 
         def activate_loaders(builder)
-          @loader_registrations.each do |component, loader_type, loader|
-            builder.register_loader(component, loader_type, loader)
+          @loader_registrations.each do |component, loader_type, body|
+            builder
+              .input_component_registry(component)
+              .setup_loader(loader_type, &body)
           end
         end
 

data/lib/rggen/core/configuration/error.rb

@@ -7,7 +7,8 @@ module RgGen
       end
 
       module RaiseError
-        def error(message, position = nil)
+        def error(message, input_value = nil)
+          position = input_value.position if input_value.respond_to?(:position)
           raise ConfigurationError.new(message, position || @position)
         end
       end

data/lib/rggen/core/core_extensions/kernel.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Kernel
+  alias_method :__orignal_Integer, :Integer
+
+  def Integer(arg, base = 0, exception: true)
+    arg = arg.__getobj__ if arg.is_a?(::Delegator)
+    __orignal_Integer(arg, base, exception: exception)
+  end
+
+  module_function :__orignal_Integer
+  module_function :Integer
+end

data/lib/rggen/core/core_extensions/object.rb

@@ -4,8 +4,8 @@ class Object
   def export_instance_variable(variable, to)
     instance_variable_defined?(variable) &&
       instance_variable_get(variable)
-        .yield_self { |v| block_given? ? yield(v) : v }
-        .yield_self { |v| to.instance_variable_set(variable, v) }
+        .then { |v| block_given? ? yield(v) : v }
+        .then { |v| to.instance_variable_set(variable, v) }
   end
 
   def singleton_exec(*args, &block)

data/lib/rggen/core/dsl.rb

@@ -11,17 +11,17 @@ module RgGen
         :input_component_registry,
         :output_component_registry,
         :register_loader,
+        :setup_loader,
+        :load_plugin,
         :define_loader,
         :define_simple_feature,
         :define_list_feature,
         :define_list_item_feature,
         :define_value_extractor,
         :enable,
-        :disable_all,
-        :disable,
+        :enable_all,
         :delete,
-        :register_plugin,
-        :load_plugin
+        :setup_plugin
       ].each do |method_name|
         def_delegator :'RgGen.builder', method_name
       end

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

@@ -5,6 +5,7 @@ module RgGen
     module InputBase
       class Feature < Base::Feature
         include Utility::RegexpPatterns
+        include Utility::TypeChecker
 
         class << self
           def property(name, **options, &body)
@@ -50,8 +51,7 @@ module RgGen
           end
 
           def input_pattern(pattern_or_patterns, **options, &converter)
-            @input_matcher =
-              InputMatcher.new(pattern_or_patterns, **options, &converter)
+            @input_matcher = InputMatcher.new(pattern_or_patterns, **options, &converter)
           end
 
           attr_reader :input_matcher
@@ -88,9 +88,8 @@ module RgGen
           end
 
           def export_verifiers(subclass)
-            subclass.instance_variable_set(
-              :@verifiers, @verifiers.transform_values(&:dup)
-            )
+            subclass
+              .instance_variable_set(:@verifiers, @verifiers.transform_values(&:dup))
           end
         end
 
@@ -104,9 +103,7 @@ module RgGen
         end
 
         def post_build
-          self.class.post_builders&.each do |post_builder|
-            instance_exec(&post_builder)
-          end
+          self.class.post_builders&.each { |block| instance_exec(&block) }
         end
 
         def verify(scope)
@@ -114,9 +111,7 @@ module RgGen
         end
 
         def printables
-          helper
-            .printables
-            &.map { |name, body| [name, printable(name, &body)] }
+          helper.printables&.map { |name, body| [name, printable(name, &body)] }
         end
 
         def printable?
@@ -133,10 +128,13 @@ module RgGen
 
         def do_build(args)
           @position = args.last.position
-          value = args.last.value
-          match_automatically? && match_pattern(value)
-          Array(self.class.builders)
-            .each { |builder| instance_exec(*args[0..-2], value, &builder) }
+          match_automatically? && match_pattern(args.last)
+          execute_build_blocks(args)
+        end
+
+        def execute_build_blocks(args)
+          args = [*args, args.last.options] if args.last.with_options?
+          self.class.builders.each { |builder| instance_exec(*args, &builder) }
         end
 
         attr_reader :position

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

@@ -4,6 +4,8 @@ module RgGen
   module Core
     module InputBase
       class FeatureFactory < Base::FeatureFactory
+        include Utility::TypeChecker
+
         class << self
           def convert_value(&block)
             @value_converter = block
@@ -15,10 +17,18 @@ module RgGen
             @default_value = block if block_given?
             @default_value
           end
+
+          def allow_options
+            @allow_options = true
+          end
+
+          def allow_options?
+            @allow_options || false
+          end
         end
 
         def create(component, *args)
-          input_value = preprocess(args.last)
+          input_value = process_input_value(args.last)
           create_feature(component, *args[0..-2], input_value) do |feature|
             build_feature(feature, input_value)
             feature.verify(:feature)
@@ -35,20 +45,60 @@ module RgGen
 
         private
 
-        def preprocess(input_value)
-          converted_value =
-            active_feature_factory? && convert_value(input_value)
-          converted_value || input_value
+        def process_input_value(input_value)
+          if passive_feature_factory?
+            input_value
+          elsif self.class.allow_options?
+            process_input_value_with_options(input_value)
+          else
+            process_input_value_without_options(input_value)
+          end
         end
 
-        def convert_value(input_value)
-          new_value =
-            if input_value.empty_value?
-              evaluate_defalt_value(input_value.position)
+        def process_input_value_with_options(input_value)
+          value, options =
+            if string?(input_value)
+              parse_string_value(input_value)
             else
-              convert(input_value.value, input_value.position)
+              Array(input_value).then { |values| [values.first, values[1..]] }
             end
-          new_value && InputValue.new(new_value, input_value.position)
+          value = convert_value(value, input_value.position) || value
+          InputValue.new(value, options || [], input_value.position)
+        end
+
+        def parse_string_value(input_value)
+          value, options = split_string(input_value, ':', 2)
+          [value, parse_option_string(options)]
+        end
+
+        def parse_option_string(option_string)
+          split_string(option_string, /[,\n]/, 0)&.map do |option|
+            name, value = split_string(option, ':', 2)
+            value && [name, value] || name
+          end
+        end
+
+        def split_string(string, separator, limit)
+          string&.split(separator, limit)&.map(&:strip)
+        end
+
+        def process_input_value_without_options(input_value)
+          value = convert_value(input_value.value, input_value.position)
+          value && InputValue.new(value, input_value.position) || input_value
+        end
+
+        def convert_value(value, position)
+          if empty_value?(value)
+            evaluate_defalt_value(position)
+          else
+            convert(value, position)
+          end
+        end
+
+        def empty_value?(value)
+          return true if value.nil?
+          return value.empty? if value.respond_to?(:empty?)
+          false
         end
 
         def evaluate_defalt_value(position)

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

@@ -13,8 +13,8 @@ module RgGen
         def match(rhs)
           rhs
             .to_s
-            .yield_self { |s| ignore_blanks? && delete_blanks(s) || s }
-            .yield_self(&method(:match_patterns))
+            .then { |s| ignore_blanks? && delete_blanks(s) || s }
+            .then(&method(:match_patterns))
         end
 
         def match_automatically?

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

@@ -3,21 +3,43 @@
 module RgGen
   module Core
     module InputBase
-      class InputValue
-        def initialize(value, position)
-          @value = (value.is_a?(String) && value.strip) || value
-          @position = position
+      class InputValue < ::SimpleDelegator
+        NoValue = Object.new
+
+        def initialize(value, options_or_position, position = NoValue)
+          super((value.is_a?(String) && value.strip) || value)
+          @options, @position =
+            if position.equal?(NoValue)
+              [NoValue, options_or_position]
+            else
+              [options_or_position, position]
+            end
         end
 
-        attr_accessor :value
+        alias_method :value, :__getobj__
+
         attr_reader :position
+        attr_reader :options
+
+        def ==(other)
+          __getobj__ == other ||
+            other.is_a?(InputValue) && __getobj__ == other.__getobj__
+        end
+
+        def match_class?(klass)
+          __getobj__.is_a?(klass)
+        end
 
         def empty_value?
-          return true if @value.nil?
-          return true if @value.respond_to?(:empty?) && @value.empty?
+          return true if value.nil?
+          return true if value.respond_to?(:empty?) && value.empty?
           false
         end
 
+        def with_options?
+          !@options.equal?(NoValue)
+        end
+
         def available?
           true
         end

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

@@ -80,8 +80,8 @@ module RgGen
 
         def set_initial_value(feature, varible_name)
           @options[:initial]
-            .yield_self { |v| evaluate_default_initial_value(feature, v) }
-            .yield_self { |v| feature.instance_variable_set(varible_name, v) }
+            .then { |v| evaluate_default_initial_value(feature, v) }
+            .then { |v| feature.instance_variable_set(varible_name, v) }
         end
 
         def evaluate_default_initial_value(feature, value)

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

@@ -4,15 +4,111 @@ module RgGen
   module Core
     module InputBase
       module YAMLLoader
+        Position = Struct.new(:file, :line, :column) do
+          def to_s
+            "file #{file} line #{line} column #{column}"
+          end
+        end
+
+        module PsychExtension
+          refine ::Psych::Nodes::Node do
+            attr_accessor :filename
+
+            attr_writer :mapping_key
+
+            def mapping_key?
+              @mapping_key || false
+            end
+          end
+        end
+
+        using PsychExtension
+
+        class TreeBuilder < ::Psych::TreeBuilder
+          def initialize(filename)
+            super()
+            @filename = filename
+          end
+
+          def set_start_location(node)
+            super
+            node.filename = @filename
+          end
+
+          def scalar(value, anchor, tag, plain, quated, style)
+            node = super
+            node.mapping_key = mapping_key?
+            node
+          end
+
+          private
+
+          def mapping_key?
+            @last.mapping? && @last.children.size.odd?
+          end
+        end
+
+        class Visitor < ::Psych::Visitors::ToRuby
+          if ::Psych::VERSION >= '3.2.0'
+            def initialize(scalar_scanner, class_loader)
+              super(scalar_scanner, class_loader, symbolize_names: true)
+            end
+          end
+
+          def register(node, object)
+            obj =
+              if override_object?(node)
+                file = node.filename
+                line = node.start_line + 1
+                column = node.start_column + 1
+                position = Position.new(file, line, column)
+                InputValue.new(object, position)
+              else
+                object
+              end
+            super(node, obj)
+          end
+
+          private
+
+          def override_object?(node)
+            node.mapping? || node.sequence? || (node.scalar? && !node.mapping_key?)
+          end
+        end
+
         private
 
         def load_yaml(file)
-          yaml = File.binread(file)
-          YAML.safe_load(
-            yaml,
-            permitted_classes: [Symbol], aliases: true,
-            filename: file, symbolize_names: true
-          )
+          parse_yaml(File.binread(file), file)
+            .then { |result| to_ruby(result) }
+            .then { |result| symbolize_names(result) }
+        end
+
+        def parse_yaml(yaml, file)
+          parser = ::Psych::Parser.new(TreeBuilder.new(file))
+          parser.parse(yaml, file)
+          parser.handler.root.children.first
+        end
+
+        def to_ruby(result)
+          cl = ::Psych::ClassLoader::Restricted.new(['Symbol'], [])
+          ss = ::Psych::ScalarScanner.new(cl)
+          Visitor.new(ss, cl).accept(result)
+        end
+
+        def symbolize_names(result)
+          return result if ::Psych::VERSION >= '3.2.0'
+
+          if result.match_class?(Hash)
+            keys = result.keys
+            keys.each do |key|
+              result[key.to_sym] = symbolize_names(result.delete(key))
+            end
+          elsif result.match_class?(Array)
+            result.map! { |value| symbolize_names(value) }
+          end
+
+          result
         end
       end
     end

data/lib/rggen/core/options.rb

@@ -119,7 +119,7 @@ module RgGen
     Options.add_option(:configuration) do |option|
       option.short_option '-c'
       option.long_option '--configuration FILE'
-      option.default { ENV['RGGEN_DEFAULT_CONFIGURATION_FILE'] }
+      option.default { ENV.fetch('RGGEN_DEFAULT_CONFIGURATION_FILE', nil) }
       option.description 'Specify a configuration file'
     end
 

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

@@ -7,7 +7,8 @@ module RgGen
       end
 
       module RaiseError
-        def error(message, position = nil)
+        def error(message, input_value = nil)
+          position = input_value.position if input_value.respond_to?(:position)
           raise RegisterMapError.new(message, position || @position)
         end
       end

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

@@ -4,6 +4,8 @@ module RgGen
   module Core
     module RegisterMap
       module HashLoader
+        include Utility::TypeChecker
+
         private
 
         SUB_LAYER_KEYS = {
@@ -21,7 +23,7 @@ module RgGen
         }.freeze
 
         def format_layer_data(read_data, layer, file)
-          if read_data.is_a?(Array)
+          if array?(read_data)
             format_array_layer_data(read_data, layer, file)
           else
             fomrat_hash_layer_data(read_data, layer, file)
@@ -39,7 +41,7 @@ module RgGen
         end
 
         def format_sub_layer_data(read_data, layer, file)
-          if read_data.is_a?(Array)
+          if array?(read_data)
             format_array_sub_layer_data(read_data, layer, file)
           else
             format_hash_sub_layer_data(read_data, layer, file)

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

@@ -32,6 +32,18 @@ module RgGen
         def integer
           INTEGER_PATTERN
         end
+
+        TRUTHY_PATTERN = /true|on|yes/i.freeze
+
+        def truthy_pattern
+          TRUTHY_PATTERN
+        end
+
+        FALSEY_PATTERN = /false|off|no/i.freeze
+
+        def falsey_pattern
+          FALSEY_PATTERN
+        end
       end
     end
   end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module RgGen
+  module Core
+    module Utility
+      module TypeChecker
+        [String, Symbol, Integer, Array, Hash].each do |klass|
+          module_eval(<<~DEFINE_METHOD, __FILE__, __LINE__ + 1)
+            # module_function def string?(value)
+            #   return value.match_class?(String) if value.respond_to?(:match_class?)
+            #   value.is_a?(String)
+            # end
+            module_function def #{klass.to_s.downcase}?(value)
+              return value.match_class?(#{klass}) if value.respond_to?(:match_class?)
+              value.is_a?(#{klass})
+            end
+          DEFINE_METHOD
+        end
+      end
+    end
+  end
+end

data/lib/rggen/core/version.rb

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

data/lib/rggen/core.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'delegate'
 require 'docile'
 require 'erubi'
 require 'fileutils'
@@ -14,6 +15,7 @@ require 'yaml'
 require_relative 'core/version'
 
 require_relative 'core/facets'
+require_relative 'core/core_extensions/kernel'
 require_relative 'core/core_extensions/object'
 
 require_relative 'core/utility/attribute_setter'
@@ -24,6 +26,7 @@ require_relative 'core/utility/code_utility/structure_definition'
 require_relative 'core/utility/code_utility'
 require_relative 'core/utility/error_utility'
 require_relative 'core/utility/regexp_patterns'
+require_relative 'core/utility/type_checker'
 
 require_relative 'core/exceptions'
 
@@ -105,7 +108,6 @@ require_relative 'core/builder/plugin_manager'
 require_relative 'core/builder/builder'
 require_relative 'core/builder'
 
-require_relative 'core/plugin'
 require_relative 'core/printers'
 require_relative 'core/options'
 require_relative 'core/dsl'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rggen-core
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.28.0
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-25 00:00:00.000000000 Z
+date: 2022-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile
@@ -134,6 +134,7 @@ files:
 - 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/kernel.rb
 - lib/rggen/core/core_extensions/object.rb
 - lib/rggen/core/dsl.rb
 - lib/rggen/core/exceptions.rb
@@ -165,7 +166,6 @@ files:
 - 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
@@ -188,12 +188,13 @@ files:
 - lib/rggen/core/utility/code_utility/structure_definition.rb
 - lib/rggen/core/utility/error_utility.rb
 - lib/rggen/core/utility/regexp_patterns.rb
+- lib/rggen/core/utility/type_checker.rb
 - lib/rggen/core/version.rb
 homepage: https://github.com/rggen/rggen-core
 licenses:
 - MIT
 metadata:
-  bug_tracker_uri: https://github.com/rggen/rggen-core/issues
+  bug_tracker_uri: https://github.com/rggen/rggen/issues
   mailing_list_uri: https://groups.google.com/d/forum/rggen
   rubygems_mfa_required: 'true'
   source_code_uri: https://github.com/rggen/rggen-core
@@ -213,8 +214,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
-summary: rggen-core-0.26.0
+summary: rggen-core-0.28.0
 test_files: []

data/lib/rggen/core/plugin.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module RgGen
-  module Core
-    module Plugin
-      attr_reader :plugin_spec
-
-      private
-
-      def setup_plugin(name)
-        @plugin_spec = Builder::PluginSpec.new(name, self)
-        block_given? && yield(@plugin_spec)
-      end
-    end
-  end
-end