mailgun_rails 0.5.3 → 0.5.6

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2013 YOURNAME
+Copyright 2013 Jorge Manrubia
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/mailgun/deliverer.rb

@@ -16,30 +16,32 @@ module Mailgun
     end
 
     def deliver!(rails_message)
-      mailgun_message = prepare_mailgun_message_for(rails_message)
-      remove_empty_values mailgun_message
-      mailgun_client.send_message mailgun_message
+      mailgun_client.send_message build_mailgun_message_for(rails_message)
     end
 
     private
 
-    def prepare_mailgun_message_for(rails_message)
-      mailgun_message = build_basic_mailgun_message_from_rails_message rails_message
-
-      prepare_reply_to rails_message, mailgun_message if rails_message.reply_to
-      prepare_mailgun_variables rails_message, mailgun_message
-      prepare_mailgun_recipient_variables rails_message, mailgun_message
+    def build_mailgun_message_for(rails_message)
+      mailgun_message = build_basic_mailgun_message_for rails_message
+      transform_mailgun_attributes_from_rails rails_message, mailgun_message
+      remove_empty_values mailgun_message
 
       mailgun_message
     end
 
-    def build_basic_mailgun_message_from_rails_message(rails_message)
-      {:from => rails_message.from, :to => rails_message.to, :subject => rails_message.subject,
+    def transform_mailgun_attributes_from_rails(rails_message, mailgun_message)
+      transform_reply_to rails_message, mailgun_message if rails_message.reply_to
+      transform_mailgun_variables rails_message, mailgun_message
+      transform_mailgun_recipient_variables rails_message, mailgun_message
+    end
+
+    def build_basic_mailgun_message_for(rails_message)
+      {:from => rails_message[:from].formatted, :to => rails_message[:to].formatted, :subject => rails_message.subject,
        :html => extract_html(rails_message), :text => extract_text(rails_message)}
     end
 
-    def prepare_reply_to(rails_message, mailgun_message)
-      mailgun_message['h:Reply-To'] = rails_message.reply_to
+    def transform_reply_to(rails_message, mailgun_message)
+      mailgun_message['h:Reply-To'] = rails_message.reply_to.first
     end
 
     # @see http://stackoverflow.com/questions/4868205/rails-mail-getting-the-body-as-plain-text
@@ -59,13 +61,13 @@ module Mailgun
       end
     end
 
-    def prepare_mailgun_variables(rails_message, mailgun_message)
+    def transform_mailgun_variables(rails_message, mailgun_message)
       rails_message.mailgun_variables.try(:each) do |name, value|
         mailgun_message["v:#{name}"] = value
       end
     end
 
-    def prepare_mailgun_recipient_variables(rails_message, mailgun_message)
+    def transform_mailgun_recipient_variables(rails_message, mailgun_message)
       mailgun_message['recipient-variables'] = rails_message.mailgun_recipient_variables.to_json if rails_message.mailgun_recipient_variables
     end
 
@@ -79,4 +81,4 @@ module Mailgun
   end
 end
 
-ActionMailer::Base.add_delivery_method :mailgun, Mailgun::Deliverer
+ActionMailer::Base.add_delivery_method :mailgun, Mailgun::Deliverer

data/lib/mailgun/version.rb

@@ -1,3 +1,3 @@
 module Mailgun
-  VERSION = "0.5.3"
+  VERSION = "0.5.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailgun_rails
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +9,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.13
   type: :runtime
@@ -24,7 +24,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.13
 - !ruby/object:Gem::Dependency
@@ -91,7 +91,8 @@ files:
 - Rakefile
 - README.rdoc
 homepage: https://github.com/jorgemanrubia/mailgun_rails/
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -104,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2196270500897695838
+      hash: 1001558418500426276
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -113,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2196270500897695838
+      hash: 1001558418500426276
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23