rggen-core 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 499721925eeb3291211749b7d3d6d05d5a527276ee9b4753efd641b56e1b6a10
-  data.tar.gz: 0e58580b541d24357e2c8921c6f0a8eaadacc9267057ee05d4df830f4a7fa531
+  metadata.gz: 26c927df65c347b1c8d450b7497933c8fe402b4850d08a5d61990179d4bc8211
+  data.tar.gz: 862fc6ba9a7671faabc58036139fd43c5bb2492662d3859ae809940ad5ae1b9b
 SHA512:
-  metadata.gz: ade22814aaa37d1a9ba3b384aabfb8a845eeadb8fd2524faa1e75d0f9256f160bd62ea9536c926db1a2425a3f0276b0700150ab8a011e28210a7eee1726369d2
-  data.tar.gz: 64509761dfcbde650e2f390295cd0b7560a1d3dd615a85f5b6ed8e330d89a55575b91b07a812040b23d80cb371d9c0ade77e36360ca39f1f252c9e76bba270c4
+  metadata.gz: f047fa24d9e9ac529b2690a5953004f19661a82ce934062eaf609e48e165e9140bc5acb9a7b34a2add0ac040340250aa8c690bf8bc212ee93ce95e11b2c087c9
+  data.tar.gz: b78eb23efb2d6a1bc61acaa0d1160807e2c8938eb019472ec11e34d07c939a0b01b3dd00772515aff108409767ae737a5affc50b119eb2f149b040b60c046adc

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

@@ -4,8 +4,6 @@ module RgGen
   module Core
     module Base
       class Component
-        include SingleForwardable
-
         def initialize(*args)
           @parent = args.first
           @children = []
@@ -48,6 +46,20 @@ module RgGen
 
         def post_initialize(*argv)
         end
+
+        def define_proxy_calls(receiver, methods)
+          Array(methods)
+            .map(&:to_sym)
+            .each { |method| define_proxy_call(receiver, method) }
+        end
+
+        def define_proxy_call(receiver, method)
+          @proxy_calls ||= {}
+          @proxy_calls[method] = ProxyCall.new(receiver, method)
+          define_singleton_method(method) do |*args, &block|
+            @proxy_calls[__method__].call(*args, &block)
+          end
+        end
       end
     end
   end

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module RgGen
+  module Core
+    module Base
+      class ProxyCall
+        def initialize(receiver, method)
+          @receiver = receiver
+          @method = method
+        end
+
+        def call(*args, &block)
+          @receiver.__send__(@method, *args, &block)
+        end
+      end
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module RgGen
       class Component < Base::Component
         def add_feature(feature)
           super
-          define_property_methods(feature)
+          define_proxy_calls(feature, feature.properties)
         end
 
         def properties
@@ -17,13 +17,6 @@ module RgGen
           @features.each_value { |feature| feature.verify(scope) }
           @children.each { |child| child.verify(scope) } if scope == :all
         end
-
-        private
-
-        def define_property_methods(feature)
-          target = "@features[:#{feature.feature_name}]"
-          def_delegators(target, *feature.properties)
-        end
       end
     end
   end

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

@@ -74,9 +74,10 @@ module RgGen
           end
         end
 
-        delegate_to_class [
-          :properties, :active_feature?, :passive_feature?, :ignore_empty_value?
-        ]
+        def_delegator :'self.class', :properties
+        def_delegator :'self.class', :active_feature?
+        def_delegator :'self.class', :passive_feature?
+        def_delegator :'self.class', :ignore_empty_value?
 
         def build(*args)
           self.class.builders && do_build(args)

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

@@ -14,8 +14,8 @@ module RgGen
           @source = source
           @need_children = source.need_children?
           define_hierarchical_accessors
-          define_property_accessors
           define_children_presense_indicator
+          define_proxy_calls(@source, @source.properties)
         end
 
         def children?
@@ -47,10 +47,6 @@ module RgGen
 
         private
 
-        def define_property_accessors
-          def_delegators(:@source, *@source.properties)
-        end
-
         INDICATOR_NAMES = {
           register_map: :register_blocks?,
           register_block: :registers?,
@@ -69,9 +65,8 @@ module RgGen
         end
 
         def import_feature_methods(feature, scope)
-          receiver = "@features[:#{feature.feature_name}]"
           methods = feature.exported_methods(scope)
-          def_delegators(receiver, *methods)
+          define_proxy_calls(feature, methods)
         end
 
         def code_generators(kind, mode)

data/lib/rggen/core/version.rb

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

data/lib/rggen/core.rb

@@ -15,7 +15,6 @@ require_relative 'core/version'
 require_relative 'core/facets'
 require_relative 'core/core_extensions/casecmp'
 require_relative 'core/core_extensions/object'
-require_relative 'core/core_extensions/forwardable'
 
 require_relative 'core/utility/attribute_setter'
 require_relative 'core/utility/code_utility/line'
@@ -27,6 +26,7 @@ require_relative 'core/utility/regexp_patterns'
 
 require_relative 'core/exceptions'
 
+require_relative 'core/base/proxy_call'
 require_relative 'core/base/internal_struct'
 require_relative 'core/base/shared_context'
 require_relative 'core/base/component'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rggen-core
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-31 00:00:00.000000000 Z
+date: 2019-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile
@@ -86,6 +86,7 @@ files:
 - lib/rggen/core/base/hierarchical_accessors.rb
 - lib/rggen/core/base/hierarchical_feature_accessors.rb
 - lib/rggen/core/base/internal_struct.rb
+- lib/rggen/core/base/proxy_call.rb
 - lib/rggen/core/base/shared_context.rb
 - lib/rggen/core/builder.rb
 - lib/rggen/core/builder/builder.rb
@@ -110,8 +111,6 @@ files:
 - lib/rggen/core/configuration/ruby_loader.rb
 - lib/rggen/core/configuration/yaml_loader.rb
 - lib/rggen/core/core_extensions/casecmp.rb
-- lib/rggen/core/core_extensions/forwardable.rb
-- lib/rggen/core/core_extensions/forwardable_workaround.rb
 - lib/rggen/core/core_extensions/object.rb
 - lib/rggen/core/dsl.rb
 - lib/rggen/core/exceptions.rb
@@ -185,5 +184,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: rggen-core-0.10.0
+summary: rggen-core-0.11.0
 test_files: []

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

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module Forwardable
-  def delegate_to_class(method_or_methods)
-    Array(method_or_methods)
-      .each { |m| def_instance_delegator(:'self.class', m) }
-  end
-end
-
-if ['2.3.1', '2.3.2', '2.3.3'].include?(RUBY_VERSION)
-  require_relative 'forwardable_workaround'
-end

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

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module SingleForwardable
-  # https://bugs.ruby-lang.org/issues/12478
-  def def_single_delegator(accessor, method, ali = method)
-    accessor = accessor.to_s
-    if method_defined?(accessor) || private_method_defined?(accessor)
-      accessor = "#{accessor}()"
-    end if self.class === Module
-    line_no = __LINE__; str = %{
-      def #{ali}(*args, &block)
-        begin
-          #{accessor}.__send__(:#{method}, *args, &block)
-        rescue ::Exception
-          $@.delete_if{|s| ::Forwardable::FILE_REGEXP =~ s} unless ::Forwardable::debug
-          ::Kernel::raise
-        end
-      end
-    }
-    instance_eval(str, __FILE__, line_no)
-  end
-end