yaml_ext 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c50a167ebcd2e16535c639ffb075f669e5460f36f1529f115c0ed9da5147b51
-  data.tar.gz: 12bdbf3f9ee69f5dbdd331c013b2708c585a4de4ab692399fad4821fabef1ec0
+  metadata.gz: ff4954b8a7a31968db3c31d7d8008ec5b6943f53b58a441b53e296f222466116
+  data.tar.gz: 7570ae907e8ee2d47271bd568954cc8262e633e465ded6e6f737744b0f744bde
 SHA512:
-  metadata.gz: 34340ea31a332e792426961325dc2312dc6c2e643d0aea00f9bed21a0f12fba20823282af5181f205ea92991d407caba692c2dfbc26afaf8921f489e82b4ec7c
-  data.tar.gz: 9f5561dd431c156a93a71326e275f37458d25915c18d448b2611edcad207ab4dab83ed9a67fd1a121b6b9db9e0e90120e239b07c8da79a1019909f291334083c
+  metadata.gz: b7de6ed33f4fde2a27ef502c84cedb388ce3bb8bfd5936a329be0ab567f39280bd7dba1f21b995035fb9c462e43ed93d2995b537fe90810f34664fc6ef6e0ac9
+  data.tar.gz: 4498e81d9ce2a95a46a8e9ce885c00bf5819699f5d54442fdf203bb8192e96c0d0c2d6cd87cdb8fa1ba6c343b7cb6ec94f20c01a325fe566c4666f69dd66b746

data/.gitignore

@@ -7,3 +7,5 @@
 /spec/reports/
 /tmp/
 /Gemfile.lock
+
+.rspec_status

data/.rubocop.yml

@@ -0,0 +1,162 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  TargetRubyVersion: 2.6
+  Exclude:
+    - "node_modules/**/*"
+    - "vendor/**/*"
+
+Layout/IndentFirstArrayElement:
+  EnforcedStyle: consistent
+
+Layout/IndentFirstHashElement:
+  EnforcedStyle: consistent
+
+Layout/IndentationConsistency:
+  EnforcedStyle: indented_internal_methods
+
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented_relative_to_receiver
+
+Lint/AmbiguousBlockAssociation:
+  Exclude:
+    - "spec/**/*_spec.rb"
+
+Lint/InheritException:
+  EnforcedStyle: standard_error
+
+Lint/UnderscorePrefixedVariableName:
+  Enabled: false
+
+Lint/UnusedMethodArgument:
+  Enabled: false
+
+Metrics/AbcSize:
+  Max: 24
+
+Metrics/BlockLength:
+  Exclude:
+    - "spec/**/*.rb"
+    - "Gemfile"
+    - "*.gemspec"
+
+CyclomaticComplexity:
+  Max: 10
+
+Metrics/LineLength:
+  Max: 120
+
+Metrics/MethodLength:
+  Max: 20
+
+Naming/UncommunicativeMethodParamName:
+  Enabled: false
+
+Security/YAMLLoad:
+  Enabled: false
+
+Style/Alias:
+  EnforcedStyle: prefer_alias_method
+
+Style/AndOr:
+  EnforcedStyle: conditionals
+
+Style/AsciiComments:
+  Enabled: false
+
+Style/BlockDelimiters:
+  Enabled: false
+
+Style/BracesAroundHashParameters:
+  Enabled: false
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Style/CollectionMethods:
+  PreferredMethods:
+    detect: "detect"
+    find: "detect"
+    inject: "inject"
+    reduce: "inject"
+
+Style/Documentation:
+  Enabled: false
+
+Style/DoubleNegation:
+  Enabled: false
+
+Style/EmptyCaseCondition:
+  Enabled: false
+
+Style/EmptyElse:
+  EnforcedStyle: empty
+
+Style/EmptyMethod:
+  EnforcedStyle: expanded
+
+Style/FormatString:
+  EnforcedStyle: percent
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/HashSyntax:
+  Exclude:
+    - "Rakefile"
+
+Style/MultilineBlockChain:
+  Enabled: false
+
+Style/MixinUsage:
+  Exclude:
+    - "bin/setup"
+
+Style/NumericLiterals:
+  MinDigits: 7
+  Strict: true
+
+Style/NumericPredicate:
+  Enabled: false
+
+Style/OrAssignment:
+  Enabled: false
+
+Style/PercentLiteralDelimiters:
+  Enabled: false
+
+Style/PreferredHashMethods:
+  EnforcedStyle: verbose
+
+Style/RedundantReturn:
+  AllowMultipleReturnValues: true
+
+Style/RedundantSelf:
+  Enabled: false
+
+Style/RescueStandardError:
+  EnforcedStyle: implicit
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Style/StringLiteralsInInterpolation:
+  EnforcedStyle: double_quotes
+
+Style/SymbolArray:
+  Enabled: false
+
+Style/TernaryParentheses:
+  EnforcedStyle: require_parentheses_when_complex
+
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/WordArray:
+  Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,21 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2019-08-28 09:55:33 +0900 using RuboCop version 0.74.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+Lint/UselessAssignment:
+  Exclude:
+    - 'lib/yaml_ext.rb'
+
+# Offense count: 1
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/MethodLength:
+  Max: 21
+
+# Offense count: 2
+Metrics/PerceivedComplexity:
+  Max: 9

data/.travis.yml

@@ -1,5 +1,10 @@
+---
 sudo: false
 language: ruby
+cache: bundler
 rvm:
-  - 2.5.1
-before_install: gem install bundler -v 1.16.2
+  - 2.6.3
+before_install: gem install bundler -v 2.0.2
+script:
+  - bundle exec rake spec
+  - bundle exec rubocop

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in yaml_ext.gemspec
 gemspec

data/README.md

@@ -1,5 +1,7 @@
 # YamlExt
 
+[![Build Status](https://travis-ci.org/i2bskn/yaml_ext.svg?branch=master)](https://travis-ci.org/i2bskn/yaml_ext)
+
 Multiple YAML Loader.
 
 ## Installation

data/Rakefile

@@ -1,10 +1,6 @@
 require "bundler/gem_tasks"
-require "rake/testtask"
+require "rspec/core/rake_task"
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
-end
+RSpec::Core::RakeTask.new(:spec)
 
-task :default => :test
+task default: :spec

data/bin/setup

@@ -3,6 +3,4 @@ set -euo pipefail
 IFS=$'\n\t'
 set -vx
 
-bundle install
-
-# Do any other automated setup that you need to do here
+bundle install --path .bundle -j 4

data/lib/yaml_ext.rb

@@ -5,74 +5,88 @@ require "yaml_ext/version"
 module YamlExt
   class << self
     def load(path)
-      resolve_ref_inner_json(load_file(path))
+      parse_nodes(:ref_inner_node, load_with_extended_nodes(path), path)
     end
 
-    def load_file(path)
-      parse_extended_node(load_yaml_file(path), path)
+    def load_with_extended_nodes(path)
+      parse_nodes(:ref_extended_node, load_with_erb(path), path)
+    end
+
+    def load_with_erb(path)
+      YAML.safe_load(ERB.new(File.read(path), trim_mode: "-").result)
     end
 
     private
 
-      def load_yaml_file(path)
-        YAML.load(ERB.new(File.read(path), nil, "-").result)
-      end
+      def parse_nodes(type, node, path, node_tree = nil, node_path = [])
+        node_tree ||= node.dup
 
-      def parse_extended_node(node, path)
         case node
         when Hash
-          node.each_with_object({}) { |(k, v), obj|
-            if k == "$ref" && v.is_a?(String) && !v.start_with?("#/")
-              value = load_file(File.expand_path(v, File.dirname(path)))
-              case value
-              when Hash
-                obj = {} unless obj.is_a?(Hash)
-                obj.merge!(value)
-              when Array
-                obj = [] unless obj.is_a?(Array)
-                obj.concat(value)
-              else
-                obj = value
-              end
-            else
-              obj = {} unless obj.is_a?(Hash)
-              obj[k] = parse_extended_node(v, path)
-            end
-          }
+          send(type, node, path, node_tree, node_path)
         when Array
-          node.map { |n| parse_extended_node(n, path) }
+          node.map.with_index { |n, idx|
+            parse_nodes(type, n, path, node_tree, node_path.dup.push(idx))
+          }
         else
           node
         end
       end
 
-      def resolve_ref_inner_json(node, node_tree = nil)
-        node_tree ||= node
+      def ref_inner_node(node, path, node_tree = nil, node_path = [])
+        node.each_with_object({}) do |(k, v), obj|
+          if k == "$ref" && v.is_a?(String) && v.start_with?("#/")
+            ref_path = v.split("/")[1..-1]
+            value = ref_path.inject(node_tree) { |nodes, key| nodes[key] }
+            value = parse_nodes(:ref_inner_node, value, path, node_tree, ref_path)
+            update_node_tree(node_tree, node_path, value)
 
-        case node
-        when Hash
-          node.each_with_object({}) { |(k, v), obj|
-            if k == "$ref" && v.is_a?(String) && v.start_with?("#/")
-              value = v.split("/")[1..-1].inject(node_tree) { |nodes, key| nodes.fetch(key) }
-              case value
-              when Hash
-                obj = {} unless obj.is_a?(Hash)
-                obj.merge!(value)
-              when Array
-                obj = [] unless obj.is_a?(Array)
-                obj.concat(value)
-              else
-                obj = value
-              end
+            case value
+            when Hash
+              obj = {} unless obj.is_a?(Hash)
+              obj.merge!(value)
+            when Array
+              obj = [] unless obj.is_a?(Array)
+              obj.concat(value)
             else
+              obj = value
+            end
+          else
+            obj = {} unless obj.is_a?(Hash)
+            obj[k] = parse_nodes(:ref_inner_node, v, path, node_tree, node_path.dup.push(k))
+          end
+        end
+      end
+
+      def ref_extended_node(node, path, node_tree = nil, node_path = [])
+        node.each_with_object({}) do |(k, v), obj|
+          if k == "$ref" && v.is_a?(String) && !v.start_with?("#/")
+            value = load_with_extended_nodes(File.expand_path(v, File.dirname(path)))
+            case value
+            when Hash
               obj = {} unless obj.is_a?(Hash)
-              obj[k] = resolve_ref_inner_json(v, node_tree)
+              obj.merge!(value)
+            when Array
+              obj = [] unless obj.is_a?(Array)
+              obj.concat(value)
+            else
+              obj = value
             end
-          }
-        when Array
-          node.map { |n| resolve_ref_inner_json(n, node_tree) }
-        else
-          node
+          else
+            obj = {} unless obj.is_a?(Hash)
+            obj[k] = parse_nodes(:ref_extended_node, v, path, node_tree, node_path.dup.push(k))
+          end
+        end
+      end
+
+      def update_node_tree(node_tree, node_path, value)
+        content = node_tree
+        node_path.each.with_index(1) do |k, i|
+          if node_path.size > i
+            content = content[k]
+          else
+            content[k] = value
+          end
         end
       end
   end

data/lib/yaml_ext/version.rb

@@ -1,3 +1,3 @@
 module YamlExt
-  VERSION = "0.1.0"
+  VERSION = "0.1.1".freeze
 end

data/yaml_ext.gemspec

@@ -1,5 +1,4 @@
-
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "yaml_ext/version"
 
@@ -9,21 +8,22 @@ Gem::Specification.new do |spec|
   spec.authors       = ["i2bskn"]
   spec.email         = ["i2bskn@gmail.com"]
 
-  spec.summary       = %q{Multiple YAML Loader.}
-  spec.description   = %q{Multiple YAML Loader.}
+  spec.summary       = "Multiple YAML Loader."
+  spec.description   = "Multiple YAML Loader."
   spec.homepage      = "https://github.com/i2bskn/yaml_ext"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "bundler", "~> 2.0.2"
+  spec.add_development_dependency "pry", "~> 0.12.2"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "pry"
+  spec.add_development_dependency "rspec", "~> 3.8.0"
+  spec.add_development_dependency "rubocop", "~> 0.74.0"
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: yaml_ext
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - i2bskn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-17 00:00:00.000000000 Z
+date: 2019-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.2
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -39,33 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.74.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.74.0
 description: Multiple YAML Loader.
 email:
 - i2bskn@gmail.com
@@ -74,6 +88,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE