pokeberu 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5eb9b7133595c7905f66170224c8e095f3925b68d810da1eee643d6949db1ebe
-  data.tar.gz: ac4bddab585eab30297808b43fd354f52305e9fbc5be66ce460350c6e11839d1
+  metadata.gz: a5008bc20349e495bbbc583130a96fd500422b582fbd2a2ea0abe586d3e6e8bf
+  data.tar.gz: '09121533a1dc7c0a6c73534a6786276dea6e706b1c8c4a1ffa6bda06a4d7bf25'
 SHA512:
-  metadata.gz: f8463cff066743d76c3b262e8acfb6056b0e3e7c7b2c96a8ca594c92f4a9ed7b2233f54813f7e0b851b0a52a9cc2266b7df97bc100580afe83a890bdb83c1197
-  data.tar.gz: b345f713a02139317d43311da86e613375ebb32ceb7763ff863ef73b67e50cfcd5c174b1b87837e6880b758c4bed038bf099f02c05e9a6e4483da8c1528f6c46
+  metadata.gz: e93a8ee4630b4b06ec80d42ab423b6007722efef21fc55bc309a93109d799740f2794348f4144bdd814e140c3ac6ed599eab1e6bdb1493ea935809e18a9ef28f
+  data.tar.gz: 571a54c4d83b152d3345f8fb0cb3149988524014ff8543bbe09ff9c05210a5b8a94196d559ad85cf26d85ba95448c3aa3c9e19feeb0d6d22abe57ac56963bf38

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+### 0.1.4 - 2019-11-01
+
+* Show help with "h"
+* Quit with "q" instead of "exit"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pokeberu (0.1.3)
+    pokeberu (0.1.4)
       mojinizer
 
 GEM
@@ -23,4 +23,4 @@ DEPENDENCIES
   rake (~> 10.0)
 
 BUNDLED WITH
-   1.17.2
+   1.17.3

data/README.md

@@ -21,7 +21,7 @@ Or install it yourself as:
 
 ## Usage
 
-```
+```ruby
 require 'pokeberu'
 
 converter = Pokeberu::Converter.new
@@ -29,17 +29,20 @@ converter.to_chars('1112324493')
 #=> ｱｲｼﾃﾙ
 ```
 
-OR
+Or
 
 ```
 $ pokeberu
-メッセージを入力してください (exitで終了): 1112324493
-------------------
-|     ｱｲｼﾃﾙ      |
-------------------
+メッセージを入力してください (h=help, q=quit): 1112324493
+--------------------
+| ｱｲｼﾃﾙ            |
+--------------------
+
+メッセージを入力してください (h=help, q=quit): q
+--------------------
+| BYE!             |
+--------------------
 
-メッセージを入力してください (exitで終了): exit
-Bye!
 ```
 
 ## Development
@@ -50,7 +53,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/pokeberu. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/JunichiIto/pokeberu. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 

data/lib/pokeberu/converter.rb

@@ -12,12 +12,64 @@ module Pokeberu
       %w(ら り る れ ろ １ ２ ３ ４ ５),
       %w(わ を ん ゛ ゜ ６ ７ ８ ９ ０),
     ]
+    HELP_COL_WIDTH = 4
+    H_BORDER = '-'
+    V_BORDER = '|'
 
     def to_chars(input)
-      input.scan(/../).map { |row_col|
-        row, col = row_col.chars.map(&:to_i)
-        TABLE[row - 1][col - 1]
-      }.join.katakana.zen_to_han
+      to_c = -> ((row, col)) { TABLE[row][col] }
+
+      input
+        .each_char
+        .map(&:to_i)
+        .map(&:pred)
+        .each_slice(2)
+        .map(&to_c)
+        .join
+        .katakana
+        .zen_to_han
+    end
+
+    def help
+      tr = []
+      TABLE.each.with_index(1) do |row, i|
+        tr << draw_full_border
+        tr << draw_char_cols(row)
+        tr << draw_num_cols(i)
+      end
+      tr << draw_full_border
+      tr.map(&method(:format_row)).join("\n")
+    end
+
+    private
+
+    def draw_char_cols(row)
+      row.map(&method(:format_char)).join(V_BORDER)
+    end
+
+    def format_char(c)
+      c.katakana.center(HELP_COL_WIDTH - 1)
+    end
+
+    def draw_num_cols(i)
+      i = 0 if i > 9
+      from = i * 10
+      to = from + 9
+      nums = (from..to).map(&method(:format_num))
+      nums.rotate(1).join(V_BORDER)
+    end
+
+    def format_num(n)
+      n.to_s.rjust(2, '0').center(HELP_COL_WIDTH)
+    end
+
+    def draw_full_border
+      col_count = TABLE[0].size
+      H_BORDER * (HELP_COL_WIDTH * col_count + col_count - 1)
+    end
+
+    def format_row(text)
+      [V_BORDER, text, V_BORDER].join
     end
   end
 end

data/lib/pokeberu/decorator.rb

@@ -3,11 +3,11 @@ module Pokeberu
     LENGTH = 16
 
     def decorate(text)
-      lines = []
-      lines << hr
-      lines << "| #{text.ljust(LENGTH)} |"
-      lines << hr
-      lines.join("\n")
+      <<-TEXT
+#{hr}
+| #{text.ljust(LENGTH)} |
+#{hr}
+      TEXT
     end
 
     private

data/lib/pokeberu/runner.rb

@@ -13,15 +13,19 @@ module Pokeberu
 
     def run
       loop do
-        print 'メッセージを入力してください (exitで終了): '
+        print 'メッセージを入力してください (h=help, q=quit): '
         input = gets.chomp
-        if input == 'exit'
+        case input
+        when ?q
+          show_pokberu(BYE)
           break
+        when ?h
+          puts @converter.help
+          puts
         else
           show_pokberu(input)
         end
       end
-      show_pokberu(BYE)
     end
 
     private

data/lib/pokeberu/version.rb

@@ -1,3 +1,3 @@
 module Pokeberu
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pokeberu
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Junichi Ito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-12 00:00:00.000000000 Z
+date: 2019-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mojinizer
@@ -77,6 +77,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock