simple-hd-graph 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0f104afa4985520fd742deb2f3a508aa5228fdece50f05e781967a11610b0e3
-  data.tar.gz: 00ea2753585296fb38663736e7001a7c985cac7bf6c690134ccba0826f8c5eff
+  metadata.gz: 327a5fb9abcd99a5eec214e4245c5974697c6b0af9ee95669392d8a50e3e55a0
+  data.tar.gz: 161c035ebfb3e1ef41235cebc64ecbfb670f4e2695313e1ba50a928517bb0d49
 SHA512:
-  metadata.gz: bddb9cf8a77b9c75978e45d72829883480dc937bcdc1f9d581167ac2e204332a39951c9d386889fa380fba51fca967a6a13a425bf0657edec6d580cdf610642d
-  data.tar.gz: d35882bc09d6b3ba53ea8aef0823e5ee593caa6a4e031e4b39186b81404f47d3ac599dc130db9db1a9d7797ac891650832bfd9046f04720060d2959315aa1c34
+  metadata.gz: 1820d9f70699005727cd57ee996281845b64e447338606985a79dfe3bcafd095c82d3e79fa4cf52041dba487a919ade3cc4bfd024366340646a6badffa37e349
+  data.tar.gz: 818175be429154357dd08830d7da6a0cca06daddbc44afe14b7b8cb7c01c8b39b0d3e80a7eb2c4222978c1f50a5820fe1b203b0932a5767e3019c9275c25e8a6

data/.editorconfig

@@ -1,3 +1,5 @@
 [*]
 indent_size = 2
 indent_style = space
+trim_trailing_whitespace = true
+insert_final_newline = true

data/.github/workflows/test.yml

@@ -0,0 +1,31 @@
+name: test
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '3 0 2 * *'
+  push:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    name: Ruby ${{ matrix.ruby }}
+    strategy:
+      matrix:
+        ruby:
+          - '2.7'
+          - '3.0'
+          - '3.1'
+          - '3.2'
+          - '3.3'
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up RUby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: lint
+        run: bundle exec rake standard
+      - name: test
+        run: bundle exec rake spec

data/.rubocop.yml

@@ -0,0 +1,5 @@
+require:
+  - standard
+
+inherit_gem:
+  standard: config/base.yml

data/.standard.yml

@@ -0,0 +1,3 @@
+# For available configuration options, see:
+#   https://github.com/testdouble/standard
+ruby_version: 2.7

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+## [0.3.5] 2024-08-16
+
+- standardrb compliant
+
+## [0.1.0] 2021-04-16
+
+- initial release

data/Gemfile

@@ -2,3 +2,16 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in graph.gemspec
 gemspec
+
+gem "bundler", "~> 2.0"
+gem "rake", "~> 13.0"
+
+gem "standard", "~> 1.37"
+gem "rubocop", "~> 1.62"
+gem "yard"
+
+group :test do
+  gem "minitest", "~> 5.0"
+  gem "minitest-reporters", "~> 1"
+  gem "minitest-power_assert"
+end

data/Rakefile

@@ -8,9 +8,11 @@ Rake::TestTask.new(:spec) do |t|
   t.test_files = FileList["spec/**/*_spec.rb"]
 end
 
+require "standard/rake"
+
 YARD::Rake::YardocTask.new do |t|
   t.files = ["lib/**/*.rb"]
   t.options = ["--any", "--extra", "--opts"]
 end
 
-task :default => :spec
+task default: :spec

data/exe/simple-hd-graph

@@ -1,8 +1,8 @@
 #! /usr/bin/env ruby
 
-$LOAD_PATH.unshift File.absolute_path(File.join(__dir__, '../lib'))
+$LOAD_PATH.unshift File.absolute_path(File.join(__dir__, "../lib"))
 
-require 'simple-hd-graph'
+require "simple-hd-graph"
 
 Version = SimpleHdGraph::VERSION
 cmd = SimpleHdGraph::Command.new

data/lib/simple-hd-graph/command.rb

@@ -1,9 +1,8 @@
-require 'optparse'
+require "optparse"
 
 module SimpleHdGraph
-  class Error < StandardError; end
   class FileNotExist < Error; end
-  class DirectoryNotExist < Error; end
+  class DirectoryNotExist < Error; end # rubocop:disable Layout/EmptyLineBetweenDefs
 
   class Command
     #
@@ -39,7 +38,7 @@ module SimpleHdGraph
     # @return [String]
     #
     def stream
-      if (@dir)
+      if @dir
         reader.read_dir(@dir)
       else
         reader.read_file(@file)
@@ -58,25 +57,25 @@ module SimpleHdGraph
     # :reek:NestedIterators, :reek:DuplicateMethodCall
     def opts
       OptionParser.new do |opt|
-        opt.on('-d DIR', '--dir', 'dirname') { |value|
+        opt.on("-d DIR", "--dir", "dirname") { |value|
           if File.exist?(value) && File.directory?(value)
             @dir = value
           else
             raise DirectoryNotExist, value
           end
         }
-        opt.on('-f FILE', '--file', 'filename') { |value|
+        opt.on("-f FILE", "--file", "filename") { |value|
           if File.exist?(value) && File.file?(value)
             @file = value
           else
             raise FileNotExist, value
           end
         }
-        opt.on('-r RENDERER', '--renderer', 'renderer') { |value|
+        opt.on("-r RENDERER", "--renderer", "renderer") { |value|
           begin
             @renderer = SimpleHdGraph::Renderer.method(value)
           rescue NameError
-            STDERR.puts "[Warining] renderer `#{value}` not found. falling back to :plantuml"
+            warn "[Warining] renderer `#{value}` not found. falling back to :plantuml"
           end
         }
       end

data/lib/simple-hd-graph/context.rb

@@ -1,4 +1,4 @@
-require 'simple-hd-graph/node'
+require "simple-hd-graph/node"
 
 module SimpleHdGraph
   class ContextNode < Node
@@ -39,15 +39,14 @@ module SimpleHdGraph
       @depends = depends
     end
 
-    # :reek:NestedIterators, :reek:TooManyStatements
     def refill_relation
-      @resource  ||= []
+      @resource ||= []
       @relations ||= []
       @resources.each { |resource|
         dependencies = resource.has
-        if dependencies
+        if dependencies.respond_to? :each
           dependencies.each { |dependency|
-            @relations << { resource.id => @resource_dict[dependency] }
+            @relations << {resource.id => @resource_dict[dependency]}
           }
         end
       }

data/lib/simple-hd-graph/node.rb

@@ -1,8 +1,8 @@
-require 'dry/inflector'
+require "dry/inflector"
 
 module SimpleHdGraph
   class Node
-    class RequiredFieldNotFilled < StandardError; end
+    class RequiredFieldNotFilled < Error; end
 
     class << self
       #
@@ -13,7 +13,7 @@ module SimpleHdGraph
       end
     end
 
-    CAMELIZE_SEPARATOR = ' ,.、。'
+    CAMELIZE_SEPARATOR = /[ ,.、。]/
 
     def initialize
       @inflector = Dry::Inflector.new
@@ -22,27 +22,26 @@ module SimpleHdGraph
     #
     # @param struct [Hash]
     #
-    # :reek:TooManyStatements
     def load(struct)
       klass = self.class
 
-      required_fields = if klass.instance_variables.grep(/@required_fields/).size > 0
-                          klass.instance_variable_get('@required_fields')
-                        else
-                          nil
-                        end
-
-      if required_fields.is_a? Array
-        filled = required_fields.all? {|field|
-          if struct.has_key? field
-            true
-          else
-            raise RequiredFieldNotFilled, field
-          end
-        }
-      else
-        filled = true
-      end
+      required_fields =
+        if klass.instance_variables.grep(/@required_fields/).size > 0
+          klass.instance_variable_get(:@required_fields)
+        end
+
+      filled =
+        if required_fields.is_a? Array
+          required_fields.all? { |field|
+            if struct.has_key? field
+              true
+            else
+              raise RequiredFieldNotFilled, field
+            end
+          }
+        else
+          true
+        end
 
       @content = struct if filled
     end
@@ -52,7 +51,7 @@ module SimpleHdGraph
     # @return [String]
     #
     def camelize(str)
-      @inflector.camelize(@inflector.underscore(str.gsub(/[#{CAMELIZE_SEPARATOR}]/, '_')))
+      @inflector.camelize(@inflector.underscore(str.gsub(CAMELIZE_SEPARATOR, "_")))
     end
   end
 end

data/lib/simple-hd-graph/parser.rb

@@ -1,34 +1,32 @@
-require 'yaml'
+require "yaml"
 
 module SimpleHdGraph
   #
   # parse for YAML string
   #
-  # :reek:InstanceVaariableAssumption
   class Parser
-    KEYWORD_ID        ||= 'id'.freeze
-    KEYWORD_RESOURCES ||= 'resources'.freeze
-    KEYWORD_DEPENDS   ||= 'depends'.freeze
+    KEYWORD_ID = "id".freeze
+    KEYWORD_RESOURCES = "resources".freeze
+    KEYWORD_DEPENDS = "depends".freeze
 
     #
     # @param document [String]
     #
-    # :reek:TooManyStatements
     def parse(document)
       contexts = []
 
       YAML.load_stream(document) do |node|
         next unless node
 
-        context   = nil
+        context = nil
         resources = nil
-        depends   = nil
+        depends = nil
 
         node.each_pair { |key, value|
           case key
           when KEYWORD_ID
             context = ContextNode.new
-            context.load({ id: value })
+            context.load({id: value})
           when KEYWORD_DEPENDS
             depends = value
           when KEYWORD_RESOURCES
@@ -62,7 +60,7 @@ module SimpleHdGraph
     def pack_resources_into_context(resources, context)
       resources.each { |key, resource|
         rn = ResourceNode.new
-        rn.load_with_context({ id: context.id }, { key => resource })
+        rn.load_with_context({id: context.id}, {key => resource})
         context << rn
       }
     end
@@ -71,7 +69,7 @@ module SimpleHdGraph
     # @param contexts [Array]
     #
     def refill_relation(contexts)
-      contexts.each {|context|
+      contexts.each { |context|
         context.refill_relation
       }
     end
@@ -83,9 +81,9 @@ module SimpleHdGraph
       contexts.map { |context|
         if context.depends
           regularized = context.depends.map { |dependee|
-            d = contexts.select { |c|
+            d = contexts.find { |c|
               c.alias == dependee
-            }.first
+            }
 
             {
               context.id => d ? d.id : dependee

data/lib/simple-hd-graph/reader.rb

@@ -4,7 +4,6 @@ module SimpleHdGraph
     # @param file [String]
     # @return [String]
     #
-    # :reek:UtilityFunction
     def read_file(file)
       File.read(file)
     end
@@ -14,7 +13,7 @@ module SimpleHdGraph
     # @return [String]
     #
     def read_dir(dir)
-      Dir.glob("#{dir}/**/*.{yml,yaml}").map {|file|
+      Dir.glob("#{dir}/**/*.{yml,yaml}").map { |file|
         read_file(file)
       }.join("---\n")
     end

data/lib/simple-hd-graph/renderer/plantuml/context.rb

@@ -9,24 +9,33 @@ module SimpleHdGraph
         #
         # @param node [ContextNode]
         #
-        # :reek:FeatureEnvy, :reek:DuplicateMethodCall
         def render(node)
-          resources = node.resources.map { |resource|
-            indent_resource(resource)
-          }.join if node.resources.size > 0
-          relations = node.relations.map { |relation|
-            render_relation(relation)
-          }.join("\n") if node.relations.size > 0
-          depends = node.depends.map { |depending|
-            render_depends(depending)
-          }.join("\n") if node.depends.size > 0
-          (<<-EOD).gsub(/^$\n/, '')
-rectangle \"#{node.alias}\" as #{node.id} {
-#{resources}
-#{relations}
-}
-#{depends}
-EOD
+          resources =
+            if node.resources.size > 0
+              node.resources.map { |resource|
+                indent_resource(resource)
+              }.join
+            end
+          relations =
+            if node.relations.size > 0
+              node.relations.map { |relation|
+                render_relation(relation)
+              }.join("\n")
+            end
+          depends =
+            if node.depends.size > 0
+              node.depends.map { |depending|
+                render_depends(depending)
+              }.join("\n")
+            end
+
+          <<~EOD.gsub(/^$\n/, "")
+            rectangle "#{node.alias}" as #{node.id} {
+            #{resources}
+            #{relations}
+            }
+            #{depends}
+          EOD
         end
 
         #

data/lib/simple-hd-graph/renderer/plantuml/resource.rb

@@ -10,11 +10,11 @@ module SimpleHdGraph
           content = node.content.map { |key, value|
             "  #{key}: #{value}"
           }.join("\n")
-          <<EOD
-object \"#{node.alias}\" as #{node.id} {
-#{content}
-}
-EOD
+          <<~EOD
+            object "#{node.alias}" as #{node.id} {
+            #{content}
+            }
+          EOD
         end
       end
     end

data/lib/simple-hd-graph/renderer/plantuml.rb

@@ -1,4 +1,4 @@
-Dir.glob(File.join(__dir__, '**/*.rb')).each { |f| require f }
+Dir.glob(File.join(__dir__, "plantuml/*.rb")).sort.each { |f| require f }
 
 module SimpleHdGraph
   module Renderer

data/lib/simple-hd-graph/resource.rb

@@ -1,4 +1,4 @@
-require 'simple-hd-graph/node'
+require "simple-hd-graph/node"
 
 module SimpleHdGraph
   class ResourceNode < Node
@@ -24,7 +24,7 @@ module SimpleHdGraph
     def id
       id = camelize(context)
       id[0] = id[0].downcase
-      [id, camelize(self.alias)].join('').freeze
+      [id, camelize(self.alias)].join("").freeze
     end
 
     #
@@ -38,8 +38,8 @@ module SimpleHdGraph
     # @return [Hash]
     #
     def content
-      @content.values.first.select { |key, value|
-        key != 'has'
+      @content.values.first.select { |key, value| # rubocop:disable Style/HashExcept
+        key != "has"
       }
     end
 
@@ -47,7 +47,7 @@ module SimpleHdGraph
     # @return [Array]
     #
     def has
-      @content.values.first['has']
+      @content.values.first["has"]
     end
   end
 end

data/lib/simple-hd-graph/version.rb

@@ -1,3 +1,3 @@
 module SimpleHdGraph
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/lib/simple-hd-graph.rb

@@ -3,6 +3,6 @@ module SimpleHdGraph
   # Your code goes here...
 end
 
-Dir.glob(__dir__ + '/simple-hd-graph/**/*.rb').each { |f|
-  require f.sub(/\.rb\z/, '')
+Dir.glob(__dir__ + "/simple-hd-graph/**/*.rb").each { |f|
+  require f.sub(/\.rb\z/, "")
 }

data/simple-hd-graph.gemspec

@@ -3,36 +3,29 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "simple-hd-graph/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "simple-hd-graph"
-  spec.version       = SimpleHdGraph::VERSION
-  spec.authors       = ["wtnabe"]
-  spec.email         = ["wtnabe@gmail.com"]
+  spec.name = "simple-hd-graph"
+  spec.version = SimpleHdGraph::VERSION
+  spec.authors = ["wtnabe"]
+  spec.email = ["18510+wtnabe@users.noreply.github.com"]
 
-  spec.summary       = %q{single-tier hierary and simplex direction graph DSL}
-  spec.description   = %q{parse single-tier hierarchy and simplex direction graph from YAML, and generate PlantUML with rectangle and object}
-  spec.homepage      = "https://github.com/wtnabe/simple-hd-graph"
+  spec.summary = "single-tier hierary and simplex direction graph DSL"
+  spec.description = "parse single-tier hierarchy and simplex direction graph from YAML, and generate PlantUML with rectangle and object"
+  spec.homepage = "https://github.com/wtnabe/simple-hd-graph"
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
-  spec.metadata["changelog_uri"] = spec.metadata["source_code_uri"] + "/blob/master/CHANGELOG.md"
+  spec.metadata["changelog_uri"] = spec.metadata["source_code_uri"] + "/blob/main/CHANGELOG.md"
 
   # 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("..", __FILE__)) 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.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "dry-inflector", "~> 0"
-
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "minitest-reporters", "~> 1"
-  spec.add_development_dependency "minitest-power_assert"
-  spec.add_development_dependency "yard"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple-hd-graph
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - wtnabe
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-20 00:00:00.000000000 Z
+date: 2024-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector
@@ -24,102 +24,21 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: minitest-power_assert
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: parse single-tier hierarchy and simplex direction graph from YAML, and
   generate PlantUML with rectangle and object
 email:
-- wtnabe@gmail.com
+- 18510+wtnabe@users.noreply.github.com
 executables:
 - simple-hd-graph
 extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".travis.yml"
+- ".rubocop.yml"
+- ".standard.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -146,8 +65,8 @@ metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/wtnabe/simple-hd-graph
   source_code_uri: https://github.com/wtnabe/simple-hd-graph
-  changelog_uri: https://github.com/wtnabe/simple-hd-graph/blob/master/CHANGELOG.md
-post_install_message: 
+  changelog_uri: https://github.com/wtnabe/simple-hd-graph/blob/main/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -162,8 +81,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.5.9
+signing_key:
 specification_version: 4
 summary: single-tier hierary and simplex direction graph DSL
 test_files: []

data/.travis.yml

@@ -1,7 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.6.5
-before_install: gem install bundler -v 2.0.2