filex 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '07842dde93309500dc3c9462ba33e530443a84376a4c6e5cf7edce3d5b9843a7'
-  data.tar.gz: 73b1b04a6b0c0e42693e8ee11d523647b1aeaa57e31238f57ef3aecab64fc6b8
+  metadata.gz: 7c06f30e685dd60d4ac9dcdaec214e7a3577504adf9e3a01b49bd5441f3a09b1
+  data.tar.gz: 26ae4e902da3aca7127482db62cb0292f73c4fac41aadebda6f40fc1f2cfbd61
 SHA512:
-  metadata.gz: da6c1f283a4578ef8e4bc7377fa5da990363db1c3c213783e98aa09f0564f7746999bf76750c4347f3ea10938d3b2414edadfe557c34ad0ab71b61e63e1fe87c
-  data.tar.gz: 6526c843d4e043e4b996b73640323a0dcc0850b37370a6ad23ed50ed78037b0a10d586cd396cabc210d7e24fd7fa6a206372c77023d0de8d9795f4c41b18ec91
+  metadata.gz: 1260552fecb2730fbf4de170a295b1d9c018d107e7cd01f001bd6a48f8ed2fe1e130ab4d07f9601e103223ac0b1c188c3dc110c425f69f91cdafbaf65b31bc8a
+  data.tar.gz: 175eeaac4a0b02b57115f4621ee13f12b5af6a2fd79acefdef5f77b439ea013053d99ee13d6c2f1a6cb18594c7525b431dedca7f9a57e571829fb1543a9f6b47

data/lib/filex.rb

@@ -128,7 +128,7 @@ module Filex
     end
 
     #
-    # eRubyスクリプト文字列を、ハッシュを用いて置換した内容を1個の文字列に変換
+    # eRubyスクリプト文字列を、ハッシュを用いて置換した内容を、1個の文字列に変換
     #
     # @param eruby_str [String] eRubyスクリプト文字列
     # @param data [Hash] eRubyスクリプト置換用ハッシュ
@@ -216,7 +216,7 @@ module Filex
     # @param str [String] 分割対象文字列
     # @return [Array<String>] 第0要素　分割文字列の左側部分、第１要素　分割文字列の右側部分
     def self.hyphen_space(str)
-      if (m = /^(\s*((\-\s+)+))(.+)$/.match(str))
+      if (m = /^(\s*((\-\s+)+))(.*)$/.match(str))
         left = m[1]
         right = m[4]
       end
@@ -233,30 +233,43 @@ module Filex
     def self.escape_single_quote_yaml_first(line, state)
       # lineに対して": "での分割を試みる
       left, right = colon_space(line)
-      state[:mes].output_info("1|left=#{left}")
+      state[:mes].output_info("F1|left=#{left}|right=#{right}")
+      # 分割できなければ、lineに対して":"での分割を試みる
       left, right = colon(line) unless left
-      state[:mes].output_info("2|left=#{left}")
+      state[:mes].output_info("F2|left=#{left}|right=#{right}")
 
+      # 右側部分に"-"が含まれていれば、"- "で区切れるか調べる
       if right&.index("-")
         left, right = hyphen_space(line)
-        state[:mes].output_info("3|left=#{left}")
+        state[:mes].output_info("F3|left=#{left}")
         if left
           state[:need_quoto] = true
           state[:mes].output_info("NQ|1|need_quoto=#{state[:need_quoto]}")
         end
       end
 
+      # lineが":"が分割できなければ、lineに対して"- "での分割を試みる
       unless left
         left, right = hyphen_space(line)
+        state[:mes].output_info("F4|left=#{left}|right=#{right}")
+        if right&.index("-") == 0
+          state[:mes].output_info("F-X|index=0|right.size=#{right.size}")
+          if right.size == 1
+            left += right
+            right = nil
+          else
+            state[:need_quoto] = true
+          end
+        end
       end
 
+      state[:mes].output_info("FE|left=#{left}|right=#{right}")
       [left, right]
     end
 
     #
     # YAML形式の文字列に、シングルクォーテーションでのエスケープが必要かを調べる（第2段階）
     #
-    # @param line [String] 対象文字列
     # @param right [String] 対象文字列の分割右側部分
     # @param state [Hash] 状態
     # @option state [Messagex] :mes Messagexクラスのインスタンス
@@ -285,18 +298,19 @@ module Filex
     # @param right [String] 対象文字列の分割右側部分
     # @return [Array<String>] 第0要素　分割された文字列の左側部分、第１要素　分割された文字列の右側部分
     def self.escape_single_quote_yaml_second(line, state, left, right)
-      state[:mes].output_info("4|left=#{left}|right=#{right}")
-
       return [left, right] if right.nil? || right.strip.empty?
 
+      state[:mes].output_info("S1|left=#{left}|right=#{right}")
       state[:has_quoto] = true if right.index("'")
 
-      return [left, right] if right.index(":").nil?
-
-      return([left, right]) if /\d:/.match?(right)
+      if right.index(":")
+        state[:mes].output_info("S2|left=#{left}|right=#{right}")
 
+        return([left, right]) if /\d:/.match?(right)
+        state[:mes].output_info("S3|left=#{left}|right=#{right}")
+      end
       left2, right2 = colon_space(right)
-      state[:mes].output_info("51|left2=#{left2}|right2=#{right2}")
+      state[:mes].output_info("S4|left2=#{left2}|right2=#{right2}")
 
       unless left2
         left2, right2 = check_colon_in_right(right, state)
@@ -305,8 +319,9 @@ module Filex
       if left2
         left += left2
         right = right2
-        state[:mes].output_info("6|left=#{left}|right=#{right}")
+        state[:mes].output_info("S5|left=#{left}|right=#{right}")
       end
+      state[:mes].output_info("S6|left=#{left}|right=#{right}")
       [left, right]
     end
 
@@ -322,17 +337,20 @@ module Filex
     # @return [void]
     def self.escape_single_quote_yaml_third(line, state, left, right)
       return if right.nil? || right.strip.empty?
+      state[:mes].output_info("T1|left=#{left}|right=#{right}")
 
       return if state[:need_quoto]
+      state[:mes].output_info("T2|left=#{left}|right=#{right}")
 
       return unless right.index(":") && right.index("*")
+      state[:mes].output_info("T3|left=#{left}|right=#{right}")
 
-      state[:mes].output_info("1 not need_quoto")
+      state[:mes].output_info("T4 not need_quoto")
       unless right.index("-")
         state[:need_quoto] = true
-        state[:mes].output_info("NQ|2|need_quoto=#{state[:need_quoto]}")
+        state[:mes].output_info("NQ|T5|need_quoto=#{state[:need_quoto]}")
       end
-      state[:mes].output_info("1A need_quoto=#{state[:need_quoto]}")
+      state[:mes].output_info("T6 need_quoto=#{state[:need_quoto]}")
     end
 
     #

data/lib/filex/version.rb

@@ -1,4 +1,4 @@
 module Filex
   # バージョン番号
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filex
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - yasuo kominami
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-01 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler