emailyak 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -4,6 +4,7 @@ PATH
     emailyak (0.0.1)
       json
       rest-client
+      yajl-ruby (>= 0.8.3)
 
 GEM
   remote: http://rubygems.org/
@@ -12,6 +13,7 @@ GEM
     mime-types (1.16)
     rest-client (1.6.7)
       mime-types (>= 1.16)
+    yajl-ruby (0.8.3)
 
 PLATFORMS
   ruby
@@ -20,3 +22,4 @@ DEPENDENCIES
   emailyak!
   json
   rest-client
+  yajl-ruby (>= 0.8.3)

data/emailyak.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Emailyak::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Scott Ballantyne", 'Greg Brockman']
-  s.email       = ["ussballantyne@gmail.cm", 'gdb@gregbrockman.com']
+  s.email       = ["ussballantyne@gmail.com", 'gdb@gregbrockman.com']
   s.homepage    = ""
   s.summary     = %q{making several different emailyak projects into a gem}
   s.description = %q{making several different emailyak projects into a gem description}
@@ -19,5 +19,5 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   s.add_dependency(%q<rest-client>, [">= 0"])
-  s.add_dependency(%q<json>, [">= 0"])
+  s.add_dependency('yajl-ruby', '>= 0.8.3')
 end

data/lib/emailyak/version.rb

@@ -1,3 +1,3 @@
 module Emailyak
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/emailyak.rb

@@ -2,7 +2,7 @@ require 'cgi'
 require 'set'
 
 require 'rubygems'
-require 'json'
+require 'yajl'
 require 'openssl'
 require 'rest_client'
 
@@ -12,6 +12,7 @@ require 'rest_client'
 # Further adapted from https://github.com/gdb/emailyak-ruby 
 # because I couldn't get it to install on heroku and 
 # I wanted to add to it
+
 module EmailYak
   # @@version = '0.0.1'
   @@ssl_bundle_path = File.join(File.dirname(__FILE__), 'data/ca-certificates.crt')
@@ -30,6 +31,20 @@ module EmailYak
       end
     end
   end
+  
+  def self.docs(url=self.api_docs_url)
+    begin
+    puts "opening api docs at #{self.api_docs_url} "
+    `open #{url}`
+    rescue
+      false
+    end
+    true
+  end
+  
+  def self.api_docs_url
+    "http://docs.emailyak.com/"
+  end
 
   class EmailYakError < StandardError; end
   class APIConnectionError < EmailYakError; end
@@ -69,13 +84,13 @@ module EmailYak
       EmailYak.request(:get, 'get/new/email/', nil, params)
     end
     
-    def self.delete(params={})
-      EmailYak.request(:post, 'delete/email/', nil, params)
-    end
-    
     def self.send(params={})
       EmailYak.request(:post, 'send/email/', nil, params)
     end
+    
+    def self.delete(params={})
+      EmailYak.request(:post, 'delete/email/', nil, params)
+    end
   end
   
   module Address
@@ -119,7 +134,11 @@ module EmailYak
       headers = { :params => params }.merge(headers)
       payload = nil
     else
-      payload = params
+      
+      
+      headers = {:content_type => 'application/json'}
+      payload = Yajl::Encoder.encode(params)
+      puts payload
     end
     opts = {
       :method => method,
@@ -130,7 +149,7 @@ module EmailYak
       :payload => payload,
       :timeout => 80
     }.merge(ssl_opts)
-
+    # puts params.inspect
     begin
       response = execute_request(opts)
     rescue SocketError => e
@@ -144,6 +163,7 @@ module EmailYak
         raise
       end
     rescue RestClient::ExceptionWithResponse => e
+      puts e
       if rcode = e.http_code and rbody = e.http_body
         self.handle_api_error(rcode, rbody)
       else
@@ -156,8 +176,8 @@ module EmailYak
     rbody = response.body
     rcode = response.code
     begin
-      resp = JSON.parse(rbody, :symbolize_names => true)
-    rescue JSON::ParseError
+      resp = Yajl::Parser.parse(rbody)
+    rescue
       raise APIError.new("Invalid response object from API: #{rbody.inspect} (HTTP response code was #{rcode})")
     end
 
@@ -195,7 +215,7 @@ module EmailYak
     when 431
       raise APIResponseCodeError.new('Invalid Response Format. In the url, specify ../json/.. or ../xml/..', rcode, rbody)
     when 432
-      raise APIResponseCodeError.new('Invalid when 431(Request Format. Needs to be JSON or XML.', rcode, rbody)
+      raise APIResponseCodeError.new('Invalid when 431 Request Format. Needs to be JSON or XML.', rcode, rbody)
     when 503
       raise APIResponseCodeError.new('Service is Temporarily Down. Please stand by.', rcode, rbody)
     else

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: emailyak
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Scott Ballantyne
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-02 00:00:00 +08:00
+date: 2011-10-03 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,22 +34,24 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: yajl-ruby
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 57
         segments: 
         - 0
-        version: "0"
+        - 8
+        - 3
+        version: 0.8.3
   type: :runtime
   version_requirements: *id002
 description: making several different emailyak projects into a gem description
 email: 
-- ussballantyne@gmail.cm
+- ussballantyne@gmail.com
 - gdb@gregbrockman.com
 executables: []