sbsm 1.2.4 → 1.2.5

data/.travis.yml

@@ -3,6 +3,7 @@ language: ruby
 notifications:
   email:
   - ngiger@ywesee.com
+bundler_args: --without debugger
 rvm:
   - ruby-head
   - 2.0.0

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 gem 'hoe'
-gem 'rmail'
+gem 'mail', '>=2.2.7'
 gem 'hpricot'
 # gem 'rockit', '0.3.8' Cannot find version 0.3.8 is this really needed?
 
@@ -17,6 +17,6 @@ end
 group :development do
   gem 'racc'
   gem 'travis-lint'
-#  gem 'pry'
-#  gem 'pry-debugger'
+  gem 'pry'
+  gem 'pry-debugger'
 end

data/Gemfile.lock

@@ -3,36 +3,59 @@ GEM
   specs:
     ansi (1.4.3)
     builder (3.2.2)
-    docile (1.1.0)
-    hashie (2.0.5)
+    coderay (1.1.0)
+    columnize (0.8.9)
+    debugger (1.6.7)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.3.5)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.3.5)
+    docile (1.1.3)
     hashr (0.0.22)
-    hoe (3.7.1)
+    hoe (3.12.0)
       rake (>= 0.8, < 11.0)
     hoe-travis (1.2)
       hoe (~> 3.0)
       travis-lint (~> 1.2)
     hpricot (0.8.6)
-    minitest (5.0.8)
-    minitest-reporters (1.0.0)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    method_source (0.8.2)
+    mime-types (1.25.1)
+    minitest (5.3.4)
+    minitest-reporters (1.0.4)
       ansi
       builder
       minitest (>= 5.0)
-      powerbar
-    multi_json (1.8.2)
-    powerbar (1.0.11)
-      ansi (~> 1.4.0)
-      hashie (>= 1.1.0)
-    racc (1.4.10)
-    rake (10.1.0)
-    rmail (1.0.0)
+      ruby-progressbar
+    multi_json (1.10.1)
+    polyglot (0.3.4)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    pry-debugger (0.2.2)
+      debugger (~> 1.3)
+      pry (~> 0.9.10)
+    racc (1.4.11)
+    rake (10.3.2)
+    ruby-progressbar (1.5.1)
+    safe_yaml (0.9.7)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
+    slop (3.5.0)
     test-unit (2.5.5)
-    travis-lint (1.7.0)
+    travis-lint (1.8.0)
       hashr (~> 0.0.22)
+      safe_yaml (~> 0.9.0)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
 
 PLATFORMS
   ruby
@@ -41,11 +64,13 @@ DEPENDENCIES
   hoe
   hoe-travis
   hpricot
+  mail (>= 2.2.7)
   minitest
   minitest-reporters
+  pry
+  pry-debugger
   racc
   rake
-  rmail
   simplecov
   test-unit
   travis-lint

data/lib/sbsm/validator.rb

@@ -24,7 +24,7 @@
 # Validator -- sbsm -- 15.11.2002 -- hwyss@ywesee.com 
 
 require 'digest/md5'
-require 'rmail'
+require 'mail'
 require 'date'
 require 'drb/drb'
 require 'uri'
@@ -152,13 +152,19 @@ module SBSM
 		private
 		def email(value)
 			return if(value.empty?)
-			parsed = RMail::Address.parse(value).first
-      if(parsed.nil?)
+			parsed = Mail::Address.new(value)
+			if(parsed.nil?)
 			  raise InvalidDataError.new(:e_invalid_email_address, :email, value)
-      elsif(parsed.domain)
-				parsed.address
+				elsif (parsed.domain)
+				parsed.to_s
 			else
-				raise InvalidDataError.new(:e_domainless_email_address, :email, value)
+				raise InvalidDataError.new(:e_invalid_email_address, :email, value)
+			end
+		rescue => e
+			if e.class == SBSM::InvalidDataError
+				raise e
+			else
+				raise InvalidDataError.new(:e_invalid_email_address, :email, value)
 			end
 		end
 		def filename(value)

data/lib/version.rb

@@ -1 +1 @@
-VERSION = '1.2.4'
+VERSION = '1.2.5'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sbsm
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 2
-  - 4
-  version: 1.2.4
+  - 5
+  version: 1.2.5
 platform: ruby
 authors: 
 - Masaomi Hatakeyama, Zeno R.R. Davatz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-03-05 00:00:00 Z
+date: 2014-05-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rdoc