sendgrid_toolkit 1.0.5 → 1.0.6

data/.rvmrc

@@ -0,0 +1,3 @@
+export RUBYOPT="rubygems"
+export RUBYLIB="."
+rvm 1.9.2@sendgrid_toolkit

data/Gemfile

@@ -0,0 +1,11 @@
+source "http://rubygems.org"
+
+gem "activesupport", ">= 2.3.5"
+gem "httparty", ">= 0.7.6"
+
+group :development do
+  gem "bundler", "~> 1.0.0"
+  gem "fakeweb", "~> 1.3.0"
+  gem "jeweler", "~> 1.6.4"
+  gem "rspec", "~> 2.7.0"
+end

data/Gemfile.lock

@@ -0,0 +1,37 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
+    diff-lcs (1.1.3)
+    fakeweb (1.3.0)
+    git (1.2.5)
+    httparty (0.8.1)
+      multi_json
+      multi_xml
+    jeweler (1.6.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    multi_json (1.0.3)
+    multi_xml (0.4.1)
+    rake (0.9.2.2)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.7.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (>= 2.3.5)
+  bundler (~> 1.0.0)
+  fakeweb (~> 1.3.0)
+  httparty (>= 0.7.6)
+  jeweler (~> 1.6.4)
+  rspec (~> 2.7.0)

data/LICENSE.txt

@@ -0,0 +1,20 @@
+Copyright (c) 2011 Robby Grossman
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -26,7 +26,13 @@ Common actions are documented below under each module. For more details, visit t
 Contributing
 ------------
 
-When submitting patches, please be sure you include rspec tests!
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
+* Fork the project
+* Start a feature/bugfix branch
+* Commit and push until you are happy with your contribution
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
 Big thanks to [James Brennan][1] for refactoring old code and writing the Bounces, InvalidEmails and SpamReports modules.
 

data/Rakefile

@@ -1,22 +1,24 @@
 require 'rubygems'
-require 'rake'
-
+require 'bundler'
 begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "sendgrid_toolkit"
-    gemspec.summary = "A Ruby wrapper and utility library for communicating with the Sendgrid API"
-    gemspec.description = "A Ruby wrapper and utility library for communicating with the Sendgrid API"
-    gemspec.email = "robby@freerobby.com"
-    gemspec.homepage = "http://github.com/freerobby/sendgrid_toolkit"
-    gemspec.authors = ["Robby Grossman"]
-    
-    gemspec.add_dependency "httparty"
-    # Development dependencies: fakeweb, rake, jeweler, rspec
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler must be installed. Use 'sudo gem install jeweler'."
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
 end
+require 'rake'
 
-Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each {|ext| load ext}
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = "sendgrid_toolkit"
+  gem.homepage = "http://github.com/freerobby/sendgrid_toolkit"
+  gem.license = "MIT"
+  gem.summary = "sendgrid_toolkit = Sendgrid + Ruby"
+  gem.description = "A Ruby wrapper and utility library for communicating with the Sendgrid API."
+  gem.email = "robby@freerobby.com"
+  gem.authors = ["Robby Grossman"]
+  # dependencies defined in Gemfile
+end
+Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.0.6

data/lib/sendgrid_toolkit.rb

@@ -1,3 +1,4 @@
+require 'active_support/all'
 require 'httparty'
 
 require 'sendgrid_toolkit/abstract_sendgrid_client'

data/lib/sendgrid_toolkit/statistics.rb

@@ -2,22 +2,31 @@ module SendgridToolkit
   class Statistics < AbstractSendgridClient
     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
-      %w(bounces clicks delivered invalid_email opens repeat_bounces repeat_spamreports repeat_unsubscribes requests spamreports unsubscribes).each do |int_field|
-        response[int_field] = response[int_field].to_i if response.has_key?(int_field)
+      if Hash === response.parsed_response
+          to_ints(response.parsed_response)
+      elsif Array === response.parsed_response
+          response.parsed_response.each {|o| to_ints(o) }
       end
       response
     end
-    
+
+    def to_ints(resp)
+      %w(bounces clicks delivered invalid_email opens repeat_bounces repeat_spamreports repeat_unsubscribes requests spamreports unsubscribes).each do |int_field|
+        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
   end
-end
+end

data/spec/helper.rb

@@ -1,6 +1,6 @@
 require 'fakeweb'
 require 'sendgrid_toolkit'
-require 'spec'
+require 'rspec'
 
 FakeWeb.allow_net_connect = false
 

data/spec/lib/sendgrid_toolkit/abstract_sendgrid_client_spec.rb

@@ -17,7 +17,7 @@ describe SendgridToolkit::AbstractSendgridClient do
       }.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 => 'A server error occured', :status => ['500', 'Internal Server Error'])
+      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/profile\.get\.json\?|, :body => '{}', :status => ['500', 'Internal Server Error'])
       @obj = SendgridToolkit::AbstractSendgridClient.new("someuser", "somepass")
       lambda {
         @obj.send(:api_post, "profile", "get", {})

data/spec/lib/sendgrid_toolkit/bounces_spec.rb

@@ -42,7 +42,7 @@ describe SendgridToolkit::Bounces do
       }.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 => 'An internal server error occurred. Please try again later.')
+      FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/bounces\.delete\.json\?.*email=.+|, :body => '{}')
       lambda {
         @obj.delete :email => "user@domain.com"
       }.should_not raise_error

data/spec/lib/sendgrid_toolkit/common_spec.rb

@@ -14,7 +14,7 @@ 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 => 'An internal server error occurred. Please try again later.')
+    FakeWeb.register_uri(:post, %r|https://sendgrid\.com/api/fakeclass\.delete\.json\?.*email=.+|, :body => '{}')
     lambda {
       @fake_class.delete :email => "user@domain.com"
     }.should_not raise_error

data/spec/lib/sendgrid_toolkit/statistics_spec.rb

@@ -27,6 +27,16 @@ describe SendgridToolkit::Statistics do
         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
       end
     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}]')
+      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
+        stats[0][int].kind_of?(Integer).should == true if stats[0].has_key?(int)
+        stats[1][int].kind_of?(Integer).should == true if stats[1].has_key?(int)
+      end
+    end
   end
   
   describe "#list_categories" do

data/spec/webconnect/sendgrid_toolkit_spec.rb

@@ -56,18 +56,18 @@ describe SendgridToolkit do
       @obj = SendgridToolkit::Unsubscribes.new
       unsubscribes = @obj.retrieve
       unsubscribes.each do |u|
-        @obj.delete u['email']
+        @obj.delete :email => u['email']
       end
     end
     xit "adds, retrieves and deletes email addresses properly" do
-      @obj.add "user@domain.com"
-      @obj.add "user2@domain.com"
+      @obj.add :email => "user@domain.com"
+      @obj.add :email => "user2@domain.com"
       unsubs = @obj.retrieve_with_timestamps
       emails = unsubs.map {|h| h['email']}
       emails.include?('user@domain.com').should == true
       emails.include?('user2@domain.com').should == true
-      @obj.delete 'user@domain.com'
-      @obj.delete 'user2@domain.com'
+      @obj.delete :email => 'user@domain.com'
+      @obj.delete :email => 'user2@domain.com'
       @obj.retrieve.count.should == 0
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sendgrid_toolkit
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,27 +9,87 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-19 00:00:00.000000000Z
+date: 2011-11-01 00:00:00.000000000Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70095510282140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.5
+  type: :runtime
+  prerelease: false
+  version_requirements: *70095510282140
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70103627509080 !ruby/object:Gem::Requirement
+  requirement: &70095510281640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.6
   type: :runtime
   prerelease: false
-  version_requirements: *70103627509080
+  version_requirements: *70095510281640
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70095510281060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *70095510281060
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &70095510280440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: *70095510280440
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &70095510279400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+  type: :development
+  prerelease: false
+  version_requirements: *70095510279400
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70095510278900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+  type: :development
+  prerelease: false
+  version_requirements: *70095510278900
 description: A Ruby wrapper and utility library for communicating with the Sendgrid
-  API
+  API.
 email: robby@freerobby.com
 executables: []
 extensions: []
 extra_rdoc_files:
+- LICENSE.txt
 - README.md
 files:
+- .rvmrc
+- Gemfile
+- Gemfile.lock
+- LICENSE.txt
 - README.md
 - Rakefile
 - VERSION
@@ -42,7 +102,6 @@ files:
 - lib/sendgrid_toolkit/spam_reports.rb
 - lib/sendgrid_toolkit/statistics.rb
 - lib/sendgrid_toolkit/unsubscribes.rb
-- sendgrid_toolkit.gemspec
 - spec/helper.rb
 - spec/lib/sendgrid_toolkit/abstract_sendgrid_client_spec.rb
 - spec/lib/sendgrid_toolkit/bounces_spec.rb
@@ -54,7 +113,8 @@ files:
 - spec/lib/sendgrid_toolkit_spec.rb
 - spec/webconnect/sendgrid_toolkit_spec.rb
 homepage: http://github.com/freerobby/sendgrid_toolkit
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -65,6 +125,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2993501477893612547
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -73,8 +136,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: A Ruby wrapper and utility library for communicating with the Sendgrid API
+summary: sendgrid_toolkit = Sendgrid + Ruby
 test_files: []

data/sendgrid_toolkit.gemspec

@@ -1,60 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{sendgrid_toolkit}
-  s.version = "1.0.5"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  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 = [
-    "README.md"
-  ]
-  s.files = [
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "lib/sendgrid_toolkit.rb",
-    "lib/sendgrid_toolkit/abstract_sendgrid_client.rb",
-    "lib/sendgrid_toolkit/bounces.rb",
-    "lib/sendgrid_toolkit/common.rb",
-    "lib/sendgrid_toolkit/invalid_emails.rb",
-    "lib/sendgrid_toolkit/sendgrid_error.rb",
-    "lib/sendgrid_toolkit/spam_reports.rb",
-    "lib/sendgrid_toolkit/statistics.rb",
-    "lib/sendgrid_toolkit/unsubscribes.rb",
-    "sendgrid_toolkit.gemspec",
-    "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"
-  ]
-  s.homepage = %q{http://github.com/freerobby/sendgrid_toolkit}
-  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}
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<httparty>, [">= 0"])
-    else
-      s.add_dependency(%q<httparty>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<httparty>, [">= 0"])
-  end
-end
-