rggen-core 0.27.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87457243bd057e719ca35386df5b23f6c0cc72a86029e93998b51d8436f0b184
-  data.tar.gz: 96a4fd969fd9399e3a1bffdbc9319315bcd9a4df1f45827eb31517eb942bb489
+  metadata.gz: 30286c1aefc400e1d6cda52dddc797fca2ad3a35fcf3a43578371a5b9a8fc4b0
+  data.tar.gz: e7bb012b70a143c1412eab481febce79e7083ab83c22136f3e52540a41e67c69
 SHA512:
-  metadata.gz: ab5f4642ecd2d47c88dfffe5432733c7c91320dace927c84d537cdc12be2e54ab70cf9e4ee32f47bd03f7ec044090f13e1b4a4efab6fa1f2549f6e99d3f05d5d
-  data.tar.gz: 1faf35891545834a2ba9df954b15d818c65ea6910859c4987c8e587d495dcfd167fbbb0a5a9206d060fca16c817a004474d721298ac0f6fa9eecbef2dccb04dc
+  metadata.gz: a14bd1ce40c782d0628e55f23a6acffa1578598a421bae4a7127c4464800078ac3181504e0a53b829581cfba4820b56fbc07803cf3fe338097479f4d3aca646a
+  data.tar.gz: 524360603dae2839afe73e23a8c2cbedac3e2373e70a24e671d006977caf08dea6a5813d50a99a1724b3ab1a098b38134b0f653cbde2f9c6ee341d12596a73d0

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

@@ -47,7 +47,7 @@ module RgGen
         def find_gemspec_by_path(path)
           Gem::Specification
             .each.find { |spec| match_gemspec_path?(spec, path) }
-            .yield_self { |spec| spec && [spec.name, spec.version] }
+            .then { |spec| spec && [spec.name, spec.version] }
         end
 
         def match_gemspec_path?(gemspec, path)
@@ -88,8 +88,8 @@ module RgGen
         end
 
         def activate_plugins
-          @plugins.each { |plugin| plugin.activate(@builder) }
-          @plugins.each { |plugin| plugin.activate_additionally(@builder) }
+          do_normal_activation
+          do_addtional_activation
         end
 
         def activate_plugin_by_name(plugin_name)
@@ -136,6 +136,14 @@ module RgGen
             &.reject(&:blank?)
             &.map { |entry| entry.split(',', 2) }
         end
+
+        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
   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/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.27.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'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rggen-core
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.28.0
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-05 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
@@ -187,6 +188,7 @@ 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:
@@ -212,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.27.0
+summary: rggen-core-0.28.0
 test_files: []