rggen-core 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec4c2a7ada4a8af68c0969d9c13ef4b54ff80f176720a88fb52b03d2ad92fbba
-  data.tar.gz: 807e8ca8ef6593a44de7f033ddb9ffdbf277715c94cda70ba65556842f39f55c
+  metadata.gz: 0510741051f873be7dc827047f0de66a99c8597f012c4115b856b5c33080a55d
+  data.tar.gz: 6acbc096d450278f19c03e4fad095d1a181fa8ae3dbe11e1fcd7e8bde0f11e16
 SHA512:
-  metadata.gz: 400ddb69015ddc339db84803976e8bbf5e427bc76014288cfb577ef4f817b16dee8ccf529a89371562169d79582092e7a5b96ac1e9dec903c89877890d0fb6da
-  data.tar.gz: 95e434257b80b8b27204e6fcb9f366413847f47b5fef71972fbe47fcf8e905f0006dab15a6e9729e1c6f198ca8b0ee3ef96c4e5fab71ad5b91c9618685d511fa
+  metadata.gz: caf9bacb6b71be870d48a03afc67ff9f35516289e331b4cc8231ee1ed94f9bb3444001b496f9a508de5c2e9700bbaa99cb9e9ab05e9628f6a73902d3d7d9d46b
+  data.tar.gz: e1863ab6134225fc653bb9dcf88dde4ae5e307f0d73ce88c1ab87669c26452a57f3852ee29c8821c42f79d83ca279047011eb5fef6d58c516699260ae4d837d2

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

@@ -4,7 +4,8 @@ module RgGen
   module Core
     module Base
       class Component
-        def initialize(*args)
+        def initialize(base_name, *args)
+          @base_name = base_name
           @parent = args.first
           @children = []
           @need_children = true
@@ -18,6 +19,15 @@ module RgGen
         attr_reader :children
         attr_reader :level
 
+        def component_name
+          [hierarchy, @base_name].compact.join('@')
+        end
+
+        def hierarchy
+        end
+
+        alias_method :to_s, :component_name
+
         def need_children?
           @need_children
         end

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

@@ -4,7 +4,8 @@ module RgGen
   module Core
     module Base
       class ComponentFactory
-        def initialize
+        def initialize(component_name)
+          @component_name = component_name
           @root_factory = false
           block_given? && yield(self)
         end
@@ -24,7 +25,7 @@ module RgGen
             else
               [args.first, preprocess(args[1..-1])]
             end
-          create_component(parent, *sources) do |component|
+          create_component(parent, sources) do |component|
             build_component(parent, component, sources)
             root_factory? && finalize(component)
           end
@@ -36,6 +37,15 @@ module RgGen
           @root_factory
         end
 
+        def create_component(parent, sources, &block)
+          actual_sources = Array(select_actual_sources(*sources))
+          @target_component
+            .new(@component_name, parent, *actual_sources, &block)
+        end
+
+        def select_actual_sources(*sources)
+        end
+
         def build_component(parent, component, sources)
           do_create_features(component, sources)
           do_create_children(component, sources)

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

@@ -8,15 +8,28 @@ module RgGen
         extend SharedContext
         extend Forwardable
 
-        def initialize(component, feature_name)
-          @component = component
+        def initialize(feature_name, sub_feature_name, component)
           @feature_name = feature_name
+          @sub_feature_name = sub_feature_name
+          @component = component
           post_initialize
           block_given? && yield(self)
         end
 
         attr_reader :component
-        attr_reader :feature_name
+
+        def feature_name(verbose: false)
+          if verbose
+            [@feature_name, @sub_feature_name]
+              .compact.reject(&:empty?).join(':')
+          else
+            @feature_name
+          end
+        end
+
+        def inspect
+          "#{feature_name(verbose: true)}(#{component})"
+        end
 
         class << self
           attr_reader :printables

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

@@ -15,8 +15,8 @@ module RgGen
         attr_setter :target_features
 
         def create_feature(component, *args)
-          klass = select_target_feature(*args)
-          klass.new(component, @feature_name) do |feature|
+          klass, sub_feature_name = select_feature(*args)
+          klass.new(@feature_name, sub_feature_name, component) do |feature|
             feature.available? || break
             block_given? && yield(feature)
             component.add_feature(feature)
@@ -25,11 +25,13 @@ module RgGen
 
         private
 
-        def select_target_feature(*args)
-          (@target_features && select_feature(*args)) || @target_feature
+        def select_feature(*args)
+          key = @target_features && target_feature_key(*args)
+          feature = (key && @target_features[key]) || @target_feature
+          [feature, key]
         end
 
-        def select_feature(*args)
+        def target_feature_key(*args)
         end
       end
     end

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

@@ -6,6 +6,10 @@ module RgGen
       class ComponentEntry
         Entry = Struct.new(:target, :factory)
 
+        def initialize(component_name)
+          @component_name = component_name
+        end
+
         [:component, :feature].each do |entry_name|
           define_method(entry_name) do |target, factory|
             instance_variable_set("@#{__method__}", Entry.new(target, factory))
@@ -18,7 +22,7 @@ module RgGen
         end
 
         def build_factory
-          @component.factory.new do |f|
+          @component.factory.new(@component_name) do |f|
             f.target_component(@component.target)
             f.feature_factories(feature_registry&.build_factories)
           end

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

@@ -4,8 +4,8 @@ module RgGen
   module Core
     module Builder
       class ComponentRegistry
-        def initialize(name, builder)
-          @name = name
+        def initialize(component_name, builder)
+          @component_name = component_name
           @builder = builder
           @entries = []
         end
@@ -31,7 +31,7 @@ module RgGen
         private
 
         def create_new_entry(category, block)
-          entry = ComponentEntry.new
+          entry = ComponentEntry.new(@component_name)
           Docile.dsl_eval(entry, category, &block)
           add_feature_registry(category, entry.feature_registry)
           entry
@@ -39,7 +39,8 @@ module RgGen
 
         def add_feature_registry(category, feature_registry)
           feature_registry || return
-          @builder.add_feature_registry(@name, category, feature_registry)
+          @builder
+            .add_feature_registry(@component_name, category, feature_registry)
         end
       end
     end

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

@@ -6,10 +6,6 @@ module RgGen
       class ComponentFactory < InputBase::ComponentFactory
         private
 
-        def create_component(*_, &block)
-          @target_component.new(&block)
-        end
-
         def create_input_data(&block)
           InputBase::InputData.new(valid_value_lists, &block)
         end

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

@@ -105,6 +105,12 @@ module RgGen
           !helper.printables.nil?
         end
 
+        def inspect
+          printable_values =
+            printables&.map { |name, value| "#{name}: #{value.inspect}" }
+          (printable_values && "#{super}[#{printable_values.join(', ')}]") || super
+        end
+
         private
 
         def do_build(args)

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

@@ -6,8 +6,8 @@ module RgGen
       class ComponentFactory < Base::ComponentFactory
         private
 
-        def create_component(parent, configuration, register_map, &block)
-          target_component.new(parent, configuration, register_map, &block)
+        def select_actual_sources(configuration, register_map)
+          [configuration, register_map]
         end
 
         def create_features(component, configuration, register_map)

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

@@ -6,8 +6,8 @@ module RgGen
       class ComponentFactory < InputBase::ComponentFactory
         private
 
-        def create_component(parent, configuration, _, &block)
-          @target_component.new(parent, configuration, &block)
+        def select_actual_sources(configuration, *_)
+          configuration
         end
 
         def create_input_data(&block)

data/lib/rggen/core/version.rb

@@ -3,7 +3,7 @@
 module RgGen
   module Core
     MAJOR = 0
-    MINOR = 15
+    MINOR = 16
     PATCH = 0
     VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rggen-core
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-18 00:00:00.000000000 Z
+date: 2019-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile
@@ -187,5 +187,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: rggen-core-0.15.0
+summary: rggen-core-0.16.0
 test_files: []