igo 0.1.5 → 0.1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f601c65deddd555e091f5688fec28cad9a5a38e9b1c30e6618ce076e8dacce6a
-  data.tar.gz: dcab0296c1c6e1ee7e6ad44f0fc77900235364a932c89e1f7795292f6b36cc07
+  metadata.gz: 81b5f3fec925891f2ab69645a249aebd65c2e2cf1ae14957cb80d4c85861c138
+  data.tar.gz: 0aacd859a7c85dc0385be5630083b1862293c008214bf6c0c230ebd071a0a65e
 SHA512:
-  metadata.gz: 2724f4e58e730c0c86b107475dc18c27d65ea3c5b990236e4ebe9e55db9d959ac538004d0957563a986397e0ca240846b5025259f6e192c8007bbfc958694e2a
-  data.tar.gz: b6dfe00759471e08c933827822db4e9bc0cf869c614b24173a26bd451076db17439b96e5d81adeca647167741d1ef43e5098fb34bfedbcf42efd21d00ccdee9f
+  metadata.gz: 6d995a0dca73847507437bf4c33bf0e937f58ee4f8e959836cea94f643e2dff2ae4a9ffeb62dca790fc1aaf8a433fa7b16855f233c401be7cad6f73567718c5b
+  data.tar.gz: 04c947e5b3e0cb76b77afddb6f271fdfa998243bb4aea60a036073873c013a0435cdb59db62bb98c2b40cf7da360c7573e1ccc6d76013b7a6486ec59a6396378

data/lib/igo/ja.rb

@@ -70,8 +70,9 @@ module Igo
         # else cutted.map(&:last)
         # end
 
-        tag(str, s: s, lr: lr, tag: false, kana: true)
+        tag(str, s: s, lr: lr, tag: false, kana: true, kana_only: true)
       end
+
       def ruby str, s: false, lr: "（）"
         # str = URI.encode_www_form_component(str)
         # doc = Nokogiri::HTML(URI.open(SEARCH_URL + str).read)
@@ -93,7 +94,7 @@ module Igo
         # else cutted
         # end
 
-        tag(str, s: s, lr: lr, kana: 1, tag: false)
+        tag(str, s: s, lr: lr, kana: true, tag: false)
 
       end
       # TODO: tag word function
@@ -102,7 +103,7 @@ module Igo
 
       end
 
-      def tag str, s: false, ns: 0, lr: "（）", sp:"_", short: false, tag: true, kana: false, timeout: 10
+      def tag str, s: false, ns: 0, lr: "（）", sp:"_", short: false, tag: true, kana: false, timeout: 10, kana_only: false
 
         def async_query(arr, timeout=0, &block)
           promises = arr.map do |element|
@@ -126,7 +127,7 @@ module Igo
           results
         end
 
-        def _tag str, vis_kana: true, vis_tag: true
+        def _tag str
           str = URI.encode_www_form_component(str)
           doc = Nokogiri::HTML(URI.open(SEARCH_URL + str).read)
 
@@ -135,35 +136,41 @@ module Igo
             _1&.css(".japanese_word__furigana").text||nil, # kana
             _1.attr("data-pos")] # tag
           end
-          # .map{_1.values_at(* [0, vis_kana ? 1 : 0, vis_tag ? 2 : 0].uniq)}
         end
 
-        def _stringify cutted, s: "/", lr: "（）", sp:"_", short: false, vis_tag: true, vis_kana: true
+        def _stringify cutted, s: "/", lr: "（）", sp:"_", short: false, vis_tag: true, vis_kana: true, kana_only: false
           # cutted.each{ _1[1] = nil } unless vis_kana
           # cutted.each{ _1[2] = nil } unless vis_tag
-          unless s.is_a?(String)
-            s = " "
-          end
-          left, right = case lr
-          when String then (lr*2).split("").values_at(0, -1)
-          when Array then lr
+          if kana_only
+            return cutted.map do
+              (_1[1].empty? ? _1[0] : _1[1]) +
+              ((vis_kana && _1[2]) ? (sp + _1[2]) : "")
+            end.join(s)
+          else
+            unless s.is_a?(String)
+              s = " "
+            end
+            left, right = case lr
+            when String then (lr*2).split("").values_at(0, -1)
+            when Array then lr
+            end
+            cutted.map do
+              _1[0] +
+              ((vis_tag && !_1[1]&.empty? )? (left + _1[1] + right) : "") +
+              ((vis_kana && _1[2]) ? (sp + _1[2]) : "")
+            end.join(s)
           end
-          cutted.map do
-            _1[0] +
-            ((vis_tag && !_1[1]&.empty? )? (left + _1[1] + right) : "") +
-            ((vis_kana && _1[2]) ? (sp + _1[2]) : "")
-          end.join(s)
         end
 
-        def singo_proc str, s: false, ns: 0, lr: "（）", sp:"_", short: false, vis_tag: true, vis_kana: true
-          cutted = _tag str, vis_kana: vis_kana, vis_tag: vis_tag
+        def singo_proc str, s: false, ns: 0, lr: "（）", sp:"_", short: false, vis_tag: true, vis_kana: true, kana_only: false
+          cutted = _tag str
           if short
             short = short.is_a?(Integer) ? short : 4
             cutted = cutted.map{[ *_1[0,2],      (_1[2][0, short].downcase rescue nil)   ]}
           end
 
           if s
-            _stringify cutted, s: s, lr: lr, sp: sp, short: short, vis_tag: vis_kana, vis_kana: vis_tag
+            _stringify cutted, s: s, lr: lr, sp: sp, short: short, vis_tag: vis_kana, vis_kana: vis_tag, kana_only: kana_only
           else
             cutted = cutted.map{_1.values_at(* [0, vis_kana ? 1 : 0, vis_tag ? 2 : 0].uniq)}
             cutted[0].size == 1 ? cutted.flatten : cutted
@@ -172,10 +179,10 @@ module Igo
 
         case str
         when String
-          singo_proc str, s: s, ns: ns, lr: lr, sp: sp, short: short, vis_tag: tag, vis_kana: kana
+          singo_proc str, s: s, ns: ns, lr: lr, sp: sp, short: short, vis_tag: tag, vis_kana: kana, kana_only: kana_only
         when Array
           async_query str, timeout do
-            singo_proc _1, s: s, ns: ns, lr: lr, sp: sp, short: short, vis_tag: tag, vis_kana: kana
+            singo_proc _1, s: s, ns: ns, lr: lr, sp: sp, short: short, vis_tag: tag, vis_kana: kana, kana_only: kana_only
           end
         end
         # TODO

data/lib/igo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Igo
-  VERSION = "0.1.5"
+  VERSION = "0.1.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: igo
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.5.1
 platform: ruby
 authors:
 - saisui