pdm 0.0.3 → 0.0.4

data/lib/pdm/api_request.rb

@@ -35,7 +35,7 @@ module Pdm
 
     def get(path, params)
       with_rest_client(path, params) do |r, uri, params|
-        r.get(uri, params, :accept => accept)
+        r.get(uri, :params => params, :accept => accept)
       end
     end
 

data/lib/pdm/job.rb

@@ -0,0 +1,32 @@
+module Pdm
+
+  require "pdm/resource"
+  
+  class Job < Pdm::Resource
+
+    attr_accessor :last_api_response, :guid, :payload
+
+    def describe(guid)
+      with_exceptions do
+        res = api_request.get(describe_uri(guid), describe_params)
+        process_describe(res)
+      end
+    end
+
+    def describe_uri(guid)
+      "/jobs/#{guid}"
+    end
+
+    def describe_params
+      {}
+    end
+
+    def process_describe(res)
+      self.last_api_response = res = Json.decode(res)
+      res["job"].each do |key, value|
+        setter = "#{key}="
+        __send__(setter, value) if respond_to?(setter)
+      end
+    end
+  end
+end

data/lib/pdm/mail.rb

@@ -6,7 +6,7 @@ module Pdm
 
     require "pdm/attachment"
     
-    attr_accessor :guid, :mail
+    attr_accessor :guid, :mail, :last_api_response
     
     def initialize(mail, options = {})
       self.mail = mail
@@ -72,8 +72,9 @@ module Pdm
     def create_and_send_job_params(mail)
       params = basic_params(mail)
       params.merge!(body_params(mail))
-      params.merge!(personalization_params(mail))
+      params.merge!(personalization_params(mail)) if mail.respond_to?(:personalization)
       params.merge!(attachment_params(mail))
+      params.reject { |k, v| v.nil? || (v.respond_to?(:empty?) && v.empty?) }
     end
 
     def create_and_send_job(mail)
@@ -82,13 +83,38 @@ module Pdm
         api_request.post(:jobs, params)
       end
     end
+
+    def parse_api_response(res)
+      self.last_api_response = res = Json.decode(res)
+      if singleton?(res)
+        parse_singleton_response(res)
+      else
+        parse_multiple_response(res)
+      end
+    end
+
+    def singleton?(res)
+      res.has_key?("singleton_job")
+    end
+
+    def parse_singleton_response(res)
+      root = res["singleton_job"]
+      root.each do |key, value|
+        setter = "#{key}="
+        __send__(setter, value) if respond_to?(setter)
+      end
+    end
+
+    def parse_multiple_response(res)
+      # TODO
+    end
     
     def deliver
       res = create_and_send_job(mail)
 
       case res.code
       when 200
-        self.guid = res.body
+        parse_api_response(res)
       end
 
       return res

data/lib/pdm/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pdm
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - PipeDevMail
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-26 00:00:00 Z
+date: 2012-03-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -29,8 +29,8 @@ dependencies:
         version: "0"
   prerelease: false
   requirement: *id001
-  type: :development
   name: rake
+  type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -43,8 +43,8 @@ dependencies:
         version: "0"
   prerelease: false
   requirement: *id002
-  type: :runtime
   name: mail
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -57,8 +57,8 @@ dependencies:
         version: "0"
   prerelease: false
   requirement: *id003
-  type: :runtime
   name: yajl-ruby
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -71,8 +71,8 @@ dependencies:
         version: "0"
   prerelease: false
   requirement: *id004
-  type: :runtime
   name: rest-client
+  type: :runtime
 description: Wrapper around the PipeDevMail.com API
 email: 
 - support@pipedevmail.com
@@ -92,6 +92,7 @@ files:
 - lib/pdm/error.rb
 - lib/pdm/ext/mail/message.rb
 - lib/pdm/history.rb
+- lib/pdm/job.rb
 - lib/pdm/json.rb
 - lib/pdm/mail.rb
 - lib/pdm/resource.rb
@@ -127,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Interact with the PDM API