sailthru-client 1.10 → 1.11

data/README.md

@@ -195,3 +195,29 @@ Examples
 	email = 'praj@sailthru.com'
 	tags = ['red', 'blue']
 	response = sailthru.set_horizon(email, tags)
+
+### [job] (http://docs.sailthru.com/api/job)
+
+    # get status of job id
+    job_id = '4dd58f036803fa3b5500000b'
+    response = sailthru.get_job_status(job_id)
+
+    # process import job for email string
+    list = 'test-list'
+    emails = 'a@a.com,b@b.com'
+    response = sailthru.process_import_job(list, emails)
+
+    # process import job from CSV or text file
+    list = 'test-list'
+    source_file = '/home/praj/Desktop/emails.txt'
+    response = sailthru.process_import_job(list, source_file)
+
+    # process snapshot job
+    query = {}
+    report_email = 'praj@sailthru.com'
+    postback_url = 'http://example.com/reports/snapshot_postback'
+    response = sailthru.process_snapshot_job(query)
+
+    # process export list job
+    list = 'test-list'
+    response = sailthru.process_export_list_job(list)

data/lib/sailthru.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'net/https'
 require 'net/http'
 require 'uri'
 require 'cgi'
@@ -8,7 +9,7 @@ require 'net/http/post/multipart'
 
 module Sailthru
 
-  Version = VERSION = '1.10'
+  Version = VERSION = '1.11'
 
   class SailthruClientException < Exception
   end
@@ -104,16 +105,19 @@ module Sailthru
 
     include Helpers
 
+    attr_accessor :verify_ssl
+
     # params:
     #   api_key, String
     #   secret, String
     #   api_uri, String
     #
     # Instantiate a new client; constructor optionally takes overrides for key/secret/uri.
-    def initialize(api_key, secret, api_uri)
+    def initialize(api_key, secret, api_uri = nil)
       @api_key = api_key
       @secret  = secret
-      @api_uri = api_uri
+      @api_uri = if api_uri.nil? then 'https://api.sailthru.com' else api_uri end
+      @verify_ssl = true
     end
 
     # params:
@@ -691,33 +695,34 @@ module Sailthru
     # Perform an API request, using the shared-secret auth hash.
     #
     def api_request(action, data, request_type, binary_key = nil)
-      
-      data[:api_key] = @api_key
-      data[:format] ||= 'json'
-      
       if (!binary_key.nil?)
         binary_key_data = data[binary_key]
         data.delete(binary_key)
       end
-      
-      data[:sig] = get_signature_hash(data, @secret)
+
+      if data[:format].nil? or data[:format] == 'json'
+        data = self.prepare_json_payload(data)
+      else
+        data[:api_key] = @api_key
+        data[:format] ||= 'json'
+        data[:sig] = get_signature_hash(data, @secret)
+      end
       
       if (!binary_key.nil?)
         data[binary_key] = binary_key_data
       end 
       _result = self.http_request("#{@api_uri}/#{action}", data, request_type, binary_key)
 
-
       # NOTE: don't do the unserialize here
-     if data[:format] == 'json'
+      if data[:format] == 'json'
         begin
-           unserialized = JSON.parse(_result)
-          return unserialized ? unserialized : _result
+            unserialized = JSON.parse(_result)
+            return unserialized ? unserialized : _result
         rescue JSON::JSONError => e
-          return {'error' => e}
+            return {'error' => e}
         end
-     end
-     return _result
+      end
+      return _result
     end
 
 
@@ -743,7 +748,6 @@ module Sailthru
         if (!binary_key.nil?) 
           binary_data = data[binary_key]
           data[binary_key] = UploadIO.new(File.open(binary_data), "text/plain")
-          #req = Net::HTTP::Post::Multipart.new(_uri.path, binary_key => UploadIO.new(File.open(binary_data), "text/plain"))
           req = Net::HTTP::Post::Multipart.new(_uri.path, data)
         else
           req = Net::HTTP::Post.new(_uri.path, headers)
@@ -760,11 +764,19 @@ module Sailthru
       end
 
       begin
-        response = Net::HTTP.start(_uri.host, _uri.port) {|http|
-          http.request(req)
+        http = Net::HTTP.new(_uri.host, _uri.port)
+        
+        if _uri.scheme == 'https'
+            http.use_ssl = true
+            http.verify_mode = OpenSSL::SSL::VERIFY_NONE if @verify_ssl != true  # some openSSL client doesn't work without doing this
+        end
+
+        response = http.start {
+            http.request(req)
         }
+        
       rescue Exception => e
-        raise SailthruClientException.new("Unable to open stream: #{_uri.to_s}");
+        raise SailthruClientException.new("Unable to open stream: #{_uri.to_s}\n" + e);
       end
       
       if response.body
@@ -778,5 +790,15 @@ module Sailthru
       req = Net::HTTP::Post::Multipart.new url.path,
         "file" => UploadIO.new(data['file'], "application/octet-stream")
     end
+
+    def prepare_json_payload(data)
+        payload = {
+            :api_key => @api_key,
+            :format => 'json', #fuck XML
+            :json => data.to_json
+        }
+        payload[:sig] = get_signature_hash(payload, @secret)
+        payload
+    end
   end
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: sailthru-client
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
-  - 10
-  version: "1.10"
+  - 11
+  version: "1.11"
 platform: ruby
 authors: 
 - Prajwal Tuladhar
@@ -14,8 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-19 00:00:00 -04:00
-default_executable: 
+date: 2011-06-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -59,6 +58,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: 
 email: praj@sailthru.com
 executables: []
@@ -70,7 +83,6 @@ extra_rdoc_files:
 files: 
 - README.md
 - lib/sailthru.rb
-has_rdoc: true
 homepage: http://docs.sailthru.com
 licenses: []
 
@@ -101,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: A simple client library to remotely access the Sailthru REST API.