unidom-geo-china 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fd4c0d9e03b26fe74231108e84f1213bcad8a3f
-  data.tar.gz: 2b2061f680dfdcc795f8a2ab0abe8756a1e1f380
+  metadata.gz: f0c8fbbaead8184aba625abc654d73c50a7d9070
+  data.tar.gz: 1e2e037b320f0139fba69b0457825e9ecf8db5ab
 SHA512:
-  metadata.gz: a1c6a285032be9c30d0b0dbd39fb5120e2a682b534f44165efabba458b97155dd178578ffc4f8e02d8f169344245608c72dc41576a7e037622ef26f3ef494742
-  data.tar.gz: 997a811fb875dda09525b31b402b4da90d97ba7ed2ca38d7d196d19739d78df5bc0023da40ff7b7e57a19107110da3e16ba77aaea9a1ca39467f5a58981c80e3
+  metadata.gz: 2e2567f1d2bde59f0713334aec9fc5da00880a780dcca69936c88ad7cdf990ac4a6b46bb6656c5ca63e62d28ff428fb5117f4b4616269dfa66a13478746517c8
+  data.tar.gz: e3882b5ed976a72c8c81bce624b77640fe2622b6d58dd8dab7f7b3e6279dcb22252c593c0be89cb77dca71fe3cc0c520482c5c1e50440afb93316936360e9147

data/app/models/unidom/geo/china/region.rb

@@ -54,14 +54,20 @@ class Unidom::Geo::China::Region < Unidom::Geo::China::ApplicationRecord
     numeric_code[0..1]
   end
 
+  ##
+  # 获取行政区划代码的中间 2 位数字。
   def numeric_code_middle
     numeric_code[2..3]
   end
 
+  ##
+  # 获取行政区划代码的后 2 位数字。
   def numeric_code_suffix
     numeric_code[4..5]
   end
 
+  ##
+  # 判断行政区划代码的中间 2 位数字是否为 00 。
   def numeric_code_middle_empty?
     '00'==numeric_code_middle
   end

data/app/models/unidom/geo/china/town.rb

@@ -8,7 +8,7 @@ class Unidom::Geo::China::Town < Unidom::Geo::China::ApplicationRecord
   include Unidom::Common::Concerns::ModelExtension
 
   validates :numeric_code, length: { minimum: self.columns_hash['numeric_code'].limit }, numericality: { only_integer: true, greater_than_or_equal_to: 0 }
-  validates :name,         presence: true, length: { in: 2..self.columns_hash['name'].limit      }
+  validates :name,         presence: true, length: { in: 2..self.columns_hash['name'].limit }
 
   belongs_to :region, class_name: 'Unidom::Geo::China::Region'
 

data/lib/rspec/models/unidom/geo/china/region_spec.rb

@@ -8,6 +8,61 @@ describe Unidom::Geo::China::Region, type: :model do
   after :each do
   end
 
+  it 'should consider Beijing under a municipality direct under central government' do
+    region = described_class.numeric_coded_as('110000').first_or_initialize
+    expect(region.under_mducg?).to be_truthy
+  end
+
+  it 'should consider Chaoyang under a municipality direct under central government' do
+    region = described_class.numeric_coded_as('110105').first_or_initialize
+    expect(region.under_mducg?).to be_truthy
+  end
+
+  it 'should consider Tainjin under a municipality direct under central government' do
+    region = described_class.numeric_coded_as('120000').first_or_initialize
+    expect(region.under_mducg?).to be_truthy
+  end
+
+  it 'should consider Nankai under a municipality direct under central government' do
+    region = described_class.numeric_coded_as('120104').first_or_initialize
+    expect(region.under_mducg?).to be_truthy
+  end
+
+  it 'should consider Shanghai under a municipality direct under central government' do
+    region = described_class.numeric_coded_as('310000').first_or_initialize
+    expect(region.under_mducg?).to be_truthy
+  end
+
+  it 'should consider Xuhui under a municipality direct under central government' do
+    region = described_class.numeric_coded_as('310104').first_or_initialize
+    expect(region.under_mducg?).to be_truthy
+  end
+
+  it 'should consider Chongqing under a municipality direct under central government' do
+    region = described_class.numeric_coded_as('500000').first_or_initialize
+    expect(region.under_mducg?).to be_truthy
+  end
+
+  it 'should consider Shapinba under a municipality direct under central government' do
+    region = described_class.numeric_coded_as('500106').first_or_initialize
+    expect(region.under_mducg?).to be_truthy
+  end
+
+  it 'should not consider Sichuan under a municipality direct under central government' do
+    region = described_class.numeric_coded_as('510000').first_or_initialize
+    expect(region.under_mducg?).to be_falsey
+  end
+
+  it 'should not consider Chengdu under a municipality direct under central government' do
+    region = described_class.numeric_coded_as('510100').first_or_initialize
+    expect(region.under_mducg?).to be_falsey
+  end
+
+  it 'should not consider Jinniu under a municipality direct under central government' do
+    region = described_class.numeric_coded_as('510106').first_or_initialize
+    expect(region.under_mducg?).to be_falsey
+  end
+
   context do
 
     model_attributes = {
@@ -75,6 +130,15 @@ describe Unidom::Geo::China::Region, type: :model do
       { attributes_collection: [ model_attributes.merge(scheme_id: SecureRandom.uuid, virtual: true) ], count_diff: 0, args: [ false ] }
     ]
 
+    it_behaves_like 'scope', :root_level, [
+      { attributes_collection: [ model_attributes.merge(scheme_id: SecureRandom.uuid                        ) ], count_diff: 0, args: [] },
+      { attributes_collection: [ model_attributes.merge(scheme_id: SecureRandom.uuid, numeric_code: '999900') ], count_diff: 0, args: [] },
+      { attributes_collection: [ model_attributes.merge(scheme_id: SecureRandom.uuid, numeric_code: '999000') ], count_diff: 0, args: [] },
+      { attributes_collection: [ model_attributes.merge(scheme_id: SecureRandom.uuid, numeric_code: '990000') ], count_diff: 1, args: [] },
+      { attributes_collection: [ model_attributes.merge(scheme_id: SecureRandom.uuid, numeric_code: '900000') ], count_diff: 1, args: [] },
+      { attributes_collection: [ model_attributes.merge(scheme_id: SecureRandom.uuid, numeric_code: '000000') ], count_diff: 1, args: [] }
+    ]
+
   end
 
 end

data/lib/unidom/geo/china/version.rb

@@ -1,7 +1,7 @@
 module Unidom
   module Geo
     module China
-      VERSION = '0.5.7'.freeze
+      VERSION = '0.5.8'.freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-geo-china
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-geo