jkf 0.4.0 → 0.4.1

data/.rubocop_todo.yml

@@ -0,0 +1,11 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-02-24 04:22:16 +0900 using RuboCop version 0.37.2.
+# 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
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 30
+Metrics/AbcSize:
+  Max: 127

data/.travis.yml

@@ -4,3 +4,6 @@ rvm:
 before_install: gem install bundler -v 1.11.2
 bundler_args: --jobs 3 --retry 3
 cache: bundler
+addons:
+  code_climate:
+    repo_token: 196df8880b27b92c2e879846ffb08040eee02248297a0c9fd0a1e071ea031f28

data/Gemfile

@@ -1,4 +1,19 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-# Specify your gem's dependencies in jkf.gemspec
 gemspec
+
+gem "rake", "~> 10.0"
+
+group :development do
+  gem "yard", require: false
+  gem "redcarpet", require: false
+
+  gem "rubocop", "~> 0.37.2", require: false
+  gem "guard-rubocop", require: false
+end
+
+group :test do
+  gem "codeclimate-test-reporter", require: nil
+  gem "rspec", "~> 3.0", require: false
+  gem "guard-rspec", require: false
+end

data/Guardfile

@@ -1,70 +1,27 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
+scope(groups: %w(specs))
 
-## Uncomment and set this to only include directories you want to watch
-# directories %w(app lib config test spec features) \
-#  .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")}
+directories %w(spec lib)
 
-## Note: if you are using the `directories` clause above and you are not
-## watching the project directory ('.'), then you will want to move
-## the Guardfile to a watched dir and symlink it back, e.g.
-#
-#  $ mkdir config
-#  $ mv Guardfile config/
-#  $ ln -s config/Guardfile .
-#
-# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
+group :specs, halt_on_fail: true do
+  guard :rspec, cmd: "bundle exec rspec", failed_mode: :keep do
+    require "guard/rspec/dsl"
+    dsl = Guard::RSpec::Dsl.new(self)
 
-# Note: The cmd option is now required due to the increasing number of ways
-#       rspec may be run, below are examples of the most common uses.
-#  * bundler: 'bundle exec rspec'
-#  * bundler binstubs: 'bin/rspec'
-#  * spring: 'bin/rspec' (This will use spring if running and you have
-#                          installed the spring binstubs per the docs)
-#  * zeus: 'zeus rspec' (requires the server to be started separately)
-#  * 'just' rspec: 'rspec'
+    # RSpec files
+    rspec = dsl.rspec
+    watch(rspec.spec_helper) { rspec.spec_dir }
+    watch(rspec.spec_support) { rspec.spec_dir }
+    watch(rspec.spec_files)
 
-guard :rspec, cmd: "bundle exec rspec" do
-  require "guard/rspec/dsl"
-  dsl = Guard::RSpec::Dsl.new(self)
-
-  # Feel free to open issues for suggestions and improvements
-
-  # RSpec files
-  rspec = dsl.rspec
-  watch(rspec.spec_helper) { rspec.spec_dir }
-  watch(rspec.spec_support) { rspec.spec_dir }
-  watch(rspec.spec_files)
-
-  # Ruby files
-  ruby = dsl.ruby
-  dsl.watch_spec_files_for(ruby.lib_files)
-
-  # Rails files
-  rails = dsl.rails(view_extensions: %w(erb haml slim))
-  dsl.watch_spec_files_for(rails.app_files)
-  dsl.watch_spec_files_for(rails.views)
-
-  watch(rails.controllers) do |m|
-    [
-      rspec.spec.("routing/#{m[1]}_routing"),
-      rspec.spec.("controllers/#{m[1]}_controller"),
-      rspec.spec.("acceptance/#{m[1]}")
-    ]
+    # Ruby files
+    ruby = dsl.ruby
+    dsl.watch_spec_files_for(ruby.lib_files)
   end
 
-  # Rails config changes
-  watch(rails.spec_helper)     { rspec.spec_dir }
-  watch(rails.routes)          { "#{rspec.spec_dir}/routing" }
-  watch(rails.app_controller)  { "#{rspec.spec_dir}/controllers" }
-
-  # Capybara features specs
-  watch(rails.view_dirs)     { |m| rspec.spec.("features/#{m[1]}") }
-  watch(rails.layouts)       { |m| rspec.spec.("features/#{m[1]}") }
-
-  # Turnip features and steps
-  watch(%r{^spec/acceptance/(.+)\.feature$})
-  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) do |m|
-    Dir[File.join("**/#{m[1]}.feature")][0] || "spec/acceptance"
+  guard :rubocop, all_on_start: false, cli: "--rails" do
+    watch(%r{.+\.rb$}) { |m| m[0] }
+    watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
   end
 end
+
+# vim: ft=ruby

data/README.md

@@ -1,5 +1,5 @@
 # Jkf
-[![Build Status](https://travis-ci.org/iyuuya/jkf.svg?branch=master)](https://travis-ci.org/iyuuya/jkf)
+[![Gem Version](https://badge.fury.io/rb/jkf.svg)](https://badge.fury.io/rb/jkf) [![Build Status](https://travis-ci.org/iyuuya/jkf.svg?branch=master)](https://travis-ci.org/iyuuya/jkf) [![Code Climate](https://codeclimate.com/github/iyuuya/jkf/badges/gpa.svg)](https://codeclimate.com/github/iyuuya/jkf) [![Test Coverage](https://codeclimate.com/github/iyuuya/jkf/badges/coverage.svg)](https://codeclimate.com/github/iyuuya/jkf/coverage) [![Inline docs](http://inch-ci.org/github/iyuuya/jkf.svg?branch=develop)](http://inch-ci.org/github/iyuuya/jkf)
 
 Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/jkf`. To experiment with that code, run `bin/console` for an interactive prompt.
 

data/Rakefile

@@ -3,4 +3,4 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/jkf.gemspec

@@ -1,26 +1,21 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'jkf/version'
+require "jkf/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "jkf"
-  spec.version       = Jkf::VERSION
-  spec.authors       = ["iyuuya"]
-  spec.email         = ["i.yuuya@gmail.com"]
+  spec.name = "jkf"
+  spec.version = Jkf::VERSION
+  spec.authors = ["iyuuya"]
+  spec.email = ["i.yuuya@gmail.com"]
 
-  spec.summary       = %q{jkf/csa/kif/ki2 parser and converter}
-  spec.description   = %q{converter/parser of records of shogi}
-  spec.homepage      = "https://github.com/iyuuya/jkf"
-  spec.license       = "MIT"
+  spec.summary = "jkf/csa/kif/ki2 parser and converter"
+  spec.description = "converter/parser of records of shogi"
+  spec.homepage = "https://github.com/iyuuya/jkf"
+  spec.license = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "guard-rspec"
 end

data/lib/jkf.rb

@@ -7,7 +7,7 @@ module Jkf
   class FileTypeError < StandardError; end
 
   class << self
-    def parse_file(filename, encoding: 'Shift_JIS')
+    def parse_file(filename, encoding: "Shift_JIS")
       parser = case ::File.extname(filename)
                when /kif/
                  ::Jkf::Parser::Kif.new
@@ -15,8 +15,8 @@ module Jkf
                  ::Jkf::Parser::Ki2.new
                when /csa/
                  ::Jkf::Parser::Csa.new
-                when /jkf|json/
-                  JSON
+               when /jkf|json/
+                 JSON
                end
       str = File.read(File.expand_path(filename), encoding: encoding).toutf8
       parser.parse(str)

data/lib/jkf/converter.rb

@@ -4,7 +4,9 @@ module Jkf
   end
 end
 
-require 'json'
-require 'jkf/converter/kif'
-require 'jkf/converter/ki2'
-require 'jkf/converter/csa'
+require "json"
+require "jkf/converter/base"
+require "jkf/converter/kifuable"
+require "jkf/converter/kif"
+require "jkf/converter/ki2"
+require "jkf/converter/csa"

data/lib/jkf/converter/base.rb

@@ -0,0 +1,8 @@
+module Jkf::Converter
+  class Base
+    def convert(jkf)
+      jkf = jkf.is_a?(Hash) ? jkf : JSON.parse(jkf)
+      convert_root(jkf)
+    end
+  end
+end

data/lib/jkf/converter/csa.rb

@@ -1,135 +1,88 @@
 module Jkf::Converter
-  class Csa
-    VERSION = '2.2'
-
-    def convert(jkf)
-      hash = if jkf.is_a?(Hash)
-               jkf
-             else
-               JSON.parse(jkf)
-             end
+  class Csa < Base
+    VERSION = "2.2".freeze
 
+    def convert_root(jkf)
       result = version
-      result += convert_information(hash['header']) if hash['header']
-      result += convert_initial(hash['initial']) if hash['initial']
-      result += convert_moves(hash['moves']) if hash['moves']
+      result += convert_information(jkf["header"]) if jkf["header"]
+      result += convert_initial(jkf["initial"]) if jkf["initial"]
+      result += convert_moves(jkf["moves"]) if jkf["moves"]
       result
     end
 
+    protected
+
     def convert_information(header)
-      result = ''
-      result += 'N+' + (header.delete('先手') || header.delete('下手') || '') + "\n" if header['先手'] || header['下手']
-      result += 'N-' + (header.delete('後手') || header.delete('上手') || '') + "\n" if header['後手'] || header['上手']
-      header.each { |(k,v)| result += "$#{csa_header_key(k)}:#{v}\n" }
+      result = ""
+      if header["先手"] || header["下手"]
+        result += "N+" + (header.delete("先手") || header.delete("下手") || "") + "\n"
+      end
+      if header["後手"] || header["上手"]
+        result += "N-" + (header.delete("後手") || header.delete("上手") || "") + "\n"
+      end
+      header.each { |(k, v)| result += "$#{csa_header_key(k)}:#{v}\n" }
       result
     end
 
     def convert_initial(initial)
-      result = ''
-      data = initial['data']
-      if initial['preset'] == 'OTHER'
-        9.times { |y|
-          line = "P#{y+1}"
-          9.times { |x|
-            piece = data['board'][8-x][y]
-            line += if piece == {}
-                       " * "
-                     else
-                       csa_color(piece['color']) + piece['kind']
-                     end
-          }
-          result += line + "\n"
-        }
-      else
-        result += 'PI'
-        case initial['preset']
-        when 'HIRATE'
-        when 'KY' # 香落ち
-          result += '11KY'
-        when 'KY_R' # 右香落ち
-          result += '91KY'
-        when 'KA' # 角落ち
-          result += '22KA'
-        when 'HI' # 飛車落ち
-          result += '82HI'
-        when 'HIKY' # 飛香落ち
-          result += '22HI11KY91KY'
-        when '2' # 二枚落ち
-          result += '82HI22KA'
-        when '3' # 三枚落ち
-          result += '82HI22KA91KY'
-        when '4' # 四枚落ち
-          result += '82HI22KA11KY91KY'
-        when '5' # 五枚落ち
-          result += '82HI22KA81KE11KY91KY'
-        when '5_L' # 左五枚落ち
-          result += '82HI22KA21KE11KY91KY'
-        when '6' # 六枚落ち
-          result += '82HI22KA21KE81KE11KY91KY'
-        when '8' # 八枚落ち
-          result += '82HI22KA31GI71GI21KE81KE11KY91KY'
-        when '10' # 十枚落ち
-          result += '82HI22KA41KI61KI31GI71GI21KE81KE11KY91KY'
-        end
-      end
+      result = ""
+      data = initial["data"]
+      result += if initial["preset"] == "OTHER"
+                  convert_board(data["board"])
+                else
+                  convert_preset(initial["preset"])
+                end
       # 持駒
-      if data['hands']
-        sum = 0
-        data['hands'][0].each_value { |n| sum += n }
-        if sum > 0
-          result += 'P+'
-          data['hands'][0].to_a.reverse.each { |(k, v)| v.times { result += "00#{k}" } }
-          result += "\n"
-        end
-        sum = 0
-        data['hands'][1].each_value { |n| sum += n }
-        if sum > 0
-          result += 'P-'
-          data['hands'][1].to_a.reverse.each { |(k, v)| v.times { result += "00#{k}" } }
-          result += "\n"
-        end
+      if data["hands"]
+        result += convert_hands(data["hands"], 0)
+        result += convert_hands(data["hands"], 1)
+      end
+      result += csa_color(data["color"]) + "\n" if data["color"]
+      result
+    end
+
+    def convert_hands(hands, color)
+      result = ""
+      sum = 0
+      hands[color].each_value { |n| sum += n }
+      if sum > 0
+        result += "P#{csa_color(color)}"
+        hands[color].to_a.reverse_each { |(k, v)| v.times { result += "00#{k}" } }
+        result += "\n"
       end
-      result += csa_color(data['color']) + "\n" if data['color']
       result
     end
 
     def convert_moves(moves)
-      result = ''
+      result = ""
       moves.each do |move|
         next if move == {}
-        result += convert_move(move['move']) if move['move']
-        result += convert_special(move['special'], move['color']) if move['special']
-        if move['time']
-          result += "," + convert_time(move['time'])
-        elsif move['move'] || move['special']
+        result += convert_move(move["move"]) if move["move"]
+        result += convert_special(move["special"], move["color"]) if move["special"]
+        if move["time"]
+          result += "," + convert_time(move["time"])
+        elsif move["move"] || move["special"]
           result += "\n"
         end
-        result += convert_comments(move['comments']) if move['comments']
+        result += convert_comments(move["comments"]) if move["comments"]
       end
       result
     end
 
     def convert_move(move)
-      result = csa_color(move['color'])
-      result += if move['from']
-                  "#{move['from']['x']}#{move['from']['y']}"
-                else
-                  "00"
-                end
-      result += "#{move['to']['x']}#{move['to']['y']}"
-      result += move['piece']
-      result
+      result = csa_color(move["color"])
+      result += move["from"] ? pos2str(move["from"]) : "00"
+      result + pos2str(move["to"]) + move["piece"]
     end
 
-    def convert_special(special, color=nil)
+    def convert_special(special, color = nil)
       result = "%"
       result += csa_color(color) if color
-      result += special
-      result
+      result + special
     end
 
     def convert_time(time)
-      sec = time['now']['m'] * 60 + time['now']['s']
+      sec = time["now"]["m"] * 60 + time["now"]["s"]
       "T#{sec}\n"
     end
 
@@ -137,10 +90,62 @@ module Jkf::Converter
       comments.map { |comment| "'#{comment}" }.join("\n") + "\n"
     end
 
-    protected
+    def convert_board(board)
+      result = ""
+      9.times do |y|
+        result += "P#{y + 1}"
+        9.times do |x|
+          piece = board[8 - x][y]
+          result += if piece == {}
+                      " * "
+                    else
+                      csa_color(piece["color"]) + piece["kind"]
+                    end
+        end
+        result += "\n"
+      end
+      result
+    end
+
+    def convert_preset(preset)
+      "PI" +
+        case preset
+        when "HIRATE"
+        when "KY" # 香落ち
+          "11KY"
+        when "KY_R" # 右香落ち
+          "91KY"
+        when "KA" # 角落ち
+          "22KA"
+        when "HI" # 飛車落ち
+          "82HI"
+        when "HIKY" # 飛香落ち
+          "22HI11KY91KY"
+        when "2" # 二枚落ち
+          "82HI22KA"
+        when "3" # 三枚落ち
+          "82HI22KA91KY"
+        when "4" # 四枚落ち
+          "82HI22KA11KY91KY"
+        when "5" # 五枚落ち
+          "82HI22KA81KE11KY91KY"
+        when "5_L" # 左五枚落ち
+          "82HI22KA21KE11KY91KY"
+        when "6" # 六枚落ち
+          "82HI22KA21KE81KE11KY91KY"
+        when "8" # 八枚落ち
+          "82HI22KA31GI71GI21KE81KE11KY91KY"
+        when "10" # 十枚落ち
+          "82HI22KA41KI61KI31GI71GI21KE81KE11KY91KY"
+        end
+    end
 
     def csa_color(color)
-      color == 0 ? '+' : '-'
+      color == 0 ? "+" : "-"
+    end
+
+    def pos2str(pos)
+      "%d%d" % [pos["x"], pos["y"]]
     end
 
     def version
@@ -149,11 +154,11 @@ module Jkf::Converter
 
     def csa_header_key(key)
       {
-        "棋戦"     => "EVENT",
-        "場所"     => "SITE",
+        "棋戦" => "EVENT",
+        "場所" => "SITE",
         "開始日時" => "START_TIME",
         "終了日時" => "END_TIME",
-        "持ち時間" => "TIME_LIMIT",
+        "持ち時間" => "TIME_LIMIT"
       }[key] || key
     end
   end