jkf 0.5.1 → 0.5.3

data/lib/jkf/parser/ki2.rb

@@ -130,7 +130,7 @@ module Jkf
           s3 = parse_result
           s3 = nil if s3 == :failed
           @reported_pos = s0
-          s0 = -> (hd, tl, res) do
+          s0 = lambda do |hd, tl, res|
             tl.unshift(hd)
             tl << { 'special' => res } if res && !tl[tl.length - 1]['special']
             tl
@@ -177,7 +177,7 @@ module Jkf
             s5 = match_space if s5 == :failed
           end
           @reported_pos = s0
-          s0 = -> (line, c) do
+          s0 = lambda do |line, c|
             ret = { 'move' => line }
             ret['comments'] = c unless c.empty?
             ret
@@ -406,6 +406,7 @@ module Jkf
 
         str.gsub(/　$/, '').split('　').each do |kind|
           next if kind.empty?
+
           ret[kind2csa(kind[0])] = kind.length == 1 ? 1 : kan2n2(kind[1..-1])
         end
 

data/lib/jkf/parser/kif.rb

@@ -539,9 +539,7 @@ module Jkf
         end
         transform_root_header_data(ret) if ret['initial'] && ret['initial']['data']
         transform_root_forks(forks, moves)
-        if ret['initial'] && ret['initial']['data'] && ret['initial']['data']['color'] == 1
-          reverse_color(ret['moves'])
-        end
+        reverse_color(ret['moves']) if ret['initial'] && ret['initial']['data'] && ret['initial']['data']['color'] == 1
         ret
       end
 
@@ -600,6 +598,7 @@ module Jkf
 
         str.split(/[ 　]/).each do |kind|
           next if kind.empty?
+
           ret[kind2csa(kind[0])] = kind.length == 1 ? 1 : kan2n2(kind[1..-1])
         end
 
@@ -609,9 +608,7 @@ module Jkf
       # exchange sente gote
       def reverse_color(moves)
         moves.each do |move|
-          if move['move'] && move['move']['color']
-            move['move']['color'] = (move['move']['color'] + 1) % 2
-          end
+          move['move']['color'] = (move['move']['color'] + 1) % 2 if move['move'] && move['move']['color']
           move['forks']&.each { |fork| reverse_color(fork) }
         end
       end

data/lib/jkf/parser/kifuable.rb

@@ -479,7 +479,7 @@ module Jkf
         end
       end
 
-      # nonl : 
+      # nonl :
       def parse_nonl
         match_regexp(/[^\r\n]/)
       end
@@ -517,7 +517,7 @@ module Jkf
           make_hand(ret['header']['先手の持駒'] || ret['header']['下手の持駒']),
           make_hand(ret['header']['後手の持駒'] || ret['header']['上手の持駒'])
         ]
-        %w(先手の持駒 下手の持駒 後手の持駒 上手の持駒).each do |key|
+        %w[先手の持駒 下手の持駒 後手の持駒 上手の持駒].each do |key|
           ret['header'].delete(key)
         end
       end

data/lib/jkf/version.rb

@@ -1,3 +1,3 @@
 module Jkf
-  VERSION = '0.5.1'
+  VERSION = '0.5.3'
 end

data/lib/jkf.rb

@@ -49,6 +49,7 @@ module Jkf
         break
       end
       raise FileTypeError if result.nil?
+
       result
     end
   end

data/manifest.scm

@@ -1,143 +1,17 @@
 (use-modules ((guix licenses)
               #:prefix license:)
              (gnu packages ruby)
+             (gnu packages ruby-check)
+             (gnu packages ruby-xyz)
              (guix build-system ruby)
              (guix download)
-             (guix git)
              (guix packages)
-             (guix git-download))
-
-(define-public ruby-guard-rubocop
-  (package
-    (name "ruby-guard-rubocop")
-    (version "1.5.0")
-    (source (origin
-              (method url-fetch)
-              (uri (rubygems-uri "guard-rubocop" version))
-              (sha256
-               (base32
-                "0lb2fgfac97lvgwqvx2gbcimyvw2a0i76x6yabik3vmmvjbdfh9h"))))
-    (build-system ruby-build-system)
-    (arguments
-     `(#:tests? #f)) ;TODO
-    (propagated-inputs (list ruby-guard ruby-rubocop))
-    (synopsis
-     "Automatically checks Ruby code style with RuboCop when files are
-modified")
-    (description
-     "@code{Guard::RuboCop} automatically checks Ruby code style with
-RuboCop when files are modified.")
-    (home-page "https://github.com/rubocop/guard-rubocop")
-    (license license:expat)))
-
-(define-public ruby-guard-compat
-  (package
-    (name "ruby-guard-compat")
-    (version "1.2.1")
-    (source (origin
-              (method url-fetch)
-              (uri (rubygems-uri "guard-compat" version))
-              (sha256
-               (base32
-                "1zj6sr1k8w59mmi27rsii0v8xyy2rnsi09nqvwpgj1q10yq1mlis"))))
-    (build-system ruby-build-system)
-    (arguments
-     `(#:test-target "spec"))
-    (native-inputs (list ruby-rspec ruby-rubocop))
-    (synopsis "Helps creating valid Guard plugins and testing them")
-    (description "guard-compat helps creating valid Guard plugins and testing them.")
-    (home-page "https://github.com/guard/guard-compat")
-    (license license:expat)))
-
-(define-public ruby-ruby-dep
-  (package
-    (name "ruby-ruby-dep")
-    (version "1.5.0")
-    (source (origin
-             (method git-fetch)
-             (uri (git-reference
-                   (url "https://github.com/e2/ruby_dep")
-                   (commit "4e79416a55dff4b3ff50e73c8fbd0455de1e68b7")))
-             (file-name (git-file-name name version))
-             (sha256
-              (base32
-               "0vv2bm4lghh5pl8zi0ihp6hpbp7xlk8d5h888nhxr725in0ypy9x"))))
-    (build-system ruby-build-system)
-    (arguments
-     `(#:test-target "spec"
-       #:tests? #f ;FIXME: needs gem_isolator, but cyclic dependencies
-       ))
-    (native-inputs (list ruby-rspec))
-    (synopsis
-     "Creates a version constraint of supported Rubies, suitable for a
-gemspec file")
-    (description
-     "This package creates a version constraint of supported Rubies,
-suitable for a gemspec file.")
-    (home-page "https://github.com/e2/ruby_dep")
-    (license license:expat)))
-
-(define-public ruby-gem-isolator
-  (package
-    (name "ruby-gem-isolator")
-    (version "0.2.3")
-    (source (origin
-             (method git-fetch)
-             (uri (git-reference
-                   (url "https://github.com/e2/gem_isolator")
-                   (commit "1ec35362d946e682089a3983e7063593231d5188")))
-             (file-name (git-file-name name version))
-             (sha256
-              (base32
-               "1kkg7y2lw2jpdcdw33f2pvz9q14rlnx29l3a2qcwc5smivd03kww"))))
-    (build-system ruby-build-system)
-    (arguments
-     `(#:test-target "spec"
-       #:tests? #f ;FIXME: uninitialized constant Pathname
-       ))
-    (native-inputs (list ruby-rspec ruby-nenv ruby-rubocop))
-    (propagated-inputs (list ruby-ruby-dep))
-    (synopsis
-     "Good for testing dependencies of a gem and/or different gem version
-combinations")
-    (description
-     "gem_isolator is good for testing dependencies of a gem and/or
-different gem version combinations.")
-    (home-page "https://github.com/e2/gem_isolator")
-    (license license:expat)))
-
-(define-public ruby-guard-rspec
-  (package
-    (name "ruby-guard-rspec")
-    (version "4.7.3")
-    (source (origin
-              (method url-fetch)
-              (uri (rubygems-uri "guard-rspec" version))
-              (sha256
-               (base32
-                "1jkm5xp90gm4c5s51pmf92i9hc10gslwwic6mvk72g0yplya0yx4"))))
-    (build-system ruby-build-system)
-    (arguments
-     `(#:test-target "spec"
-       #:tests? #f ;FIXME: uninitialized constant Bundler
-       ))
-    (native-inputs (list ruby-rubocop ruby-launchy ruby-gem-isolator bundler ruby))
-    (propagated-inputs (list ruby-guard ruby-guard-compat ruby-rspec))
-    (synopsis "Automatically run your specs (much like autotest)")
-    (description
-     "@code{Guard::RSpec} automatically run your specs (much like autotest).")
-    (home-page "https://github.com/guard/guard-rspec")
-    (license license:expat)))
+             (guix git-download)
+             (guix profiles))
 
 (packages->manifest (list ruby-rake
                           ruby-yard
-                          ruby-redcarpet
-                          ruby-rubocop
-                          ruby-guard-rubocop
-                          ruby-rubocop-rake
-                          ruby-rubocop-rspec
                           ruby-rspec
-                          ruby-guard-rspec
                           ruby-simplecov
                           ruby-benchmark-ips
                           ruby))

data/po/all.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2023-06-19 22:27+0900\n"
+"POT-Creation-Date: 2023-07-22 08:02+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,11 +19,11 @@ msgstr ""
 #. type: Title #
 #: README.md:1
 #, markdown-text, no-wrap
-msgid "Jkf"
+msgid "jkf gem"
 msgstr ""
 
 #. type: Plain text
-#: README.md:3
+#: README.md:4
 #, markdown-text
 msgid ""
 "[![Gem "
@@ -34,77 +34,73 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: README.md:6
+#: README.md:7
 #, markdown-text
 msgid ""
-"jkfは[JSON棋譜フォーマット (JKF)][jkf]をRubyに移植したものです。 KIF, KI2, "
-"CSAをパースしJKFへ変換、JKFからKIF, KI2, CSAへの変換に対応しています。"
+"jkf gemは[JSON棋譜フォーマット (JKF)][jkf]をRubyに移植したものです。 柿木形式（[棋譜ファイル KIF "
+"形式][kakinoki]、KI2）、[CSA標準棋譜ファイル形式][csa]の構文解析とJKFへの変換、JKFからKIF, KI2, "
+"CSAへの変換に対応しています。"
 msgstr ""
 
 #. type: Plain text
-#: README.md:8
+#: README.md:11
 #, markdown-text
 msgid ""
-"[jkf]: "
-"https://github.com/na2hiro/Kifu-for-JS/tree/master/packages/json-kifu-format"
+"[csa]: http://www2.computer-shogi.org/protocol/record_v22.html [jkf]: "
+"https://github.com/na2hiro/Kifu-for-JS/tree/master/packages/json-kifu-format "
+"[kakinoki]: http://kakinoki.o.oo7.jp/kif_format.html"
 msgstr ""
 
 #. type: Title ##
-#: README.md:9
+#: README.md:12
 #, markdown-text, no-wrap
-msgid "Installation"
+msgid "インストール"
 msgstr ""
 
 #. type: Plain text
-#: README.md:12
+#: README.md:15
 #, markdown-text
-msgid "アプリケーションにインストールする場合(bundlerを使用する場合)、Gemfileに以下のように記述してください。"
-msgstr ""
-
-#. type: Fenced code block (ruby)
-#: README.md:13
-#, no-wrap
-msgid "gem 'jkf'\n"
+msgid "アプリケーションにインストールする場合（[Bundler][bundler]を使用する場合）、`Gemfile`に以下のように記述してください。"
 msgstr ""
 
 #. type: Plain text
-#: README.md:18
+#: README.md:17
 #, markdown-text
-msgid "さらにbundleコマンドを実行することでインストールできます。"
+msgid "[bundler]: https://bundler.io/"
 msgstr ""
 
-#. type: Plain text
-#: README.md:20
-#, markdown-text, no-wrap
-msgid "    $ bundle\n"
+#. type: Fenced code block (ruby)
+#: README.md:18
+#, no-wrap
+msgid "gem 'jkf'\n"
 msgstr ""
 
 #. type: Plain text
-#: README.md:22
+#: README.md:23
 #, markdown-text
-msgid "または、gem installコマンドを使って直接インストールすることもできます。"
+msgid "さらに`bundle`コマンドを実行することでインストールできます。"
 msgstr ""
 
 #. type: Plain text
-#: README.md:24
-#, markdown-text, no-wrap
-msgid "    $ gem install jkf\n"
+#: README.md:25
+#, markdown-text
+msgid "または、`gem install`コマンドを使って直接インストールもできます。"
 msgstr ""
 
 #. type: Title ##
-#: README.md:25
+#: README.md:26
 #, markdown-text, no-wrap
-msgid "Usage"
+msgid "使い方"
 msgstr ""
 
 #. type: Plain text
-#: README.md:28
+#: README.md:29
 #, markdown-text
-msgid "KIF, KI2, CSAそれぞれParserとConverterが用意してあります。"
+msgid "KIF, KI2, CSAそれぞれ構文解析器 {Jkf::Parser} と変換器 {Jkf::Converter} が用意してあります。"
 msgstr ""
 
 #. type: Fenced code block (ruby)
-#: README.md:29
+#: README.md:30
 #, no-wrap
 msgid ""
 "kif_parser = Jkf::Parser::Kif.new\n"
@@ -113,7 +109,7 @@ msgid ""
 msgstr ""
 
 #. type: Fenced code block (ruby)
-#: README.md:35
+#: README.md:36
 #, no-wrap
 msgid ""
 "kif_converter = Jkf::Converter::Kif.new\n"
@@ -122,13 +118,15 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: README.md:42
+#: README.md:43
 #, markdown-text
-msgid "`parser#parse(str)`でjkfへの変換、`#convert(jkf)`でjkfから各フォーマットへ変換できます。"
+msgid ""
+"{Jkf::Parser::Base#parse} でJKFへの変換、 {Jkf::Converter::Base#convert} "
+"でJKFから各形式へ変換できます。"
 msgstr ""
 
 #. type: Fenced code block (ruby)
-#: README.md:43
+#: README.md:44
 #, no-wrap
 msgid ""
 "jkf = kif_parser.parse(kif_str) #=> Hash\n"
@@ -137,7 +135,7 @@ msgid ""
 msgstr ""
 
 #. type: Fenced code block (ruby)
-#: README.md:49
+#: README.md:50
 #, no-wrap
 msgid ""
 "kif = kif_converter.convert(jkf) #=> String\n"
@@ -146,31 +144,43 @@ msgid ""
 msgstr ""
 
 #. type: Title ##
-#: README.md:55
+#: README.md:56
 #, markdown-text, no-wrap
-msgid "Contributing"
+msgid "貢献"
 msgstr ""
 
 #. type: Plain text
 #: README.md:59
 #, markdown-text
-msgid "バグレポートやプルリクエストはGithubでよろしくお願いします。 https://github.com/iyuuya/jkf."
+msgid "バグレポートやプルリクエストは[GitHubのリポジトリ][repo]でよろしくお願いします。"
 msgstr ""
 
 #. type: Plain text
 #: README.md:61
 #, markdown-text
+msgid "[repo]: https://github.com/iyuuya/jkf"
+msgstr ""
+
+#. type: Plain text
+#: README.md:63
+#, markdown-text
 msgid "Guixで開発されている場合は`guix shell`で`rake test`によるテスト実行ができます。"
 msgstr ""
 
 #. type: Title ##
-#: README.md:62
+#: README.md:64
 #, markdown-text, no-wrap
-msgid "License"
+msgid "利用許諾"
+msgstr ""
+
+#. type: Plain text
+#: README.md:67
+#, markdown-text
+msgid "ライセンスは[MIT License][mit]です。"
 msgstr ""
 
 #. type: Plain text
-#: README.md:66
+#: README.md:68
 #, markdown-text
-msgid "ライセンスはMITです。 [MIT License](http://opensource.org/licenses/MIT)."
+msgid "[mit]: http://opensource.org/licenses/MIT"
 msgstr ""