rggen-core 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3d870cf0f36dd58dd0f6b8916139330c671669bee9bca328f1e980915d0ecd8
-  data.tar.gz: d637d69bf089c9f4092bb9891dc6cb4c81c682620728868878b83d88daf80dbe
+  metadata.gz: 07b141658bda7d5c43afba30ecbff539ab05beb383844f5a5b8fc9d9b605ebb5
+  data.tar.gz: faac4148e8c6c2e1bfa2632e1e1a589139db03280e3d25af8d39a1172708950e
 SHA512:
-  metadata.gz: b9cab065f30c61edd6a60005019502d60f00ec8c796232a6fdaa50cf000927bdb7aaebbdcf0e558bc1c1d71fde256a2f4ebf451cdb13aab65dde548c70226383
-  data.tar.gz: c4134d3eee4fbeb0b23c922a4108cd8878c80ee21164947cf6bd8905c871d109b5f70098822c0838cc02482353eea19ac0a218dcdc5f1b685840a12c04f09616
+  metadata.gz: 4838ab9d430ae360da7d223db91171e4460221ecec07e8ed475053eec91ed3a6af1ac10f62350731fb9593e34d7c332f135e68d4d459290cc440b9c7b882065e
+  data.tar.gz: 696f4186513d88b855434a295182dea303b54c52b6a04c251bb8a8dd2910bbeb42147abd9dfe292e28e42c91e4aba4971901490895b3685d375a18c988dd9d70

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2019 Taichi Ishitani
+Copyright (c) 2017-2020 Taichi Ishitani
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,5 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/rggen-core.svg)](https://badge.fury.io/rb/rggen-core)
-[![Build Status](https://travis-ci.com/rggen/rggen-core.svg?branch=master)](https://travis-ci.com/rggen/rggen-core)
+[![CI](https://github.com/rggen/rggen-core/workflows/CI/badge.svg)](https://github.com/rggen/rggen-core/actions?query=workflow%3ACI)
 [![Maintainability](https://api.codeclimate.com/v1/badges/53c8e6654c2b5ecb9142/maintainability)](https://codeclimate.com/github/rggen/rggen-core/maintainability)
 [![codecov](https://codecov.io/gh/rggen/rggen-core/branch/master/graph/badge.svg)](https://codecov.io/gh/rggen/rggen-core)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=rggen_rggen-core&metric=alert_status)](https://sonarcloud.io/dashboard?id=rggen_rggen-core)
@@ -43,7 +43,7 @@ Feedbacks, bug reports, questions and etc. are wellcome! You can post them by us
 
 ## Copyright & License
 
-Copyright © 2017-2019 Taichi Ishitani. RgGen::Core is licensed under the [MIT License](https://opensource.org/licenses/MIT), see [LICENSE](LICENSE) for futher details.
+Copyright © 2017-2020 Taichi Ishitani. RgGen::Core is licensed under the [MIT License](https://opensource.org/licenses/MIT), see [LICENSE](LICENSE) for futher details.
 
 ## Code of Conduct
 

data/lib/rggen/core.rb

@@ -13,7 +13,6 @@ require 'yaml'
 require_relative 'core/version'
 
 require_relative 'core/facets'
-require_relative 'core/core_extensions/casecmp'
 require_relative 'core/core_extensions/object'
 
 require_relative 'core/utility/attribute_setter'

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

@@ -44,7 +44,7 @@ module RgGen
 
           def input_pattern(pattern_or_patterns, **options, &converter)
             @input_matcher =
-              InputMatcher.new(pattern_or_patterns, options, &converter)
+              InputMatcher.new(pattern_or_patterns, **options, &converter)
           end
 
           attr_reader :input_matcher

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

@@ -4,7 +4,7 @@ module RgGen
   module Core
     module InputBase
       class InputMatcher
-        def initialize(pattern_or_patterns, options, &converter)
+        def initialize(pattern_or_patterns, **options, &converter)
           @options = options
           @converter = converter
           @patterns = format_patterns(pattern_or_patterns)
@@ -22,23 +22,22 @@ module RgGen
 
         private
 
-        def format_patterns(patterns)
+        def format_patterns(pattern_or_patterns)
           if @options.fetch(:match_wholly, true)
-            patterns_hash(patterns)
-              .map { |i, pattern| [i, /\A#{pattern}\z/] }
-              .to_h
+            expand_patterns(pattern_or_patterns)
+              .transform_values { |pattern| /\A#{pattern}\z/ }
           else
-            patterns_hash(patterns)
+            expand_patterns(pattern_or_patterns)
           end
         end
 
-        def patterns_hash(patterns)
-          if patterns.is_a?(Hash)
-            patterns
-          else
-            Array(patterns)
-              .map.with_index { |pattern, i| [i, pattern] }
-              .to_h
+        def expand_patterns(pattern_or_patterns)
+          Array(pattern_or_patterns).each_with_object({}) do |pattern, patterns|
+            if pattern.is_a? Hash
+              patterns.update(pattern)
+            else
+              patterns[patterns.size] = pattern
+            end
           end
         end
 
@@ -62,11 +61,11 @@ module RgGen
         end
 
         def match_patterns(rhs)
-          match_data, index =
+          index, match_data =
             @patterns
-              .map { |i, pattern| pattern.match(rhs) { |m| [m, i] } }
+              .transform_values { |pattern| pattern.match(rhs) }
               .compact
-              .max { |m| m[0].length }
+              .max_by { |_, m| m[0].length }
           match_data && [convert_match_data(match_data), index]
         end
 

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

@@ -6,34 +6,38 @@ module RgGen
       module YAMLLoader
         private
 
-        def load_yaml(file)
-          result = yaml_safe_load(File.binread(file), file)
-          symbolize_key(result)
-        end
-
-        if Psych::VERSION >= '3.1.0'
+        if RUBY_VERSION >= '2.6.0'
           def yaml_safe_load(yaml, file)
             YAML.safe_load(
               yaml,
-              permitted_classes: [Symbol], aliases: true, filename: file
+              permitted_classes: [Symbol], aliases: true, filename: file,
+              symbolize_names: true
             )
           end
+        elsif RUBY_VERSION >= '2.5.0'
+          def yaml_safe_load(yaml, file)
+            YAML.safe_load(yaml, [Symbol], [], true, file, symbolize_names: true)
+          end
         else
           def yaml_safe_load(yaml, file)
-            YAML.safe_load(yaml, [Symbol], [], true, file)
+            reuslt = YAML.safe_load(yaml, [Symbol], [], true, file)
+            symbolize_keys(reuslt)
           end
-        end
 
-        def symbolize_key(result)
-          case result
-          when Hash
-            result.keys.each do |key|
-              result[key.to_sym] = symbolize_key(result.delete(key))
+          def symbolize_keys(result)
+            if result.is_a? Hash
+              result.keys.each do |key|
+                result[key.to_sym] = symbolize_keys(result.delete(key))
+              end
+            elsif result.is_a? Array
+              result.map! { |value| symbolize_keys(value) }
             end
-          when Array
-            result.map! { |value| symbolize_key(value) }
+            result
           end
-          result
+        end
+
+        def load_yaml(file)
+          yaml_safe_load(File.binread(file), file)
         end
       end
     end

data/lib/rggen/core/version.rb

@@ -3,7 +3,7 @@
 module RgGen
   module Core
     MAJOR = 0
-    MINOR = 18
+    MINOR = 19
     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.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-19 00:00:00.000000000 Z
+date: 2020-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile
@@ -111,7 +111,6 @@ files:
 - lib/rggen/core/configuration/loader.rb
 - 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/object.rb
 - lib/rggen/core/dsl.rb
 - lib/rggen/core/exceptions.rb
@@ -177,15 +176,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: rggen-core-0.18.0
+summary: rggen-core-0.19.0
 test_files: []

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

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-if RUBY_VERSION < '2.4'
-  casecmp = Module.new do
-    def casecmp?(other)
-      casecmp(other).zero?
-    end
-  end
-
-  String.send(:include, casecmp)
-  Symbol.send(:include, casecmp)
-end