pdm 0.0.1 → 0.0.2

data/lib/pdm.rb

@@ -4,7 +4,7 @@ module Pdm
 
   def default_options
     {
-      :url => "http://api.pipedevmail.com/jobs",
+      :endpoint => "http://api.pipedevmail.com",
     }
   end
   module_function :default_options

data/lib/pdm/api_request.rb

@@ -0,0 +1,63 @@
+module Pdm
+  
+  class ApiRequest
+
+    require "cgi"
+    require "uri"
+    require "net/http/post/multipart"
+    require "pdm/json"
+    
+
+    attr_accessor :endpoint, :api_key
+
+    def initialize(endpoint, api_key)
+      self.endpoint = endpoint
+      self.api_key = api_key
+    end
+
+
+    def decorate_params(params)
+      params = params.dup
+      params["api_key"] = self.api_key
+      params
+    end
+
+    def uri_from_path(path)
+      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 = {})
+      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
+    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)
+      end
+    end
+    
+    def multipart_post(path, params)
+      request(path, params) do |uri, params|
+        Net::HTTP::Post::Multipart.new(uri.path, params)
+      end
+    end
+
+    def multipart_put(path, params)
+      request(path, params) do |uri, params|
+        Net::HTTP::Put::Multipart.new(uri.path, params)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+require "mail/message"
+
+module Mail
+  class Message
+
+    attr_accessor :template_html
+    attr_accessor :template_assigns
+  end
+end

data/lib/pdm/history.rb

@@ -0,0 +1,17 @@
+module Pdm
+
+  require "pdm/api_request"
+
+  module History
+
+    class << self
+
+      def recent_jobs(options = {})
+        options = Pdm.default_options.merge(options)
+        api_request = Pdm::ApiRequest.new(options[:endpoint], options[:api_key])
+        res = api_request.get(:recent_jobs)
+        Pdm::Json.decode(res.body)
+      end
+    end
+  end
+end

data/lib/pdm/json.rb

@@ -0,0 +1,18 @@
+module Pdm
+
+  module Json
+
+    require "yajl" # For now.
+    
+    class << self
+
+      def encode(what)
+        Yajl::Encoder.encode(what)
+      end
+
+      def decode(what)
+        Yajl::Parser.parse(what)
+      end
+    end
+  end
+end

data/lib/pdm/mail.rb

@@ -1,35 +1,17 @@
 module Pdm
+
+  require "pdm/resource"
   
-  class Mail
+  class Mail < Pdm::Resource
 
-    require "uri"
-    require "net/http/post/multipart"
-    require "pdm/error"
-    
-    attr_accessor :guid, :mail, :options
+    attr_accessor :guid, :mail
     
     def initialize(mail, options = {})
       self.mail = mail
-      self.options = Pdm.default_options.merge(options)
-      check_opts
-    end
-
-    def check_opts
-      required_opt_proc = lambda do |value|
-        !(value.nil? || value.empty?)
-      end
-
-      [
-       [:url, required_opt_proc],
-       [:api_key, required_opt_proc],
-      ].each do |key, proc|
-        raise ArgumentError.new(":api_key is a required option") unless
-          proc.call(options[key])
-      end
-    rescue => e
-      Error.extend_and_raise(e)
+      super(options)
     end
 
+    
     def get_body_parts(mail)
       parts = mail.body.parts
       plain_part = parts.detect { |p| p.content_type == "text/plain" }
@@ -42,30 +24,46 @@ module Pdm
       [plain_part, html_part]
     end      
 
-    def build_params(mail)
-      plain_part, html_part = get_body_parts(mail)
+    def basic_params(mail)
       {
         "job[from]" => mail.from.first,
         "job[reply_to]" => mail.reply_to,
         "job[subject]" => mail.subject,
+        "job[recipients][][email]" => mail.to.first,
+      }
+    end
+
+    def body_params(mail)
+      plain_part, html_part = get_body_parts(mail)
+      {
         "job[plain]" => plain_part,
         "job[html]" => html_part,
-        "job[recipients][][email]" => mail.to.first,
-        :api_key => options[:api_key],
       }
     end
 
-    def create_and_send_job(url, params)
-      url = URI.parse(url)
-      req = Net::HTTP::Post::Multipart.new(url.path, params)
-      Net::HTTP.start(url.host, url.port) do |http|
-        http.request(req)
+    def template_params(mail)
+      return {} if mail.template_html.nil?
+      {
+        "job[template_html]" => mail.template_html,
+        "job[template_assigns]" => mail.template_assigns,
+      }
+    end
+      
+    def create_and_send_job_params(mail)
+      params = basic_params(mail)
+      params.merge!(body_params(mail))
+      params.merge!(template_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)
       end
     end
     
     def deliver
-      params = build_params(mail)
-      res = create_and_send_job(options[:url], params)
+      res = create_and_send_job(mail)
 
       case res
       when Net::HTTPSuccess
@@ -73,8 +71,6 @@ module Pdm
       end
 
       return res
-    rescue Timeout::Error, StandardError => e
-      Error.extend_and_raise(e)
     end
   end
 end

data/lib/pdm/resource.rb

@@ -0,0 +1,39 @@
+module Pdm
+
+  class Resource
+
+    require "pdm/api_request"
+    require "pdm/error"
+
+    attr_accessor :options
+
+    def initialize(options = {})
+      self.options = Pdm.default_options.merge(options)
+      check_opts
+    end
+
+    def with_exceptions
+      yield
+    rescue Timeout::Error, StandardError => e
+      Error.extend_and_raise(e)
+    end
+
+    def check_opts
+      required_opt_proc = lambda do |value|
+        !(value.nil? || value.empty?)
+      end
+
+      [
+       [:endpoint, required_opt_proc],
+       [:api_key, required_opt_proc],
+      ].each do |key, proc|
+        raise ArgumentError.new(":api_key is a required option") unless
+          proc.call(options[key])
+      end
+    end
+
+    def api_request
+      Pdm::ApiRequest.new(options[:endpoint], options[:api_key])
+    end
+  end
+end

data/lib/pdm/template.rb

@@ -0,0 +1,72 @@
+module Pdm
+
+  require "pdm/resource"
+  
+  class Template < Pdm::Resource
+
+    class << self
+
+      def exists?(name)
+        Template.new(name).exists?
+      end
+    end
+
+    
+    attr_accessor :name, :description, :html
+    
+    def initialize(name, description = nil, html = nil, options = {})
+      self.name = name
+      self.description = description
+      self.html = html
+      super(options)
+    end
+
+
+    def show_params
+      {
+        "template[name]" => self.name,
+      }
+    end
+
+    def show
+      params = show_params
+      with_exceptions do
+        api_request.get(:templates, params)
+      end
+    end
+    
+    def exists?
+      params = show_params
+      res = with_exceptions do
+        api_request.get(:templates, params)
+      end
+      res.is_a?(Net::HTTPSuccess)
+    end
+    
+    def create_params
+      {
+        "template[name]" => self.name,
+        "template[description]" => self.description,
+        "template[html]" => self.html,
+      }
+    end
+    
+    def create
+      params = create_params
+      with_exceptions do
+        api_request.multipart_post(:templates, params)
+      end
+    end
+
+    # FIXME: I guess we could be clever here - e.g. no need to repost
+    # the HTML if only the name is changing.
+    alias :update_params :create_params
+
+    def update
+      params = update_params
+      with_exceptions do
+        api_request.multipart_put(:templates, params)
+      end
+    end
+  end
+end

data/lib/pdm/version.rb

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

data/pdm.gemspec

@@ -17,5 +17,6 @@ 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")
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pdm
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - PipeDevMail
@@ -15,11 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-18 00:00:00 +02:00
+date: 2011-11-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,11 +28,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rake
   version_requirements: *id001
+  name: rake
+  type: :development
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -43,11 +42,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: mail
   version_requirements: *id002
+  name: mail
+  type: :runtime
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -57,8 +56,23 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: multipart-post
   version_requirements: *id003
+  name: yajl-ruby
+  type: :runtime
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id004
+  name: multipart-post
+  type: :runtime
   prerelease: false
 description: Wrapper around the PipeDevMail.com API
 email: 
@@ -74,9 +88,14 @@ files:
 - Gemfile
 - Rakefile
 - lib/pdm.rb
+- lib/pdm/api_request.rb
 - lib/pdm/error.rb
+- lib/pdm/ext/mail/message.rb
+- lib/pdm/history.rb
+- lib/pdm/json.rb
 - lib/pdm/mail.rb
-- lib/pdm/recent_jobs.rb
+- lib/pdm/resource.rb
+- lib/pdm/template.rb
 - lib/pdm/version.rb
 - pdm.gemspec
 has_rdoc: true

data/lib/pdm/recent_jobs.rb

@@ -1,60 +0,0 @@
-module Pdm
-  
-  class RecentJobs
-
-    require "uri"
-    require "net/http"
-    require "pdm/error"
-    
-    attr_accessor :response, :options
-    
-    def initialize(options = {})
-      self.options = Pdm.default_options.merge(options)
-      check_opts
-    end
-
-    def check_opts
-      required_opt_proc = lambda do |value|
-        !(value.nil? || value.empty?)
-      end
-
-      [
-       [:url, required_opt_proc],
-       [:api_key, required_opt_proc],
-      ].each do |key, proc|
-        raise ArgumentError.new(":api_key is a required option") unless
-          proc.call(options[key])
-      end
-    rescue => e
-      Error.extend_and_raise(e)
-    end
-
-    def build_params
-      {
-        :api_key => options[:api_key],
-      }
-    end
-
-    def make_api_request(url, params)
-      uri = URI.parse(url)
-      req = Net::HTTP::Get.new(url.path, params)
-      Net::HTTP.start(url.host, url.port) do |http|
-        http.request(req)
-      end
-    end
-    
-    def fetch
-      params = build_params
-      res = make_api_request(options[:url], params)
-
-      case res
-      when Net::HTTPSuccess
-        return self.response = res.body
-      else
-        raise RuntimeError.new("Unexpected server response: #{res.inspect}")
-      end
-    rescue Timeout::Error, StandardError => e
-      Error.extend_and_raise(e)
-    end
-  end
-end