unidom-visitor 1.13.4 → 1.13.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29f640ac2c868be349d60215948410335e3ac4e4
-  data.tar.gz: eea7eff56cadbc743c323b73a55c9fe617c95618
+  metadata.gz: 1548e1bbdb03bf173876665278c0f89b3b780212
+  data.tar.gz: aa7195117c0aa319e0a7e199de9b40388c1b7845
 SHA512:
-  metadata.gz: 961e6e04e663981774c00e5bcbf48fa2756a3f286073c976fa168057e934de74d3a768df1559d1f3280026dc2158bceeba4d161390f8de4c8eaad9e2a634c9ae
-  data.tar.gz: 7e5e5d922a7715fae18c9102b6db58c1223cc3db8bcb5b3c95509571165e59099b0b7ee25256fb2e6c00cbcbd1f916714d44292a93615ec1b11476a6acbf6b24
+  metadata.gz: f6ac8dbce79296442cb7f32308e994059bbd654c14cbe9c294cbb9ae64b8663a2f2b39ea6b7da0808f946d9e30d12d4b2a5b43f90d218d60ce82aee43094ae09
+  data.tar.gz: 6549bc235bb223f97f522acd955b167f4b802f2f96a6b18ee92d65d58bae0de8b6f8a27dfdef466bfc404077b5ba5c63dcd7c10918ff79f0b3854dab3a7fa1b0

data/app/models/unidom/visitor/identificating.rb

@@ -13,6 +13,10 @@ class Unidom::Visitor::Identificating < Unidom::Visitor::ApplicationRecord
   scope :identity_is, ->(identity) { where identity: identity }
   scope :visitor_is,  ->(visitor)  { where visitor:  visitor  }
 
+  ##
+  # 根据访问者 visitor ，找到其对应的登录身份标示 identity （如手机号码或自定义用户名）。如：
+  # mobile_phone_number = Unidom::Visitor::Identificating.find_identity user
+  # puts mobile_phone_number.phone_number
   def self.find_identity(visitor)
     visitor_is(visitor).first.try :identity
   end

data/lib/rspec/models/unidom/visitor/guest_spec.rb

@@ -13,26 +13,10 @@ describe Unidom::Visitor::Guest, type: :model do
       platform_specific_identification: '123456789012'
     }
 
-    platform_specific_identification_max_length = described_class.columns_hash['platform_specific_identification'].limit
-
     it_behaves_like 'Unidom::Common::Concerns::ModelExtension', model_attributes
 
-    it_behaves_like 'validates', model_attributes, :platform_specific_identification,
-      {                                         } => 0,
-      { platform_specific_identification: nil   } => 2,
-      { platform_specific_identification: ''    } => 2,
-      { platform_specific_identification: '1'   } => 1,
-      { platform_specific_identification: 'A'   } => 1,
-      { platform_specific_identification: '11'  } => 0,
-      { platform_specific_identification: 'AA'  } => 0,
-      { platform_specific_identification: '111' } => 0,
-      { platform_specific_identification: 'AAA' } => 0,
-      { platform_specific_identification: '1'*(platform_specific_identification_max_length-1) } => 0,
-      { platform_specific_identification: 'A'*(platform_specific_identification_max_length-1) } => 0,
-      { platform_specific_identification: '1'*platform_specific_identification_max_length     } => 0,
-      { platform_specific_identification: 'A'*platform_specific_identification_max_length     } => 0,
-      { platform_specific_identification: '1'*(platform_specific_identification_max_length+1) } => 1,
-      { platform_specific_identification: 'A'*(platform_specific_identification_max_length+1) } => 1
+    it_behaves_like 'validates text', model_attributes, :platform_specific_identification,
+      length: 2..described_class.columns_hash['platform_specific_identification'].limit
 
     new_platform_specific_identification = 'ABCDEFGHIJKLMNOP'
     it_behaves_like 'scope', :platform_specific_identification_is, [

data/lib/rspec/models/unidom/visitor/password_spec.rb

@@ -12,28 +12,12 @@ describe Unidom::Visitor::Password, type: :model do
       clear_text: 'password'
     }
 
-    clear_text_max_length     = 200
-    pepper_content_max_length = described_class.columns_hash['pepper_content'].limit
-
     it_behaves_like 'Unidom::Common::Concerns::ModelExtension', model_attributes
 
-    it_behaves_like 'validates', model_attributes, :clear_text,
-      {                   } => 0,
-      { clear_text: nil   } => 2,
-      { clear_text: ''    } => 2,
-      { clear_text: '1'*5 } => 1,
-      { clear_text: 'A'*5 } => 1,
-      { clear_text: '1'*6 } => 0,
-      { clear_text: 'A'*6 } => 0,
-      { clear_text: '1'*7 } => 0,
-      { clear_text: 'A'*7 } => 0,
-      { clear_text: '1'*(clear_text_max_length-1) } => 0,
-      { clear_text: 'A'*(clear_text_max_length-1) } => 0,
-      { clear_text: '1'*clear_text_max_length     } => 0,
-      { clear_text: 'A'*clear_text_max_length     } => 0,
-      { clear_text: '1'*(clear_text_max_length+1) } => 1,
-      { clear_text: 'A'*(clear_text_max_length+1) } => 1
+    it_behaves_like 'validates text', model_attributes, :clear_text,
+      length: 6..200
 
+    pepper_content_max_length = described_class.columns_hash['pepper_content'].limit
     it_behaves_like 'validates', model_attributes, :pepper_content,
       {                     } => 0,
       { pepper_content: nil } => 0,

data/lib/unidom/visitor/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Visitor
-    VERSION = '1.13.4'.freeze
+    VERSION = '1.13.5'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-visitor
 version: !ruby/object:Gem::Version
-  version: 1.13.4
+  version: 1.13.5
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common