rggen-core 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b863029dea0e5088f792bad82e185bf15bd22de39578f7e1d368851ab9d7549
-  data.tar.gz: 5e8714a42f5b385f2373e01bcf7395b0139359c2a6dde6aa22889759edda12d0
+  metadata.gz: 2ad3c3965e2c0ac0bea5b0ef6d96ee5edeabb686d6eef675a9331e2754e26ffc
+  data.tar.gz: 56a3a6ceae64abc9d4f7f0398b3b3cbeb79c80350aef7dfb094c04989497830a
 SHA512:
-  metadata.gz: 953bf54d406360b11bf39a2d5be9be50dffbb139ec9a55b2d0cc8e5405f58e05e047e938bb92cbee866dada08e57000e2675aa3055dfde881d63fbe570e1d24f
-  data.tar.gz: 5ccbf66f592401e5fd3bd3bacf9dcdd883a5744eb7ba684eb6efb70332042efa8b692d2c2e7d07cc3dbbb4b7c95cadc2234d8a6125789ffbb42b8580fa0b4a2e
+  metadata.gz: 4a7bf7db44471e1d49fcec8f9e68d3619a0b63224854332255f4a4f8b0dc6e9f66be4142a25c374dd50d988401c9042fc7610d3ea0d2eaf3c34d83c9b6228f95
+  data.tar.gz: fea70cddb6c3b99904a7d0bdb20e9f71d112684bf52ebd847314b1368370863a2f05d878b153e638339c0de2bc6e64d9f90aa9a800c493a51eff47dcbe916016

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

@@ -4,7 +4,7 @@ module RgGen
   module Core
     module Base
       class Feature
-        include InternalStruct
+        extend InternalStruct
         extend SharedContext
         extend Forwardable
 

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

@@ -4,10 +4,6 @@ module RgGen
   module Core
     module Base
       module InternalStruct
-        def self.included(klass)
-          klass.extend(self)
-        end
-
         private
 
         def define_struct(name, members, &body)

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

@@ -90,8 +90,8 @@ module RgGen
           RegisterMap.setup(self)
         end
 
-        def setup(name, plugin_module, &block)
-          plugins.add(name, plugin_module, block)
+        def setup(name, module_or_version = nil, &block)
+          plugins.add(name, module_or_version, &block)
         end
 
         def activate_plugins

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

@@ -4,23 +4,37 @@ module RgGen
   module Core
     module Builder
       class Plugin
-        def initialize(name, plugin_module, block)
+        DEFAULT_PLUGIN_VERSION = '0.0.0'
+
+        def initialize(name, module_or_version, &block)
           @name = name
-          @version = extract_version(plugin_module)
-          @plugin_module = plugin_module
           @block = block
+          @version, @plugin_module =
+            if module_or_version.is_a?(Module)
+              [extract_version(module_or_version), module_or_version]
+            else
+              [module_or_version || DEFAULT_PLUGIN_VERSION]
+            end
         end
 
         attr_reader :name
         attr_reader :version
 
         def default_setup(builder)
-          @plugin_module.respond_to?(:default_setup) &&
-            @plugin_module.default_setup(builder)
+          @plugin_module &&
+            begin
+              @plugin_module.respond_to?(:default_setup) &&
+                @plugin_module.default_setup(builder)
+            end
         end
 
         def optional_setup(builder)
-          @block && @plugin_module.instance_exec(builder, &@block)
+          @block &&
+            if @plugin_module
+              @plugin_module.instance_exec(builder, &@block)
+            else
+              @block.call(builder)
+            end
         end
 
         private
@@ -31,7 +45,7 @@ module RgGen
           elsif plugin_module.respond_to?(:version)
             plugin_module.version
           else
-            '0.0.0'
+            DEFAULT_PLUGIN_VERSION
           end
         end
       end
@@ -41,8 +55,8 @@ module RgGen
           @plugins = []
         end
 
-        def add(name, plugin_module, block)
-          @plugins << Plugin.new(name, plugin_module, block)
+        def add(name, module_or_version, &block)
+          @plugins << Plugin.new(name, module_or_version, &block)
         end
 
         def activate(builder)

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

@@ -7,16 +7,23 @@ module RgGen
         private
 
         def load_yaml(file)
-          yaml = File.binread(file)
-          result =
-            if Psych::VERSION >= '3.1.0'
-              YAML.safe_load(yaml, aliases: true, filename: file)
-            else
-              YAML.safe_load(yaml, [], [], true, file)
-            end
+          result = yaml_safe_load(File.binread(file), file)
           symbolize_key(result)
         end
 
+        if Psych::VERSION >= '3.1.0'
+          def yaml_safe_load(yaml, file)
+            YAML.safe_load(
+              yaml,
+              permitted_classes: [Symbol], aliases: true, filename: file
+            )
+          end
+        else
+          def yaml_safe_load(yaml, file)
+            YAML.safe_load(yaml, [Symbol], [], true, file)
+          end
+        end
+
         def symbolize_key(result)
           case result
           when Hash

data/lib/rggen/core/version.rb

@@ -3,7 +3,7 @@
 module RgGen
   module Core
     MAJOR = 0
-    MINOR = 13
+    MINOR = 14
     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.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-28 00:00:00.000000000 Z
+date: 2019-09-03 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.13.0
+summary: rggen-core-0.14.0
 test_files: []