id_validator 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ab0ebe883bfc647be492fdbc4fd3b80e35a4a33e2a9f3d9a97802ac4e8e99c4
-  data.tar.gz: 84e81d6823a9aaf1ed12ffa4d1ecb0a35d54ea4c46a96a1aaf46dabb608ba280
+  metadata.gz: 8bd01142bac23a42e104f98cbbbd5f863b187cc2eedcf0a63df79bbb43ea2d78
+  data.tar.gz: 793d358b5a92c519c137f798870b67fc904cb9ae33384ee432097a879c939e76
 SHA512:
-  metadata.gz: 35bc2b3ba1e7deb4d2340d9ad83cbf1e924a5e06917ca77f2e1cb9660ec8c1d3648a68a230955b9ebeb3a1ec56e5adcbfcba6444453a02f4b74efc512ed96938
-  data.tar.gz: 0f77b4441b862d41b6f55d5b9bfc6801d39f986c8273ca1559fff747e849020a1a8bab19dca7481882bd385095c78a76d0d6ee6ea4b934601dcdf8274d2e5113
+  metadata.gz: 5c876bffcf541eed5c9cedcae239cb9c9d3b31f92af697754ce78e7d1cf23c416cbb634d45d62b2103183ac16f239f491519956350bcb7ef2d28cfc3a5dffa84
+  data.tar.gz: dd5a98ed7ed655d159cef97f1295db5e6991522ad039b53ef8f0b9dfd615766a040b0d2cbd6da0e31fa940eb603cd58494fc6fbde40a40dc664e72b991f97001

data/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 renyijiu
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -1,5 +1,6 @@
 [![Build Status](https://travis-ci.com/renyijiu/id_validator.svg?branch=master)](https://travis-ci.com/renyijiu/id_validator)
-
+[![Gem Version](https://badge.fury.io/rb/id_validator.svg)](https://badge.fury.io/rb/id_validator)
+[![Maintainability](https://api.codeclimate.com/v1/badges/c12676a3c0261956e06c/maintainability)](https://codeclimate.com/github/renyijiu/id_validator/maintainability)
 
 # IdValidator
 
@@ -105,7 +106,7 @@ IdValidator.upgrade_id('610104620927690')
 
 - [中华人民共和国民政部：行政区划代码](http://www.mca.gov.cn/article/sj/xzqh/)
 
-- [中华人民共和国行政区划代码历史数据集](https://github.com/jxlwqq/address-code-of-china)
+- [中华人民共和国行政区划代码历史数据集](https://github.com/renyijiu/address-code-of-china)
 
 - [国务院办公厅关于印发《港澳台居民居住证申领发放办法》的通知](http://www.gov.cn/zhengce/content/2018-08/19/content_5314865.htm)
 

data/lib/id_validator/concern/helper.rb

@@ -26,7 +26,7 @@ module IdValidator
 
       # 随意获取一个符合要求的地址码
       def get_random_address_code(reg)
-        keys = IdValidator::Config.address_info.keys.shuffle
+        keys = IdValidator::Config.latest_address_info.keys.shuffle
 
         keys.find { |key| key.to_s =~ reg }.to_s
       end
@@ -51,6 +51,15 @@ module IdValidator
       def get_random_birthday_code
         Time.at(rand * Time.now.to_i).strftime('%Y%m%d')
       end
+
+      # 获取指定区划代码最新的地址名称
+      def get_address_info(address_code)
+        address_code = address_code.to_i
+        address_arr = IdValidator::Config.total_address_info.fetch(address_code, [])
+
+        address = address_arr.sort_by{|a| a[:end_year]}.last || {}
+        address.fetch(:address, nil)
+      end
     end
 
     module Helper
@@ -81,26 +90,15 @@ module IdValidator
 
       # 获取地址信息
       def get_address_info(address_code)
-        address_code_hash = IdValidator::Config.address_info
-        abandoned_address_code_hash = IdValidator::Config.abandoned_address_code
+        province_address_code = "#{address_code[0...2]}0000"
+        city_address_code = "#{address_code[0...4]}00"
 
-        province_address_code = "#{address_code[0...2]}0000".to_i
-        city_address_code = "#{address_code[0...4]}00".to_i
-
-        province = address_code_hash[province_address_code] || abandoned_address_code_hash[province_address_code]
-
-        if address_code[0].to_i != 8
-          city = address_code_hash[city_address_code] || abandoned_address_code_hash[city_address_code]
-          district = address_code_hash[address_code.to_i] ||abandoned_address_code_hash[address_code.to_i]
-        else
-          city = nil
-          district = nil
-        end
+        is_mainland = (address_code[0].to_i != 8)
 
         {
-            province: province,
-            city: city,
-            district: district
+            province: Func.get_address_info(province_address_code),
+            city: is_mainland ? Func.get_address_info(city_address_code) : nil,
+            district: is_mainland ? Func.get_address_info(address_code) : nil
         }
       end
 
@@ -154,9 +152,9 @@ module IdValidator
 
       # 检查是否已经废弃
       def check_is_abandoned(address_code)
-        address = IdValidator::Config.abandoned_address_code.fetch(address_code.to_i, nil)
+        address = IdValidator::Config.latest_address_info.fetch(address_code.to_i, nil)
 
-        !address.nil?
+        address.nil?
       end
 
       # 生成校验码
@@ -174,7 +172,7 @@ module IdValidator
 
       # 生成地址码
       def generate_address_code(address)
-        key = IdValidator::Config.address_info.key(address).to_s
+        key = IdValidator::Config.latest_address_info.key(address).to_s
 
         case
         when key.empty?
@@ -218,8 +216,7 @@ module IdValidator
       def generate_order_code(sex)
         order_code = rand(1..999)
 
-        order_code = order_code % 2 == 0 ? order_code : order_code - 1 if sex == 0
-        order_code = order_code % 2 == 0 ? order_code - 1 : order_code if sex == 1
+        order_code -= 1 if sex != (order_code % 2)
 
         Func.get_str_pad(order_code, 3, '0', false)
       end