multi_mail 0.1.2 → 0.1.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fcb39c73b30d0f52705ccc4d3f24bcb1142a974d
+  data.tar.gz: c1a3e5183e6755f559475f3a4dcda2f8103d89fb
+SHA512:
+  metadata.gz: b93ac384cfad8aa761a4cf21073a1c5ac4379493be11e8823f82006b8b8f2500e0868a5a1f545c09f22ecde04e107ec54d3cba42aaedfbb6f27a03e6f7f84196
+  data.tar.gz: f850d3ba49bc77ba05a54d0851920495bfa8ae4030d5a6f574d436009b6a115032b3e1ac5bccf0e59251ce379425ca6161713b6a6c12733598069628662dfffd

data/lib/multi_mail.rb

@@ -6,7 +6,6 @@ require 'iconv' unless RUBY_VERSION >= '1.9'
 
 require 'faraday'
 require 'mail'
-require 'multimap'
 require 'rack'
 
 require 'mail_ext/message'
@@ -101,6 +100,7 @@ module MultiMail
   end
 end
 
+require 'multi_mail/multimap'
 require 'multi_mail/service'
 require 'multi_mail/receiver'
 require 'multi_mail/message/base'

data/lib/multi_mail/multimap.rb

@@ -0,0 +1,63 @@
+# @note The multimap gem was yanked, so we re-implement its functionality.
+# @see https://github.com/josh/multimap
+module MultiMail
+  class Multimap
+    def initialize
+      @hash = {}
+    end
+
+    def [](key)
+      @hash[key]
+    end
+
+    def []=(key, value)
+      @hash[key] ||= []
+      @hash[key] << value
+    end
+
+    def ==(other)
+      if Multimap === other
+        @hash == other.hash
+      else
+        @hash == other
+      end
+    end
+
+    def size
+      @hash.values.flatten.size
+    end
+
+    def each_pair
+      @hash.each_pair do |key,values|
+        values.each do |value|
+          yield key, value
+        end
+      end
+    end
+
+    def merge(other)
+      dup.update(other)
+    end
+
+    def update(other)
+      if Multimap === other
+        other.each_pair do |key,value|
+          self[key] = value
+        end
+      else
+        raise ArgumentError
+      end
+      self
+    end
+
+    def to_hash
+      @hash.dup
+    end
+
+  protected
+
+    def hash
+      @hash
+    end
+  end
+end

data/lib/multi_mail/postmark/message.rb

@@ -4,7 +4,7 @@ module MultiMail
     class Postmark < MultiMail::Message::Base
       # Returns the message headers in Postmark format.
       #
-      # @return [Multimap] the message headers in Postmark format
+      # @return [Array<Hash>] the message headers in Postmark format
       def postmark_headers
         array = []
         header_fields.each do |field|
@@ -20,7 +20,7 @@ module MultiMail
 
       # Returns the message's attachments in Postmark format.
       #
-      # @return [Multimap] the attachments in Postmark format
+      # @return [Array<Hash>] the attachments in Postmark format
       # @see http://developer.postmarkapp.com/developer-build.html#attachments
       def postmark_attachments
         attachments.map do |attachment|

data/lib/multi_mail/postmark/sender.rb

@@ -41,7 +41,7 @@ module MultiMail
 
         unless response.status == 200
           case body['ErrorCode']
-          when 0
+          when 10
             raise InvalidAPIKey, body['Message']
           when 300
             case body['Message']

data/lib/multi_mail/receiver/base.rb

@@ -123,7 +123,7 @@ module MultiMail
             end
 
             # Flatten the parameters.
-            map.each do |key,value|
+            map.each_pair do |key,value|
               if Array === value && value.size == 1
                 params[key] = value.first
               else

data/lib/multi_mail/version.rb

@@ -1,3 +1,3 @@
 module MultiMail
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/multi_mail.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'faraday', '~> 0.8.0'
   s.add_runtime_dependency 'mail', '~> 2.5.3' # Rails 3.2.13, less buggy than 2.4.x
-  s.add_runtime_dependency 'multimap', '~> 1.1.2'
   s.add_runtime_dependency 'rack', '~> 1.4'
 
   # For testing

data/spec/postmark/sender_spec.rb

@@ -65,7 +65,7 @@ describe MultiMail::Sender::Postmark do
       expect{
         message.delivery_method MultiMail::Sender::Postmark, :api_key => 'xxx'
         message.deliver
-      }.to raise_error(MultiMail::InvalidAPIKey, 'Bad or missing server or user API token.')
+      }.to raise_error(MultiMail::InvalidAPIKey, 'Bad or missing Server API token.')
     end
   end
 

metadata

@@ -1,234 +1,194 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: multi_mail
-version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
+version: !ruby/object:Gem::Version
+  version: 0.1.3
 platform: ruby
-authors: 
+authors:
 - Open North
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-01-08 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-04-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: faraday
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 8
-        - 0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 0.8.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mail
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 2
-        - 5
-        - 3
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: mail
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 2.5.3
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: multimap
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 1
-        - 2
-        version: 1.1.2
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.3
+- !ruby/object:Gem::Dependency
   name: rack
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: coveralls
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 7
-        - 7
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 1.7.7
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.7
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 10
-        version: "2.10"
+  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: '2.10'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: vcr
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 2
-        - 4
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.10'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 2.4.0
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: mandrill-api
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 81
-        segments: 
-        - 1
-        - 0
-        - 35
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: mandrill-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 1.0.35
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: postmark
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.35
+- !ruby/object:Gem::Dependency
+  name: postmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 6
-        - 7
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 1.6.7
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: sendgrid_webapi
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.7
+- !ruby/object:Gem::Dependency
+  name: sendgrid_webapi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id013
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
-email: 
+email:
 - info@opennorth.ca
-executables: 
+executables:
 - multi_mail_post
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .travis.yml
-- .yardopts
+files:
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
 - Gemfile
 - LICENSE
 - README.md
@@ -245,6 +205,7 @@ files:
 - lib/multi_mail/mandrill/receiver.rb
 - lib/multi_mail/mandrill/sender.rb
 - lib/multi_mail/message/base.rb
+- lib/multi_mail/multimap.rb
 - lib/multi_mail/postmark/message.rb
 - lib/multi_mail/postmark/receiver.rb
 - lib/multi_mail/postmark/sender.rb
@@ -312,41 +273,31 @@ files:
 - spec/service_spec.rb
 - spec/simple/receiver_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/opennorth/multi_mail
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Easily switch between email APIs
-test_files: 
+test_files:
 - spec/cloudmailin/receiver_spec.rb
 - spec/fixtures/cloudmailin/json/attachment_store.txt
 - spec/fixtures/cloudmailin/json/spam.txt