sendgrid_toolkit 1.0.4 → 1.0.5

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/lib/sendgrid_toolkit/abstract_sendgrid_client.rb

@@ -1,30 +1,38 @@
 module SendgridToolkit
   class AbstractSendgridClient
-    
+
     def initialize(api_user = nil, api_key = nil)
       @api_user = (api_user.nil?) ? ENV['SMTP_USERNAME'] : api_user
       @api_key = (api_key.nil?) ? ENV['SMTP_PASSWORD'] : api_key
-      
+
       raise SendgridToolkit::NoAPIUserSpecified if @api_user.blank?
       raise SendgridToolkit::NoAPIKeySpecified if @api_key.blank?
     end
-    
+
     protected
-    
+
     def api_post(module_name, action_name, opts = {})
       response = HTTParty.post("https://#{BASE_URI}/#{module_name}.#{action_name}.json?", :query => get_credentials.merge(opts), :format => :json)
-      raise(SendgridToolkit::SendgridServerError, "The sengrid server returned an error. #{response.inspect}") if response.code > 401
-      raise SendgridToolkit::AuthenticationFailed if has_error?(response) && response['error'].has_key?('code') && response['error']['code'].to_i == 401
+      if response.code > 401
+        raise(SendgridToolkit::SendgridServerError, "The sengrid server returned an error. #{response.inspect}")
+      elsif has_error?(response) and
+          response['error'].respond_to?(:has_key?) and
+          response['error'].has_key?('code') and
+          response['error']['code'].to_i == 401
+        raise SendgridToolkit::AuthenticationFailed
+      elsif has_error?(response)
+        raise(SendgridToolkit::APIError, response['error'])
+      end
       response
     end
-    
+
     def get_credentials
       {:api_user => @api_user, :api_key => @api_key}
     end
-    
+
     private
     def has_error?(response)
       response.kind_of?(Hash) && response.has_key?('error')
     end
   end
-end
+end

data/lib/sendgrid_toolkit/sendgrid_error.rb

@@ -6,4 +6,5 @@ module SendgridToolkit
   class UnsubscribeEmailDoesNotExist < StandardError; end
   class EmailDoesNotExist < StandardError; end
   class SendgridServerError < StandardError; end
-end
+  class APIError < StandardError; end
+end

data/sendgrid_toolkit.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sendgrid_toolkit}
-  s.version = "1.0.4"
+  s.version = "1.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Robby Grossman"]
-  s.date = %q{2011-02-01}
+  s.authors = [%q{Robby Grossman}]
+  s.date = %q{2011-09-19}
   s.description = %q{A Ruby wrapper and utility library for communicating with the Sendgrid API}
   s.email = %q{robby@freerobby.com}
   s.extra_rdoc_files = [
@@ -41,24 +41,11 @@ Gem::Specification.new do |s|
     "spec/webconnect/sendgrid_toolkit_spec.rb"
   ]
   s.homepage = %q{http://github.com/freerobby/sendgrid_toolkit}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{A Ruby wrapper and utility library for communicating with the Sendgrid API}
-  s.test_files = [
-    "spec/helper.rb",
-    "spec/lib/sendgrid_toolkit/abstract_sendgrid_client_spec.rb",
-    "spec/lib/sendgrid_toolkit/bounces_spec.rb",
-    "spec/lib/sendgrid_toolkit/common_spec.rb",
-    "spec/lib/sendgrid_toolkit/invalid_emails_spec.rb",
-    "spec/lib/sendgrid_toolkit/spam_reports_spec.rb",
-    "spec/lib/sendgrid_toolkit/statistics_spec.rb",
-    "spec/lib/sendgrid_toolkit/unsubscribes_spec.rb",
-    "spec/lib/sendgrid_toolkit_spec.rb",
-    "spec/webconnect/sendgrid_toolkit_spec.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/spec/lib/sendgrid_toolkit/abstract_sendgrid_client_spec.rb

@@ -16,13 +16,20 @@ describe SendgridToolkit::AbstractSendgridClient do
         @obj.send(:api_post, "profile", "get", {})
       }.should raise_error SendgridToolkit::AuthenticationFailed
     end
-    it "thows error when sendgrid response is an error" do
+    it "thows error when sendgrid response is a server error" do
       FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/profile\.get\.json\?|, :body => 'A server error occured', :status => ['500', 'Internal Server Error'])
       @obj = SendgridToolkit::AbstractSendgridClient.new("someuser", "somepass")
       lambda {
         @obj.send(:api_post, "profile", "get", {})
       }.should raise_error SendgridToolkit::SendgridServerError
     end
+    it "thows error when sendgrid response is an API error" do
+      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/stats\.get\.json\?|, :body => '{"error": "error in end_date: end date is in the future"}', :status => ['400', 'Bad Request'])
+      @obj = SendgridToolkit::AbstractSendgridClient.new("someuser", "somepass")
+      lambda {
+        @obj.send(:api_post, "stats", "get", {})
+      }.should raise_error SendgridToolkit::APIError
+    end
   end
 
   describe "#initialize" do
@@ -59,4 +66,4 @@ describe SendgridToolkit::AbstractSendgridClient do
       }.should raise_error SendgridToolkit::NoAPIKeySpecified
     end
   end
-end
+end

metadata

@@ -1,46 +1,35 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sendgrid_toolkit
-version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 4
-  version: 1.0.4
+version: !ruby/object:Gem::Version
+  version: 1.0.5
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Robby Grossman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-01 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-19 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: httparty
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70103627509080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-description: A Ruby wrapper and utility library for communicating with the Sendgrid API
+  prerelease: false
+  version_requirements: *70103627509080
+description: A Ruby wrapper and utility library for communicating with the Sendgrid
+  API
 email: robby@freerobby.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - README.md
 - Rakefile
 - VERSION
@@ -64,48 +53,28 @@ files:
 - spec/lib/sendgrid_toolkit/unsubscribes_spec.rb
 - spec/lib/sendgrid_toolkit_spec.rb
 - spec/webconnect/sendgrid_toolkit_spec.rb
-has_rdoc: true
 homepage: http://github.com/freerobby/sendgrid_toolkit
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: A Ruby wrapper and utility library for communicating with the Sendgrid API
-test_files: 
-- spec/helper.rb
-- spec/lib/sendgrid_toolkit/abstract_sendgrid_client_spec.rb
-- spec/lib/sendgrid_toolkit/bounces_spec.rb
-- spec/lib/sendgrid_toolkit/common_spec.rb
-- spec/lib/sendgrid_toolkit/invalid_emails_spec.rb
-- spec/lib/sendgrid_toolkit/spam_reports_spec.rb
-- spec/lib/sendgrid_toolkit/statistics_spec.rb
-- spec/lib/sendgrid_toolkit/unsubscribes_spec.rb
-- spec/lib/sendgrid_toolkit_spec.rb
-- spec/webconnect/sendgrid_toolkit_spec.rb
+test_files: []