unidom-geo-china 0.5.7 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6fd4c0d9e03b26fe74231108e84f1213bcad8a3f
-  data.tar.gz: 2b2061f680dfdcc795f8a2ab0abe8756a1e1f380
+SHA256:
+  metadata.gz: 311edb0fbbb12609b7eedc18a3491248de71f500547db17fb754203eac9823ac
+  data.tar.gz: eed898aa9c21926478716b8286223bbb93094bfb41e5b9e6f6c11e0c2c4c051f
 SHA512:
-  metadata.gz: a1c6a285032be9c30d0b0dbd39fb5120e2a682b534f44165efabba458b97155dd178578ffc4f8e02d8f169344245608c72dc41576a7e037622ef26f3ef494742
-  data.tar.gz: 997a811fb875dda09525b31b402b4da90d97ba7ed2ca38d7d196d19739d78df5bc0023da40ff7b7e57a19107110da3e16ba77aaea9a1ca39467f5a58981c80e3
+  metadata.gz: de04120c184bd5652d8477c061b7798f0bde11d732b4392f0c945abe94c7a61c2bcb9ae32f3b5609dc3eb3583dda5d4751677f4a6dd2b3fe2ae92c8283400793
+  data.tar.gz: ef85c7981c451c107379b11d753d5e5dd8ca0d188dbbfd7bcb8f4b548ae81896ecd75ae1f7264bd6ec242263ba865205d30cca030231a60d7972bf1babd31ced

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

@@ -54,34 +54,53 @@ 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
 
+  ##
+  # 判断行政区划代码的后 2 位数字是否为 00 。
   def numeric_code_suffix_empty?
     '00'==numeric_code_suffix
   end
 
+  ##
+  # 判断一个区县级的行政区划是否是区。
   def district?
     numeric_code_suffix.to_i<20
   end
 
+  ##
+  # 判断一个行政区划是否是或者属于直辖市。
   def under_mducg?
     self.class::MDUCG_CODES.include? numeric_code_prefix
   end
 
+  ##
+  # 判断一个行政区划是否是直辖市。
   def mducg?
     under_mducg? && numeric_code_middle_empty? && numeric_code_suffix_empty?
   end
 
+  ##
+  # 拼写当前行政区划的全称，用指定的分隔符区分。如：
+  # region.full_name
+  # # or
+  # region.full_name ' '
   def full_name(separator = ' ')
     final_name     = self.name
     current_region = self

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/db/migrate/20010491560010_create_unidom_china_regions.rb

@@ -1,4 +1,4 @@
-class CreateUnidomChinaRegions < ActiveRecord::Migration
+class CreateUnidomChinaRegions < ActiveRecord::Migration[6.0]
 
   def change
 
@@ -16,9 +16,9 @@ class CreateUnidomChinaRegions < ActiveRecord::Migration
       t.text :instruction
       t.text :description
 
-      t.column   :state, 'char(1)', null: false, default: 'C'
-      t.datetime :opened_at,        null: false, default: ::Time.utc(1970)
-      t.datetime :closed_at,        null: false, default: ::Time.utc(3000)
+      t.column   :state, 'char(1)', null: false, default: Unidom::Common::STATE
+      t.datetime :opened_at,        null: false, default: Unidom::Common::OPENED_AT
+      t.datetime :closed_at,        null: false, default: Unidom::Common::CLOSED_AT
       t.boolean  :defunct,          null: false, default: false
       t.jsonb    :notation,         null: false, default: {}
 

data/db/migrate/20010491560020_create_unidom_china_towns.rb

@@ -1,4 +1,4 @@
-class CreateUnidomChinaTowns < ActiveRecord::Migration
+class CreateUnidomChinaTowns < ActiveRecord::Migration[6.0]
 
   def change
 
@@ -14,9 +14,9 @@ class CreateUnidomChinaTowns < ActiveRecord::Migration
       t.text :instruction
       t.text :description
 
-      t.column   :state, 'char(1)', null: false, default: 'C'
-      t.datetime :opened_at,        null: false, default: ::Time.utc(1970)
-      t.datetime :closed_at,        null: false, default: ::Time.utc(3000)
+      t.column   :state, 'char(1)', null: false, default: Unidom::Common::STATE
+      t.datetime :opened_at,        null: false, default: Unidom::Common::OPENED_AT
+      t.datetime :closed_at,        null: false, default: Unidom::Common::CLOSED_AT
       t.boolean  :defunct,          null: false, default: false
       t.jsonb    :notation,         null: false, default: {}
 

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 = '1.0.1'.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: 1.0.1
 platform: ruby
 authors:
 - Topbit Du
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2021-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-geo
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.6
+        version: '2.0'
 description: Unidom (UNIfied Domain Object Model) is a series of domain model engines.
   The China Contact domain model engine includes Mobile Phone Number and its relative
   models. Unidom (统一领域对象模型)是一系列的领域模型引擎。中国地理领域模型引擎包括中国大陆的行政区划及其相关的模型。
@@ -72,7 +66,7 @@ homepage: https://github.com/topbitdu/unidom-geo-china
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -87,9 +81,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.4
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Unidom China Geo Domain Model Engine 中国地理领域模型引擎
 test_files: []