unidom-geo-china 0.5.8 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f0c8fbbaead8184aba625abc654d73c50a7d9070
-  data.tar.gz: 1e2e037b320f0139fba69b0457825e9ecf8db5ab
+SHA256:
+  metadata.gz: 4677dc9b04bb881de11541d1c19dda7d5b17bbca8ba81238b89304b3660a953f
+  data.tar.gz: 76092b6a738538d1b66a4ec0b2824f2080893f6322b86f4c4a11bd93bd207e51
 SHA512:
-  metadata.gz: 2e2567f1d2bde59f0713334aec9fc5da00880a780dcca69936c88ad7cdf990ac4a6b46bb6656c5ca63e62d28ff428fb5117f4b4616269dfa66a13478746517c8
-  data.tar.gz: e3882b5ed976a72c8c81bce624b77640fe2622b6d58dd8dab7f7b3e6279dcb22252c593c0be89cb77dca71fe3cc0c520482c5c1e50440afb93316936360e9147
+  metadata.gz: 2b23addeeda638fb9b937d1b71c2ae6e3c3c90f4274cbfc991a4378caa7eb034f05a219ac000f7d8442e5484d312a061340d866b8b3d7309aa2c90c20a448f3c
+  data.tar.gz: e7e378200d1d6ad76414ff1cfbc19d1e856afd1bed647b35791f0b2b85cb84e77010af0e585ed06b89639e37110fc690266d5d9d645ab19d169290238f87844a

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

@@ -72,22 +72,35 @@ class Unidom::Geo::China::Region < Unidom::Geo::China::ApplicationRecord
     '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/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,10 +1,11 @@
-class CreateUnidomChinaTowns < ActiveRecord::Migration
+class CreateUnidomChinaTowns < ActiveRecord::Migration[6.0]
 
   def change
 
     create_table :unidom_china_towns, id: :uuid do |t|
 
-      t.references :region, type: :uuid, null: false
+      t.references :region, type: :uuid, null: false,
+        foreign_key: false
 
       t.column :numeric_code, 'char(9)', null: false, default: '0'*9
 
@@ -14,9 +15,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: {}
 
@@ -24,7 +25,7 @@ class CreateUnidomChinaTowns < ActiveRecord::Migration
 
     end
 
-    add_index :unidom_china_towns, :region_id
+    # add_index :unidom_china_towns, :region_id
     add_index :unidom_china_towns, :numeric_code
 
   end

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

@@ -1,7 +1,7 @@
 module Unidom
   module Geo
     module China
-      VERSION = '0.5.8'.freeze
+      VERSION = '1.0.2'.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.8
+  version: 1.0.2
 platform: ruby
 authors:
 - Topbit Du
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-04-13 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: []