jisx0402 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2722816e893e3e002ae219054da5ff44934f5e47
-  data.tar.gz: 0ee5cac5347314583bb13527e4313c92a4c2b94a
+  metadata.gz: 5de0232be3ec65da31e16dc07ab76e475082c427
+  data.tar.gz: 84182ccad0d6aa9720c74eef71680ddab5037707
 SHA512:
-  metadata.gz: e4df6c458b1e2a3af699a6f1a1230c95d93d57ec153b704b4ffd8d48db10a7a1987b11779135961b1dd2cf1661cf1280b4f2f09da4f666a8dda440794a811cbe
-  data.tar.gz: 87a6813bb7798f9f753404cedc8bde35e68ff55b01c51d55ba7a45c2801122b3bbc753261ff01c29460c62b04c70e53f1d7a388673cf28fac7547cff86046128
+  metadata.gz: a3041634f80f824876e0034222f92771280324c2f0d51d21aac03923b4cfcc26a01e93439f6fc39df4fb884182dffe12e74ed9994013a385f930e4131a1617cf
+  data.tar.gz: 4d166002be767dd41e92a70a9bfc0937194d0fd8438f8f2105ec12379996225cc39dfaecbb579b03e73122bdefab7fbaf7387fe1974ff87065aa7584123cd45c

data/jisx0402.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "pry"
 end

data/lib/jisx0402/district_array.rb

@@ -1,11 +1,11 @@
 class Jisx0402::DistrictArray < Array
   def self.wrap(ary)
     this = new
-    ary.map{|e| this << ary }
+    ary.flatten.map{|e| this << e }
     return this
   end
 
   def zipcodes
-    self.flatten.map(&:zipcodes).flatten.uniq
+    self.map(&:zipcodes).flatten.uniq.compact
   end
 end

data/lib/jisx0402/tree.rb

@@ -0,0 +1,52 @@
+class Jisx0402::Tree
+  class Root
+    def initialize
+      @root_node = Node.new
+    end
+
+    def []=(key, val)
+      chars = key.chars
+      @root_node.insert(chars.shift, chars, val)
+    end
+
+    def [](key)
+      chars = key.chars
+      @root_node.search(chars.shift, chars)
+    end
+
+    def values
+      @root_node.values
+    end
+  end
+
+  class Node
+    attr_accessor :value
+
+    def initialize
+      @data = {}
+      @value = nil
+    end
+
+    def insert(key, remain, val)
+      @data[key] ||= Node.new
+      if remain.empty?
+        @data[key].value = val
+      else
+        @data[key].insert(remain.shift, remain, val)
+      end
+    end
+
+    def search(key, remain)
+      return nil unless @data[key]
+      if remain.empty?
+        @data[key].values
+      else
+        @data[key].search(remain.shift, remain)
+      end
+    end
+
+    def values
+      [value, @data.values.map(&:values)].flatten.compact
+    end
+  end
+end

data/lib/jisx0402/version.rb

@@ -1,3 +1,3 @@
 module Jisx0402
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/jisx0402.rb

@@ -1,46 +1,76 @@
 require "jisx0402/version"
 require 'jisx0402/district_array'
+require 'jisx0402/tree'
 require 'msgpack'
+require 'pry'
 
 module Jisx0402
   class << self
+    TREE_INDEX_KEYS = %i(code full)
     def search
       data
     end
 
-    def search(word, by: nil)
-      way = %w(code prefecture prefecture_yomi district district_yomi full full_yomi)
+    def forward_match_by_full(chunk)
+      forward_match_by(:full, chunk)
+    end
+
+    def forward_match_by_code(chunk)
+      forward_match_by(:code, chunk)
+    end
+
+    def forward_match_by(by, chunk)
+      ary = data_trees_index[by.to_sym][chunk.to_s] || []
+      return Jisx0402::DistrictArray.wrap(ary)
+    end
+
+    def match_by_zipcode(zipcode)
+      zipcode_to_jisx0402_table[zipcode]
+    end
 
+    def search(word, by: nil)
       if by
-        result = data.select do |d|
-          d.at(way.index(by.to_s)) =~ /#{word}/
-        end
-        if result.size == 1
-          return Code.new(result.first)
-        else
-          Jisx0402::DistrictArray.wrap(
-            result.map{|r| Code.new(r) }
-          )
-        end
+        result = data.select { |d| d.match?(word, by) }
       else
-        result = way.map do |w|
-          search(word, by: w)
-        end
-        result = result.flatten.uniq{|e| e.code }
-        if result.size == 1
-          return result.first
-        else
-          return Jisx0402::DistrictArray.wrap(result)
-        end
+        result = Code::ATTRS_INDEX.map { |w| search(word, by: w) }.uniq.flatten
+      end
+
+      if result.size == 1
+        return result.first
+      else
+        Jisx0402::DistrictArray.wrap(result)
       end
     end
 
     def data
-      @@data ||= open_msgpack_data('jisx0402.msgpack')
+      @@data ||= open_msgpack_data('jisx0402.msgpack').map do |d|
+        Code.new(d)
+      end
+    end
+
+    def data_trees_index
+      @@data_trees_index ||= begin
+        TREE_INDEX_KEYS.map.with_object({}) do |idx_key, h|
+          h[idx_key] = Jisx0402::Tree::Root.new
+          data.each { |d| h[idx_key][d.send(idx_key.to_sym)] = d }
+        end
+      end
+    end
+
+    def zipcode_to_jisx0402_table
+      @@zipcode_to_jisx0402_table ||= begin
+        jisx0402_to_zipcode_table.map.with_object({}) do |(jisx0402, zipcodes), hash|
+          zipcodes.map do |zipcode|
+            hash[zipcode] = forward_match_by_code(jisx0402).first
+          end
+
+          hash
+        end
+      end
     end
 
-    def zipcodes_table
-      @@zipcodes_table ||= open_msgpack_data('jisx0402_to_zipcode.msgpack')
+    def jisx0402_to_zipcode_table
+      @@jisx0402_to_zipcode_table ||= open_msgpack_data('jisx0402_to_zipcode.msgpack')
     end
 
     def open_msgpack_data(fname)
@@ -51,10 +81,24 @@ module Jisx0402
   end
 
   class Code
+    ATTRS_INDEX = %w(
+      code
+      prefecture
+      prefecture_yomi
+      district
+      district_yomi
+      full
+      full_yomi
+    ).freeze
+
     def initialize(row)
       @row = row
     end
 
+    def match?(word, by)
+      @row.at(ATTRS_INDEX.index(by.to_s)) =~ /#{word}/
+    end
+
     def code
       @row[0]
     end
@@ -80,7 +124,7 @@ module Jisx0402
     end
 
     def zipcodes
-      Jisx0402.zipcodes_table[code_without_checkdigit]
+      Jisx0402.jisx0402_to_zipcode_table[code_without_checkdigit] || []
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jisx0402
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - cnosuke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2016-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: 
 email:
 - shinnosuke@gmail.com
@@ -88,6 +102,7 @@ files:
 - lib/data/jisx0402_to_zipcode.msgpack
 - lib/jisx0402.rb
 - lib/jisx0402/district_array.rb
+- lib/jisx0402/tree.rb
 - lib/jisx0402/version.rb
 homepage: https://github.com/cnosuke/jisx0402
 licenses: