rggen-core 0.23.0 → 0.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bb706524df1f6ce830d322807a5fefe011d196b047b6a21305aedd2d139e44f
-  data.tar.gz: b5e0f96144161ca175d50fca3efa30a87c6a2024eb0a44e2990712a295b258d9
+  metadata.gz: d508be683e4b6306f85c0fa2c793e98ba33dc2710dab29c07ae0fb720c0b1e20
+  data.tar.gz: a19ac7cea3493c7128672f343dee9833199d9e2c3769fdf0cd4679c3cc464c6d
 SHA512:
-  metadata.gz: 7f08a781cf05602cb6d5412f3c6b72789de4b601acf0054458476bd49366757daa7ae4057d89c2d30b87d6efe54be4faf0def357b9ffa8d4a7af513f28b754c3
-  data.tar.gz: 15952384793891091f3cc415a0770027a47d394867b5a8bef6690424e0ccd7a21ddef9af420ea2e9817f748ff8a764af5695de39e80de823c085546a4232d8b9
+  metadata.gz: f173621ce29ca6664d0201b4af80d9851151ab71dbd01f3027793d48402533ee9b8941d7149e5df0039370b4701975c9e926af2b36c94d8253bb6921ef3710b9
+  data.tar.gz: 0a7bdf33b0708f3e493b79f932fb4daf1400ea68fef957d040ef6ff5b6e1881b783b06d78d7d43a857034bc98addb3c10bb0238b01e0d7d93921c49a7ec3901b

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

@@ -11,22 +11,19 @@ module RgGen
           @enabled_features = {}
         end
 
-        def define_simple_feature(names, context = nil, &body)
-          Array(names)
-            .each { |name| create_new_entry(:simple, name, context, body) }
+        def define_simple_feature(name, context = nil, &body)
+          create_new_entry(:simple, name, context, body)
         end
 
-        def define_list_feature(list_names, context = nil, &body)
-          Array(list_names)
-            .each { |name| create_new_entry(:list, name, context, body) }
+        def define_list_feature(list_name, context = nil, &body)
+          create_new_entry(:list, list_name, context, body)
         end
 
-        def define_list_item_feature(list_name, feature_names, context = nil, &body)
+        def define_list_item_feature(list_name, feature_name, context = nil, &body)
           entry = @feature_entries[list_name]
           entry&.match_entry_type?(:list) ||
             (raise BuilderError.new("unknown list feature: #{list_name}"))
-          Array(feature_names)
-            .each { |name| entry.define_feature(name, context, &body) }
+          entry.define_feature(feature_name, context, &body)
         end
 
         def enable(feature_or_list_names, feature_names = nil)

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

@@ -11,16 +11,8 @@ module RgGen
 
           attr_setter :body
           attr_setter :method_name
-          attr_setter :list_names
-          attr_setter :feature_names
-
-          def shared_context(&body)
-            if block_given?
-              @shared_context ||= Object.new
-              @shared_context.instance_eval(&body)
-            end
-            @shared_context
-          end
+          attr_setter :list_name
+          attr_setter :feature_name
 
           def register_execution(registry, &body)
             @executions ||= []
@@ -29,15 +21,14 @@ module RgGen
 
           def execute(layer)
             Docile.dsl_eval(layer, &body)
-            @executions&.each(&method(:call_execution))
+            @executions&.each { |execution| call_execution(layer, execution) }
           end
 
           private
 
-          def call_execution(execution)
-            args = [list_names, feature_names, shared_context].compact
-            execution[:registry]
-              .__send__(method_name, *args, &execution[:body])
+          def call_execution(layer, execution)
+            args = [list_name, feature_name, layer.shared_context].compact
+            execution[:registry].__send__(method_name, *args, &execution[:body])
           end
         end
 
@@ -52,31 +43,44 @@ module RgGen
         end
 
         def shared_context(&body)
-          block_given? && @proxy&.shared_context(&body)
+          return unless @proxy
+
+          if block_given?
+            context = current_shared_context(true)
+            context.singleton_exec(&body)
+          end
+
+          current_shared_context(false)
         end
 
         def define_simple_feature(feature_names, &body)
-          do_proxy_call do |proxy|
-            proxy.body(body)
-            proxy.method_name(__method__)
-            proxy.feature_names(feature_names)
+          Array(feature_names).each do |feature_name|
+            do_proxy_call do |proxy|
+              proxy.body(body)
+              proxy.method_name(__method__)
+              proxy.feature_name(feature_name)
+            end
           end
         end
 
         def define_list_feature(list_names, &body)
-          do_proxy_call do |proxy|
-            proxy.body(body)
-            proxy.method_name(__method__)
-            proxy.list_names(list_names)
+          Array(list_names).each do |list_name|
+            do_proxy_call do |proxy|
+              proxy.body(body)
+              proxy.method_name(__method__)
+              proxy.list_name(list_name)
+            end
           end
         end
 
         def define_list_item_feature(list_name, feature_names, &body)
-          do_proxy_call do |proxy|
-            proxy.body(body)
-            proxy.method_name(__method__)
-            proxy.list_names(list_name)
-            proxy.feature_names(feature_names)
+          Array(feature_names).each do |feature_name|
+            do_proxy_call do |proxy|
+              proxy.body(body)
+              proxy.method_name(__method__)
+              proxy.list_name(list_name)
+              proxy.feature_name(feature_name)
+            end
           end
         end
 
@@ -111,6 +115,17 @@ module RgGen
           @proxy.execute(self)
           remove_instance_variable(:@proxy)
         end
+
+        def current_shared_context(allocate)
+          list_name = @proxy.list_name || @proxy.feature_name
+          feature_name = @proxy.feature_name
+          allocate && (shared_contexts[list_name][feature_name] ||= Object.new)
+          shared_contexts[list_name][feature_name]
+        end
+
+        def shared_contexts
+          @shared_contexts ||= Hash.new { |h, k| h[k] = {} }
+        end
       end
     end
   end

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

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

data/lib/rggen/core/version.rb

@@ -4,7 +4,7 @@ module RgGen
   module Core
     MAJOR = 0
     MINOR = 23
-    PATCH = 0
+    PATCH = 1
     VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rggen-core
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.23.1
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2020-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile
@@ -189,5 +189,5 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: rggen-core-0.23.0
+summary: rggen-core-0.23.1
 test_files: []