rfc-822 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc27d6a8f4a5e74135bc1b45f043ecadd3f54396
-  data.tar.gz: 05754014b5b287fc651903082bc6db274f1bfe8c
+  metadata.gz: 31093e28dadc0e6463032bbacab6a932ff834561
+  data.tar.gz: d5aa904a3dc3d422e7e24d9c2573105fec52851b
 SHA512:
-  metadata.gz: afe3f3e8b7c5cc9c29c7c611d619042c7f19c125746215778764f958ab8e0b7dfdc716a1065696966166bac835a8a9fbcbd2bed809a6b5b4a84dfdce47dfbac6
-  data.tar.gz: 5d2c4a43b34f8f0110b21476497763b843aca7f63244e228d547b3a1ec6e69d5d097143709cea6f5b8b849c8d5a11a4404f585e0244e1eb3553246e46607b501
+  metadata.gz: 414b95c3e8c18bd877eafdb2ca7c8e4722ad48cee813806c1fba6bc7aff96a54ade491e85e93e0f7160ae6033dc0b5fa23f3e86f4349e943bf004e4863a85c4d
+  data.tar.gz: 16f85b720fa3ee9b19372f810223f206cc8ec15abb0b19f6ce18fc2733a72e538386b6758b79c33c3154b5aeab0f19f8abed6926d6a6b2ec53dd36d3bbaac879

data/lib/rfc822.rb

@@ -2,29 +2,29 @@ require 'timeout'
 require 'uri'
 
 module RFC822
-  
+
   module Patterns
-    
+
     ATOM      = "[^\\x00-\\x20\\x22\\x28\\x29\\x2c\\x2e\\x3a-\\x3c\\x3e\\x40\\x5b-\\x5d\\x7f-\\u00ff]+"
-    
-    QTEXT     = "[^\\x0d\\x22\\x5c\\u0080-\\u00ff]"  
+
+    QTEXT     = "[^\\x0d\\x22\\x5c\\u0080-\\u00ff]"
     QPAIR     = "\\x5c[\\x00-\\x7f]"
     QSTRING   = "\\x22(?:#{QTEXT}|#{QPAIR})*\\x22"
-    
+
     WORD      = "(?:#{ATOM}|#{QSTRING})"
 
     LOCAL_PT  = "#{WORD}(?:\\x2e#{WORD})*"
-    ADDRESS   = "#{LOCAL_PT}\\x40#{URI::REGEXP::PATTERN::HOSTNAME}"    
+    ADDRESS   = "#{LOCAL_PT}\\x40(?:#{URI::REGEXP::PATTERN::HOSTNAME})?#{ATOM}"
 
   end
-  
-  MXRecord = Struct.new(:priority, :host)  
+
+  MXRecord = Struct.new(:priority, :host)
   EMAIL    = /\A#{Patterns::ADDRESS}\z/
-  
+
   @@host_command = '/usr/bin/env host'
-  
+
   class << self
-    
+
     def host_command
       @@host_command
     end
@@ -36,8 +36,8 @@ module RFC822
     def mx_records(address)
       address = address.to_s
       return [] unless address =~ EMAIL
-  
-      Timeout::timeout(2) do 
+
+      Timeout::timeout(2) do
         raw_mx_records(address.split('@').last).map do |priority, host|
           MXRecord.new(priority.to_i, host)
         end
@@ -46,12 +46,12 @@ module RFC822
       []
     end
 
-    def raw_mx_records(domain)      
-      host_mx(domain).scan(/#{Regexp.escape(domain)}[\w ]+?(\d+) (#{URI::REGEXP::PATTERN::HOSTNAME})\./)      
+    def raw_mx_records(domain)
+      host_mx(domain).scan(/#{Regexp.escape(domain)}[\w ]+?(\d+) (#{URI::REGEXP::PATTERN::HOSTNAME})\./)
     end
-    
+
     def host_mx(domain)
-      `#{host_command} -t MX #{domain}`      
+      `#{host_command} -t MX #{domain}`
     end
 
   end

data/spec/rfc822_spec.rb

@@ -3,52 +3,54 @@ require File.dirname(__FILE__) + '/helper'
 describe RFC822 do
 
   after do
-    RFC822.host_command = '/usr/bin/env host'    
+    RFC822.host_command = '/usr/bin/env host'
   end
-  
+
   describe 'email pattern' do
-    
+
     it 'should match RFC822 compliant addresses' do
-      "user@home".should match(RFC822::EMAIL)
-      "user@home.com".should match(RFC822::EMAIL)
-      "user@dashed-home.info".should match(RFC822::EMAIL)
-      "user@separated.home.info".should match(RFC822::EMAIL)
-      "dashed-user@home.com".should match(RFC822::EMAIL)            
-      "underscored_user@home.com".should match(RFC822::EMAIL)            
-      "separated.user@home.com".should match(RFC822::EMAIL)            
-      "slashed/user@home.com".should match(RFC822::EMAIL)            
-      "plussed+user@home.com".should match(RFC822::EMAIL)            
-      "{wrapped}user@home.com".should match(RFC822::EMAIL)            
-      "end-dashed-@home.com".should match(RFC822::EMAIL)            
+      expect("user@x").to match(RFC822::EMAIL)
+      expect("user@home").to match(RFC822::EMAIL)
+      expect("user@home.com").to match(RFC822::EMAIL)
+      expect("user@dashed-home.info").to match(RFC822::EMAIL)
+      expect("user@separated.home.info").to match(RFC822::EMAIL)
+      expect("dashed-user@home.com").to match(RFC822::EMAIL)
+      expect("underscored_user@home.com").to match(RFC822::EMAIL)
+      expect("separated.user@home.com").to match(RFC822::EMAIL)
+      expect("slashed/user@home.com").to match(RFC822::EMAIL)
+      expect("plussed+user@home.com").to match(RFC822::EMAIL)
+      expect("{wrapped}user@home.com").to match(RFC822::EMAIL)
+      expect("end-dashed-@home.com").to match(RFC822::EMAIL)
     end
 
     it 'should not match non-RFC822 compliant addresses' do
-      "user-home".should_not match(RFC822::EMAIL)
-      "@home.com".should_not match(RFC822::EMAIL)
-      "user@".should_not match(RFC822::EMAIL)
-      "user@underscored_home.org".should_not match(RFC822::EMAIL)
-      "user@just,wrong.org".should_not match(RFC822::EMAIL)
-      "user@just/wrong.org".should_not match(RFC822::EMAIL)
-      "user@just wrong.org".should_not match(RFC822::EMAIL)
-      "wrong,user@home.com".should_not match(RFC822::EMAIL)            
-      "wrong-user.@home.com".should_not match(RFC822::EMAIL)            
-      "wrong@user@home.com".should_not match(RFC822::EMAIL)            
-      "wrong user@home.com".should_not match(RFC822::EMAIL)            
-      "wrong(user)@home.com".should_not match(RFC822::EMAIL)            
-    end    
-    
+      expect("user-home").not_to match(RFC822::EMAIL)
+      expect("@home.com").not_to match(RFC822::EMAIL)
+      expect("user@").not_to match(RFC822::EMAIL)
+      expect("user@trailing.period.").not_to match(RFC822::EMAIL)
+      expect("user@underscored_home.org").not_to match(RFC822::EMAIL)
+      expect("user@just,wrong.org").not_to match(RFC822::EMAIL)
+      expect("user@just/wrong.org").not_to match(RFC822::EMAIL)
+      expect("user@just wrong.org").not_to match(RFC822::EMAIL)
+      expect("wrong,user@home.com").not_to match(RFC822::EMAIL)
+      expect("wrong-user.@home.com").not_to match(RFC822::EMAIL)
+      expect("wrong@user@home.com").not_to match(RFC822::EMAIL)
+      expect("wrong user@home.com").not_to match(RFC822::EMAIL)
+      expect("wrong(user)@home.com").not_to match(RFC822::EMAIL)
+    end
+
   end
-  
+
   it 'should allow to change the host command' do
-    RFC822.host_command.should == '/usr/bin/env host'
+    expect(RFC822.host_command).to eq('/usr/bin/env host')
     RFC822.host_command = '/opt/bin host'
-    RFC822.host_command.should == '/opt/bin host'     
+    expect(RFC822.host_command).to eq('/opt/bin host')
   end
-  
+
   describe 'MX record check' do
 
     before do
-      RFC822.stub(:host_mx).and_return(%Q(
+      allow(RFC822).to receive(:host_mx).and_return(%Q(
 hotmail.com mail is handled by 5 mx3.hotmail.com.
 hotmail.com mail is handled by 5 mx4.hotmail.com.
 hotmail.com mail is handled by 5 mx1.hotmail.com.
@@ -57,24 +59,24 @@ hotmail.com mail is handled by 5 mx2.hotmail.com.
     end
 
     it 'should return raw MX records fo a domain' do
-      RFC822.raw_mx_records('hotmail.com').should == [
-        ["5", "mx3.hotmail.com"], 
-        ["5", "mx4.hotmail.com"], 
-        ["5", "mx1.hotmail.com"], 
-        ["5", "mx2.hotmail.com"]
-      ]
+      expect(RFC822.raw_mx_records('hotmail.com')).to eq([
+        ["5", "mx3.hotmail.com"],
+        ["5", "mx4.hotmail.com"],
+        ["5", "mx1.hotmail.com"],
+        ["5", "mx2.hotmail.com"],
+      ])
     end
 
     it 'should return prioritised MX records of an address' do
-      RFC822.mx_records('user@hotmail.com').should have(4).items
+      expect(RFC822.mx_records('user@hotmail.com').size).to eq(4)
       record = RFC822.mx_records('user@hotmail.com').first
-      record.priority.should == 5
-      record.host.should == "mx3.hotmail.com"
+      expect(record.priority).to eq(5)
+      expect(record.host).to eq("mx3.hotmail.com")
     end
 
     it 'should return an empty result if address is invalid' do
-      RFC822.mx_records('user@hotmail@com').should == []
+      expect(RFC822.mx_records('user@hotmail@com')).to eq([])
     end
-   
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rfc-822
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Dimitrij Denissenko
@@ -9,34 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-12 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: RFC822 compatible email validation and MX record check
@@ -50,8 +50,8 @@ files:
 - init.rb
 - lib/rfc-822.rb
 - lib/rfc822.rb
-- spec/rfc822_spec.rb
 - spec/helper.rb
+- spec/rfc822_spec.rb
 homepage: http://github.com/dim/rfc-822
 licenses: []
 metadata: {}
@@ -61,20 +61,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: RFC822 compatible email validation and MX record check
 test_files:
-- spec/rfc822_spec.rb
 - spec/helper.rb
+- spec/rfc822_spec.rb