ykutils 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94d8725f098ed2fab402064d5d17f29a3d66893a9f0ec2046d2bbf6de385f0d6
-  data.tar.gz: de9db8ffac06710ed34babc306e1f273d7b4719651de134c29e50606ed3d19c2
+  metadata.gz: e5d696f13493f9f0087022669fcaea75295086078ba4ebd851c4d3daca72746c
+  data.tar.gz: 366473d0cb86d38dce2c0e4d183aba31a40bcce6aee18c28633817d3b7ee2cb0
 SHA512:
-  metadata.gz: 4fa01e7f6a1b09185b054a55cf34ee8852e9f127580880af3fa40ab3c48ad0216ed94f41acafabe43a7abb33182ed511a406c52482ea9b6916f9c98120f0fafc
-  data.tar.gz: 57fba77e78eb39fedb2cce6caaf6f65fbf13bb4c1b4ab742b4c606eeb56849d7aa3fd82dbe6c007c5d693fb7b6255b288589022fafe7f4048d078fea68a71363
+  metadata.gz: 9845481d8f18dd7326a4f3109a3b6e57ef226055c9bdd4ecf89a0ade2c69675e6022a5f09bd0e87f6002a499cb9c4ef3d2bfadf4e89b6324d60da7b28d2b223e
+  data.tar.gz: 60f678a622a4a063d71fe9b033460ad4291b6088d152433204b21da1b50ebd1dbe3293bcac871ac2f6e73b07f2aa9caa6e8509e5c42df0731ee8ff248a29a5f2

data/Gemfile

@@ -9,6 +9,7 @@ gem "erubi"
 gem "filex"
 gem "rake", "~> 13.2"
 gem "tilt"
+gem "nkf", "0.2.0"
 
 group :development, optional: true do
   gem "yard"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ykutils (0.1.8)
+    ykutils (0.1.10)
       erubi
       filex
       tilt
@@ -19,6 +19,7 @@ GEM
     json (2.7.1)
     language_server-protocol (3.17.0.3)
     messagex (0.1.5)
+    nkf (0.2.0)
     parallel (1.24.0)
     parser (3.3.0.2)
       ast (~> 2.4.1)
@@ -78,6 +79,7 @@ PLATFORMS
 DEPENDENCIES
   erubi
   filex
+  nkf (= 0.2.0)
   rake (~> 13.2)
   rspec (~> 3.13)
   rubocop (~> 1.50)

data/lib/ykutils/nkfutil20.rb

@@ -0,0 +1,167 @@
+# -*- coding utf-8 -*-
+
+require "nkf"
+
+module Ykutils
+  module NKFUTIL
+    # ASCII-8BIT
+    # US-ASCII
+    unless CODE_TO_NAME
+      CODE_TO_NAME = Hash.new("ASCII")
+      CODE_TO_NAME["US-ASCII"] = "ASCII"
+      CODE_TO_NAME["stateless-ISO-2022-JP"] = "JIS"
+      CODE_TO_NAME["ISO-2022-JP"] = "JIS"
+      CODE_TO_NAME["ISO-2022-JP-2"] = "JIS"
+      CODE_TO_NAME["EUC-JP"] = "EUC"
+      CODE_TO_NAME["eucJP-ms"] = "EUC"
+      CODE_TO_NAME["Shift_JIS"] = "SJIS"
+      CODE_TO_NAME["Windows-31J"] = "SJIS"
+      CODE_TO_NAME["ASCII-8BIT"] = "BINARY"
+      CODE_TO_NAME["UTF-8"] = "UTF8"
+    end
+
+    begin
+      NAME_TO_ENCODING
+    rescue StandardError
+      NAME_TO_ENCODING = Hash.new("US-ASCII")
+      NAME_TO_ENCODING["UTF8"] = "UTF-8"
+      NAME_TO_ENCODING["ASCII"] = "US-ASCII"
+      NAME_TO_ENCODING["JIS"] = "ISO-2022-JP"
+      NAME_TO_ENCODING["EUC"] = "EUC-JP"
+      NAME_TO_ENCODING["SJIS"] = "Winodws-31J"
+      NAME_TO_ENCODING["BINARY"] = "ASCII-8BIT"
+    end
+
+    def self.guess_encoding(str)
+      puts "**#{str.encoding}"
+      CODE_TO_NAME[str.encoding.to_s]
+    end
+
+    class Assoc
+      @hs = {}
+      @config = nil
+
+      def self.set(key, value)
+        @hs[key] = if value
+                     Assoc.convert(value)
+                     # else
+                     #  value
+                   end
+      end
+
+      def self.get(key)
+        @hs[key]
+      end
+
+      def self.to_nkf_encoding_format(encoding)
+        NAME_TO_ENCODING[encoding]
+      end
+
+      def self.config(_src_encoding, dest_encoding, _misc_option = nil)
+        @config = dest_encoding
+      end
+
+      def self.auto_config_to_inner(str, _misc_option = nil)
+        src_encoding = if str
+                         Assoc.to_nkf_encoding_format(NKFUTIL.guess_encoding(str))
+                       else
+                         "US-ASCII"
+                       end
+
+        #      inner_encoding = Assoc.to_nkf_encoding_format( Assoc.get_inner_encoding )
+        #      if inner_encoding != "US-ASCII"
+        #      @config = inner_encoding
+        @config = nil
+        #      end
+        src_encoding
+      end
+
+      def self.auto_config_from_inner(dest_enc, _misc_option = nil)
+        dest_encoding = Assoc.to_nkf_encoding_format(dest_enc)
+        #      inner_encoding = Assoc.to_nkf_encoding_format( Assoc.get_inner_encoding )
+        #      if inner_encoding != "US-ASCII"
+        #      @config = dest_encoding.downcase
+        @config = dest_encoding
+        #      end
+      end
+
+      def self.convert(str)
+        nstr = nil
+        unless str.nil?
+          if @config.nil?
+            nstr = str
+          else
+            begin
+              #            nstr = NKF.nkf( @@config , str )
+              nstr = str.encode(@config)
+            rescue StandardError => e
+              puts e
+              puts "========="
+              pp caller(0)
+            end
+          end
+        end
+        nstr
+      end
+
+      #    def Assoc.get_inner_encoding
+      #      @@inner_encoding = ($KCODE != "NONE") ? $KCODE : "ASCII"
+      #    end
+    end
+
+    def self.set(key, value)
+      Assoc.set(key, value)
+    end
+
+    def self.get(key)
+      Assoc.get(key)
+    end
+
+    def self.convert(str)
+      if str.nil?
+        ""
+      else
+        Assoc.convert(str)
+      end
+    end
+
+    def self.assoc_equal(target, key)
+      target == key || target == Assoc.get(key)
+    end
+
+    def self.config(src_encoding, dest_encoding, misc_option = nil)
+      Assoc.config(src_encoding, dest_encoding, misc_option)
+    end
+
+    def self.auto_config_to_inner(str, misc_option = nil)
+      Assoc.auto_config_to_inner(str, misc_option)
+    end
+
+    def self.auto_config_from_inner(dest_encoding, misc_option = nil)
+      Assoc.auto_config_to_inner(dest_encoding, misc_option)
+    end
+
+    def puts_sj(line)
+      puts line.encod(NAME_TO_ENCODING["SJIS"])
+      #    puts NKF.nkf( "-Ws -m0" , line )
+    end
+
+    def puts_u(line)
+      puts line.encod(NAME_TO_ENCODING["UTF8"])
+      puts NKF.nkf("-Sw -m0", line)
+    end
+
+    def nkf_utf8_file(infname, outfname)
+      File.open(outfname) do |outf|
+        File.open(infname) do |file|
+          while (line = file.gets)
+            line.chomp!
+            #          oline = NKF.nkf( "-w -m0" , line )
+            oline = line.encode(NAME_TO_ENCODING["UTF8"])
+            outf.printf("%s\n", oline)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ykutils/specfileop.rb

@@ -3,11 +3,12 @@
 require "yaml"
 require "csv"
 require "ykutils/treemanagera"
-if RUBY_VERSION >= "1.8.7"
-  require "ykutils/nkfutil19"
-else
-  require "ykutils/nkfutil"
-end
+#if RUBY_VERSION >= "1.8.7"
+#  require "ykutils/nkfutil19"
+#else
+#  require "ykutils/nkfutil"
+#end
+require "ykutils/nkfutil20"
 require "ykutils/debugutils"
 
 module Ykutils

data/lib/ykutils/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ykutils
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - yasuo kominami
@@ -92,6 +92,7 @@ files:
 - lib/ykutils/nginxconfigfiles.rb
 - lib/ykutils/nkfutil.rb
 - lib/ykutils/nkfutil19.rb
+- lib/ykutils/nkfutil20.rb
 - lib/ykutils/osutil.rb
 - lib/ykutils/pathop.rb
 - lib/ykutils/retcodex.rb