pdm 0.0.2 → 0.0.3

data/lib/pdm/api_request.rb

@@ -4,15 +4,16 @@ module Pdm
 
     require "cgi"
     require "uri"
-    require "net/http/post/multipart"
+    require "rest_client"
     require "pdm/json"
     
 
-    attr_accessor :endpoint, :api_key
+    attr_accessor :endpoint, :api_key, :accept
 
-    def initialize(endpoint, api_key)
+    def initialize(endpoint, api_key, accept = :json)
       self.endpoint = endpoint
       self.api_key = api_key
+      self.accept = accept
     end
 
 
@@ -26,37 +27,27 @@ module Pdm
       URI.join(self.endpoint, path.to_s)
     end
 
-    def make_query_string(path, params)
-      params = params.collect { |k,v| "#{k}=#{CGI.escape(v.to_s)}" }
-      params = params.join("&")
-      [path, params].join("?")
-    end
-    
-    def request(path, params = {})
+    def with_rest_client(path, params)
       uri = uri_from_path(path)
       params = decorate_params(params)
-      Net::HTTP.start(uri.host, uri.port) do |http|
-        req = yield(uri, params)
-        http.request(req)
-      end
+      yield(::RestClient, uri.to_s, params)
     end
 
-    def get(path, params = {})
-      request(path, params) do |uri, params|
-        query_string = make_query_string(uri.path, params)
-        Net::HTTP::Get.new(query_string)
+    def get(path, params)
+      with_rest_client(path, params) do |r, uri, params|
+        r.get(uri, params, :accept => accept)
       end
     end
-    
-    def multipart_post(path, params)
-      request(path, params) do |uri, params|
-        Net::HTTP::Post::Multipart.new(uri.path, params)
+
+    def post(path, params)
+      with_rest_client(path, params) do |r, uri, params|
+        r.post(uri, params, :accept => accept)
       end
     end
 
-    def multipart_put(path, params)
-      request(path, params) do |uri, params|
-        Net::HTTP::Put::Multipart.new(uri.path, params)
+    def put(path, params)
+      with_rest_client(path, params) do |r, uri, params|
+        r.put(uri, params, :accept => accept)
       end
     end
   end

data/lib/pdm/attachment.rb

@@ -0,0 +1,30 @@
+module Pdm
+  class Attachment
+
+    attr_accessor :mail_attachment
+    attr_accessor :eof
+    
+    def initialize(mail_attachment)
+      self.mail_attachment = mail_attachment
+      self.eof = false
+    end
+
+
+    def eof?
+      self.eof == true
+    end
+    
+    def read(bytes)
+      if eof?
+        nil
+      else
+        self.eof = true
+        mail_attachment.read
+      end
+    end
+
+    def path
+      mail_attachment.filename
+    end
+  end
+end

data/lib/pdm/ext/mail/message.rb

@@ -3,7 +3,6 @@ require "mail/message"
 module Mail
   class Message
 
-    attr_accessor :template_html
-    attr_accessor :template_assigns
+    attr_accessor :personalization
   end
 end

data/lib/pdm/mail.rb

@@ -4,6 +4,8 @@ module Pdm
   
   class Mail < Pdm::Resource
 
+    require "pdm/attachment"
+    
     attr_accessor :guid, :mail
     
     def initialize(mail, options = {})
@@ -11,18 +13,22 @@ module Pdm
       super(options)
     end
 
+
+    def get_body_part(parts, content_type)
+      parts.detect do |p|
+        p.content_type.include?(content_type) &&
+          p.header[:content_disposition].nil?
+      end
+    end
     
     def get_body_parts(mail)
-      parts = mail.body.parts
-      plain_part = parts.detect { |p| p.content_type == "text/plain" }
-      html_part = parts.detect { |p| p.content_type == "text/html" }
-
-      if plain_part.blank? && html_part.blank?
-        html_part = mail.body.to_s
+      [
+       "text/plain",
+       "text/html",
+      ].map do |content_type|
+        get_body_part(mail.parts, content_type)
       end
-
-      [plain_part, html_part]
-    end      
+    end
 
     def basic_params(mail)
       {
@@ -34,39 +40,54 @@ module Pdm
     end
 
     def body_params(mail)
-      plain_part, html_part = get_body_parts(mail)
+      plain_part, html_part = get_body_parts(mail).map do |p|
+        p && p.body.to_s
+      end
       {
         "job[plain]" => plain_part,
         "job[html]" => html_part,
       }
     end
 
-    def template_params(mail)
-      return {} if mail.template_html.nil?
+    def personalization_params(mail)
+      return {} if mail.personalization.nil?
       {
-        "job[template_html]" => mail.template_html,
-        "job[template_assigns]" => mail.template_assigns,
+        "job[personalization]" => mail.personalization,
       }
     end
-      
+
+    def attachments_for_rest_client(attachments)
+      attachments.map do |attachment|
+        Pdm::Attachment.new(attachment)
+      end
+    end
+
+    def attachment_params(mail)
+      return {} if mail.attachments.empty?
+      {
+        "job[attachments]" => attachments_for_rest_client(mail.attachments),
+      }
+    end
+    
     def create_and_send_job_params(mail)
       params = basic_params(mail)
       params.merge!(body_params(mail))
-      params.merge!(template_params(mail))
+      params.merge!(personalization_params(mail))
+      params.merge!(attachment_params(mail))
     end
 
     def create_and_send_job(mail)
       params = create_and_send_job_params(mail)
       with_exceptions do
-        api_request.multipart_post(:jobs, params)
+        api_request.post(:jobs, params)
       end
     end
     
     def deliver
       res = create_and_send_job(mail)
 
-      case res
-      when Net::HTTPSuccess
+      case res.code
+      when 200
         self.guid = res.body
       end
 

data/lib/pdm/version.rb

@@ -1,7 +1,7 @@
 module Pdm
 
   def version
-    "0.0.2"
+    "0.0.3"
   end
   module_function :version
 end

data/pdm.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency("rake")
   gem.add_runtime_dependency("mail")
   gem.add_runtime_dependency("yajl-ruby")
-  gem.add_runtime_dependency("multipart-post")
+  gem.add_runtime_dependency("rest-client")
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pdm
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - PipeDevMail
@@ -15,11 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-20 00:00:00 +02:00
-default_executable: 
+date: 2011-11-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -28,12 +27,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id001
-  name: rake
-  type: :development
   prerelease: false
+  requirement: *id001
+  type: :development
+  name: rake
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -42,12 +41,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id002
-  name: mail
-  type: :runtime
   prerelease: false
+  requirement: *id002
+  type: :runtime
+  name: mail
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -56,12 +55,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id003
-  name: yajl-ruby
-  type: :runtime
   prerelease: false
+  requirement: *id003
+  type: :runtime
+  name: yajl-ruby
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -70,10 +69,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id004
-  name: multipart-post
-  type: :runtime
   prerelease: false
+  requirement: *id004
+  type: :runtime
+  name: rest-client
 description: Wrapper around the PipeDevMail.com API
 email: 
 - support@pipedevmail.com
@@ -89,6 +88,7 @@ files:
 - Rakefile
 - lib/pdm.rb
 - lib/pdm/api_request.rb
+- lib/pdm/attachment.rb
 - lib/pdm/error.rb
 - lib/pdm/ext/mail/message.rb
 - lib/pdm/history.rb
@@ -98,7 +98,6 @@ files:
 - lib/pdm/template.rb
 - lib/pdm/version.rb
 - pdm.gemspec
-has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -128,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Interact with the PDM API