ykxutils 0.1.8 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb57978cd24ccbb824287f130d77a3c38a6703e0341914b32221adf60786bb73
-  data.tar.gz: 92fd92f8550542480f7f44e11870d0a18edc3c7412311d0511bd0c9e554eacbd
+  metadata.gz: c0659659032f5707b2cdeade5612ba9450d0b031766aa3ae592c0ac33e598543
+  data.tar.gz: a101d3eb24966539154012d769913cb0be13fac416eb1de173a77034bf6576e5
 SHA512:
-  metadata.gz: 594acd0dd1516dfad347315770af817a49df02e09bbee5b3b78f6dae768a6272f450a160318a708e5e3d39b6070be5128bf2d327045da9c516bbe3e891b45e94
-  data.tar.gz: 1909511a5120c6a9564f74db65f45d602277df8ee594010f3ea6f7d2da2f7c3dab22bf2aec8739c29369fe75bbee547e6f10ee0171d0ee4b31af76a0940d9e99
+  metadata.gz: 623fb0b29f44a21eaaf84ead317c17b104d701cd81f28345f9788d513a3690f79c644e5e12f8450b90c27d0f6dc9dbabff19db4124abbde81a61eabeb5536281
+  data.tar.gz: b4a226775f324625a513cc9c802ee2779ef9593b66da85abc798e998c56bc91cc9a4ee3b25f5e64030733da1da6de53ffe74858239d86f2b23ab9822addc6b07

data/.rubocop.yml

@@ -27,3 +27,12 @@ Layout/LineLength:
 
 Style/Documentation:
   Enabled: false
+
+#追加
+#
+Style/StringConcatenation:
+  Enabled: false
+#
+Naming/AccessorMethodName:
+  Enabled: false
+

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-10-11 11:06:24 UTC using RuboCop version 1.36.0.
+# on 2024-02-06 17:44:56 UTC using RuboCop version 1.59.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
@@ -12,168 +12,38 @@
 # Include: **/*.gemfile, **/Gemfile, **/gems.rb
 Bundler/OrderedGems:
   Exclude:
-    # - 'Gemfile'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
-# Include: **/*.gemspec
-Gemspec/OrderedDependencies:
-  Exclude:
-    # - 'ykxutils.gemspec'
+#    - 'Gemfile'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle.
-# SupportedStyles: space, no_space
-Layout/SpaceAroundEqualsInParameterDefault:
-  Exclude:
-    # - 'lib/ykxutils/pstorex.rb'
-
-# Offense count: 10
-Lint/UselessAssignment:
+# SupportedStyles: final_newline, final_blank_line
+Layout/TrailingEmptyLines:
   Exclude:
-    # - 'lib/ykxutils/yamlx.rb'
+#    - 'Gemfile'
 
 # Offense count: 1
-# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes.
+# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 19
 
 # Offense count: 3
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 15
+  Max: 14
 
 # Offense count: 1
 # Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
 Metrics/ParameterLists:
   Max: 6
 
-# Offense count: 1
-# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
-# AllowedNames: as, at, by, db, id, in, io, ip, of, on, os, pp, to
-Naming/MethodParameterName:
-  Exclude:
-    - 'lib/ykxutils/nginxconfigfiles.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: be, be_nil
-RSpec/BeNil:
-  Exclude:
-    - 'spec/ykxutils_spec.rb'
-
-# Offense count: 1
-RSpec/BeforeAfterAll:
-  Exclude:
-    - 'spec/spec_helper.rb'
-    - 'spec/rails_helper.rb'
-    - 'spec/support/**/*.rb'
-    - 'spec/ykxutils_spec.rb'
-
 # Offense count: 2
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
-  Max: 9
+  Max: 8
 
 # Offense count: 1
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Exclude:
-    - 'spec/ykxutils_spec.rb'
-
-# Offense count: 1
-RSpec/NoExpectationExample:
-  Exclude:
-    - 'spec/ykxutils_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: not_to, to_not
-RSpec/NotToNot:
-  Exclude:
-    - 'spec/ykxutils_spec.rb'
-
-# Offense count: 8
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, AllowedMethods, AllowedPatterns, IgnoredMethods, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
-# SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
-# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
-# FunctionalMethods: let, let!, subject, watch
-# AllowedMethods: lambda, proc, it
-Style/BlockDelimiters:
-  Exclude:
-    - 'lib/ykxutils/erubyx.rb'
-    - 'lib/ykxutils/gridlist.rb'
-    - 'lib/ykxutils/nginxconfig.rb'
-    - 'lib/ykxutils/nginxconfigfiles.rb'
-    - 'spec/ykxutils_spec.rb'
-
-# Offense count: 5
-# This cop supports safe autocorrection (--autocorrect).
-Style/ColonMethodCall:
-  Exclude:
-    - 'lib/ykxutils/gridlist.rb'
-    - 'lib/ykxutils/nginxconfig.rb'
-    - 'spec/ykxutils_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Style/EachWithObject:
-  Exclude:
-    - 'spec/ykxutils_spec.rb'
-
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
-# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
-# SupportedShorthandSyntax: always, never, either, consistent
-Style/HashSyntax:
-  Exclude:
-    - 'lib/ykxutils/gridlist.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Style/IfUnlessModifier:
-  Exclude:
-    - 'lib/ykxutils/erubyx.rb'
-    - 'lib/ykxutils/gridlist.rb'
-
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: literals, strict
-Style/MutableConstant:
-  Exclude:
-    - 'lib/ykxutils/gridlist.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, MinBodyLength.
-# SupportedStyles: skip_modifier_ifs, always
-Style/Next:
-  Exclude:
-    - 'lib/ykxutils/nginxconfig.rb'
-    - 'lib/ykxutils/nginxconfigfiles.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: PreferredDelimiters.
-Style/PercentLiteralDelimiters:
-  Exclude:
-    - 'lib/ykxutils/gridlist.rb'
-
-# Offense count: 45
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
-# SupportedStyles: single_quotes, double_quotes
-Style/StringLiterals:
-  Exclude:
-    - 'Gemfile'
-    - 'lib/ykxutils/erubyx.rb'
-    - 'lib/ykxutils/gridlist.rb'
-    - 'lib/ykxutils/nginxconfigfiles.rb'
-    - 'ykxutils.gemspec'
+#    - 'spec/ykxutils_spec.rb'

data/Gemfile

@@ -1,22 +1,24 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in ykxutils.gemspec
 gemspec
 
-gem 'bundler'
-gem 'erubi'
-gem 'rake', '~> 13.0'
-gem 'tilt'
+gem "bundler"
+gem "erubi"
+gem "rake", "~> 13.1"
+gem "tilt"
 
 group :development do
-  gem 'yard'
+  gem "debug"
+  gem "yard"
 end
 
 group :test do
-  gem 'rspec', '~> 3.0'
-  gem 'rubocop'
-  gem 'rubocop-rake', require: false
-  gem 'rubocop-rspec', require: false
+  gem "rspec", "~> 3.12"
+  gem "rubocop"
+  gem "rubocop-performance"
+  gem "rubocop-rake", require: false
+  gem "rubocop-rspec", require: false
 end

data/Gemfile.lock

@@ -1,73 +1,92 @@
 PATH
   remote: .
   specs:
-    ykxutils (0.1.8)
-      bundler
-      erubi
-      rake (~> 13.0)
-      tilt
+    ykxutils (0.1.12)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
+    debug (1.9.1)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
     diff-lcs (1.5.0)
-    erubi (1.11.0)
-    json (2.6.2)
-    parallel (1.22.1)
-    parser (3.1.2.1)
+    erubi (1.12.0)
+    io-console (0.7.2)
+    irb (1.11.1)
+      rdoc
+      reline (>= 0.4.2)
+    json (2.7.1)
+    language_server-protocol (3.17.0.3)
+    parallel (1.24.0)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
+      racc
+    psych (5.1.2)
+      stringio
+    racc (1.7.3)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.6.0)
-    rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.1)
+    rake (13.1.0)
+    rdoc (6.6.2)
+      psych (>= 4.0.0)
+    regexp_parser (2.8.3)
+    reline (0.4.2)
+      io-console (~> 0.5)
+    rexml (3.2.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.1)
-    rubocop (1.36.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    rubocop (1.59.0)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
-      parser (>= 3.1.1.0)
-    rubocop-performance (1.15.0)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.20.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.25.1)
+      rubocop (~> 1.41)
+    rubocop-performance (1.20.1)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.13.2)
-      rubocop (~> 1.33)
-    ruby-progressbar (1.11.0)
-    tilt (2.0.11)
-    unicode-display_width (2.3.0)
-    webrick (1.7.0)
-    yard (0.9.28)
-      webrick (~> 1.7.0)
+    rubocop-rspec (2.25.0)
+      rubocop (~> 1.40)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+    ruby-progressbar (1.13.0)
+    stringio (3.1.0)
+    tilt (2.3.0)
+    unicode-display_width (2.5.0)
+    yard (0.9.34)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
   bundler
+  debug
   erubi
-  rake (~> 13.0)
-  rspec (~> 3.0)
+  rake (~> 13.1)
+  rspec (~> 3.12)
   rubocop
   rubocop-performance
   rubocop-rake

data/SECURITY.md

@@ -0,0 +1,21 @@
+# Security Policy
+
+## Supported Versions
+
+Use this section to tell people about which versions of your project are
+currently being supported with security updates.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 5.1.x   | :white_check_mark: |
+| 5.0.x   | :x:                |
+| 4.0.x   | :white_check_mark: |
+| < 4.0   | :x:                |
+
+## Reporting a Vulnerability
+
+Use this section to tell people how to report a vulnerability.
+
+Tell them where to go, how often they can expect to get an update on a
+reported vulnerability, what to expect if the vulnerability is accepted or
+declined, etc.

data/a.northern-cross.net.conf

@@ -0,0 +1,86 @@
+server {
+    listen 443 ssl;
+    ssl_certificate /etc/letsencrypt/live/v103-3-189-127.myvps.jp/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/v103-3-189-127.myvps.jp/privkey.pem;
+    server_name  a.northern-cross.net;
+
+    error_log   /var/www/vhosts/a.northern-cross.net/statistics/logs/ssl_error_log;
+    access_log   /var/www/vhosts/a.northern-cross.net/statistics/logs/ssl_access_log;
+
+#    rewrite_log on;
+
+    root   /var/www/vhosts/a.northern-cross.net/httpdocs;
+    location  / {
+        index index.html;
+    }
+    error_page   500 502 503 504  /50x.html;
+    #error_page   500  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html/;
+        index 50x.html;
+    }
+}
+
+
+server {
+    listen 443 ssl;
+    server_name www.a.northern-cross.net;
+        #
+    return 301 https://a.northern-cross.net;
+
+    ssl_certificate /etc/letsencrypt/live/v103-3-189-127.myvps.jp/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/v103-3-189-127.myvps.jp/privkey.pem;
+    include /etc/letsencrypt/options-ssl-nginx.conf;
+    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
+
+}
+
+
+server {
+    if ($host = a.northern-cross.net) {
+        return 301 https://$host$request_uri;
+    }
+
+    listen 80;
+    server_name  a.northern-cross.net;
+
+    error_log   /var/www/vhosts/a.northern-cross.net/statistics/logs/error_log;
+    access_log   /var/www/vhosts/a.northern-cross.net/statistics/logs/access_log;
+
+    root   /var/www/vhosts/a.northern-cross.net/httpdocs;
+    location / {
+        index index.html;
+    }
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html/;
+        index 50x.html;
+    }
+}
+
+
+server {
+    if ($host = northern-cross.net) {
+        return 301 https://$host$request_uri;
+    }
+
+
+    listen 80;
+    server_name  a.northern-cross.net;
+
+    error_log   /var/www/vhosts/a.northern-cross.net/statistics/logs/error_log;
+    access_log   /var/www/vhosts/a.northern-cross.net/statistics/logs/access_log;
+
+    rewrite_log on;
+
+    root   /var/www/vhosts/a.northern-cross.net/httpdocs;
+    location / {
+        index index.html;
+    }
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html/;
+        index 50x.html;
+    }
+}
+

data/lib/ykxutils/erubyx.rb

@@ -1,14 +1,12 @@
-require 'tilt'
-require 'yaml'
+require "tilt"
+require "yaml"
 
 module Ykxutils
   module Erubyx
     module_function
 
     def erubi_render(template_hash, scope, value_hash = {})
-      unless template_hash[:OBJ]
-        template_hash[:OBJ] = Tilt::ErubiTemplate.new { template_hash[:TEMPLATE] }
-      end
+      template_hash[:OBJ] = Tilt::ErubiTemplate.new { template_hash[:TEMPLATE] } unless template_hash[:OBJ]
       template_hash[:OBJ].render(scope, value_hash)
     end
 
@@ -25,14 +23,14 @@ module Ykxutils
       template_text = File.read(template_file_path)
       template_hash = { TEMPLATE: template_text,
                         OBJ: nil }
-      value_hash = value_file_path_array.reduce({}) { |hash, path|
+      value_hash = value_file_path_array.reduce({}) do |hash, path|
         # p path
         hash0 = YAML.load_file(path)
         # p hash0
         hash = hash.merge(hash0)
         # p hash
         hash
-      }
+      end
       # puts value_hash
       erubi_render(template_hash, scope, value_hash)
     end

data/lib/ykxutils/fileop.rb

@@ -0,0 +1,51 @@
+require "yaml"
+require "pathname"
+
+module Ykxutils
+  module_function
+
+  def make_output_filename(prefix, basename, postfix, extname, extname_pn)
+    if extname == nil
+      if extname_pn.size <= 1
+        extname = ""
+      else
+        extname = extname_pn.to_s
+      end
+    end
+    "#{prefix}#{basename}#{postfix}#{extname}"
+  end
+
+  def make_output_file_pn(out_dir, ofname, input_pn)
+    case out_dir
+    when nil
+      Pathname.new(ofname)
+    when :SAME
+      parent = input_pn.parent
+      parent + ofname
+    else
+      out_dir_pn = Pathname.new(out_dir)
+      out_dir_pn + ofname
+    end
+  end
+
+  def make_output_path( input_path:, out_dir: nil, prefix: "", postfix: "", extname: nil)
+    input_pn = Pathname.new(input_path)
+    basename = input_pn.basename(".*")
+    extname_pn = input_pn.extname
+    ofname = make_output_filename(prefix, basename, postfix, extname, extname_pn)
+    output_pn = make_output_file_pn(out_dir, ofname, input_pn)
+    if input_pn.expand_path('/') === output_pn.expand_path('/')
+      nil
+    else
+      output_pn.to_s
+    end
+  end
+
+  def file_convert(infile, outfile, &block)
+    if block
+      block.call(infile, outfile)
+    else
+      false
+    end
+  end
+end

data/lib/ykxutils/gridlist.rb

@@ -1,37 +1,34 @@
-require 'ykxutils/erubyx'
+require "ykxutils/erubyx"
 
 module Ykxutils
   module Gridlist
-    TAMPLETES = { :GRID_DEF =>
-      { :TEMPLATE => %!
+    TAMPLETES = { GRID_DEF: { TEMPLATE: %(
     .g-<%= row %>-<%= colum %> {
       grid-row-start: <%= row %>;
       grid-row-end: ,<%= row + 1 %>;
       grid-column-start: <%= colum %>;
       grid-column-end: <%= colum + 1 %>;
     }
-    !, :OBJ => nil } }
+    ), OBJ: nil } }.freeze
 
     module_function
 
     def make_one_grid(hash, row, colum)
-      unless hash[:OBJ]
-        hash[:OBJ] = Tilt::ErubiTemplate.new { hash[:TEMPLATE] }
-      end
+      hash[:OBJ] = Tilt::ErubiTemplate.new { hash[:TEMPLATE] } unless hash[:OBJ]
       hash[:OBJ].render(Object.new, { row: row, colum: colum })
     end
 
     def make_grid(template_hash, scope, min_row, max_row, min_colum, max_colum)
-      (min_row..max_row).map { |row|
-        (min_colum..max_colum).map { |colum|
+      (min_row..max_row).map do |row|
+        (min_colum..max_colum).map do |colum|
           # puts "#{row} #{colum}"
           value_hash = { row: row, colum: colum }
           # make_one_grid(template_hash, value_hash)
           # p template_hash
           # p value_hash
-          Ykxutils::Erubyx::erubi_render(template_hash, scope, value_hash)
-        }
-      }
+          Ykxutils::Erubyx.erubi_render(template_hash, scope, value_hash)
+        end
+      end
     end
 
     def make_grid_list(min_row, max_row, min_colum, max_colum)

data/lib/ykxutils/htmlparsex.rb

@@ -0,0 +1,30 @@
+require "yaml"
+
+module Ykxutils
+  module_function
+
+  def complemente_dt_tag(line)
+    if line =~ /<DT>/
+      # p "complemente_dt_tag T"
+      line + "</DT>" 
+    elsif line =~ /<dt>/
+      line + "</dt>" 
+    else
+      # p "complemente_dt_tag F"
+      line
+    end
+  end
+
+  def reform_dt_tag(infilename, outfilename)
+    infile = File.open(infilename)
+    outfile = File.open(outfilename, 'w')
+
+    Ykxutils::file_convert(infile, outfile){ |infile, outfile|
+      while line = infile.gets
+        line.chomp!
+        oline = Ykxutils.complemente_dt_tag(line)
+        outfile.write( oline + "\n" ) 
+      end
+    }
+  end
+end

data/lib/ykxutils/nginxconfig.rb

@@ -18,23 +18,23 @@ module Ykxutils
     def extract(scope)
       hashx = {}
       @hash.each do |k, v|
-        if k !~ /^_/
-          # puts k
-          # puts v
-          pn = Pathname.new(v["template"]).cleanpath
-          # Pathname.new(v).cleanpath
-          template_pn = @server_dir_pn + pn
-          # puts(template_pn)
-          value_file_path_array = v["value"].map { |x|
-            @virtual_domain_dir_pn + Pathname.new(x).cleanpath
-          }
-          hashx[k] = Ykxutils::Erubyx::erubi_render_with_file(template_pn, scope, value_file_path_array)
+        next unless k !~ /^_/
+
+        # puts k
+        # puts v
+        pn = Pathname.new(v["template"]).cleanpath
+        # Pathname.new(v).cleanpath
+        template_pn = @server_dir_pn + pn
+        # puts(template_pn)
+        value_file_path_array = v["value"].map do |x|
+          @virtual_domain_dir_pn + Pathname.new(x).cleanpath
         end
+        hashx[k] = Ykxutils::Erubyx.erubi_render_with_file(template_pn, scope, value_file_path_array)
       end
       template = File.read(@root_template_pn)
       template_hash = { TEMPLATE: template,
                         OBJ: nil }
-      Ykxutils::Erubyx::erubi_render(template_hash, scope, hashx)
+      Ykxutils::Erubyx.erubi_render(template_hash, scope, hashx)
     end
   end
 end

data/lib/ykxutils/nginxconfigfiles.rb

@@ -1,33 +1,32 @@
-require 'find'
-require_relative 'nginxconfig'
+require "find"
+require_relative "nginxconfig"
 
 module Ykxutils
   class Nginxconfigfiles
-    def get_file_list(start_dir, re)
+    def get_file_list(start_dir, rex)
       @file_list = []
 
-      Find.find(start_dir) { |x|
-        if x =~ re
-          # puts x
+      Find.find(start_dir) do |x|
+        if x =~ rex
           @file_list << x
           Find.prune
         end
-      }
+      end
       @file_list
     end
 
     def output(file_list)
-      file_list.map { |fname|
+      file_list.map do |fname|
         parent_dir_pn = Pathname.new(fname).cleanpath.parent
         vdomain = parent_dir_pn.basename
         output_fname = "#{vdomain}.conf"
         cli = ::Ykxutils::Nginxconfig.new(fname)
         scope = nil
-        File.open(output_fname, "w") { |f|
+        File.open(output_fname, "w") do |f|
           x = cli.extract(scope)
           f.write(x)
-        }
-      }
+        end
+      end
     end
   end
 end

data/lib/ykxutils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ykxutils
-  VERSION = "0.1.8"
+  VERSION = "0.1.12"
 end

data/lib/ykxutils/yamlx.rb

@@ -1,20 +1,25 @@
 require "yaml"
 
 module Ykxutils
+  SUCCESS = 0
+  ARGUMENT_ERROR = 1
+  STANDARD_ERROR = 2
+
   module_function
 
   def yaml_load_file_aliases(yaml_file_path, use_aliases: true)
+    converted = nil
     begin
-      use_aliases ? YAML.load_file(yaml_file_path, aliases: true) : YAML.load_file(yaml_file_path)
-      value = 0
+      converted = use_aliases ? YAML.load_file(yaml_file_path, aliases: true) : YAML.load_file(yaml_file_path)
+      value = SUCCESS
     rescue ArgumentError
       # puts e.message
-      value = 1
+      value = ARGUMENT_ERROR
     rescue StandardError
-      # puts e.message
-      value = 2
+      # puts e.message8
+      value = STANDARD_ERROR
     end
-    value
+    [converted, value]
   end
 
   def yaml_load_file_compati(yaml_file_path)
@@ -24,22 +29,23 @@ module Ykxutils
   end
 
   def yaml_load_aliases(content, use_aliases: true)
+    converted = nil
     begin
-      use_aliases ? YAML.safe_load(content, aliases: true) : YAML.safe_load(content)
-      value = 0
+      converted = use_aliases ? YAML.safe_load(content, use_aliases) : YAML.safe_load(content)
+      result = SUCCESS
     rescue ArgumentError
       # puts e.message
-      value = 1
+      result = ARGUMENT_ERROR
     rescue StandardError
       # puts e.message
-      value = 2
+      result = STANDARD_ERROR
     end
-    value
+    [converted, result]
   end
 
   def yaml_load_compati(content)
-    setting = yaml_load_aliases(content, use_aliases: true)
-    setting = yaml_load_aliases(content, use_aliases: false) if setting.nil?
-    setting
+    ret_array = yaml_load_aliases(content, use_aliases: true)
+    ret_array = yaml_load_aliases(content, use_aliases: false) if ret_array[1] != 0
+    ret_array[0]
   end
 end

data/lib/ykxutils.rb

@@ -8,8 +8,11 @@ require_relative "ykxutils/gitcmd"
 require_relative "ykxutils/nginxconfig"
 require_relative "ykxutils/nginxconfigfiles"
 require_relative "ykxutils/gridlist"
+require_relative "ykxutils/fileop"
+require_relative "ykxutils/htmlparsex"
 
 module Ykxutils
   class Error < StandardError; end
+
   # Your code goes here...
 end

data/test_data/fileop/in.html

@@ -0,0 +1 @@
+<dt>abc

data/test_data/fileop/out.html

@@ -0,0 +1 @@
+<dt>abc</dt>

data/test_data/fileop/out_0.html

@@ -0,0 +1 @@
+<dt>abc</dt>

data/ykxutils.gemspec

@@ -1,23 +1,23 @@
 # frozen_string_literal: true
 
-require_relative 'lib/ykxutils/version'
+require_relative "lib/ykxutils/version"
 
 Gem::Specification.new do |spec|
-  spec.name = 'ykxutils'
+  spec.name = "ykxutils"
   spec.version = Ykxutils::VERSION
-  spec.authors = ['ykominami']
-  spec.email = ['ykominami@gmail.com']
+  spec.authors = ["ykominami"]
+  spec.email = ["ykominami@gmail.com"]
 
-  spec.summary = 'New version of utilty function created by yk.'
-  spec.description = 'New version of utilty function created by yk.'
-  spec.homepage = 'https://ykominami.github.io/ykxutils'
-  spec.license = 'MIT'
-  spec.required_ruby_version = '>= 2.7'
+  spec.summary = "New version of utilty function created by yk."
+  spec.description = "New version of utilty function created by yk."
+  spec.homepage = "https://ykominami.github.io/ykxutils"
+  spec.license = "MIT"
+  spec.required_ruby_version = ">= 2.7"
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to your gem server 'https://example.com'"
 
-  spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://github.com/ykominami/ykxutils'
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/ykominami/ykxutils"
   # spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
 
   # Specify which files should be added to the gem when it is released.
@@ -27,28 +27,28 @@ Gem::Specification.new do |spec|
       (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
     end
   end
-  spec.bindir = 'exe'
+  spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'bundler'
+  # spec.add_runtime_dependency "bundler"
   # spec.add_runtime_dependency 'debug'
-  spec.add_runtime_dependency 'erubi'
-  spec.add_runtime_dependency 'rake', '~> 13.0'
-  spec.add_runtime_dependency 'tilt'
+  # spec.add_runtime_dependency "erubi"
+  # spec.add_runtime_dependency "rake", "~> 13.0"
+  # spec.add_runtime_dependency "tilt"
 
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-performance'
-  spec.add_development_dependency 'rubocop-rake'
-  spec.add_development_dependency 'rubocop-rspec'
+  # spec.add_development_dependency "rspec", "~> 3.0"
+  # spec.add_development_dependency "rubocop"
+  # spec.add_development_dependency "rubocop-performance"
+  # spec.add_development_dependency "rubocop-rake"
+  # spec.add_development_dependency "rubocop-rspec"
 
-  spec.add_development_dependency 'yard'
+  # spec.add_development_dependency "yard"
 
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html
-  spec.metadata['rubygems_mfa_required'] = 'true'
+  spec.metadata["rubygems_mfa_required"] = "true"
 end

metadata

@@ -1,155 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ykxutils
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.12
 platform: ruby
 authors:
 - ykominami
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-11 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: erubi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  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: rubocop-performance
-  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: rubocop-rake
-  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: rubocop-rspec
-  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'
+date: 2024-03-09 00:00:00.000000000 Z
+dependencies: []
 description: New version of utilty function created by yk.
 email:
 - ykominami@gmail.com
@@ -167,16 +27,24 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- SECURITY.md
+- a.northern-cross.net.conf
 - lib/ykxutils.rb
 - lib/ykxutils/erubyx.rb
+- lib/ykxutils/fileop.rb
 - lib/ykxutils/gitcmd.rb
 - lib/ykxutils/gridlist.rb
+- lib/ykxutils/htmlparsex.rb
 - lib/ykxutils/nginxconfig.rb
 - lib/ykxutils/nginxconfigfiles.rb
 - lib/ykxutils/pstorex.rb
 - lib/ykxutils/version.rb
 - lib/ykxutils/yamlx.rb
 - test_data/4servers.erb
+- test_data/a.txt
+- test_data/fileop/in.html
+- test_data/fileop/out.html
+- test_data/fileop/out_0.html
 - test_data/test.yaml
 - test_data/v103-3-189-127/4servers.erb
 - test_data/v103-3-189-127/a.northern-cross.net/base.yml
@@ -227,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: New version of utilty function created by yk.