mail-x_smtpapi 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d408edd7f988abd94b223dc828886644da7fda2
-  data.tar.gz: b9db873259f110c46d2369c1e4d7f3b83b2f1366
+  metadata.gz: 0ad63c7dc51b015c77377b0a011860de65d25d89
+  data.tar.gz: ece9b680c52f0259141a3e35ef9abc2bdaaada78
 SHA512:
-  metadata.gz: 03ae17f61ab25a1688b2a9962390aafc81bf3d0d30d66141d88cbf747905a73f31fec5b500443bf789618923cd7db5a270058b530c4672ca9aaeb50022f5ecd2
-  data.tar.gz: a43fe148232eac0fdf5d52930f49a9e634e075e3cca3c6d55d9eb6c54eeb49385fa91f77e2be184de2bd9d2b7e2862a3fd2bcafe71242921b717c05186c5ada3
+  metadata.gz: b2dd23f27a36f54b3fb0d8ae26e125bea10b836493e05f48d79ade01410297327b51fabfc0895b28ca9c98bdd029ae16b0dfa78f13672aacdfffd27c184b64d2
+  data.tar.gz: 0c3990f7a944b913f76852354eb1aaade19022f4cd53852f2bf62f181eb4b7f5fec2d55ba36ad1fc19ad312e5fc3b28f77a7c5c1e6b2f6324d84c1909f796329

data/.ruby-version

@@ -0,0 +1 @@
+2.3.1

data/Appraisals

@@ -0,0 +1,7 @@
+appraise "mail-2.6" do
+  gem "mail", "~> 2.6.0"
+end
+
+appraise "mail-2.7" do
+  gem "mail", "~> 2.7.0"
+end

data/CHANGELOG.md

@@ -0,0 +1,29 @@
+# CHANGELOG
+
+## Version 1.2.0
+
+### Non-breaking changes
+
+* fixes for compatibility with mail 2.7.0 (@cainlevy)
+
+## Version 1.1.0
+
+### Non-breaking changes
+
+* add support for asm_group_id, PR #2 (@stevewilhelm)
+
+## Version 1.0.2
+
+### Non-breaking changes
+
+* add minitest dependency
+* declare dependency on ruby 2.3.1
+
+## Version 1.0.1
+
+### Non-breaking changes
+
+  * changed underlying key for sections() from 'sections' to 'section'
+
+## Version 1.0.0
+

data/circle.yml

@@ -1,3 +1,10 @@
 machine:
   ruby:
     version: 2.3.1
+
+dependencies:
+  post:
+    - bundle exec appraisal install
+test:
+  override:
+    - bundle exec appraisal rake test

data/gemfiles/mail_2.6.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mail", "~> 2.6.0"
+
+gemspec path: "../"

data/gemfiles/mail_2.6.gemfile.lock

@@ -0,0 +1,35 @@
+PATH
+  remote: ..
+  specs:
+    mail-x_smtpapi (1.1.0)
+      mail (> 2.6.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    mail (2.6.6)
+      mime-types (>= 1.16, < 4)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    minitest (5.10.3)
+    rake (10.5.0)
+    thor (0.20.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bundler (~> 1.7)
+  mail (~> 2.6.0)
+  mail-x_smtpapi!
+  minitest
+  rake (~> 10.0)
+
+BUNDLED WITH
+   1.16.0

data/gemfiles/mail_2.7.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mail", "~> 2.7.0"
+
+gemspec path: "../"

data/gemfiles/mail_2.7.gemfile.lock

@@ -0,0 +1,33 @@
+PATH
+  remote: ..
+  specs:
+    mail-x_smtpapi (1.1.0)
+      mail (> 2.6.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    mini_mime (1.0.0)
+    minitest (5.10.3)
+    rake (10.5.0)
+    thor (0.20.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bundler (~> 1.7)
+  mail (~> 2.7.0)
+  mail-x_smtpapi!
+  minitest
+  rake (~> 10.0)
+
+BUNDLED WITH
+   1.16.0

data/lib/mail_x_smtpapi/accessors.rb

@@ -2,7 +2,7 @@ module MailXSMTPAPI
 
   module Recipients
     def to
-      value['to'] ||= []
+      data['to'] ||= []
     end
 
     def to=(val)
@@ -13,7 +13,7 @@ module MailXSMTPAPI
 
   module Substitutions
     def substitutions
-      value['sub'] ||= {}
+      data['sub'] ||= {}
     end
 
     def substitutions=(val)
@@ -30,7 +30,7 @@ module MailXSMTPAPI
 
   module UniqueArguments
     def unique_args
-      value['unique_args'] ||= {}
+      data['unique_args'] ||= {}
     end
 
     def unique_args=(val)
@@ -41,33 +41,33 @@ module MailXSMTPAPI
 
   module Category
     def category
-      value['category']
+      data['category']
     end
 
     def category=(val)
-      value['category'] = val
+      data['category'] = val
     end
   end
 
   module AsmGroupId
     def asm_group_id
-      value['asm_group_id']
+      data['asm_group_id']
     end
 
     def asm_group_id=(val)
-      value['asm_group_id'] = val
+      data['asm_group_id'] = val
     end
   end
 
   module Filters
     def filters
-      value['filters'] ||= {}
+      data['filters'] ||= {}
     end
   end
 
   module Sections
     def sections
-      value['section'] ||= {}
+      data['section'] ||= {}
     end
   end
 

data/lib/mail_x_smtpapi/field.rb

@@ -7,6 +7,8 @@ module MailXSMTPAPI
     FIELD_NAME = 'x-smtpapi'
     CAPITALIZED_FIELD = 'X-SMTPAPI'
 
+    attr_reader :data
+
     # Accessors
     include Recipients
     include Substitutions
@@ -19,7 +21,11 @@ module MailXSMTPAPI
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
       self.name = CAPITALIZED_FIELD
-      self.value = value || {}
+      @data = value || {}
+    end
+
+    def value
+      JSON.generate(data)
     end
 
     def encoded
@@ -33,11 +39,11 @@ module MailXSMTPAPI
     # to take advantage of folding, decoded must return a string of
     # JSON with extra spaces inserted for line wrapping.
     def decoded
-      JSON.generate(value).gsub(/(["\]}])([,:])(["\[{])/, '\\1\\2 \\3')
+      value.gsub(/(["\]}])([,:])(["\[{])/, '\\1\\2 \\3')
     end
 
     def empty?
-      value.values.all?{|v| !v || v.empty? }
+      data.values.all?{|v| !v || v.empty? }
     end
   end
 end

data/lib/mail_x_smtpapi/version.rb

@@ -1,3 +1,3 @@
 module MailXSMTPAPI
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/mail-x_smtpapi.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest"
+  spec.add_development_dependency "appraisal"
 
   spec.add_dependency "mail", "> 2.6.0"
 end

data/test/mail_integration_test.rb

@@ -6,10 +6,11 @@ class MailIntegrationTest < Minitest::Test
     assert subject.smtpapi
     assert subject.smtpapi.empty?
 
-    subject.smtpapi.value['to'] = 'c@example.com'
+    subject.smtpapi.data['to'] = 'c@example.com'
     refute subject.smtpapi.empty?
 
-    assert_equal 'c@example.com', subject.smtpapi.value['to']
+    assert_equal 'c@example.com', subject.smtpapi.data['to']
+    assert_equal '{"to":"c@example.com"}', subject.smtpapi.value
   end
 
   def test_hash_reader
@@ -19,7 +20,8 @@ class MailIntegrationTest < Minitest::Test
 
   def test_hash_writer
     subject['x-smtpapi'] = {'to' => 'c@example.com'}
-    assert_equal 'c@example.com', subject.smtpapi.value['to']
+    assert_equal 'c@example.com', subject.smtpapi.data['to']
+    assert_equal '{"to":"c@example.com"}', subject.smtpapi.value
   end
 
   def test_limited_field
@@ -27,7 +29,8 @@ class MailIntegrationTest < Minitest::Test
     subject['x-smtpapi'] = {'to' => 'd@example.com'}
 
     refute subject['x-smtpapi'].is_a?(Array)
-    assert_equal 'd@example.com', subject['x-smtpapi'].value['to']
+    assert_equal 'd@example.com', subject['x-smtpapi'].data['to']
+    assert_equal '{"to":"d@example.com"}', subject.smtpapi.value
   end
 
   def test_field_name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mail-x_smtpapi
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Lance Ivy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  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: mail
   requirement: !ruby/object:Gem::Requirement
@@ -74,11 +88,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
+- Appraisals
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - circle.yml
+- gemfiles/mail_2.6.gemfile
+- gemfiles/mail_2.6.gemfile.lock
+- gemfiles/mail_2.7.gemfile
+- gemfiles/mail_2.7.gemfile.lock
 - lib/mail-x_smtpapi.rb
 - lib/mail/x_smtpapi.rb
 - lib/mail_x_smtpapi/accessors.rb
@@ -109,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Adds SendGrid X-SMTPAPI header support to Mail