unidom-geo-china 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c644d279817669978931c34931bc44835a42c084
-  data.tar.gz: 8f5cea3672acb64e112cfe2c5d8727b206e989ee
+  metadata.gz: 70c8f8c8ebb8daffd6de328fba9502812afb8c99
+  data.tar.gz: 45165c649ec96997c5de8d6ca2aa951c601492c1
 SHA512:
-  metadata.gz: 680ce9d86dec8bec6d500b856704748ebd61cdcba4a802286139c94553fd03847f39e99c3229fda70977d8832dc50a7ea9faec348d3826ff48b2f6f2c651b660
-  data.tar.gz: d64016110315bbbac2fa61ddefd6f3864e5430e472a4e0a9d78ef114d314a84f9b46bebc4610a963a39ea5f9cb207ef6edce8d2aa247566e88b7b1a4bba66844
+  metadata.gz: 7e4db96018499a72be7e123f10e0d6ef75eafcb4ca732ccb9d41dd78d4a631f4c76afe6bddb6aa410bb91e0ec18a201ec206225aa98c312f988bf0e134929e57
+  data.tar.gz: 89dd8eba094bed15c66c0b65a3f9f3abf7b067b6545eb6ca398e56a000f88f20d7b5598af89e78bca04981e27001a7d06868866be65d4c9f797dc674027b48ff

data/README.md

@@ -6,6 +6,10 @@
 Unidom (UNIfied Domain Object Model) is a series of domain model engines. The China Geo domain model engine includes the Region model and its migration.
 Unidom (统一领域对象模型)是一系列的领域模型引擎。中国地理领域模型引擎包括中国大陆的行政区划模型及其数据迁移脚本。
 
+## Recent Update
+Check out the [Road Map](ROADMAP.md) to find out what's the next.
+Check out the [Change Log](CHANGELOG.md) to find out what's new.
+
 ## Usage in Gemfile
 ```ruby
 gem 'unidom-geo-china'
@@ -15,6 +19,7 @@ gem 'unidom-geo-china'
 ```shell
 rake db:migrate
 ```
+The migration versions start with 2001049156.
 
 ## Import Data
 ```shell
@@ -26,4 +31,7 @@ bundle exec rake unidom:geo:china:town:import file=/china-region-data/NBS-town/2
 ```ruby
 Unidom::Geo::China::Region.root_level # All the 31 province-level regions including Beijing, Tianjin, etc.
 Unidom::Geo::China::Region.numeric_coded_as('120000').valid_at.alive.first # Tianjin (天津)
+
+active_locations = region.locations.valid_at.alive
+active_towns     = region.towns.valid_at.alive
 ```

data/app/assets/javascripts/unidom/geo/china/application.js

@@ -10,4 +10,4 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require_tree .
+//= require_self

data/app/assets/stylesheets/unidom/geo/china/application.css

@@ -10,6 +10,5 @@
  * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
  * file per style scope.
  *
- *= require_tree .
  *= require_self
  */

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

@@ -25,25 +25,28 @@ class Unidom::Geo::China::Region < ActiveRecord::Base
 
   self.table_name = 'unidom_china_regions'
 
+  include Unidom::Common::Concerns::ModelExtension
+
   validates :numeric_code,    numericality: { integer_only: true }
-  validates :alphabetic_code, allow_blank: true, length: { minimum: 2 }
-  validates :name,            presence:    true, length: { maximum: self.columns_hash['name'].limit }
+  validates :alphabetic_code, allow_blank:  true, length: { minimum: 2 }
+  validates :name,            presence:     true, length: { maximum: self.columns_hash['name'].limit }
+
+  belongs_to :scheme, polymorphic: true
 
-  belongs_to :scheme,    polymorphic: true
-  has_many   :locations, class_name: 'Unidom::Geo::Location', as: :region
-  has_many   :towns,     class_name: 'Unidom::Geo::China::Town'
+  has_many :locations, class_name: 'Unidom::Geo::Location', as:     :region
+  has_many :locatings, through:    :locations,              source: :locatings
+
+  has_many :towns, class_name: 'Unidom::Geo::China::Town'
 
   scope :scheme_is,      ->(scheme) { scheme.present? ? where(scheme: scheme) : scheme_id_is.scheme_type_is }
-  scope :scheme_id_is,   ->(scheme_id   = ::Unidom::Common::NULL_UUID) { where scheme_id:   scheme_id   }
-  scope :scheme_type_is, ->(scheme_type = ''                         ) { where scheme_type: scheme_type }
+  scope :scheme_id_is,   ->(scheme_id   = Unidom::Common::NULL_UUID) { where scheme_id:   scheme_id   }
+  scope :scheme_type_is, ->(scheme_type = ''                       ) { where scheme_type: scheme_type }
 
   scope :name_is,       ->(name)           { where name:    name    }
   scope :being_virtual, ->(virtual = true) { where virtual: virtual }
 
   scope :root_level, -> { numeric_code_ending_with '0000' }
 
-  include Unidom::Common::Concerns::ModelExtension
-
   def numeric_code_prefix
     numeric_code[0..1]
   end

data/app/views/layouts/unidom/geo/china/application.html.erb

@@ -2,13 +2,14 @@
 <html>
 <head>
   <title>Unidom Geo China</title>
-  <%= stylesheet_link_tag    'unidom/geo/china/application', media: 'all' %>
-  <%= javascript_include_tag 'unidom/geo/china/application' %>
+  <%= stylesheet_link_tag 'unidom/geo/china/application', media: 'all' %>
   <%= csrf_meta_tags %>
 </head>
 <body>
 
 <%= yield %>
 
+<%= javascript_include_tag 'unidom/geo/china/application' %>
+
 </body>
 </html>

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-geo-china
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
 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 (统一领域对象模型)是一系列的领域模型引擎。中国地理领域模型引擎包括中国大陆的行政区划及其相关的模型。
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Unidom China Geo Domain Model Engine 中国地理领域模型引擎