tataki 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2ee32cd3111b09f4e62781debac62e4b5685017
-  data.tar.gz: 90a9ae1f2b96841d50ec13cefc9740fb43f7557c
+  metadata.gz: aa8fec9bc8527b014ade8528d1cd9cefa2223c59
+  data.tar.gz: 39f9543bbcdf66bb83fc3062a019c126064cbde2
 SHA512:
-  metadata.gz: ba6ba513abcfbd2b1b31250cc592a094a39ab9c5dc995741dcbfa864091f7e96f1f73119ea3965f5b49ec4329589731219c62fca4c6df8096ec10b3001bfe6c1
-  data.tar.gz: 94070b7ba996462447f5e942c6193829ab8c01cb10687e5812d7d97954710168fcf6fe2443a6b736f79595bc7b21af29830ea4cbfec74842165a68060ea00832
+  metadata.gz: d1b330894a4b2bd8d159b6ebabb3be71486ba820f87feee4a744682a83e3a93936acbeacd48bfd44cf80ecec99f197b2da6d354e97e2048e067fe1bfe73492e0
+  data.tar.gz: ff9e1b5643bb7d748bfe0fadfcd191ebf270103198662d5e2f6c2d4aa3171d8c29bc4bebbe8a58ce4cbf67853ea9a8d87a5f2a43d4c1c5de2cbdff158627c4a5

data/lib/tataki/converters/skk_jisyo.rb

@@ -7,30 +7,30 @@ require "trie"
 module Tataki
   module Converter
     class SkkJisyo < Base
+      DEFAULT_CONFIG_PATH = "../../../../data/skk-jisyo.yml"
       DEFAULT_JISYO_SUFFIXES = %w[M]
 
-      def initialize(options = {})
-        options = {
-          :jisyo_paths => DEFAULT_JISYO_SUFFIXES.map{|suffix| Skk::Jisyo.path(suffix) },
-          :trie_cache_path => trie_cache_path(DEFAULT_JISYO_SUFFIXES.join("_")),
-        }.merge(options)
-        config_file = File.expand_path("../../../../data/skk-jisyo.yml", __FILE__)
+      def initialize(jisyo_types = DEFAULT_JISYO_SUFFIXES)
+        @jisyo_paths = jisyo_types.map{|suffix| Skk::Jisyo.path(suffix) }
+        @trie_cache_path = trie_cache_path(jisyo_types.join("_"))
+
+        config_file = File.expand_path(DEFAULT_CONFIG_PATH, __FILE__)
         config_data = YAML.load_file(config_file)
         @roman_data = config_data["roman_table"]
         @ignore_kana = config_data["ignore_kana"]
-        @trie = setup_jisyo(options).freeze
+        @trie = setup_jisyo.freeze
       end
 
-      def setup_jisyo(options)
-        if File.exist?(options[:trie_cache_path])
-          trie = Marshal.load(File.read(options[:trie_cache_path]))
+      def setup_jisyo
+        if File.exist?(@trie_cache_path)
+          trie = Marshal.load(File.read(@trie_cache_path))
         else
           trie = Trie.new
-          options[:jisyo_paths].each do |jisyo_path|
+          @jisyo_paths.each do |jisyo_path|
             add_jisyo(trie, jisyo_path)
           end
-          File.binwrite(options[:trie_cache_path], Marshal.dump(trie))
-          File.write("#{options[:trie_cache_path]}.timestamp", Time.now.to_s)
+          File.binwrite(@trie_cache_path, Marshal.dump(trie))
+          File.write("#{@trie_cache_path}.timestamp", Time.now.to_s)
         end
         trie
       end

data/lib/tataki/version.rb

@@ -1,3 +1,3 @@
 module Tataki
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/tataki/converters/skk_jisyo_spec.rb

@@ -2,7 +2,6 @@
 require "spec_helper"
 
 describe Tataki::Converter::SkkJisyo do
-  let(:converter) { Tataki::Converter::SkkJisyo.new }
 
   describe ".to_kana" do
     shared_examples "converts_kana" do |sentence, kana|
@@ -11,12 +10,24 @@ describe Tataki::Converter::SkkJisyo do
       end
     end
 
-    include_examples "converts_kana", "", ""
-    include_examples "converts_kana", "漢字", "かんじ"
-    include_examples "converts_kana", "漢字変換する", "かんじへんかんする"
-    include_examples "converts_kana", "隣りの", "となりの"
-    include_examples "converts_kana", "隣りはよく柿食う", "となりはよくかきくう"
-    include_examples "converts_kana", "安心安全", "あんしんあんぜん"
-    include_examples "converts_kana", "毎朝新聞配達をしています", "まいあさしんぶんはいたつをしています"
+    context "with default config" do
+      let(:converter) { Tataki::Converter::SkkJisyo.new }
+
+      include_examples "converts_kana", "", ""
+      include_examples "converts_kana", "漢字", "かんじ"
+      include_examples "converts_kana", "漢字変換する", "かんじへんかんする"
+      include_examples "converts_kana", "隣りの", "となりの"
+      include_examples "converts_kana", "隣りはよく柿食う", "となりはよくかきくう"
+      include_examples "converts_kana", "安心安全", "あんしんあんぜん"
+      include_examples "converts_kana", "毎朝新聞配達をしています", "まいあさしんぶんはいたつをしています"
+    end
+
+    context "with jinmei jisyo" do
+      let(:converter) { Tataki::Converter::SkkJisyo.new(%w[jinmei]) }
+
+      include_examples "converts_kana", "", ""
+      include_examples "converts_kana", "漢字", "漢字"
+      include_examples "converts_kana", "半澤直樹", "はんざわなおき"
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tataki
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - hogelog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: skk-jisyo