china_regions 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65852eef10a092038e498c3f7eec696ad6c2598072839bf3edafbc96d52579c6
-  data.tar.gz: '0169f567da375fd7d4e9713fe6004991ab01b34ee0a8e4fb61f33284ee96d296'
+  metadata.gz: 72b433dc0d51468a2a5e06c4b51aa450e2e9ff661f13995019e7bc05f99d5b7f
+  data.tar.gz: 748f7542e2a8a7c6267d9bb543505706c1c1104eb08d3d71c4eb5891180d9c20
 SHA512:
-  metadata.gz: 639f67a31cf88385fec479e174e5d25999c8ee2f4e61fdac1fdf31e08012aefbfa8d5c32c40c97989dcad9629085ff656804f06d3c4931818e0158a07dd70f76
-  data.tar.gz: 903e20a4be9c05635e05117ace6e8e429b44d50be7938c02d7708631c4462a20c1f8a04e846a3e9cc54ccbdf8886ef1b2b0f325d8847a53d7c78ed89fd35ed47
+  metadata.gz: 64083c36bff08087d65f17a820cb24245f7279d5d2d10f5973b8dd9e39aba2fb2e57176a3322788af92b9b43c560f4d32664114a3768f0f91edeb6804c29e1f9
+  data.tar.gz: 314f8737b7bdc229d1f442260947ee0f4df14dade593f3a34252cc8497beed94885653ecf22d82f117f6f83d196d76d52b084384140f8c7d24ad0f4031701cc0

data/app/models/city.rb

@@ -10,7 +10,7 @@ class City < ApplicationRecord
 
   # Relationships
   belongs_to :province, counter_cache: true
-  delegate :name, to: :province
+  delegate :name, to: :province, prefix: true
 
   has_many :districts, dependent: :destroy
 

data/app/models/district.rb

@@ -9,19 +9,19 @@ class District < ApplicationRecord
 
   # Relationships
   belongs_to :city, counter_cache: true
-  delegate :name, to: :city
+  delegate :name, to: :city, prefix: true
 
   # Filters
   scope :for_city, ->(city_id) { where(city_id: city_id) }
 
-  def full_name
-    [province.name, city_name, name].compact.join(' - ')
-  end
-
   def province
     city.province
   end
 
+  def full_name
+    [province.name, city_name, name].compact.join(' - ')
+  end
+
   def short_name
     @short_name ||= name.gsub(/区|县|市|自治县/, '')
   end

data/config/locales/{en.yml → china_regions.en.yml}

@@ -10,18 +10,23 @@ en:
     attributes:
       province:
         name: Name
+        code: Code
         name_en: English Name
         name_abbr: Short Name
+        cities_count: Cities Count
       city:
-        name: Nam
+        name: Name
         province_id: Province
         province: Province
         name_en: English Name
         name_abbr: Short Name
         level: Level
+        code: Code
+        districts_count: Districts Count
       district:
         name: Name
         city_id: City
         city: City
         name_en: English Name
         name_abbr: Short Name
+        code: Code

data/config/locales/{zh.yml → china_regions.zh.yml}

@@ -10,8 +10,10 @@ zh:
     attributes:
       province:
         name: 名称
+        code: 编码
         name_en: 拼音
         name_abbr: 简称
+        cities_count: 城市数
       city:
         name: 名称
         province_id: 省份
@@ -19,9 +21,12 @@ zh:
         name_en: 拼音
         name_abbr: 简称
         level: 等级
+        code: 编码
+        districts_count: 地区数
       district:
         name: 名称
         city_id: 城市
         city: 城市
         name_en: 拼音
         name_abbr: 简称
+        code: 编码

data/lib/china_regions/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ChinaRegions
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/lib/generators/china_regions/install_generator.rb

@@ -14,7 +14,7 @@ module ChinaRegions
     def copy_locales
       %w[en zh].each do |locale|
         config_file = "config/locales/regions.#{locale}.yml"
-        copy_file "../../../../config/locales/#{locale}.yml", config_file unless File.exist?(config_file)
+        copy_file "../../../../config/locales/china_regions.#{locale}.yml", config_file unless File.exist?(config_file)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: china_regions
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Encore Shao
@@ -120,8 +120,8 @@ files:
 - bin/console
 - bin/setup
 - china_regions.gemspec
-- config/locales/en.yml
-- config/locales/zh.yml
+- config/locales/china_regions.en.yml
+- config/locales/china_regions.zh.yml
 - config/routes.rb
 - lib/china_regions.rb
 - lib/china_regions/engine.rb