jisx0402 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26f222f7c4d13c8cc3c688882b7781dd4ab889a1
-  data.tar.gz: e8c977c6bf60f7a210792042ce7fc6d7c4245bbd
+  metadata.gz: cd262b9bf6cddc56cf73871c49364a6ec13987d4
+  data.tar.gz: 223a359bfdd1be71794138d842f47ce6dc37e065
 SHA512:
-  metadata.gz: c9b1ebf30cddd6b3667fea0afe4a43dc17455c545ef63c035d05e89333324608bfefbb3725e7d22620cc7e02ad423b44bf8f4447b16668a9eaf181c8360e8721
-  data.tar.gz: d92d57af91e005f284ba356ecb299087a7ca28c46306bda9e711dc214664687d8e2ebb043f4a3a9c292ba4be88192f14299bda92892617a3cbab8c0e2b393070
+  metadata.gz: f9a70e935fb241eb69e21f2d1bbfe1d17cba26e40e427e5d3b14b11177e44a713eeea1ba5dddc9e97672a1fcd5886b3d8562325a610ab5af2a87532e4d41f449
+  data.tar.gz: c999eedc62ef3442956ea5410fad7c0ef289f6fc4e68364b458aa6898edb2c7186dc8378a9bdae6f29f27613021099a2006e33ce2582bb65bad9fa0d57eeff26

data/lib/jisx0402.rb

@@ -124,7 +124,30 @@ module Jisx0402
     end
 
     def code_without_checkdigit
-      @row[0][0..-2]
+      code[0..-2]
+    end
+
+    def district_code
+      @district_code ||= code[2..4]
+    end
+
+    def prefecture?
+      district_code == '000'.freeze
+    end
+
+    GOVERNMENT_ORDINANCE_DESIGNATED_CITY_CODE_LIST = %(100 130 140 150).freeze
+    def government_ordinance_designated_city?
+      @government_ordinance_designated_city ||= begin
+        GOVERNMENT_ORDINANCE_DESIGNATED_CITY_CODE_LIST.include?(district_code)
+      end
+    end
+
+    def ward?
+      @ward ||= (100..199).cover?(district_code.to_i)
+    end
+
+    def prefecture_code
+      code[0..1]
     end
 
     def prefecture(hiragana: false)
@@ -146,7 +169,19 @@ module Jisx0402
     def zipcodes
       Jisx0402.jisx0402_to_zipcode_table[code_without_checkdigit] || []
     end
+
+    def cover?(c)
+      area_code = c.to_s
+      if prefecture?
+        area_code.start_with?(prefecture_code)
+      elsif government_ordinance_designated_city?
+        Jisx0402.forward_match_by_full(full).codes.include?(area_code)
+      else
+        code == area_code
+      end
+    end
   end
 end
 
+# Warmpup zipcodes converting table and district codes tree cache.
 Jisx0402.warmup

data/lib/jisx0402/district_array.rb

@@ -8,4 +8,8 @@ class Jisx0402::DistrictArray < Array
   def zipcodes
     self.map(&:zipcodes).flatten.uniq.compact
   end
+
+  def codes
+    self.map(&:code).flatten.uniq.compact
+  end
 end

data/lib/jisx0402/version.rb

@@ -1,3 +1,3 @@
 module Jisx0402
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jisx0402
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - cnosuke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack