pokebell 0.0.2 → 0.1.0

data/Gemfile

@@ -12,3 +12,5 @@ group :development do
   gem "jeweler", "~> 2.0.1"
   gem "simplecov", ">= 0"
 end
+
+gem "moji", "1.6"

data/README.md

@@ -1,6 +1,6 @@
 # pokebell
 
-This gem is convert from Japanese message written by Hiragana / Katakana / alphabet / digit to Japanese pager aka "Pokebell" 2-digits format codes.
+This gem is convert from Japanese message written by Hiragana / Katakana / alphabet / digit to Japanese pager aka "Pokebell" 2-digits format codes, and from the code to Katakana message.
 
 ## usage
 
@@ -8,8 +8,15 @@ This gem is convert from Japanese message written by Hiragana / Katakana / alpha
 pokeberu = Pokebell.new("ぽけべる")
 pokeberu.pokebell #=> "650524640493"
 pokeberu.code     #=> "650524640493"
-pokeberu.str      #=> "ぽけべる"
-pokeberu.to_a     #=> "ぽけべる"
+pokeberu.str      #=> "ポケベル"
+pokeberu.to_s     #=> "ポケベル"
+```
+```
+pokeberu = Pokebell.number("650524640493")
+pokeberu.pokebell #=> "650524640493"
+pokeberu.code     #=> "650524640493"
+pokeberu.str      #=> "ポケベル"
+pokeberu.to_s     #=> "ポケベル"
 ```
 
 ## convert table
@@ -53,12 +60,18 @@ Pokebell.new("ruby").pokebell   #=> "48561750"
 Pokebell.new("hello pokebell").pokebell
 #=> "2810373730884630361017103737"
 ```
-
+```
+Pokebell.number("61056993").str #=> "パール"
+Pokebell.number("93620469").str #=> "ルビー"
+Pokebell.number("46104837").str #=> "ＰＥＲＬ"
+Pokebell.number("48561750").str #=> "ＲＵＢＹ"
+Pokebell.number("2810373730884630361017103737").str
+#=> "ＨＥＬＬＯ　ＰＯＫＥＢＥＬＬ"
+```
 ##TODO
 
 * RSpec
 * Emoji (Clock="78", Phone="79", Cup="70", Heart="89")
-* Convert (Decode) from codes to Japanese charactors
 
 ## Contributing to pokebell
  

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.0

data/lib/pokebell.rb

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 # coding: utf-8
+
+require 'moji'
+
 require 'nkf'
 
 class Pokebell
@@ -7,23 +10,82 @@ class Pokebell
   # @param str [String] message (contains Hiragana / Katakana / alphabet / digit)
   # @return [Pokebell]
   def initialize(str)
-    @str = str.gsub(/\\/, "")
+    @str = Moji.han_to_zen(hiragana2katakana(str.upcase.gsub(/\\/, "")))
     @pokebell = pick_hankaku_code(zenkaku2hankaku(@str)).map{ |code| encode(code) }.join
   end
   
+  # Set Pokebell code and make message string.
+  # @param num [String] Pokebell code (length must be even)
+  # @raise [ArgumentError] if param does not makes digit or its length is not even
+  # @return [Pokebell]
+  # @since 0.1.0
+  def self.number(num)
+    num_str = num.to_s
+    unless num_str == num_str[/(\d\d)+/]
+      raise ArgumentError, "wrong digit length (must be even digits)"
+    end
+    two_digits_array = num_str.scan(/\d\d/)
+    str_array_with_daku_handaku = make_str_array(two_digits_array)
+    str_array = []
+    loop do
+      follow_char = nil
+      char = str_array_with_daku_handaku.shift
+      break unless char
+      follow_char_test = str_array_with_daku_handaku.first
+      unless follow_char_test
+        str_array << char
+        break
+      end
+      if follow_char_test[/[゛゜]/]
+        follow_char = str_array_with_daku_handaku.shift 
+        char = merge_daku_handaku(char, follow_char)
+      end
+      str_array << char
+    end
+    str = str_array.join
+    Pokebell.new(str)
+  end
+  
+  # @return [String] 
+  # @since 0.1.0
+  def inspect
+    %[#<str="#{@str}", pokebell="#{@pokebell}">]
+  end
+  
   # @!method pokebell
   # @return [String] Pokebell codes (2-digit string)
   attr_reader :pokebell
   alias :code :pokebell
+  alias :num :pokebell
   
   # @!method str
-  # @return [String] original message
+  # @return [String] message (convert to Zenkaku charactors, especially from Hiragana to Katakana)
   attr_reader :str
-  alias :to_a :str
+  alias :to_s :str
+  alias :text :str
   
   private
+  TABLE = [
+    %w[０ ワ ヲ ン ゛ ゜ ６ ７ ８ ９], 
+    %w[Ｅ ア イ ウ エ オ Ａ Ｂ Ｃ Ｄ], 
+    %w[Ｊ カ キ ク ケ コ Ｆ Ｇ Ｈ Ｉ], 
+    %w[Ｏ サ シ ス セ ソ Ｋ Ｌ Ｍ Ｎ], 
+    %w[Ｔ タ チ ツ テ ト Ｐ Ｑ Ｒ Ｓ], 
+    %w[Ｙ ナ ニ ヌ ネ ノ Ｕ Ｖ Ｗ Ｘ], 
+    %w[／ ハ ヒ フ ヘ ホ Ｚ ？ ！ ー], 
+    ([""] + %w[マ ミ ム メ モ ￥ ＆] + ["", ""]), 
+    ([""] + %w[ヤ （ ユ ） ヨ ＊ ＃ 　] + [""]), 
+    %w[５ ラ リ ル レ ロ １ ２ ３ ４], 
+  ]
+  DAKU_BASE_REGEX = /[カキクケコサシスセソタチツテト]/
+  DAKU_HANDAKU_BASE_REGEX = /[ハヒフヘホ]/
+  
   def zenkaku2hankaku(str)
-    NKF.nkf('-j -Z4', NKF.nkf('-w -h2', str))
+    NKF.nkf('-jZ4', str)
+  end
+  
+  def hiragana2katakana(str)
+    NKF.nkf("-wh2", str).gsub("¥", "￥")
   end
   
   def escape_char?(char)
@@ -53,6 +115,8 @@ class Pokebell
       else
         raise "out of aiming JIS charactor area"
       end
+    elsif char.unpack("C") == "\x21".unpack("C")
+      
     else
       raise "out of aiming JIS charactor area"
     end
@@ -157,4 +221,24 @@ class Pokebell
       raise "out of aiming charactor area"
     end
   end
+  
+  def self.make_str_array(array) 
+    array.map { |digits|
+      i = digits[0].to_i
+      j = digits[1].to_i
+      TABLE[i][j]
+    }
+  end
+  
+  def self.merge_daku_handaku(char, follow_char)
+    if follow_char[/゛/] && char[Regexp.union(DAKU_BASE_REGEX, DAKU_HANDAKU_BASE_REGEX)]
+      [char.unpack("U*").first + 1].pack("U")
+    elsif follow_char[/゜/] && char[DAKU_HANDAKU_BASE_REGEX]
+      [char.unpack("U*").first + 2].pack("U")
+    elsif follow_char[/゛/] && char[/ウ/]
+      "ヴ"
+    else
+      char + follow_char
+    end
+  end
 end

data/pokebell.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "pokebell"
-  s.version = "0.0.2"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["riocampos"]
-  s.date = "2014-06-26"
+  s.date = "2014-07-29"
   s.description = "Japanese charactor displayed by hiragana, alphabet, or number encode to 2-digit in used \"Pokebell\" pager."
   s.email = "riocampos22@gmail.com"
   s.extra_rdoc_files = [
@@ -38,12 +38,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<moji>, ["= 1.6"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
+      s.add_dependency(%q<moji>, ["= 1.6"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
@@ -51,6 +53,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
+    s.add_dependency(%q<moji>, ["= 1.6"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])

data/spec/pokebell_spec.rb

@@ -1,7 +1,67 @@
+#!/usr/bin/env ruby
+# coding: utf-8
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
+match_hash = {
+  "カキクケコ" => "2122232425",
+  "ガギグゲゴ" => "21042204230424042504",
+  "パピプペポ" => "61056205630564056505",
+  "ヤユヨ" => "818385",
+  "（）" => "8284",
+  "ラリルレロ" => "9192939495",
+  "ワヲン" => "010203",
+  "ＡＢＣＤＥ" => "1617181910",
+  "Ｚ？！ー／" => "6667686960",
+  "￥＆＊＃　" => "7677868788",
+  "１２３４５６７８９０" => "96979899900607080900",
+  "パンガオイシイー" => "61050321041512321269",
+  "ヴアイオリン" => "13041112159203",
+}  
+
+match_hash1 = match_hash.merge({
+  "あいうえお" => "1112131415",
+  "ｻｼｽｾｿ" => "3132333435",
+  "゛゜" => "0405",
+  "あ゛" => "1104",
+  "ﾊﾞﾋﾞﾌﾞﾍﾞﾎﾞ" => "61046204630464046504",
+  "67890" => "0607080900",
+  "hello pokebell" => "2810373730884630361017103737",
+})
+match_hash2 = match_hash.merge({
+  "　゛　゜" => "88048805",
+  "バビブベボ" => "61046204630464046504",
+  "６７８９０" => "0607080900",
+  "ＨＥＬＬＯ　ＰＯＫＥＢＥＬＬ" => "2810373730884630361017103737",
+})
+
 describe "Pokebell" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
+  match_hash1.each_pair do |str, num|
+    context %[give string "#{str}"] do
+      it do
+        str_pokebell = Pokebell.new(str)
+        expect(str_pokebell.pokebell).to eq num
+      end
+    end
+  end
+  
+  context "give number 111" do
+    it 'raise ArgumentError' do
+      expect { Pokebell.number("111") }.to raise_error ArgumentError, "wrong digit length (must be even digits)"
+    end
+  end
+  
+  context 'give number "abc"' do
+    it 'raise ArgumentError' do
+      expect { Pokebell.number("abc") }.to raise_error ArgumentError, "wrong digit length (must be even digits)"
+    end
+  end
+  
+  match_hash2.each_pair do |str, num|
+    context %[give number "#{num}"] do
+      it do
+        num_pokebell = Pokebell.number(num)
+        expect(num_pokebell.str).to eq str
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -8,7 +8,8 @@ end
 
 SimpleCov.configure do
   clean_filters
-  load_adapter 'test_frameworks'
+#  load_adapter 'test_frameworks'
+  load_profile 'test_frameworks'
 end
 
 ENV["COVERAGE"] && SimpleCov.start do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pokebell
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: moji
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2424198896221565706
+      hash: 2450097076129829719
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: