monkey-mailer 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjViOWIzNTk3ZGEyMWFhMTFhNTE5NTA2NTI4ZWE4MDNiMmQ4MDU5Yw==
-  data.tar.gz: !binary |-
-    YTViODJjZjExZWRmMjM0YzljMjQwZThjYjZhZGNmOGEzMTRhZGNiYQ==
+SHA1:
+  metadata.gz: 4bdbc0d56b239046873ca0b876eaee460143425b
+  data.tar.gz: 9ceeada2540368ed1035b4add76197163e26842b
 SHA512:
-  metadata.gz: !binary |-
-    NjkwNzJlODAzZDVhZWNlYjMxMzI2OWQ0OGE0MjA5NmRkNmVjYmVlMzgxMDk1
-    OTJhZWM0ZTk4MTNjZjRmMWE0MzM5Y2M1MDk2MTQxNTkwOTg1Y2VhNTk1MTMw
-    NjU3YjdiYmUzY2QzOWViMTNkYWYzMWY3NTU2YmY2OGRkMjVlYjk=
-  data.tar.gz: !binary |-
-    YmUxYTg4MDRjZjM2MmUzMjIzZTZmYWE2NzY1MTg4OGM0OWMzZGMxYjM2ZmMy
-    YWM1NjFjNjU1NWZkY2FhODljZTY5NDg4MDBjMWNjMWU0YjI1MWQzYjA4OGM2
-    OWM3MTM2YjQyNTlmOTliNTNhMzAyODAxYzNjMjdmZWU3ZWMwMjE=
+  metadata.gz: 35fcff5458819a9de1d533a0a41345ff805a409877c38114ea73f167d668e1a3cd1bcb7e04efcb40bbfc70d2da8967440ad2e120c5ca35080329f7a4d72026b6
+  data.tar.gz: 6d8510d9388c20039581c1497fac374ea9c004d992eef9df8c0bb9a8912cc8653965930bd0c61e6c4fd3940c77130854626f5716936c9dc85dd3bcdfc35a35df

data/lib/monkey-mailer/adapters/mandrilapi.rb

@@ -1,33 +1,32 @@
 require "net/http"
 require "uri"
 require "json"
+require 'base64'
 
 module MonkeyMailer
   module Adapters
     class MandrilAPI
-      @key = ''
-      @request = {}
-      @uri = ''
 
-      ENDPOINT = 'https://mandrillapp.com/api/1.0'
+      @key = ''
 
       def initialize(options)
         @key = options[:mandril_api_key]
-        @request = Hash.new
-        @uri = URI.parse(URI.encode(ENDPOINT))
       end
 
       def send_email(email)
 
-        @request = {
-          :key => '',
+        request_body = {
+          :key => @key,
           :message => {
-            :html => '',
-            :text => '',
-            :subject => '',
-            :from_email => '',
-            :from_name => '',
-            :to => [],
+            :to => [{
+              :email => email.to_email,
+              :name => email.to_name
+            }],
+            :from_name => email.from_name,
+            :from_email => email.from_email,
+            :subject => email.subject,
+            :html => email.body,
+            :text => email.body.to_s.gsub(/<\/?[^>]*>/, ""),
             :headers => {},
             :track_opens => true,
             :track_clicks => true,
@@ -35,24 +34,28 @@ module MonkeyMailer
             :url_strip_qs => true,
             :preserve_recipients => false,
             :bcc_address => '',
+            :attachments => []
           },
-          :async => true
+          :async => false
         }
 
-        @request[:key] = @key
-        @request[:message][:to] << { :email => email.to_email, :name => email.to_name}
-        @request[:message][:from_name] = email.from_name
-        @request[:message][:from_email] = email.from_email
-        @request[:message][:html] = email.body
-        @request[:message][:text] = email.body.gsub(/<\/?[^>]*>/, "") unless email.body.nil?
-        @request[:message][:subject] = email.subject
-
-        req = Net::HTTP::Post.new('/api/1.0/messages/send.json', initheader = {'Content-Type' =>'application/json'})
-        req.body = @request.to_json
+        email.attachments.each do |attachment|
+          request_body[:message][:attachments] << {
+            :type => attachment.content_type,
+            :name => File.basename(attachment.file_path),
+            :content => Base64.encode64(File.read(attachment.file_path))
+          }
+        end
 
-        http = Net::HTTP.new(@uri.host, @uri.port)
+        uri = URI('https://mandrillapp.com')
+        http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = true
-        response = http.start {|http| http.request(req)}
+
+        request = Net::HTTP::Post.new('/api/1.0/messages/send.json', initheader = {'Content-Type' =>'application/json'})
+        request.body = request_body.to_json
+
+        response = http.start {|http| http.request(request)}
+
         raise MonkeyMailer::DeliverError.new("Mandril response.code not equal to 200") unless response.code.to_i == 200
         puts "Response #{response.code} #{response.message}: #{response.body}"
       end

data/lib/monkey-mailer/adapters/smtp.rb

@@ -24,6 +24,10 @@ module MonkeyMailer
           from "#{email.from_name} <#{email.from_email}>"
           subject email.subject
 
+          email.attachments.each do |attachment|
+            add_file :filename => File.basename(attachment.file_path), :content => File.read(attachment.file_path)
+          end
+
           html_part do
             content_type 'text/html; charset=UTF-8'
             body email.body

data/lib/monkey-mailer/email.rb

@@ -1,12 +1,28 @@
 module MonkeyMailer
   class Email
 
-    attr_accessor :priority, :to_email, :to_name, :from_email, :from_name, :body, :subject
+    attr_accessor :priority, :to_email, :to_name, :from_email, :from_name, :body, :subject, :attachments
 
     def initialize(hash=nil)
+      self.attachments = []
       unless hash.nil?
+        new_attachments = [hash.delete(:attachments)].flatten.compact
+        new_attachments.each do |attachment_hash|
+          self.attachments << Attachment.new(attachment_hash)
+        end
+
         hash.each_pair{|key, value| self.send("#{key}=", value)}
       end
     end
+
+    class Attachment
+      attr_accessor :file_path, :content_type
+
+      def initialize(hash=nil)
+        unless hash.nil?
+          hash.each_pair{|key, value| self.send("#{key}=", value)}
+        end
+      end
+    end
   end
 end

data/lib/monkey-mailer/loaders/dummy.rb

@@ -7,8 +7,14 @@ module MonkeyMailer::Loaders
     def find_emails(priority, quota)
       emails = []
       quota.times do
-        emails << MonkeyMailer::Email.new(:priority => priority, :to_email => 'info@example.com', :to_name => 'Example user',
-          :from_email => 'noreply@example.com', :from_name => 'No reply', :subject => 'Lorem ipsum', :body => '')
+        emails << MonkeyMailer::Email.new(
+          :priority => priority,
+          :to_email => 'info@example.com',
+          :to_name => 'Example user',
+          :from_email => 'noreply@example.com',
+          :from_name => 'No reply',
+          :subject => 'Lorem ipsum',
+          :body => '')
       end
       emails
     end

data/lib/monkey-mailer/version.rb

@@ -1,3 +1,3 @@
 module MonkeyMailer
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/monkey-mailer.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- spec/*`.split("\n")
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'clap', '>= 1.0.0'
-  spec.add_dependency 'fallen', '>= 0.0.2'
-  spec.add_dependency 'mail', '>= 2.4.4'
-  spec.add_development_dependency 'rspec', '>= 2.12.0'
+  spec.add_dependency 'clap', '~> 1.0', '>= 1.0.0'
+  spec.add_dependency 'fallen', '~> 0.0', '>= 0.0.3'
+  spec.add_dependency 'mail', '~> 2.4','>= 2.4.4'
+  spec.add_development_dependency 'rspec', '~> 2.12', '>= 2.12.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: monkey-mailer
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Lautaro Orazi
@@ -9,62 +9,86 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-27 00:00:00.000000000 Z
+date: 2014-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: fallen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '0.0'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.4'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.4'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.4.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.12'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.12'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.12.0
 description: Ruby email queueing system with priority handling
@@ -93,7 +117,7 @@ files:
 - monkey-mailer.gemspec
 - spec/adapter_spec.rb
 - spec/loader_spec.rb
-- spec/postman_spec.rb
+- spec/monkey_mailer_spec.rb
 - spec/spec_helper.rb
 - spec/support/angry_adapter.rb
 - spec/support/email_faker.rb
@@ -109,24 +133,24 @@ 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.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby email queueing system with priority handling
 test_files:
 - spec/adapter_spec.rb
 - spec/loader_spec.rb
-- spec/postman_spec.rb
+- spec/monkey_mailer_spec.rb
 - spec/spec_helper.rb
 - spec/support/angry_adapter.rb
 - spec/support/email_faker.rb