japanese-bookkeeping-svg 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c43657e693b2aaac4e582951f79a2fbfba17a12
-  data.tar.gz: ee57cdc74902eae050f8e17c81c0849383cd4473
+  metadata.gz: 57ad3fae124e79aa17980b3e240320d237ee3957
+  data.tar.gz: 2d558545c1c2ae08281cba5c745289b6cc588d11
 SHA512:
-  metadata.gz: 6fcd45ddddde80a059aa62b2cce20f9c37a858fcf2f529e386b0b53261df0fd0f1c81359ebd78cdee78aa0dcd9cd492a04e53051f104de3043f9862d0b9238dc
-  data.tar.gz: cba1e8454b67643459862c6d4ba06d0151293604717e5500ffec1db8966ba237664d3f154a05fadc47dbc7a8159c50148f2c4bb962deeb255be23e71b001c9b1
+  metadata.gz: 259783e88b31a6cc487a0fc2048f709c56d697ecb75f93716a299d9560d9104aba2f2ea22240feef686552d72f5a3dba645300caf542622efa3a16a74a3e400a
+  data.tar.gz: 83081bd1e2c1f0a8100fa8e84908ae81330da8a4bbf753a582cad88c6ad2edc88726972424b8fcd1a65d9be0eb35a055f191e98fa78888524e9e5d9901bd1825

data/ChangeLog

@@ -0,0 +1,10 @@
+== 2016-06-26 version 0.0.2
+
+* Improve appearances
+* Add Batik usage on README.md
+
+
+== 2016-06-25 version 0.0.1
+
+* First release
+

data/README.md

@@ -1,10 +1,16 @@
 # japanese-bookkeeping-svg
 
+[![Build Status](https://travis-ci.org/gunyarakun/japanese-bookkeeping-svg.svg?branch=master)](https://travis-ci.org/gunyarakun/japanese-bookkeeping-svg)
+[![Gem Version](https://badge.fury.io/rb/japanese-bookkeeping-svg.svg)](https://badge.fury.io/rb/japanese-bookkeeping-svg)
+![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)
+
 Generate SVG files for Japanese style bookkeeping diagrams.
 
+:warning: This SVG uses `textLength` attritube which is not be supported by some SVG viewer. Use [Firefox](https://www.mozilla.org/en-US/firefox/products/), [Batik](https://xmlgraphics.apache.org/batik/), etc.
+
 ## Usage
 
-```
+```bash
 gem install japanese-bookkeeping-svg
 ```
 
@@ -47,6 +53,23 @@ File.open('t-accounts.svg', 'w') do |file|
 end
 ```
 
+## Conversion to PNG with Batik
+
+Make `user.css`.
+
+```css
+text {
+  font-size: 16px;
+  font-family: "ヒラギノ明朝 ProN W6", "HiraMinProN-W6";
+}
+```
+
+Execute.
+
+```bash
+java -jar batik-1.8/batik-rasterizer-1.8.jar -w 2400 -cssUser user.css out.svg
+```
+
 ## License
 
 ``japanese-bookkeeping-svg`` is distributed under the terms of the MIT license (see LICENSE.txt).

data/lib/japanese-bookkeeping-svg.rb

@@ -1,7 +1,16 @@
+# rubocop:disable Style/FileName
 require_relative 'japanese_bookkeeping_svg/svg_generator'
 require_relative 'japanese_bookkeeping_svg/gem_version'
 
 module JapaneseBookkeepingSVG
+  WIDTH = 500
+  CENTER_X = WIDTH / 2
+  LEFT_MARGIN = 15
+  RIGHT_MARGIN = 10
+  ACCOUNT_WIDTH = 110
+  AMOUNT_X = LEFT_MARGIN + ACCOUNT_WIDTH + RIGHT_MARGIN
+  AMOUNT_WIDTH = 105
+
   @@line_height = SVGGenerator.convert_unit('1em') # rubocop:disable Style/ClassVars
 
   def self.line_height
@@ -14,18 +23,22 @@ module JapaneseBookkeepingSVG
     }
   end
 
-  def self.account_value(svg, x, y, journals, with_brackets) # rubocop:disable Metrics/MethodLength
+  def self.account_value(svg, x, y, journals, with_brackets) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
     key_style = {
-      'textLength' => 125,
-      #      'xml:space' => 'preserve'
+      'textLength' => ACCOUNT_WIDTH
     }
     sum_value = 0
     journals.map do |key, value|
+      c_x = x
       y += line_height
-      svg.text(x, y, '(') if with_brackets
-      svg.text(x + 15, y, key.to_s, key_style)
-      svg.text(x + 150, y, ')') if with_brackets
-      svg.text(x + 290, y, delimited_number(value).to_s, value_style)
+      key_style['lengthAdjust'] = key.size > 8 ? 'spacingAndGlyphs' : 'spacing'
+      svg.text(c_x, y, '(') if with_brackets
+      c_x += LEFT_MARGIN
+      svg.text(c_x, y, key.to_s, key_style)
+      c_x += ACCOUNT_WIDTH + RIGHT_MARGIN
+      svg.text(c_x, y, ')') if with_brackets
+      c_x += AMOUNT_WIDTH
+      svg.text(c_x, y, delimited_number(value).to_s, value_style)
       sum_value += value
     end
 
@@ -36,16 +49,17 @@ module JapaneseBookkeepingSVG
     # TODO: check amount
     SVGGenerator.new do
       JapaneseBookkeepingSVG.account_value(self, 0, 0, debits, true)
-      JapaneseBookkeepingSVG.account_value(self, 300, 0, credits, true)
+      JapaneseBookkeepingSVG.account_value(self, CENTER_X + RIGHT_MARGIN, 0, credits, true)
     end
   end
 
   def self.t_accounts(account, debits, credits) # rubocop:disable Metrics/LineLength,Metrics/MethodLength,Metrics/AbcSize
     # TODO: calc amount
     line_height = SVGGenerator.convert_unit('1em')
+    that = self
     SVGGenerator.new do
       account_style = {
-        'textLength' => 145,
+        'textLength' => ACCOUNT_WIDTH,
         'text-anchor' => 'middle'
       }
       line_style = {
@@ -53,42 +67,43 @@ module JapaneseBookkeepingSVG
         'stroke-width' => 1
       }
 
-      text(300, line_height, account, account_style)
+      account_style['lengthAdjust'] = account.size > 8 ? 'spacingAndGlyphs' : 'spacing'
+      text(CENTER_X, line_height, account, account_style)
       t_start_y = line_height + 8
-      line(0, t_start_y, 600, t_start_y, line_style)
+      line(0, t_start_y, WIDTH, t_start_y, line_style)
 
       y = t_start_y + 5
-      debits_y, sum_debits = JapaneseBookkeepingSVG.account_value(self, 0, y, debits, false)
-      credits_y, sum_credits = JapaneseBookkeepingSVG.account_value(self, 300, y, credits, false)
+      debits_y, sum_debits = that.account_value(self, 0, y, debits, false)
+      credits_y, sum_credits = that.account_value(self, CENTER_X, y, credits, false)
 
       if debits_y < credits_y
         y = credits_y + 8
-        line(15, y, 140, debits_y + 8, line_style)
-        line(15, y, 300, y, line_style)
-        line(460, y, 600, y, line_style)
+        line(LEFT_MARGIN, y, AMOUNT_X, debits_y + 8, line_style)
+        line(LEFT_MARGIN, y, CENTER_X, y, line_style)
+        line(CENTER_X + AMOUNT_X, y, WIDTH, y, line_style)
       elsif debits_y > credits_y
         y = debits_y + 8
-        line(160, y, 300, y, line_style)
-        line(315, y, 440, credits_y + 8, line_style)
-        line(315, y, 600, y, line_style)
+        line(AMOUNT_X, y, CENTER_X, y, line_style)
+        line(CENTER_X + LEFT_MARGIN, y, CENTER_X + AMOUNT_X, credits_y + 8, line_style)
+        line(CENTER_X + LEFT_MARGIN, y, WIDTH, y, line_style)
       else # eq
         y = debits_y + 8
-        line(160, y, 300, y, line_style)
-        line(460, y, 600, y, line_style)
+        line(AMOUNT_X, y, CENTER_X, y, line_style)
+        line(CENTER_X + AMOUNT_X, y, WIDTH, y, line_style)
       end
 
       y += line_height + 3
-      text(290, y, JapaneseBookkeepingSVG.delimited_number(sum_debits).to_s, JapaneseBookkeepingSVG.value_style)
-      text(590, y, JapaneseBookkeepingSVG.delimited_number(sum_credits).to_s, JapaneseBookkeepingSVG.value_style)
+      text(CENTER_X - RIGHT_MARGIN, y, that.delimited_number(sum_debits).to_s, that.value_style)
+      text(WIDTH - RIGHT_MARGIN, y, that.delimited_number(sum_credits).to_s, that.value_style)
 
       y += 8
-      line(160, y, 300, y, line_style)
-      line(460, y, 600, y, line_style)
+      line(AMOUNT_X, y, CENTER_X, y, line_style)
+      line(CENTER_X + AMOUNT_X, y, WIDTH, y, line_style)
       y += 3
-      line(160, y, 300, y, line_style)
-      line(460, y, 600, y, line_style)
+      line(AMOUNT_X, y, CENTER_X, y, line_style)
+      line(CENTER_X + AMOUNT_X, y, WIDTH, y, line_style)
 
-      line(300, t_start_y, 300, y, line_style)
+      line(CENTER_X, t_start_y, CENTER_X, y, line_style)
     end
   end
 

data/lib/japanese_bookkeeping_svg/gem_version.rb

@@ -1,3 +1,3 @@
 module JapaneseBookkeepingSVG
-  VERSION = '0.0.1'.freeze unless defined? JapaneseBookkeepingSVG::Version
+  VERSION = '0.0.2'.freeze unless defined? JapaneseBookkeepingSVG::Version
 end

data/lib/japanese_bookkeeping_svg/svg_generator.rb

@@ -1,5 +1,5 @@
 module JapaneseBookkeepingSVG
-  class SVGGenerator
+  class SVGGenerator # rubocop:disable Metrics/ClassLength
     def initialize(&block)
       @output = []
       @max_width = 0
@@ -32,11 +32,12 @@ module JapaneseBookkeepingSVG
       update_max_width_and_height(x2, y2)
     end
 
-    def text(x, y, text, style = {}) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
+    def text(x, y, text, style = {}) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity
       s = style.clone
-      max_width = self.class.convert_unit(s['textLength'])
-      attrs = ['font-family', 'font-size', 'text-anchor', 'textLength', 'xml:space'].map do |attr|
+      attrs = {}
+      attrs_str = ['font-family', 'font-size', 'text-anchor', 'textLength', 'lengthAdjust', 'xml:space'].map do |attr|
         if s.key?(attr)
+          attrs[attr] = s[attr]
           %( #{attr}="#{s.delete attr}")
         else
           ''
@@ -44,7 +45,7 @@ module JapaneseBookkeepingSVG
       end.join('')
 
       text_lines = []
-      text_lines << %(<text x="#{x}" y="#{y}"#{attrs}#{style_attr(s)}>)
+      text_lines << %(<text x="#{x}" y="#{y}"#{attrs_str}#{style_attr(s)}>)
       max_width_em = 0
       height_em = 0
       dy = 0
@@ -58,8 +59,15 @@ module JapaneseBookkeepingSVG
       text_lines << '</text>'
       @output << text_lines.join('')
 
-      max_width ||= self.class.convert_unit("#{max_width_em}em")
-      max_x = x + max_width
+      max_width = self.class.convert_unit(attrs['textLength'] || "#{max_width_em}em")
+      case attrs['text-anchor']
+      when nil, 'start'
+        max_x = x + max_width
+      when 'middle'
+        max_x = x + max_width / 2
+      when 'end'
+        max_x = x
+      end
       max_y = y + self.class.convert_unit("#{height_em}em")
       update_max_width_and_height(max_x, max_y)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: japanese-bookkeeping-svg
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tasuku SUENAGA a.k.a. gunyarakun
@@ -92,6 +92,7 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".travis.yml"
+- ChangeLog
 - Gemfile
 - LICENSE.txt
 - README.md