unidom-geo-china 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 064eb05711633c7d7c9b7782ada25a80d0d2e80e
-  data.tar.gz: 79c2b92279fc00f87600702cca2eb913f9c9268e
+  metadata.gz: 3b46b75495fbc4f7d8cf1cf812e038874b112f03
+  data.tar.gz: 8b0544b4efa2abd64d7091e53e8a25281228ea4d
 SHA512:
-  metadata.gz: e11f3f65a285c07bce3dbce22d0966f89fab403b5e04ddf9e55da06291dec65f6526b092c9a924e1a50f65d149d38aba125b700eef6a1edeed36e655290a29c8
-  data.tar.gz: 395a06db555e8cc45887c737f3b98dc1b70df0b43b335d84e03bf07f6493ca3b40b14abaab3f1355a9145f22196050f3f323a196099fca3656c377a283fb999f
+  metadata.gz: 3d6b905e7fccc890adee8db7f987e685d09f543251a6ddd593e239e2d76d4320f3463b865263fd13301fba8208b8566349dc64ff43558f3d9afe93959e127700
+  data.tar.gz: da667199bf936505aae2af7642b4f63c0526b1e62d383f50ad1eb0ee629662210e2a5b44fe8aa03b84a8249b1796d89f47916ddf8487a9d0f1e54062255b6441

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

@@ -40,34 +40,10 @@ describe Unidom::Geo::China::Region, type: :model do
       { 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'   } => 0,
-      { name: 'A'   } => 0,
-      { 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
+    it_behaves_like 'validates text', model_attributes, :alphabetic_code,
+      length: 2..described_class.columns_hash['alphabetic_code'].limit
+    it_behaves_like 'validates text', model_attributes, :name,
+      length: 1..described_class.columns_hash['name'].limit
 
     town_1_attributes = {
       numeric_code: '1'*9,

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

@@ -14,8 +14,6 @@ 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,
@@ -37,21 +35,8 @@ describe Unidom::Geo::China::Town, type: :model do
       { 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
+    it_behaves_like 'validates text', model_attributes, :name,
+      length: 2..described_class.columns_hash['name'].limit
 
     region_attributes = {
       scheme_id:        SecureRandom.uuid,

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

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