kosi 0.0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81b6af7fc9f98bd40c313d725b1108bad80aca5c
-  data.tar.gz: d325142941f583225c85f82391f6bc1fc2f98094
+  metadata.gz: a7bd11fbbc42a3e1736ca1f487762ef1286d0dce
+  data.tar.gz: ae9dbb560f01a3ae57ae250e7663f8ecc611cfa4
 SHA512:
-  metadata.gz: 36da7e4271b166b40c978c95688c4683103c06f7ff494eabe3c2072eb72ac2bfbb7cae37c39cdc0eb1458523be66a64be84e29000467303c0f85628c3315ccb5
-  data.tar.gz: c34bf70484a25916f44b920548a845ba6e77b87fad82b27f50340c7500c794cc07101ab187e54bddee4073421ef743e0ff9fe70780afe8cb44ba7e178a1d2b28
+  metadata.gz: f92598c5a088961200f617bee9f3a2029ada393c75569d4b2e5bbe0f27fb575711fe34864cd4dddfa46d7beaf41fdfce89bdca82cc814b5443a7b2485fe4279b
+  data.tar.gz: 85c639c7aa8380990da72353d31e815e71131a6e8ebb6393c4ea7531a360c11bde332228797a28a63fbd4f96c9edd61e918f15798631095c4bc871dc559b2e1d

data/CHANGELOG.md

@@ -0,0 +1,16 @@
+## v.1.0.0
+2015/01/17
+
+### Update Feature
+* Unicode の判定を unicode gem の Unicode.width に変更
+
+## v.0.0.2
+2014/06/10
+
+### Update Feature
+* ANSI Escape Sequence利用時にフォーマットが崩れないように変更
+
+## v.0.0.1
+2014/06/09
+
+* first release

data/Gemfile

@@ -1,12 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-gem "rspec", "~> 2.14.1"
-gem "thor", "~> 0.18.1"
-gem "simplecov", "~> 0.8.2"
-gem "activesupport", "~> 4.0.1"
-gem "activemodel", "~> 4.0.2"
-gem "tudu", "~> 0.0.4"
-group :test do
-  gem 'coveralls', require: false
-end

data/README.md

@@ -1,12 +1,13 @@
 # Kosi
 
+[![Gem Version](https://badge.fury.io/rb/kosi.svg)](http://badge.fury.io/rb/kosi)
 [![Build Status](https://travis-ci.org/tbpgr/kosi.png?branch=master)](https://travis-ci.org/tbpgr/kosi)
 [![Coverage Status](https://coveralls.io/repos/tbpgr/kosi/badge.png)](https://coveralls.io/r/tbpgr/kosi)
 [![Code Climate](https://codeclimate.com/github/tbpgr/kosi.png)](https://codeclimate.com/github/tbpgr/kosi)
 
 ターミナルアプリケーション用表フォーマットサポートツール。格子。
 
-## Installation
+## :cloud::arrow_down: Installation
 
 Add this line to your application's Gemfile:
 
@@ -20,9 +21,9 @@ Or install it yourself as:
 
     $ gem install kosi
 
-## Description
+## :man: Description
 2次元配列をテーブルフォーマットにして出力します。  
-terminal-table gemの日本語対応版にあたります。  
+:link: [terminal-table gem](https://github.com/tj/terminal-table) の日本語対応版にあたります。  
 （terminal-tableはASCII対応のみなので全角文字が混ざるとテーブルレイアウトが崩れる）  
 
 具体的には  
@@ -31,8 +32,8 @@ terminal-table gemの日本語対応版にあたります。
 * Unicode 65377(0xff61)..65439(0xff9f) => 半角カナ。1文字分として計算
 * その他 => 全角として扱う。2文字分として計算
 
-## Options
-### Align
+## :o2: Options
+### :icecream: Align
 配置指定。右寄せ、左寄せ、中央を選択可能。  
 
 | 設定可能パラメータ | 説明 |
@@ -41,7 +42,7 @@ terminal-table gemの日本語対応版にあたります。
 |Kosi::Align::TYPE::LEFT|左寄せ。デフォルト|
 |Kosi::Align::TYPE::CENTER|中央|
 
-### ConnectorChar
+### :icecream: ConnectorChar
 表の結合部に表示するテキスト。1文字で指定。  
 下記で言うところの 「+」がConnectorChar。  
 
@@ -51,24 +52,24 @@ terminal-table gemの日本語対応版にあたります。
 +-----+------+-------+
 ~~~
 
-### Header
+### :icecream: Header
 表のヘッダー。配列で指定。  
 デフォルトはヘッダーなし。  
 
-### HorizontalBorderChar
+### :icecream: HorizontalBorderChar
 水平線を1文字で設定。  
-デフォルトは「-」  
+デフォルトは「-」(半角ハイフン)  
 
-### SeparateEachRow
+### :icecream: SeparateEachRow
 各行に区切り線を入れるかどうか。  
 デフォルトは「false」  
 
-### VerticalBorderChar
+### :icecream: VerticalBorderChar
 垂直線を1文字で設定。  
-デフォルトは「|」  
+デフォルトは「|」（パイプ）  
 
-## Usage
-### オプション指定なし  
+## :scroll: Usage
+### :shaved_ice: オプション指定なし  
 ~~~ruby
 require 'kosi'
 
@@ -76,7 +77,7 @@ kosi = Kosi::Table.new
 print kosi.render([[*'a'..'c'], ['ほｹﾞ1', 'ひｹﾞ22', 'へｹﾞ333']])
 ~~~
 
-出力  
+* 出力  
 ※GitHubの表示上ずれているかもしれませんが、等幅フォント利用時にそろいます。
 
 ~~~
@@ -86,7 +87,7 @@ print kosi.render([[*'a'..'c'], ['ほｹﾞ1', 'ひｹﾞ22', 'へｹﾞ333']])
 +-----+------+-------+
 ~~~
 
-### Align指定
+### :shaved_ice: Align指定
 ~~~ruby
 require 'kosi'
 
@@ -98,7 +99,7 @@ kosi = Kosi::Table.new({align: Kosi::Align::TYPE::LEFT})
 print kosi.render([[*'a'..'c'], ['ほｹﾞ1', 'ひｹﾞ22', 'へｹﾞ333']])
 ~~~
 
-出力  
+* 出力  
 
 ~~~
 +-----+------+-------+
@@ -115,7 +116,7 @@ print kosi.render([[*'a'..'c'], ['ほｹﾞ1', 'ひｹﾞ22', 'へｹﾞ333']])
 +-----+------+-------+
 ~~~
 
-### ConnectorChar指定
+### :shaved_ice: ConnectorChar指定
 ~~~ruby
 require 'kosi'
 
@@ -127,7 +128,7 @@ kosi = Kosi::Table.new({connector_char: '$'})
 print kosi.render([[*'a'..'c'], ['ほｹﾞ1', 'ひｹﾞ22', 'へｹﾞ333']])
 ~~~
 
-出力  
+* 出力  
 
 ~~~
 +-----+------+-------+
@@ -145,7 +146,7 @@ $-----$------$-------$
 ~~~
 
 
-### Header指定
+### :shaved_ice: Header指定
 ~~~ruby
 require 'kosi'
 
@@ -156,7 +157,7 @@ print kosi.render([[*'a'..'c'], ['ほｹﾞ1', 'ひｹﾞ22', 'へｹﾞ333']])
 ~~~
 
 
-出力  
+* 出力  
 
 ~~~
 +-----+------+-------+
@@ -171,7 +172,7 @@ print kosi.render([[*'a'..'c'], ['ほｹﾞ1', 'ひｹﾞ22', 'へｹﾞ333']])
 +-------+-------+-------+
 ~~~
 
-### HorizontalBorderChar指定
+### :shaved_ice: HorizontalBorderChar指定
 ~~~ruby
 require 'kosi'
 
@@ -181,7 +182,7 @@ kosi = Kosi::Table.new({horizontal_border_char: '*'})
 print kosi.render([[*'a'..'c'], ['ほｹﾞ1', 'ひｹﾞ22', 'へｹﾞ333']])
 ~~~
 
-出力  
+* 出力  
 
 ~~~
 +-----+------+-------+
@@ -194,7 +195,7 @@ print kosi.render([[*'a'..'c'], ['ほｹﾞ1', 'ひｹﾞ22', 'へｹﾞ333']])
 +*****+******+*******+
 ~~~
 
-### SeparateEachRow指定
+### :shaved_ice: SeparateEachRow指定
 ~~~ruby
 require 'kosi'
 
@@ -204,7 +205,7 @@ kosi = Kosi::Table.new({separate_each_row: true})
 print kosi.render([[*'a'..'c'], ['ほｹﾞ1', 'ひｹﾞ22', 'へｹﾞ333'], [*'a'..'c']])
 ~~~
 
-出力  
+* 出力  
 
 ~~~
 +-----+------+-------+
@@ -221,7 +222,7 @@ print kosi.render([[*'a'..'c'], ['ほｹﾞ1', 'ひｹﾞ22', 'へｹﾞ333'], [
 +-----+------+-------+
 ~~~
 
-### VerticalBorderChar指定
+### :shaved_ice: VerticalBorderChar指定
 ~~~ruby
 require 'kosi'
 
@@ -231,7 +232,7 @@ kosi = Kosi::Table.new({vertical_border_char: '#'})
 print kosi.render([[*'a'..'c'], ['ほｹﾞ1', 'ひｹﾞ22', 'へｹﾞ333']])
 ~~~
 
-出力  
+* 出力  
 
 ~~~
 +-----+------+-------+
@@ -244,7 +245,7 @@ print kosi.render([[*'a'..'c'], ['ほｹﾞ1', 'ひｹﾞ22', 'へｹﾞ333']])
 +-----+------+-------+
 ~~~
 
-### 複合オプション
+### :shaved_ice: 複合オプション
 様々なオプションを一気に指定してみます
 
 ~~~ruby
@@ -263,7 +264,7 @@ kosi = Kosi::Table.new(
 print kosi.render([[*'a'..'c'], ['ほｹﾞ1', 'ひｹﾞ22', 'へｹﾞ333'], [*'a'..'c']])
 ~~~
 
-出力  
+* 出力  
 
 ~~~
 x*******x*******x*******x
@@ -277,12 +278,7 @@ x*******x*******x*******x
 x*******x*******x*******x
 ~~~
 
-## History
-
-* version 0.0.2 : ANSI Escape Sequence利用時にフォーマットが崩れないように変更
-* version 0.0.1 : first release
-
-## Contributing
+## :two_men_holding_hands: Contributing :two_women_holding_hands:
 
 1. Fork it ( https://github.com/tbpgr/kosi/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)

data/kosi.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'activesupport', '~> 4.0.1'
-  spec.add_runtime_dependency 'activemodel', '~> 4.0.2'
+  spec.add_runtime_dependency 'unicode', '>= 0.4.4'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 2.14.1'
   spec.add_development_dependency 'simplecov', '~> 0.8.2'
+  spec.add_development_dependency 'coveralls'
 end

data/lib/kosi/version.rb

@@ -1,4 +1,4 @@
 # TableFormat for Terminal(Use Japanese Charactors)
 module Kosi
-  VERSION = '0.0.2'
+  VERSION = '1.0.0'
 end

data/lib/table.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require 'kosi'
 require 'kosi/validators'
+require 'unicode'
 
 # TableFormat for Terminal(Use Japanese Charactors)
 module Kosi
@@ -59,20 +60,11 @@ module Kosi
 
     def ascii1_other2_size(column)
       column.split('').reduce(0) do |a, e|
-        a += half?(e) ? 1 : 2
+        a += Unicode.width(e)
         a
       end
     end
 
-    def half?(char)
-      case char.ord
-      when 1..127, 65_377..65_439
-        true
-      else
-        false
-      end
-    end
-
     def get_table_format_rows(rows, max_lengths, header)
       top_bottom_line = top_bottom(max_lengths)
       results = [top_bottom_line]

data/spec/kosi/validators/each_array_length_validator_spec.rb

@@ -1,56 +1,56 @@
-# encoding: utf-8
-require 'spec_helper'
-require 'kosi/validators/each_array_length_validator'
-
-describe Kosi::Validators::EachArrayLength do
-  context :validate do
-    cases = [
-      {
-        case_no: 1,
-        case_title: 'Same Length Array case',
-        inputs: [[*1..5], [*6..10]],
-      },
-      {
-        case_no: 2,
-        case_title: 'Zero Length Array case',
-        inputs: [[], []],
-      },
-      {
-        case_no: 3,
-        case_title: 'Different Length Array case',
-        inputs: [[*1..5], [*6..11]],
-        expect_error: true,
-        error_class: ArgumentError
-      },
-    ]
-
-    cases.each do |c|
-      it "|case_no=#{c[:case_no]}|case_title=#{c[:case_title]}" do
-        begin
-          case_before c
-
-          # -- given --
-          # nothing
-
-          # -- when/then --
-          if c[:expect_error]
-            expect{ Kosi::Validators::EachArrayLength.validate(c[:inputs]) }.to raise_error(c[:error_class])
-            next
-          else
-            expect{ Kosi::Validators::EachArrayLength.validate(c[:inputs]) }.not_to raise_error
-          end
-        ensure
-          case_after c
-        end
-      end
-
-      def case_before(c)
-        # implement each case before
-      end
-
-      def case_after(c)
-        # implement each case after
-      end
-    end
-  end
-end
+# encoding: utf-8
+require 'spec_helper'
+require 'kosi/validators/each_array_length_validator'
+
+describe Kosi::Validators::EachArrayLength do
+  context :validate do
+    cases = [
+      {
+        case_no: 1,
+        case_title: 'Same Length Array case',
+        inputs: [[*1..5], [*6..10]],
+      },
+      {
+        case_no: 2,
+        case_title: 'Zero Length Array case',
+        inputs: [[], []],
+      },
+      {
+        case_no: 3,
+        case_title: 'Different Length Array case',
+        inputs: [[*1..5], [*6..11]],
+        expect_error: true,
+        error_class: ArgumentError
+      },
+    ]
+
+    cases.each do |c|
+      it "|case_no=#{c[:case_no]}|case_title=#{c[:case_title]}" do
+        begin
+          case_before c
+
+          # -- given --
+          # nothing
+
+          # -- when/then --
+          if c[:expect_error]
+            expect { Kosi::Validators::EachArrayLength.validate(c[:inputs]) }.to raise_error(c[:error_class])
+            next
+          else
+            expect { Kosi::Validators::EachArrayLength.validate(c[:inputs]) }.not_to raise_error
+          end
+        ensure
+          case_after c
+        end
+      end
+
+      def case_before(c)
+        # implement each case before
+      end
+
+      def case_after(c)
+        # implement each case after
+      end
+    end
+  end
+end

data/spec/kosi/validators/row_type_validator_spec.rb

@@ -1,51 +1,51 @@
-# encoding: utf-8
-require 'spec_helper'
-require 'kosi/validators/row_type_validator'
-
-describe Kosi::Validators::RowType do
-  context :validate do
-    cases = [
-      {
-        case_no: 1,
-        case_title: 'Array case',
-        inputs: ['Array'],
-      },
-      {
-        case_no: 2,
-        case_title: 'Not Array case',
-        inputs: "not Array",
-        expect_error: true,
-        error_class: ArgumentError
-      },
-    ]
-
-    cases.each do |c|
-      it "|case_no=#{c[:case_no]}|case_title=#{c[:case_title]}" do
-        begin
-          case_before c
-
-          # -- given --
-          # nothing
-
-          # -- when/then --
-          if c[:expect_error]
-            expect{ Kosi::Validators::RowType.validate(c[:inputs]) }.to raise_error(c[:error_class])
-            next
-          else
-            expect{ Kosi::Validators::RowType.validate(c[:inputs]) }.not_to raise_error
-          end
-        ensure
-          case_after c
-        end
-      end
-
-      def case_before(c)
-        # implement each case before
-      end
-
-      def case_after(c)
-        # implement each case after
-      end
-    end
-  end
-end
+# encoding: utf-8
+require 'spec_helper'
+require 'kosi/validators/row_type_validator'
+
+describe Kosi::Validators::RowType do
+  context :validate do
+    cases = [
+      {
+        case_no: 1,
+        case_title: 'Array case',
+        inputs: ['Array'],
+      },
+      {
+        case_no: 2,
+        case_title: 'Not Array case',
+        inputs: 'not Array',
+        expect_error: true,
+        error_class: ArgumentError
+      },
+    ]
+
+    cases.each do |c|
+      it "|case_no=#{c[:case_no]}|case_title=#{c[:case_title]}" do
+        begin
+          case_before c
+
+          # -- given --
+          # nothing
+
+          # -- when/then --
+          if c[:expect_error]
+            expect { Kosi::Validators::RowType.validate(c[:inputs]) }.to raise_error(c[:error_class])
+            next
+          else
+            expect { Kosi::Validators::RowType.validate(c[:inputs]) }.not_to raise_error
+          end
+        ensure
+          case_after c
+        end
+      end
+
+      def case_before(c)
+        # implement each case before
+      end
+
+      def case_after(c)
+        # implement each case after
+      end
+    end
+  end
+end

data/spec/table_spec.rb

@@ -71,7 +71,7 @@ describe Kosi::Table do
       {
         case_no: 2,
         case_title: 'use header case',
-        options: {header: %w{header1 header2 header3}},
+        options: { header: %w(header1 header2 header3) },
         inputs: [[1, 2, 3], [1111, '２22アｱ', '３3イｲ']],
         expected: <<-EOS
 +-------+-------+-------+
@@ -85,7 +85,7 @@ describe Kosi::Table do
       {
         case_no: 3,
         case_title: 'Enable SeparateEachRow case',
-        options: {separate_each_row: true},
+        options: { separate_each_row: true },
         inputs: [[1, 2, 3], [1111, '２22アｱ', '３3イｲ'], [1, 2, 3]],
         expected: <<-EOS
 +----+-------+------+
@@ -108,6 +108,18 @@ describe Kosi::Table do
 +-----+
         EOS
       },
+      {
+        case_no: 5,
+        case_title: 'Unicode width case',
+        options: nil,
+        inputs: [['$100'], ['¥100']],
+        expected: <<-EOS
++----+
+|$100|
+|¥100|
++----+
+        EOS
+      },
     ]
 
     cases.each do |c|

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kosi
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - tbpgr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2015-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: unicode
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.0.1
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +80,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.2
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: terminal table format for japanese
 email:
 - tbpgr@tbpgr.jp
@@ -106,6 +106,7 @@ files:
 - .rspec
 - .rubocop.yml
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -155,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: terminal table format for japanese
@@ -170,3 +171,4 @@ test_files:
 - spec/kosi/vertical_border_char_spec.rb
 - spec/spec_helper.rb
 - spec/table_spec.rb
+has_rdoc: