sendgrid_toolkit 1.3.0 → 1.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGYyNTgzNTkxZWQ5MDFjMDZmZTdjZWZhOWU4ZjE2NzVlNTVkZjJiYQ==
+    ODE0NWY1ZDllNTk3MjMwZTQ1NzQ3ZDNiZDc5Y2U4YjJlNzllOThhYg==
   data.tar.gz: !binary |-
-    NmQ5YjIyNDFiNWJhNzRhNmUyNmU2YmI0NmUyYWNlMDg0NWJhYzBhNA==
+    ZjUyMzNiMTJhZjA5MDBhZDU3Y2QwYzg1YWJkM2IwYzczNTJmYzkxNw==
 SHA512:
   metadata.gz: !binary |-
-    NzRjMDM4YmU0ZDQ1YjZhYzEyYTI5ZGIyZGM3NzNmYzVlMjg2NGNiMmRlNDdl
-    NzFjZWE0ZWMyNTI5NTgxZjIwMTIwNTgxNmVhNWM2MzczMTdlZDM0YmQ2ODVk
-    OWIwMTY4YzQwYTMzNDU1MjQ4YjFiMWQwNzgwYTM4ZjdkYTk5OWI=
+    NmFmNmI1ZTAyNzBlODRiYjE1YTIxZDVjYTdkOTIzODEzM2NjYzJhMjQzZDYw
+    NDMyMjA4NDI3NmY1NjdlNTgzMWJhOTZjNjFjOGYzMWRlYjEzM2EyNDU0ZmM1
+    NDUxZTYxMjkxZGMyOWRjYjQxZmJmYmE2ZTY2MTg0ODkyYTg0OGM=
   data.tar.gz: !binary |-
-    YTNlYzY2NmFjOGY0ZWFiNjNjNDY2MjJkZGI4ZGQ2MjY3NjEzMzcyNTY1Zjdj
-    NWU1NWJiMmIxNjY4N2FmOWQ3MWQyY2ZiNDFlNWRjYWI0YTBhMWFmYjVlNjJi
-    NDAwNjVkMzhjN2E4MTJjZDhkYzMxNzUzNTkzOWY5MjgzNzMxZDY=
+    YTI5MGEyMzdlNGMwMmZhMWU2MTQ4NmY2NTRjN2MxMThiMjAyYzI3OGJmMjYw
+    OWY0N2ZmMjU0NTViZGQyYWI5YTJiMzM2N2NiZWE4YmU4ZDE1NDQ5ZDQ5YjZl
+    YzNhOWEyNzUzMjU2MTgzMDYyYTEyODIzNTMzNTJlYWJhOGVjMzA=

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - jruby-19mode
+  - 2.0.0

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.4.0

data/lib/sendgrid_toolkit.rb

@@ -16,7 +16,7 @@ require 'sendgrid_toolkit/newsletter/lists'
 require 'sendgrid_toolkit/newsletter/list_emails'
 
 module SendgridToolkit
-  BASE_URI = "sendgrid.com/api"
+  BASE_URI = "api.sendgrid.com/api"
   
   class << self
     def api_user=(v); @api_user = v; end

data/lib/sendgrid_toolkit/common.rb

@@ -35,7 +35,7 @@ module SendgridToolkit
     private
 
     def parse_message_time(message)
-      message['created'] = Time.parse(message['created']) if message.has_key?('created')
+      message['created'] = Time.parse(message['created']+' UTC') if message.has_key?('created')
     end
 
   end

data/lib/sendgrid_toolkit/statistics.rb

@@ -1,11 +1,20 @@
 module SendgridToolkit
   class Statistics < AbstractSendgridClient
+    def advanced(data_type, start_date, options = {})
+      options.merge! :data_type => data_type
+      options.merge! :start_date => format_date(start_date, options)
+
+      response = api_post('stats', 'getAdvanced', options)
+      response.each { |r| r['date'] = Date.parse(r['date']) if r.kind_of?(Hash) && r.has_key?('date') }
+      response
+    end
+
     def retrieve(options = {})
       response = api_post('stats', 'get', options)
       response.each {|r| r['date'] = Date.parse(r['date']) if r.kind_of?(Hash) && r.has_key?('date')}
       response
     end
-    
+
     def retrieve_aggregate(options = {})
       options.merge! :aggregate => 1
       response = retrieve options
@@ -22,11 +31,28 @@ module SendgridToolkit
         resp[int_field] = resp[int_field].to_i if resp.has_key?(int_field)
       end
     end
- 
+
     def list_categories(options = {})
       options.merge! :list => true
       response = retrieve options
       response
     end
+
+    private
+
+    def format_date(date, options = {})
+      if date.is_a? Date
+        case options[:aggregated_by].to_s
+        when 'week'
+          date = date.strftime("%Y-%V")
+        when 'month'
+          date = date.strftime("%Y-%m")
+        else
+          date = date.strftime("%Y-%m-%d")
+        end
+      end
+
+      date
+    end
   end
 end

data/lib/sendgrid_toolkit/unsubscribes.rb

@@ -21,7 +21,7 @@ module SendgridToolkit
       options.merge! :date => 1
       response = retrieve options
       response.each do |unsubscribe|
-        unsubscribe['created'] = Time.parse(unsubscribe['created']) if unsubscribe.has_key?('created')
+        unsubscribe['created'] = Time.parse(unsubscribe['created']+' UTC') if unsubscribe.has_key?('created')
       end
       response
     end

data/sendgrid_toolkit.gemspec

@@ -2,15 +2,15 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: sendgrid_toolkit 1.3.0 ruby lib
+# stub: sendgrid_toolkit 1.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "sendgrid_toolkit"
-  s.version = "1.3.0"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robby Grossman"]
-  s.date = "2013-12-10"
+  s.date = "2014-03-04"
   s.description = "A Ruby wrapper and utility library for communicating with the Sendgrid API."
   s.email = "robby@freerobby.com"
   s.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".rvmrc",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",

data/spec/helper.rb

@@ -4,6 +4,8 @@ require 'rspec'
 
 FakeWeb.allow_net_connect = false
 
+REGEX_ESCAPED_BASE_URI = "api\.sendgrid\.com/api"
+
 def backup_env
   @env_backup = Hash.new
   ENV.keys.each {|key| @env_backup[key] = ENV[key]}

data/spec/lib/sendgrid_toolkit/abstract_sendgrid_client_spec.rb

@@ -10,21 +10,21 @@ describe SendgridToolkit::AbstractSendgridClient do
 
   describe "#api_post" do
     it "throws error when authentication fails" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/profile\.get\.json\?|, :body => '{"error":{"code":401,"message":"Permission denied, wrong credentials"}}')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/profile\.get\.json\?|, :body => '{"error":{"code":401,"message":"Permission denied, wrong credentials"}}')
       @obj = SendgridToolkit::AbstractSendgridClient.new("fakeuser", "fakepass")
       lambda {
         @obj.send(:api_post, "profile", "get", {})
       }.should raise_error SendgridToolkit::AuthenticationFailed
     end
     it "thows error when sendgrid response is a server error" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/profile\.get\.json\?|, :body => '{}', :status => ['500', 'Internal Server Error'])
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/profile\.get\.json\?|, :body => '{}', :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'])
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/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", {})

data/spec/lib/sendgrid_toolkit/blocks_spec.rb

@@ -8,7 +8,7 @@ describe SendgridToolkit::Blocks do
 
   describe "#retrieve" do
     it "returns array of bounced emails" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/blocks\.get\.json\?|, :body => '[{"email":"email1@domain.com","status":"5.1.1","reason":"host [127.0.0.1] said: 550 5.1.1 unknown or illegal user: email1@domain.com"},{"email":"email2@domain2.com","status":"5.1.1","reason":"host [127.0.0.1] said: 550 5.1.1 unknown or illegal user: email2@domain2.com"}]')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/blocks\.get\.json\?|, :body => '[{"email":"email1@domain.com","status":"5.1.1","reason":"host [127.0.0.1] said: 550 5.1.1 unknown or illegal user: email1@domain.com"},{"email":"email2@domain2.com","status":"5.1.1","reason":"host [127.0.0.1] said: 550 5.1.1 unknown or illegal user: email2@domain2.com"}]')
       blocks = @obj.retrieve
       blocks[0]['email'].should == "email1@domain.com"
       blocks[0]['status'].should == "5.1.1"
@@ -18,7 +18,7 @@ describe SendgridToolkit::Blocks do
 
   describe "#retrieve_with_timestamps" do
     it "parses timestamps" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/blocks\.get\.json\?.*date=1|, :body => '[{"email":"email1@domain.com","status":"5.1.1","reason":"host [127.0.0.1] said: 550 5.1.1 unknown or illegal user: email1@domain.com","created":"2009-06-01 19:41:39"},{"email":"email2@domain2.com","status":"5.1.1","reason":"host [127.0.0.1] said: 550 5.1.1 unknown or illegal user: email2@domain2.com","created":"2009-06-12 19:41:39"}]')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/blocks\.get\.json\?.*date=1|, :body => '[{"email":"email1@domain.com","status":"5.1.1","reason":"host [127.0.0.1] said: 550 5.1.1 unknown or illegal user: email1@domain.com","created":"2009-06-01 19:41:39"},{"email":"email2@domain2.com","status":"5.1.1","reason":"host [127.0.0.1] said: 550 5.1.1 unknown or illegal user: email2@domain2.com","created":"2009-06-12 19:41:39"}]')
       blocks = @obj.retrieve_with_timestamps
       0.upto(1) do |index|
         blocks[index]['created'].kind_of?(Time).should == true
@@ -30,19 +30,19 @@ describe SendgridToolkit::Blocks do
 
   describe "#delete" do
     it "raises no errors on success" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/blocks\.delete\.json\?.*email=.+|, :body => '{"message":"success"}')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/blocks\.delete\.json\?.*email=.+|, :body => '{"message":"success"}')
       lambda {
         @obj.delete :email => "user@domain.com"
       }.should_not raise_error
     end
     it "raises error when email address does not exist" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/blocks\.delete\.json\?.*email=.+|, :body => '{"message":"Email does not exist"}')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/blocks\.delete\.json\?.*email=.+|, :body => '{"message":"Email does not exist"}')
       lambda {
         @obj.delete :email => "user@domain.com"
       }.should raise_error SendgridToolkit::EmailDoesNotExist
     end
     it "does not choke if response does not have a 'message' field" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/blocks\.delete\.json\?.*email=.+|, :body => '{}')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/blocks\.delete\.json\?.*email=.+|, :body => '{}')
       lambda {
         @obj.delete :email => "user@domain.com"
       }.should_not raise_error

data/spec/lib/sendgrid_toolkit/bounces_spec.rb

@@ -8,7 +8,7 @@ describe SendgridToolkit::Bounces do
 
   describe "#retrieve" do
     it "returns array of bounced emails" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/bounces\.get\.json\?|, :body => '[{"email":"email1@domain.com","status":"5.1.1","reason":"host [127.0.0.1] said: 550 5.1.1 unknown or illegal user: email1@domain.com"},{"email":"email2@domain2.com","status":"5.1.1","reason":"host [127.0.0.1] said: 550 5.1.1 unknown or illegal user: email2@domain2.com"}]')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/bounces\.get\.json\?|, :body => '[{"email":"email1@domain.com","status":"5.1.1","reason":"host [127.0.0.1] said: 550 5.1.1 unknown or illegal user: email1@domain.com"},{"email":"email2@domain2.com","status":"5.1.1","reason":"host [127.0.0.1] said: 550 5.1.1 unknown or illegal user: email2@domain2.com"}]')
       bounces = @obj.retrieve
       bounces[0]['email'].should == "email1@domain.com"
       bounces[0]['status'].should == "5.1.1"
@@ -18,7 +18,7 @@ describe SendgridToolkit::Bounces do
 
   describe "#retrieve_with_timestamps" do
     it "parses timestamps" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/bounces\.get\.json\?.*date=1|, :body => '[{"email":"email1@domain.com","status":"5.1.1","reason":"host [127.0.0.1] said: 550 5.1.1 unknown or illegal user: email1@domain.com","created":"2009-06-01 19:41:39"},{"email":"email2@domain2.com","status":"5.1.1","reason":"host [127.0.0.1] said: 550 5.1.1 unknown or illegal user: email2@domain2.com","created":"2009-06-12 19:41:39"}]')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/bounces\.get\.json\?.*date=1|, :body => '[{"email":"email1@domain.com","status":"5.1.1","reason":"host [127.0.0.1] said: 550 5.1.1 unknown or illegal user: email1@domain.com","created":"2009-06-01 19:41:39"},{"email":"email2@domain2.com","status":"5.1.1","reason":"host [127.0.0.1] said: 550 5.1.1 unknown or illegal user: email2@domain2.com","created":"2009-06-12 19:41:39"}]')
       bounces = @obj.retrieve_with_timestamps
       0.upto(1) do |index|
         bounces[index]['created'].kind_of?(Time).should == true
@@ -30,19 +30,19 @@ describe SendgridToolkit::Bounces do
 
   describe "#delete" do
     it "raises no errors on success" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/bounces\.delete\.json\?.*email=.+|, :body => '{"message":"success"}')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/bounces\.delete\.json\?.*email=.+|, :body => '{"message":"success"}')
       lambda {
         @obj.delete :email => "user@domain.com"
       }.should_not raise_error
     end
     it "raises error when email address does not exist" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/bounces\.delete\.json\?.*email=.+|, :body => '{"message":"Email does not exist"}')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/bounces\.delete\.json\?.*email=.+|, :body => '{"message":"Email does not exist"}')
       lambda {
         @obj.delete :email => "user@domain.com"
       }.should raise_error SendgridToolkit::EmailDoesNotExist
     end
     it "does not choke if response does not have a 'message' field" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/bounces\.delete\.json\?.*email=.+|, :body => '{}')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/bounces\.delete\.json\?.*email=.+|, :body => '{}')
       lambda {
         @obj.delete :email => "user@domain.com"
       }.should_not raise_error

data/spec/lib/sendgrid_toolkit/common_spec.rb

@@ -6,7 +6,7 @@ describe SendgridToolkit::Common do
     class FakeClass < SendgridToolkit::AbstractSendgridClient
       include SendgridToolkit::Common
     end
-    @fake_class = FakeClass.new
+    @fake_class = FakeClass.new("fakeuser", "fakepass")
   end
 
   it "creates a module_name method that returns the class name downcased" do
@@ -14,10 +14,20 @@ describe SendgridToolkit::Common do
   end
 
   it "does not choke if response does not have a 'message' field" do
-    FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/fakeclass\.delete\.json\?.*email=.+|, :body => '{}')
+    FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/fakeclass\.delete\.json\?.*email=.+|, :body => '{}')
     lambda {
       @fake_class.delete :email => "user@domain.com"
     }.should_not raise_error
   end
 
-end
+  # this will only really test it on a computer that's on on utc.
+  describe 'retrieve_with_timestamps' do
+    it 'should parse the created date in utc' do
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/fakeclass\.get\.json\?.*date=1|, :body => '[{"created":"2013-11-25 13:00:00"}]')
+      fake_class = @fake_class.retrieve_with_timestamps
+      fake_class[0]['created'].utc.iso8601.should == "2013-11-25T13:00:00Z"
+    end
+  end
+
+end
+

data/spec/lib/sendgrid_toolkit/invalid_emails_spec.rb

@@ -8,7 +8,7 @@ describe SendgridToolkit::InvalidEmails do
 
   describe "#retrieve" do
     it "returns array of invalid emails" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/invalidemails\.get\.json\?|, :body => '[{"email":"isaac@hotmail.comm","reason":"Mail domain mentioned in email address is unknown"},{"email":"isaac@hotmail","reason":"Bad Syntax"},{"email":"isaac@example.com","reason":"Known bad domain"}]')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/invalidemails\.get\.json\?|, :body => '[{"email":"isaac@hotmail.comm","reason":"Mail domain mentioned in email address is unknown"},{"email":"isaac@hotmail","reason":"Bad Syntax"},{"email":"isaac@example.com","reason":"Known bad domain"}]')
       invalid_emails = @obj.retrieve
       invalid_emails[0]['email'].should == "isaac@hotmail.comm"
       invalid_emails[0]['reason'].should == "Mail domain mentioned in email address is unknown"
@@ -21,7 +21,7 @@ describe SendgridToolkit::InvalidEmails do
 
   describe "#retrieve_with_timestamps" do
     it "parses timestamps" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/invalidemails\.get\.json\?.*date=1|, :body => '[{"email":"isaac@hotmail.comm","reason":"Mail domain mentioned in email address is unknown","created":"2009-06-01 19:41:39"},{"email":"isaac@hotmail","reason":"Bad Syntax","created":"2009-06-12 19:41:39"},{"email":"isaac@example.com","reason":"Known bad domain","created":"2009-06-13 09:40:01"}]')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/invalidemails\.get\.json\?.*date=1|, :body => '[{"email":"isaac@hotmail.comm","reason":"Mail domain mentioned in email address is unknown","created":"2009-06-01 19:41:39"},{"email":"isaac@hotmail","reason":"Bad Syntax","created":"2009-06-12 19:41:39"},{"email":"isaac@example.com","reason":"Known bad domain","created":"2009-06-13 09:40:01"}]')
       invalid_emails = @obj.retrieve_with_timestamps
       0.upto(2) do |index|
         invalid_emails[index]['created'].kind_of?(Time).should == true
@@ -34,13 +34,13 @@ describe SendgridToolkit::InvalidEmails do
 
   describe "#delete" do
     it "raises no errors on success" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/invalidemails\.delete\.json\?.*email=.+|, :body => '{"message":"success"}')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/invalidemails\.delete\.json\?.*email=.+|, :body => '{"message":"success"}')
       lambda {
         @obj.delete :email => "user@domain.com"
       }.should_not raise_error
     end
     it "raises error when email address does not exist" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/invalidemails\.delete\.json\?.*email=.+|, :body => '{"message":"Email does not exist"}')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/invalidemails\.delete\.json\?.*email=.+|, :body => '{"message":"Email does not exist"}')
       lambda {
         @obj.delete :email => "user@domain.com"
       }.should raise_error SendgridToolkit::EmailDoesNotExist

data/spec/lib/sendgrid_toolkit/mail_spec.rb

@@ -8,7 +8,7 @@ describe SendgridToolkit::Mail do
   
   describe "#send" do
     it "raises error when sendgrid returns an error" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/mail\.send\.json\?|, :body => '{"message": "error", "errors": ["Missing destination email"]}')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/mail\.send\.json\?|, :body => '{"message": "error", "errors": ["Missing destination email"]}')
       lambda {
         response = @obj.send_mail :from => "testing@fiverr.com", :subject => "Subject", :text => "Text", "x-smtpapi" => {:category => "Testing", :to => ["elad@fiverr.com"]}
       }.should raise_error SendgridToolkit::SendEmailError

data/spec/lib/sendgrid_toolkit/newsletter/newsletter_sendgrid_client_spec.rb

@@ -13,7 +13,7 @@ describe SendgridToolkit::NewsletterSendgridClient do
     it 'prepends newsletter to the base path' do
       opts = {a: 1}
 
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/newsletter/lists/add\.json\?.*a=1|,
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/newsletter/lists/add\.json\?.*a=1|,
                                   :body => '{"message":"success"}')
 
       sendgrid_client = SendgridToolkit::NewsletterSendgridClient.new("fakeuser", "fakepass")

data/spec/lib/sendgrid_toolkit/spam_reports_spec.rb

@@ -8,7 +8,7 @@ describe SendgridToolkit::SpamReports do
 
   describe "#retrieve" do
     it "returns array of bounced emails" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/spamreports\.get\.json\?|, :body => '[{"email":"email1@domain.com"},{"email":"email2@domain2.com"}]')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/spamreports\.get\.json\?|, :body => '[{"email":"email1@domain.com"},{"email":"email2@domain2.com"}]')
       bounces = @obj.retrieve
       bounces[0]['email'].should == "email1@domain.com"
       bounces[1]['email'].should == "email2@domain2.com"
@@ -17,7 +17,7 @@ describe SendgridToolkit::SpamReports do
 
   describe "#retrieve_with_timestamps" do
     it "parses timestamps" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/spamreports\.get\.json\?.*date=1|, :body => '[{"email":"email1@domain.com","created":"2009-06-01 19:41:39"},{"email":"email2@domain2.com","created":"2009-06-12 19:41:39"}]')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/spamreports\.get\.json\?.*date=1|, :body => '[{"email":"email1@domain.com","created":"2009-06-01 19:41:39"},{"email":"email2@domain2.com","created":"2009-06-12 19:41:39"}]')
       bounces = @obj.retrieve_with_timestamps
       0.upto(1) do |index|
         bounces[index]['created'].kind_of?(Time).should == true
@@ -29,13 +29,13 @@ describe SendgridToolkit::SpamReports do
 
   describe "#delete" do
     it "raises no errors on success" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/spamreports\.delete\.json\?.*email=.+|, :body => '{"message":"success"}')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/spamreports\.delete\.json\?.*email=.+|, :body => '{"message":"success"}')
       lambda {
         @obj.delete :email => "user@domain.com"
       }.should_not raise_error
     end
     it "raises error when email address does not exist" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/spamreports\.delete\.json\?.*email=.+|, :body => '{"message":"Email does not exist"}')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/spamreports\.delete\.json\?.*email=.+|, :body => '{"message":"Email does not exist"}')
       lambda {
         @obj.delete :email => "user@domain.com"
       }.should raise_error SendgridToolkit::EmailDoesNotExist

data/spec/lib/sendgrid_toolkit/statistics_spec.rb

@@ -8,7 +8,7 @@ describe SendgridToolkit::Statistics do
   
   describe "#retrieve" do
     it "parses daily totals" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/stats\.get\.json\?|, :body => '[{"date":"2009-06-20","requests":12342,"bounces":12,"clicks":10223,"opens":9992,"spamreports":5},{"date":"2009-06-21","requests":32342,"bounces":10,"clicks":14323,"opens":10995,"spamreports":7},{"date":"2009-06-22","requests":52342,"bounces":11,"clicks":19223,"opens":12992,"spamreports":2}]')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/stats\.get\.json\?|, :body => '[{"date":"2009-06-20","requests":12342,"bounces":12,"clicks":10223,"opens":9992,"spamreports":5},{"date":"2009-06-21","requests":32342,"bounces":10,"clicks":14323,"opens":10995,"spamreports":7},{"date":"2009-06-22","requests":52342,"bounces":11,"clicks":19223,"opens":12992,"spamreports":2}]')
       stats = @obj.retrieve
       stats.each do |stat|
         %w(bounces clicks delivered invalid_email opens repeat_bounces repeat_spamreports repeat_unsubscribes requests spamreports unsubscribes).each do |int|
@@ -21,7 +21,7 @@ describe SendgridToolkit::Statistics do
   
   describe "#retrieve_aggregate" do
     it "parses aggregate statistics" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/stats\.get\.json\?.*aggregate=1|, :body => '{"requests":12342,"bounces":12,"clicks":10223,"opens":9992,"spamreports":5}')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/stats\.get\.json\?.*aggregate=1|, :body => '{"requests":12342,"bounces":12,"clicks":10223,"opens":9992,"spamreports":5}')
       stats = @obj.retrieve_aggregate
       %w(bounces clicks delivered invalid_email opens repeat_bounces repeat_spamreports repeat_unsubscribes requests spamreports unsubscribes).each do |int|
         stats[int].kind_of?(Integer).should == true if stats.has_key?(int) # We support all fields presently returned, but we are only testing what sendgrid officially documents
@@ -29,7 +29,7 @@ describe SendgridToolkit::Statistics do
     end
     
     it "parses aggregate statistics for array response" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/stats\.get\.json\?.*aggregate=1|, :body => '[{"requests":12342,"bounces":12,"clicks":10223,"opens":9992,"spamreports":5},{"requests":5,"bounces":10,"clicks":10223,"opens":9992,"spamreports":5}]')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/stats\.get\.json\?.*aggregate=1|, :body => '[{"requests":12342,"bounces":12,"clicks":10223,"opens":9992,"spamreports":5},{"requests":5,"bounces":10,"clicks":10223,"opens":9992,"spamreports":5}]')
       stats = @obj.retrieve_aggregate
       %w(bounces clicks delivered invalid_email opens repeat_bounces repeat_spamreports repeat_unsubscribes requests spamreports unsubscribes).each do |int|
         # We support all fields presently returned, but we are only testing what sendgrid officially documents
@@ -41,11 +41,79 @@ describe SendgridToolkit::Statistics do
   
   describe "#list_categories" do
     it "parses categories list" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/stats\.get\.json\?.*list=true|, :body => '[{"category":"categoryA"},{"category":"categoryB"},{"category":"categoryC"}]')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/stats\.get\.json\?.*list=true|, :body => '[{"category":"categoryA"},{"category":"categoryB"},{"category":"categoryC"}]')
       cats = @obj.list_categories
       cats[0]['category'].should == 'categoryA'
       cats[1]['category'].should == 'categoryB'
       cats[2]['category'].should == 'categoryC'
     end
   end
+
+  describe "#advanced" do
+    it "parses browser totals" do
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/stats\.getAdvanced\.json\?.*data_type=browsers|, :body => '[{"date":"2014-01-21","delivered":{"Chrome":1},"request":{"Chrome":1},"processed":{"Chrome":1}},{"date":"2014-01-22","delivered":{"Chrome":1},"request":{"Chrome":1},"processed":{"Chrome":1}}]')
+      stats = @obj.advanced('browsers', Date.new)
+      stats.each do |stat|
+        %w(delivered processed request).each do |type|
+          stat[type].kind_of?(Hash).should == true if stat.has_key?(type)
+        end
+        stat['date'].kind_of?(Date).should == true
+      end
+    end
+
+    it "parses client totals" do
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/stats\.getAdvanced\.json\?.*data_type=clients|, :body => '[{"date":"2014-01-21","delivered":{"Gmail":1},"request":{"Gmail":1},"processed":{"Gmail":1}},{"date":"2014-01-22","delivered":{"Gmail":1},"request":{"Gmail":1},"processed":{"Gmail":1}}]')
+      stats = @obj.advanced('clients', Date.new)
+      stats.each do |stat|
+        %w(delivered processed request).each do |type|
+          stat[type].kind_of?(Hash).should == true if stat.has_key?(type)
+        end
+        stat['date'].kind_of?(Date).should == true
+      end
+    end
+
+    it "parses device totals" do
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/stats\.getAdvanced\.json\?.*data_type=device|, :body => '[{"date":"2014-01-21","delivered":{"Webmail":1},"request":{"Webmail":1},"processed":{"Webmail":1}},{"date":"2014-01-22","delivered":{"Webmail":1},"request":{"Webmail":1},"processed":{"Webmail":1}}]')
+      stats = @obj.advanced('devices', Date.new)
+      stats.each do |stat|
+        %w(delivered processed request).each do |type|
+          stat[type].kind_of?(Hash).should == true if stat.has_key?(type)
+        end
+        stat['date'].kind_of?(Date).should == true
+      end
+    end
+
+    it "parses geo totals" do
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/stats\.getAdvanced\.json\?.*data_type=geo|, :body => '[{"date":"2014-01-21","delivered":{"US":1},"request":{"US":1},"processed":{"US":1}},{"date":"2014-01-22","delivered":{"US":1},"request":{"US":1},"processed":{"US":1}}]')
+      stats = @obj.advanced('geo', Date.new)
+      stats.each do |stat|
+        %w(delivered processed request).each do |type|
+          stat[type].kind_of?(Hash).should == true if stat.has_key?(type)
+        end
+        stat['date'].kind_of?(Date).should == true
+      end
+    end
+
+    it "parses global totals" do
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/stats\.getAdvanced\.json\?.*data_type=global|, :body => '[{"delivered":41,"request":41,"unique_open":1,"unique_click":1,"processed":41,"date":"2013-01-01","open":2,"click":1},{"delivered":224,"unique_open":1,"request":224,"processed":224,"date":"2013-01-02","open":3}]')
+      stats = @obj.advanced('global', Date.new)
+      stats.each do |stat|
+        %w(click delivered open processed request unique_click unique_open).each do |type|
+          stat[type].kind_of?(Integer).should == true if stat.has_key?(type)
+        end
+        stat['date'].kind_of?(Date).should == true
+      end
+    end
+
+    it "parses ISP totals" do
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/stats\.getAdvanced\.json\?.*data_type=isps|, :body => '[{"date":"2014-01-21","delivered":{"Gmail":1},"request":{"Gmail":1},"processed":{"Gmail":1}},{"date":"2014-01-22","delivered":{"Gmail":1},"request":{"Gmail":1},"processed":{"Gmail":1}}]')
+      stats = @obj.advanced('isps', Date.new)
+      stats.each do |stat|
+        %w(delivered processed request).each do |type|
+          stat[type].kind_of?(Hash).should == true if stat.has_key?(type)
+        end
+        stat['date'].kind_of?(Date).should == true
+      end
+    end
+  end
 end

data/spec/lib/sendgrid_toolkit/unsubscribes_spec.rb

@@ -8,7 +8,7 @@ describe SendgridToolkit::Unsubscribes do
   
   describe "#retrieve" do
     it "returns array of unsubscribed email addresses" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/unsubscribes\.get\.json\?|, :body => '[{"email":"user@domain.com"},{"email":"user2@domain2.com"},{"email":"user3@domain2.com"}]')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/unsubscribes\.get\.json\?|, :body => '[{"email":"user@domain.com"},{"email":"user2@domain2.com"},{"email":"user3@domain2.com"}]')
       emails = @obj.retrieve
       emails[0]['email'].should == "user@domain.com"
       emails[1]['email'].should == "user2@domain2.com"
@@ -17,7 +17,7 @@ describe SendgridToolkit::Unsubscribes do
   end
   describe "#retrieve_with_timestamps" do
     it "parses timestamps" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/unsubscribes\.get\.json\?.*date=1|, :body => '[{"email":"user@domain.com","created":"2010-03-03 11:00:00"},{"email":"user2@domain2.com","created":"2010-03-04 21:00:00"},{"email":"user3@domain2.com","created":"2010-03-05 23:00:00"}]')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/unsubscribes\.get\.json\?.*date=1|, :body => '[{"email":"user@domain.com","created":"2010-03-03 11:00:00"},{"email":"user2@domain2.com","created":"2010-03-04 21:00:00"},{"email":"user3@domain2.com","created":"2010-03-05 23:00:00"}]')
       emails = @obj.retrieve_with_timestamps
       0.upto(2) do |index|
         emails[index]['created'].kind_of?(Time).should == true
@@ -30,13 +30,13 @@ describe SendgridToolkit::Unsubscribes do
   
   describe "#add" do
     it "raises no errors on success" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/unsubscribes\.add\.json\?.*email=.+|, :body => '{"message":"success"}')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/unsubscribes\.add\.json\?.*email=.+|, :body => '{"message":"success"}')
       lambda {
         @obj.add :email => "user@domain.com"
       }.should_not raise_error
     end
     it "raises error when email already exists" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/unsubscribes\.add\.json\?.*email=.+|, :body => '{"message":"Unsubscribe email address already exists"}')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/unsubscribes\.add\.json\?.*email=.+|, :body => '{"message":"Unsubscribe email address already exists"}')
       lambda {
         @obj.add :email => "user@domain.com"
       }.should raise_error SendgridToolkit::UnsubscribeEmailAlreadyExists
@@ -45,13 +45,13 @@ describe SendgridToolkit::Unsubscribes do
   
   describe "#delete" do
     it "raises no errors on success" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/unsubscribes\.delete\.json\?.*email=.+|, :body => '{"message":"success"}')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/unsubscribes\.delete\.json\?.*email=.+|, :body => '{"message":"success"}')
       lambda {
         @obj.delete :email => "user@domain.com"
       }.should_not raise_error
     end
     it "raises error when email address does not exist" do
-      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/unsubscribes\.delete\.json\?.*email=.+|, :body => '{"message":"Email does not exist"}')
+      FakeWeb.register_uri(:post, %r|https://#{REGEX_ESCAPED_BASE_URI}/unsubscribes\.delete\.json\?.*email=.+|, :body => '{"message":"Email does not exist"}')
       lambda {
         @obj.delete :email => "user@domain.com"
       }.should raise_error SendgridToolkit::UnsubscribeEmailDoesNotExist

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sendgrid_toolkit
 version: !ruby/object:Gem::Version
-  version: !binary |-
-    MS4zLjA=
+  version: 1.4.0
 platform: ruby
 authors:
 - Robby Grossman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -33,16 +32,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4zLjA=
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4zLjA=
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -63,16 +60,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          Mi43LjA=
+        version: 2.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: !binary |-
-          Mi43LjA=
+        version: 2.7.0
 description: A Ruby wrapper and utility library for communicating with the Sendgrid
   API.
 email: robby@freerobby.com
@@ -83,6 +78,7 @@ extra_rdoc_files:
 - README.md
 files:
 - .rvmrc
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt