rails-mailgun 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 416599af643ce06b2287dc7a210b48cbb11b9322
-  data.tar.gz: 441ecec58ee0e2b572cc2b1bab9a80ed3890fc86
+  metadata.gz: aa58d03cd1bbb9b058e23af701a9339a0d4b3c59
+  data.tar.gz: 35a65120f2ee24490c12479f12664bb0e24438bb
 SHA512:
-  metadata.gz: 41fa9bb189c2927505fb437c4a406732c5c0bd9a3df8f97bffb1a3de9efc9069595b1c1434c157626114cf46d927ab8e3ce1afbe4740c0c001c6d980db444674
-  data.tar.gz: 53c458a6d56040cf53661fc88044ff9d541f4a79f18e88d4160ebc8514966f39a56014e4585b80f199424874be1b2f82ca243c38a5825fa3317f621434b358d1
+  metadata.gz: f654d9b1a0248a70874c1886146a908b2f6e73a2980c11ac8478d91e10a82dcc130588a1fc9083a93d8867692c4576bc5b30e2de1df9e7b3f7ac3d38cf565314
+  data.tar.gz: 307674d92a587bfda5d81138a87560d86bbcff299cfa5dad501d7844d04de246da842d93aa1ac7077efd0a7664c25d530d01abafc145c40165b48d958955d9b6

data/lib/rails-mailgun.rb

@@ -1,6 +1,6 @@
 require "rails-mailgun/engine"
 require "rails-mailgun/mail"
-require "rest-client"
+require 'mailgun'
 
 module RailsMailgun
 end

data/lib/rails-mailgun/mail.rb

@@ -6,25 +6,48 @@ module RailsMailgun
     attr_accessor :settings
 
     def deliver!(mail)
-      RestClient.post message_url, message_params(mail)
+      client = Mailgun::Client.new(settings[:api_key])
+      client.send_message(settings[:api_host], message_object(mail))
     end
 
     private
-    def message_url
-      "https://api:#{settings[:api_key]}@api.mailgun.net/v2/#{settings[:api_host]}/messages"
-    end
 
-    def message_params(mail)
-      message_params = {
-        from: mail.from.join(" "),
-        to:   mail.to.join(", "),
-        subject: mail.subject
-      }
+    def message_object(mail)
+      message_object = Mailgun::MessageBuilder.new
+
+      message_object.set_from_address( mail.from.join(' ') )
+      mail.to.each { |t| message_object.add_recipient(:to, t) }
+
+      message_object.set_subject(mail.subject)
+
+      if mail.multipart?
+        set_message_object_body(message_object, mail.parts.first)
 
-      type = mail.content_type.match(/html/) ? :html : :text
-      message_params[type] = mail.body.to_s
+        mail.attachments.each do |attachment|
+          tempfile = create_tempfile_from_attachment(attachment)
+          message_object.add_attachment(tempfile.path, attachment.filename)
+        end
+      else
+        set_message_object_body(message_object, mail)
+      end
+
+      message_object
+    end
+
+    def set_message_object_body(message_object, mail)
+      if mail.content_type.match(/html/)
+        message_object.set_html_body(mail.body.to_s)
+      else
+        message_object.set_text_body(mail.body.to_s)
+      end
+    end
 
-      message_params
+    def create_tempfile_from_attachment(attachment)
+      tempfile = Tempfile.new(attachment.filename)
+      tempfile.binmode
+      tempfile.write(attachment.body.raw_source)
+      tempfile.close
+      tempfile
     end
   end
 end

data/lib/rails-mailgun/version.rb

@@ -1,3 +1,3 @@
 module RailsMailgun
-  VERSION = "0.0.1"
+  VERSION = '0.1.0'
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: rails-mailgun
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Yuva Kumar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2014-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: mailgun-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
 description: 
@@ -60,13 +60,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.md
+- Rakefile
+- lib/rails-mailgun.rb
 - lib/rails-mailgun/engine.rb
 - lib/rails-mailgun/mail.rb
 - lib/rails-mailgun/version.rb
-- lib/rails-mailgun.rb
-- MIT-LICENSE
-- Rakefile
-- README.md
 homepage: https://github.com/code-mancers/rails-mailgun
 licenses: []
 metadata: {}
@@ -76,17 +76,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.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Mailgun integration for rails