unidom-contact 1.4 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f92027a30bb1656c21c247f66048446e0f4156b5
-  data.tar.gz: 1fede8e9a05da9232209c3ee2a97a5acd0b05c77
+  metadata.gz: 90ab4bbccf8f42e982b867ce4137a4526bf900ae
+  data.tar.gz: 77b6f26b29d6cea5c19c48063a0d5779c6317957
 SHA512:
-  metadata.gz: 48dd22339d50ae676bce792edfdf0ed1fc3eacbcbfca6f907879bd2c27e9c6966097a3be421064c2fb033cd0578e4285ebd99335e2bc0a251dd297f852e0d941
-  data.tar.gz: f96bd9bef4dd37ddbd2d89b40b603d81af278eacc0dee283d2104993781197b2278ee102003f5c7a4c00fc49d9d1d72d452c1350d706e8bb2844060ccf97b3a2
+  metadata.gz: 96ca484032fa3edb02ad080355905b98bf9421eacfabbf7bea4f767d077a0533226eb8b8df2d45c6e72cfcccdbdcd2bbd672cfce877eb6489ca70fdbca0d9ea4
+  data.tar.gz: 5d65a43f43c35c19dac9b49abc4f6c82a7f7a572ec83493bc51ff4d51d0c5bf4f4acdc3e571aa15965bfa328cdc27273baff157eb71b13cb732dfddc49b8a785

data/app/models/unidom/contact/contact_subscription.rb

@@ -7,7 +7,7 @@ class Unidom::Contact::ContactSubscription < Unidom::Contact::ApplicationRecord
 
   include Unidom::Common::Concerns::ModelExtension
 
-  validates :name,     presence: true, length:       { in: 2..self.columns_hash['name'].limit }
+  validates :name, presence: true, length: { in: 2..self.columns_hash['name'].limit }
 
   belongs_to :contact,    polymorphic: true
   belongs_to :subscriber, polymorphic: true

data/app/models/unidom/contact/email_address.rb

@@ -18,10 +18,10 @@ class Unidom::Contact::EmailAddress < Unidom::Contact::ApplicationRecord
   scope :domain_part_is,  ->(domain_part)  { where domain_part:  domain_part  }
 
   before_validation do
-    self.full_address.strip!
-    self.personalized_name = self.full_address if self.personalized_name.blank?
+    self.full_address = full_address.to_s.strip
+    self.personalized_name = full_address if personalized_name.blank?
     self.full_address.downcase!
-    self.local_part, self.domain_part = self.full_address.split '@', 2
+    self.local_part, self.domain_part = full_address.split '@', 2
   end
 
   # http://blog.csdn.net/wide288/article/details/20782399

data/lib/rspec/models/unidom/contact/contact_subscription_spec.rb

@@ -16,8 +16,21 @@ describe Unidom::Contact::ContactSubscription, type: :model do
       name:            'Home'
     }
 
+    name_max_length = described_class.columns_hash['name'].limit
+
     it_behaves_like 'Unidom::Common::Concerns::ModelExtension', model_attributes
 
+    it_behaves_like 'validates', model_attributes, :name,
+      {             } => 0,
+      { name: nil   } => 2,
+      { name: ''    } => 2,
+      { name: 'A'   } => 1,
+      { name: 'Al'  } => 0,
+      { name: 'Bob' } => 0,
+      { name: 'A'*(name_max_length-1)  } => 0,
+      { name: 'A'*name_max_length      } => 0,
+      { name: 'A'*(name_max_length+1)  } => 1
+
   end
 
 end

data/lib/rspec/models/unidom/contact/email_address_spec.rb

@@ -15,6 +15,23 @@ describe Unidom::Contact::EmailAddress, type: :model do
 
     it_behaves_like 'Unidom::Common::Concerns::ModelExtension', model_attributes
 
+    full_address_max_length = described_class.columns_hash['full_address'].limit
+
+    it_behaves_like 'validates', model_attributes, :full_address,
+      {                               } => 0,
+      { full_address: nil             } => 2,
+      { full_address: ''              } => 2,
+      { full_address: 'l'             } => 1,
+      { full_address: 'l@'            } => 1,
+      { full_address: 'l@d'           } => 1,
+      { full_address: 'l@us'          } => 0,
+      { full_address: 'l@com'         } => 0,
+      { full_address: 'l@jobs'        } => 0,
+      { full_address: 'l@jobs.com.cn' } => 0,
+      { full_address: "l@#{'c'*(full_address_max_length-6)}.de" } => 0,
+      { full_address: "l@#{'c'*(full_address_max_length-5)}.de" } => 0,
+      { full_address: "l@#{'c'*(full_address_max_length-4)}.de" } => 1
+
   end
 
 end

data/lib/unidom/contact/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Contact
-    VERSION = '1.4'.freeze
+    VERSION = '1.4.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-contact
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: 1.4.1
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-30 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common