mail-x_smtpapi 1.0.0.alpha → 1.0.0.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c8f40288af6ce36eda5971ed93ede0bdb8cf077
-  data.tar.gz: 7f79cd1c3ab012ae3ddee78820d42e1e6b5500c8
+  metadata.gz: 2aa241982d4d0042b269a45812005b55639ed5aa
+  data.tar.gz: c3287e3ae8bf85afc9a29ea472f8830926bb78d0
 SHA512:
-  metadata.gz: 0be1d7588bd5278f3f042744254d2dc939a22df7c537d2ecdb1ce1de722aee27e6a30b102e8da8407d4b2137cabc7f89df3bccba07a42bd2c30cad1cca777a3c
-  data.tar.gz: f553f34ef34eedf8da1e84604b2f0023bc6e11618c2572540184f8af5cbd9311d10eef25a7fef173537d0a7f51184d0a4b7c4d49f6846316952d2cb88f245ee9
+  metadata.gz: 12e2dd0e22ee789a2c4e37fb26245f900dde5125a9d2d4d4209a13f8b8c4b390df8c77e0b578e34e39b6d16c73f4df629d1ff0936d730d13830960fd146a8874
+  data.tar.gz: c8e86d4849d4f7ed2eb6af0674c39709695b2c10b1ff4abad333856c2f61c7b0357c2de4e90823eb385b64edc33c5a69faf04077ada9e4c9fece2b6005f70d44

data/lib/mail_x_smtpapi/field.rb

@@ -2,7 +2,7 @@ require 'mail'
 require_relative 'accessors'
 
 module MailXSMTPAPI
-  class Field < ::Mail::StructuredField
+  class Field < ::Mail::UnstructuredField
     FIELD_NAME = 'x-smtpapi'
     CAPITALIZED_FIELD = 'X-SMTPAPI'
 
@@ -14,22 +14,23 @@ module MailXSMTPAPI
     include Filters
 
     def initialize(value = nil, charset = 'utf-8')
-      super(FIELD_NAME, value || {}, charset)
+      self.charset = charset
+      self.name = CAPITALIZED_FIELD
+      self.value = value || {}
     end
 
-    # emits JSON with extra spaces inserted for line wrapping.
     def encoded
       if empty?
         ''
       else
-        "#{CAPITALIZED_FIELD}: #{JSON.generate(value).gsub(/(["\]}])([,:])(["\[{])/, '\\1\\2 \\3')}\r\n"
+        "#{wrapped_value}\r\n"
       end
     end
 
-    # the decoded version is good for interacting with the header in code
-    # see: Mail::StructuredField#default
+    # to take advantage of folding, decoded must return a string with
+    # emits JSON with extra spaces inserted for line wrapping.
     def decoded
-      value
+      JSON.generate(value).gsub(/(["\]}])([,:])(["\[{])/, '\\1\\2 \\3')
     end
 
     def empty?

data/lib/mail_x_smtpapi/version.rb

@@ -1,3 +1,3 @@
 module MailXSMTPAPI
-  VERSION = '1.0.0.alpha'
+  VERSION = '1.0.0.alpha2'
 end

data/test/mail_x_smtpapi_field_test.rb

@@ -20,9 +20,15 @@ class MailXSMTPAPI::FieldTest < MiniTest::Unit::TestCase
     assert f.encoded.match(/\r\n$/)
   end
 
+  def test_encoded_is_folded
+    f = subject.new('to' => 100.times.map{ 'test@example.com'} )
+    max_line_length = f.encoded.split(/[\r\n]+/).map(&:length).max
+    assert max_line_length < 998, "max line length: #{max_line_length}"
+  end
+
   def test_decoded
-    h = {'to' => ['a@example.com']}
-    assert_equal h, subject.new(h).decoded
+    h = {'to' => ['a@example.com', 'b@example.com']}
+    assert_equal '{"to": ["a@example.com", "b@example.com"]}', subject.new(h).decoded
   end
 
   def test_empty?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail-x_smtpapi
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha
+  version: 1.0.0.alpha2
 platform: ruby
 authors:
 - Lance Ivy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,7 +65,6 @@ files:
 - README.md
 - Rakefile
 - lib/mail/x_smtpapi.rb
-- lib/mail_x_smtpapi.rb
 - lib/mail_x_smtpapi/accessors.rb
 - lib/mail_x_smtpapi/field.rb
 - lib/mail_x_smtpapi/version.rb

data/lib/mail_x_smtpapi.rb

@@ -1,5 +0,0 @@
-# library
-require 'mail_x_smtpapi/field'
-
-# integration
-require 'mail/x_smtpapi'