unidom-geo-china 0.5 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4253c2c9b2bebab9dd44364fccbe7b3ea0e469e
-  data.tar.gz: 2dc44883d08f0941f86a8910fdaadbee394565b6
+  metadata.gz: 5dd8fa89ff879d8ad98a63349c4dc3fd68d8d9c9
+  data.tar.gz: '095dfe1d5ab55022b30f65328a0bbe57d4366fc2'
 SHA512:
-  metadata.gz: c5a11d775e24b072c36fe37f7a9a14ba4678ff329d3b4451efa6f3cd49f135de91ea8a0e7a309a15ccdeee20b4c8a8c574feb402d6872786447bb6eac324f7e4
-  data.tar.gz: 1f1bfd5828fd0f962dbde608f9762567fcba70956e3a72c61ff931e30fd6eb66213e369909e2a5d595f525b4ddd9bc54052b6ba8d59c76898f1fd60d70af0627
+  metadata.gz: 85df3cfef412f717c2e631359c4f92b1712fcc3740d6ede909b9790e54359048f91aaf4c75459f15cbcce58148b35caaa56a25abfe86aad9ede49f0adadb2a77
+  data.tar.gz: 3d3d5ca53e56cf977d8d161f05d2bdd37acab38ec09d995efc80268c73ee6e77db887e687613d97dc145eb34f1f0b79d4e1df696fade0e575537cfd52a1253d3

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

@@ -31,9 +31,9 @@ class Unidom::Geo::China::Region < Unidom::Geo::China::ApplicationRecord
   include Unidom::Geo::China::Concerns::AsInferiorRegion
   include Unidom::Geo::China::Concerns::AsSuperiorRegion
 
-  validates :numeric_code,    numericality: { integer_only: true }
+  validates :numeric_code,    presence:     true, numericality: { integer_only: true, greater_than_or_equal_to: 0 }, length: { minimum: columns_hash['numeric_code'].limit }
   validates :alphabetic_code, allow_blank:  true, length: { minimum: 2 }
-  validates :name,            presence:     true, length: { maximum: self.columns_hash['name'].limit }
+  validates :name,            presence:     true, length: { in: 2..self.columns_hash['name'].limit }
 
   belongs_to :scheme, polymorphic: true
 

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

@@ -7,7 +7,8 @@ class Unidom::Geo::China::Town < Unidom::Geo::China::ApplicationRecord
 
   include Unidom::Common::Concerns::ModelExtension
 
-  validates :name, presence: true, length: { in: 2..self.columns_hash['name'].limit }
+  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      }
 
   belongs_to :region, class_name: 'Unidom::Geo::China::Region'
 

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

@@ -16,8 +16,59 @@ describe Unidom::Geo::China::Region, type: :model do
       name:             'Some Region'
     }
 
+    name_max_length = described_class.columns_hash['name'].limit
+
     it_behaves_like 'Unidom::Common::Concerns::ModelExtension', model_attributes
 
+    it_behaves_like 'validates', model_attributes, :numeric_code,
+      {                         } => 0,
+      { numeric_code: nil       } => 3,
+      { numeric_code: ''        } => 3,
+      { numeric_code: '1'       } => 1,
+      { numeric_code: '11'      } => 1,
+      { numeric_code: '111'     } => 1,
+      { numeric_code: '1111'    } => 1,
+      { numeric_code: '11111'   } => 1,
+      { numeric_code: 11111     } => 1,
+      { numeric_code: '-11111'  } => 1,
+      { numeric_code: -11111    } => 1,
+      { numeric_code: '111111'  } => 0,
+      { numeric_code: 111111    } => 0,
+      { numeric_code: '-111111' } => 2,
+      { numeric_code: -111111   } => 2,
+      { numeric_code: '1111111' } => 1,
+      { numeric_code: 1111111   } => 1,
+      { numeric_code: '11111A'  } => 1
+
+    it_behaves_like 'validates', model_attributes, :alphabetic_code,
+      {                         } => 0,
+      { alphabetic_code: nil    } => 0,
+      { alphabetic_code: ''     } => 0,
+      { alphabetic_code: '1'    } => 1,
+      { alphabetic_code: '11'   } => 0,
+      { alphabetic_code: 'AA'   } => 0,
+      { alphabetic_code: '111'  } => 0,
+      { alphabetic_code: 'AAA'  } => 0,
+      { alphabetic_code: '1111' } => 1,
+      { alphabetic_code: 'AAAA' } => 1
+
+    it_behaves_like 'validates', model_attributes, :name,
+      {             } => 0,
+      { name: nil   } => 2,
+      { name: ''    } => 2,
+      { name: '1'   } => 1,
+      { name: 'A'   } => 1,
+      { name: '11'  } => 0,
+      { name: 'AA'  } => 0,
+      { name: '111' } => 0,
+      { name: 'AAA' } => 0,
+      { name: '1'*(name_max_length-1) } => 0,
+      { name: 'A'*(name_max_length-1) } => 0,
+      { name: '1'*name_max_length     } => 0,
+      { name: 'A'*name_max_length     } => 0,
+      { name: '1'*(name_max_length+1) } => 1,
+      { name: 'A'*(name_max_length+1) } => 1
+
   end
 
 end

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

@@ -14,8 +14,45 @@ describe Unidom::Geo::China::Town, type: :model do
       name:         'Some Town'
     }
 
+    name_max_length = described_class.columns_hash['name'].limit
+
     it_behaves_like 'Unidom::Common::Concerns::ModelExtension', model_attributes
 
+    it_behaves_like 'validates', model_attributes, :numeric_code,
+      {                             } => 0,
+      { numeric_code: nil           } => 3,
+      { numeric_code: ''            } => 3,
+      { numeric_code: '1'           } => 1,
+      { numeric_code: '1'*8         } => 1,
+      { numeric_code: 11_111_111    } => 1,
+      { numeric_code: "-#{'1'*8}"   } => 1,
+      { numeric_code: -11_111_111   } => 1,
+      { numeric_code: '1'*9         } => 0,
+      { numeric_code: 111_111_111   } => 0,
+      { numeric_code: "-#{'1'*9}"   } => 2,
+      { numeric_code: -111_111_111  } => 2,
+      { numeric_code: '1'*10        } => 1,
+      { numeric_code: 1_111_111_111 } => 1,
+      { numeric_code: "#{'1'*8}A"   } => 1,
+      { numeric_code: '111111.11'   } => 1,
+      { numeric_code: 111111.11     } => 1
+
+    it_behaves_like 'validates', model_attributes, :name,
+      {              } => 0,
+      { name: nil    } => 2,
+      { name: ''     } => 2,
+      { name: '1'    } => 1,
+      { name: '11'   } => 0,
+      { name: 'AA'   } => 0,
+      { name: '111'  } => 0,
+      { name: 'AAA'  } => 0,
+      { name: '1'*(name_max_length-1) } => 0,
+      { name: 'A'*(name_max_length-1) } => 0,
+      { name: '1'*name_max_length     } => 0,
+      { name: 'A'*name_max_length     } => 0,
+      { name: '1'*(name_max_length+1) } => 1,
+      { name: 'A'*(name_max_length+1) } => 1
+
   end
 
 end

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

@@ -1,7 +1,7 @@
 module Unidom
   module Geo
     module China
-      VERSION = '0.5'.freeze
+      VERSION = '0.5.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'
+  version: 0.5.1
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-01 00:00:00.000000000 Z
+date: 2017-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-geo