mailparser 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acf77838874db7d6c17b1e85420b5027eaea07c5
-  data.tar.gz: b67ae4ea3374d66de3cb11f40a5fe25074e682d6
+  metadata.gz: 396b7e55f0c34b0ad0716023d3393cff1f05acd8
+  data.tar.gz: 9877bd098b6ac1988726c3ed9a67273bb945aa15
 SHA512:
-  metadata.gz: 790f81bfd597d4b209efb81a29ffa6356484ab5b8570140b16dac2b0e33982269df2a0fa11f16362c06e198c759eef8b087d17a3a50e2967ef4daea6710d9a97
-  data.tar.gz: 2f2502e6975c84472da8675c4c42d65056e1ec4f3845a2ebe8a5477a3162f4ecaa0f43c37b729da9c189ca5dd12609704bac7c2dba002d095cabe2266ca931ff
+  metadata.gz: a42ba94877924f0d4587514dea66929beafc101cc7727b30b4df48f9b308633efdeb3dd5f6d5af8023451f11f985c90588d0b99f498b5e090dba543336033478
+  data.tar.gz: 4d5d248a63bd18f40971b9e47d72e0afb234e8bf6cb9aa20f036f0cc2962964a782151263c35369606f293df177a792ae66a59d500685eb9b6aac370fd1bb296

data/lib/mailparser/loose.rb

@@ -68,7 +68,7 @@ module MailParser
         t = Time.now
       end
       year = t.year > 9999 ? 9999 : t.year
-      return RFC2822::DateTime.new(year, t.month, t.day, t.hour, t.min, t.sec, t.zone)
+      return RFC2822::DateTime.new(year, t.month, t.day, t.hour, t.min, t.sec, t.utc_offset)
     end
 
     # parse From, To,Cc field

data/lib/mailparser/rfc2822.rb

@@ -30,16 +30,13 @@ module MailParser::RFC2822
     "return-path"       => :RETURN_PATH,
     "received"          => :RECEIVED,
   }
-  
+
   ZONE = {
     "UT"  => "+0000",
     "GMT" => "+0000",
     "EDT" => "-0400",
     "EST" => "-0500",
     "CDT" => "-0500",
-    "EDT" => "-0400",
-    "EST" => "-0500",
-    "CDT" => "-0500",
     "CST" => "-0600",
     "MDT" => "-0600",
     "MST" => "-0700",
@@ -156,10 +153,10 @@ module MailParser::RFC2822
   class DateTime
     def self.now
       t = Time.now
-      self.new(t.year, t.month, t.day, t.hour, t.min, t.sec, t.zone)
+      self.new(t.year, t.month, t.day, t.hour, t.min, t.sec, t.utc_offset)
     end
 
-    def initialize(year, month, day, hour, min, sec, zone)
+    def initialize(year, month, day, hour, min, sec, zone_or_offset)
       y, m, d, h, mi, s = year.to_i, month.to_i, day.to_i, hour.to_i, min.to_i, sec.to_i
       raise ArgumentError, "invalid year" if y < 0 or 9999 < y
       raise ArgumentError, "invalid month" if m < 1 or 12 < m
@@ -178,13 +175,21 @@ module MailParser::RFC2822
       raise ArgumentError, "invalid hour" if h > 23
       raise ArgumentError, "invalid minute" if mi > 59
       raise ArgumentError, "invalid second" if s > 60
+      @year, @month, @day, @hour, @min, @sec = y, m, d, h, mi, s
+      if zone_or_offset.is_a? Integer
+        offset = zone_or_offset
+        @zone_sec = offset
+        @zone = format("%03d%02d", offset/3600, offset%3600).sub(/^0/, '+')
+        return
+      end
+      zone = zone_or_offset
       if zone =~ /^[+-]\d\d(\d\d)$/ then
         raise ArgumentError, "invalid zone" if $1.to_i > 59
       else
-        zone = ZONE[zone.upcase] || "-0000"
+        zone = (zone && ZONE[zone.upcase]) || "-0000"
       end
-      @year, @month, @day, @hour, @min, @sec, @zone = y, m, d, h, mi, s, zone
       z = zone[1,4].to_i
+      @zone = zone
       @zone_sec = z/100*3600 + z%100*60
       @zone_sec = -@zone_sec if zone[0] == ?-
     end

data/test/test_loose.rb

@@ -22,10 +22,18 @@ class TC_Loose < Test::Unit::TestCase
       assert_equal(2007, d.year)
       assert_equal(1, d.month)
       assert_equal(10, d.day)
-      assert_equal(3, d.hour)
+      if RUBY_VERSION >= '2.2'
+        assert_equal(12, d.hour)
+      else
+        assert_equal(3, d.hour)
+      end
       assert_equal(53, d.min)
       assert_equal(55, d.sec)
-      assert_equal("+0000", d.zone)
+      if RUBY_VERSION >= '2.2'
+        assert_equal("+0900", d.zone)
+      else
+        assert_equal("+0000", d.zone)
+      end
     ensure
       ENV["TZ"] = tzbak
     end
@@ -39,10 +47,18 @@ class TC_Loose < Test::Unit::TestCase
       assert_equal(9999, d.year)
       assert_equal(1, d.month)
       assert_equal(10, d.day)
-      assert_equal(3, d.hour)
+      if RUBY_VERSION >= '2.2'
+        assert_equal(12, d.hour)
+      else
+        assert_equal(3, d.hour)
+      end
       assert_equal(53, d.min)
       assert_equal(55, d.sec)
-      assert_equal("+0000", d.zone)
+      if RUBY_VERSION >= '2.2'
+        assert_equal("+0900", d.zone)
+      else
+        assert_equal("+0000", d.zone)
+      end
     ensure
       ENV["TZ"] = tzbak
     end
@@ -86,10 +102,18 @@ class TC_Loose < Test::Unit::TestCase
       assert_equal(2007, r.date_time.year)
       assert_equal(1, r.date_time.month)
       assert_equal(10, r.date_time.day)
-      assert_equal(3, r.date_time.hour)
+      if RUBY_VERSION >= '2.2'
+        assert_equal(12, r.date_time.hour)
+      else
+        assert_equal(3, r.date_time.hour)
+      end
       assert_equal(9, r.date_time.min)
       assert_equal(55, r.date_time.sec)
-      assert_equal("+0000", r.date_time.zone)
+      if RUBY_VERSION >= '2.2'
+        assert_equal("+0900", r.date_time.zone)
+      else
+        assert_equal("+0000", r.date_time.zone)
+      end
       assert_equal("host.example.com", r.name_val["from"])
       assert_equal("my.server", r.name_val["by"])
       assert_equal("<user@domain.name>", r.name_val["for"])
@@ -185,10 +209,18 @@ class TC_Loose < Test::Unit::TestCase
         assert_equal(2007, r.date_time.year)
         assert_equal(1, r.date_time.month)
         assert_equal(10, r.date_time.day)
-        assert_equal(3, r.date_time.hour)
+        if RUBY_VERSION >= '2.2'
+          assert_equal("+0900", r.date_time.zone)
+        else
+          assert_equal("+0000", r.date_time.zone)
+        end
         assert_equal(9, r.date_time.min)
         assert_equal(55, r.date_time.sec)
-        assert_equal("+0000", r.date_time.zone)
+        if RUBY_VERSION >= '2.2'
+          assert_equal("+0900", r.date_time.zone)
+        else
+          assert_equal("+0000", r.date_time.zone)
+        end
         assert_equal("ほげ".force_encoding("utf-8"), r.name_val["from"])
         assert_equal("ふが".force_encoding("utf-8"), r.name_val["by"])
         assert_equal("ぴよ".force_encoding("utf-8"), r.name_val["for"])

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mailparser
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - TOMITA Masahiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2015-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mmapscanner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 description: MailParser is a parser for mail message
 email: tommy@tmtm.org
 executables: []
@@ -32,28 +32,28 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/mailparser.rb
-- lib/mailparser/rfc2183/scanner.rb
-- lib/mailparser/rfc2183/parser.rb
+- lib/mailparser/conv_charset.rb
 - lib/mailparser/error.rb
-- lib/mailparser/rfc2045/scanner.rb
+- lib/mailparser/loose.rb
+- lib/mailparser/rfc2045.rb
 - lib/mailparser/rfc2045/parser.rb
+- lib/mailparser/rfc2045/scanner.rb
 - lib/mailparser/rfc2047.rb
-- lib/mailparser/conv_charset.rb
-- lib/mailparser/loose.rb
 - lib/mailparser/rfc2183.rb
-- lib/mailparser/rfc2045.rb
+- lib/mailparser/rfc2183/parser.rb
+- lib/mailparser/rfc2183/scanner.rb
+- lib/mailparser/rfc2231.rb
 - lib/mailparser/rfc2822.rb
-- lib/mailparser/rfc2822/scanner.rb
 - lib/mailparser/rfc2822/parser.rb
-- lib/mailparser/rfc2231.rb
+- lib/mailparser/rfc2822/scanner.rb
 - test.rb
 - test/test_loose.rb
-- test/test_rfc2231.rb
-- test/test_rfc2183.rb
-- test/test_rfc2047.rb
-- test/test_rfc2822.rb
 - test/test_mailparser.rb
 - test/test_rfc2045.rb
+- test/test_rfc2047.rb
+- test/test_rfc2183.rb
+- test/test_rfc2231.rb
+- test/test_rfc2822.rb
 homepage: http://github.com/tmtm/mailparser
 licenses:
 - Ruby's
@@ -64,17 +64,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Mail Parser
@@ -87,3 +87,4 @@ test_files:
 - test/test_rfc2822.rb
 - test/test_mailparser.rb
 - test/test_rfc2045.rb
+has_rdoc: