sendgrid_webapi 0.0.6 → 0.1.2

data/lib/sendgrid_webapi.rb

@@ -3,3 +3,4 @@ require 'base'
 require 'helper'
 require 'webapi_client'
 require 'subuser_client'
+require 'apikey_client'

data/lib/sub_user/modules.rb

@@ -6,63 +6,63 @@ end
 
 module SendGridWebApi::SubUserModules
   def management
-    @management_instance ||= Management.new(@api_user, @api_key)
+    @management_instance ||= Management.new(@api_key)
   end
 
   def bounces
-    @bounce_instance ||= Bounce.new(@api_user, @api_key)
+    @bounce_instance ||= Bounce.new(@api_key)
   end
 
   def unsubscribes
-    @unsubscribe_instance ||= Unsubscribe.new(@api_user, @api_key)
+    @unsubscribe_instance ||= Unsubscribe.new(@api_key)
   end
 
   def spam
-    @spam_instance ||= Spam.new(@api_user, @api_key)
+    @spam_instance ||= Spam.new(@api_key)
   end
 
   def invalid_emails
-    @invalid_email_instance ||= InvalidEmail.new(@api_user, @api_key)
+    @invalid_email_instance ||= InvalidEmail.new(@api_key)
   end
   
   def event_notification
-    @event_notification_instance ||= EventNotification.new(@api_user, @api_key)
+    @event_notification_instance ||= EventNotification.new(@api_key)
   end
 
   def parse_email
-    @parse_instance ||= ParseEmail.new(@api_user, @api_key)
+    @parse_instance ||= ParseEmail.new(@api_key)
   end
 
   def limits
-    @limit_instance ||= Limit.new(@api_user, @api_key)
+    @limit_instance ||= Limit.new(@api_key)
   end
 
   def stats
-    @stats_instance ||= Stats.new(@api_user, @api_key)
+    @stats_instance ||= Stats.new(@api_key)
   end
   
   def ip_management
-    @ip_management_instance ||= IpManagement.new(@api_user, @api_key)
+    @ip_management_instance ||= IpManagement.new(@api_key)
   end
 
   def monitor_records
-    @monitor_record_instance ||= MonitorRecord.new(@api_user, @api_key)
+    @monitor_record_instance ||= MonitorRecord.new(@api_key)
   end
 
   def white_label
-    @white_label_instance ||= WhiteLabel.new(@api_user, @api_key)
+    @white_label_instance ||= WhiteLabel.new(@api_key)
   end
  
   def iframe
-    @iframe_instance ||= Iframe.new(@api_user, @api_key)
+    @iframe_instance ||= Iframe.new(@api_key)
   end
 
   def auth
-    @auth_instance ||= Auth.new(@api_user, @api_key)
+    @auth_instance ||= Auth.new(@api_key)
   end
 
   def apps
-    @app_instance ||= App.new(@api_user, @api_key)
+    @app_instance ||= App.new(@api_key)
   end
  
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module SendGridWebApi
-  VERSION = "0.0.6"
+  VERSION = "0.1.2"
 end

data/lib/web_api/modules.rb

@@ -5,46 +5,50 @@ end
 
 module SendGridWebApi::Modules
   def bounces
-    @bounce_instance ||= Bounce.new(@api_user, @api_key)
+    @bounce_instance ||= Bounce.new(@api_key)
   end
 
   def blocks
-    @block_instance ||= Block.new(@api_user, @api_key)
+    @block_instance ||= Block.new(@api_key)
   end
 
   def spam
-    @spam_instance ||= Spam.new(@api_user, @api_key)
+    @spam_instance ||= Spam.new(@api_key)
   end
 
   def invalid_emails
-    @invalid_email_instance ||= InvalidEmail.new(@api_user, @api_key)
+    @invalid_email_instance ||= InvalidEmail.new(@api_key)
   end
 
   def unsubscribes
-    @unsubscribe_instance ||= Unsubscribe.new(@api_user, @api_key)
+    @unsubscribe_instance ||= Unsubscribe.new(@api_key)
   end
 
   def parse_email
-    @parse_email_instance ||= ParseEmail.new(@api_user, @api_key)
+    @parse_email_instance ||= ParseEmail.new(@api_key)
   end
 
   def event_notification
-    @event_notification_instance ||= EventNotification.new(@api_user, @api_key)
+    @event_notification_instance ||= EventNotification.new(@api_key)
   end
 
   def stats
-    @stats_instance ||= Stats.new(@api_user, @api_key)
+    @stats_instance ||= Stats.new(@api_key)
   end
 
   def profile
-    @profile_instance ||= Profile.new(@api_user, @api_key)
+    @profile_instance ||= Profile.new(@api_key)
   end
 
   def mail
-    @mail_instance ||= Mail.new(@api_user, @api_key)
+    @mail_instance ||= Mail.new(@api_key)
   end
   
   def sub_user
-    @sub_user ||= SendGridWebApi::SubUser.new(@api_user, @api_key)
+    @sub_user ||= SendGridWebApi::SubUser.new(@api_key)
+  end
+
+  def apikey
+    @apikey ||= SendGridWebApi::ApiKey.new(@api_key)
   end
 end

data/sendgrid_webapi.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require 'version'
+require "version"
 
 Gem::Specification.new do |s|
   s.name        = "sendgrid_webapi"
@@ -8,9 +8,10 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["kylejginavan", "chebyte"]
   s.email       = ["kylejginavan@gmail.com", "maurotorres@gmail.com"]
-  s.homepage    = "https://github.com/kylejginavan/sendgrid_smtpapi"
+  s.homepage    = "https://github.com/kylejginavan/sendgrid_webapi"
   s.summary     = %q{SendGrid WEB API gem fo Rails}
   s.description = %q{Gem for access to SendGrid WEB API from rails}
+  s.license     = "MIT"
 
   s.rubyforge_project = "sendgrid_webapi"
 
@@ -19,12 +20,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "rspec", "~> 2.10.0"
-  s.add_development_dependency "webmock", "~> 1.8.7"
-  s.add_development_dependency "vcr", "~> 2.8.0"  
+  s.add_dependency "faraday",          "~> 1.0"
+  s.add_dependency "faraday_middleware",  "~> 1.0"
+  s.add_dependency "json", "~> 2.0"
 
-  s.add_dependency "faraday", "~> 0.9.0"
-  s.add_dependency "faraday_middleware", "~> 0.9.0"
-  s.add_dependency "json", "~> 1.8.0"
-  
+  s.add_development_dependency "rspec", "~> 3.4"
+  s.add_development_dependency "webmock", "~> 3.12"
+  s.add_development_dependency "vcr", "~> 6.0"
+  s.add_development_dependency "rspec_junit_formatter",   "~> 0.3", ">= 0.3.0"
 end

data/spec/cassettes/client/_modules/_block/should_get_block_emails.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/blocks.get.json?api_key=pass&api_user=user
+    uri: https://api.sendgrid.com/api/blocks.get.json
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_block/should_get_totals_blocks.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/blocks.count.json?api_key=pass&api_user=user
+    uri: https://api.sendgrid.com/api/blocks.count.json
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_block/should_try_delete_not_existing_block_email.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/blocks.delete.json?api_key=pass&api_user=user&email=test@example.com
+    uri: https://api.sendgrid.com/api/blocks.delete.json?email=test@example.com
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_bounce/should_get_bounce_emails.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/bounces.get.json?api_key=pass&api_user=user
+    uri: https://api.sendgrid.com/api/bounces.get.json
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_bounce/should_get_totals_bounces.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/bounces.count.json?api_key=pass&api_user=user
+    uri: https://api.sendgrid.com/api/bounces.count.json
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_bounce/should_try_delete_not_existing_bounce_email.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/bounces.delete.json?api_key=pass&api_user=user&email=test@example.com
+    uri: https://api.sendgrid.com/api/bounces.delete.json?email=test@example.com
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_event_notification/should_delete_event_notification_url.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/eventposturl.delete.json?api_key=pass&api_user=user
+    uri: https://api.sendgrid.com/api/eventposturl.delete.json
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_event_notification/should_get_event_notification_url.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/eventposturl.get.json?api_key=pass&api_user=user
+    uri: https://api.sendgrid.com/api/eventposturl.get.json
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_event_notification/should_set_event_notification_url.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/eventposturl.set.json?api_key=pass&api_user=user&url=http://www.yourposturlhere.com
+    uri: https://api.sendgrid.com/api/eventposturl.set.json?url=http://www.yourposturlhere.com
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_invalid_email/should_get_invalid_emails.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/invalidemails.get.json?api_key=pass&api_user=user
+    uri: https://api.sendgrid.com/api/invalidemails.get.json
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_invalid_email/should_try_delete_not_existing_invalid_emails.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/invalidemails.delete.json?api_key=pass&api_user=user&email=test@example.com
+    uri: https://api.sendgrid.com/api/invalidemails.delete.json?email=test@example.com
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_parse_email/should_delete_parse_email.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/parse.delete.json?api_key=pass&api_user=user&hostname=www.example.com
+    uri: https://api.sendgrid.com/api/parse.delete.json?hostname=www.example.com
     body:
       encoding: US-ASCII
       string: ''
@@ -46,7 +46,7 @@ http_interactions:
   recorded_at: Fri, 17 Jan 2014 01:51:54 GMT
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/parse.get.json?api_key=pass&api_user=user
+    uri: https://api.sendgrid.com/api/parse.get.json
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_parse_email/should_get_parse_email.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/parse.get.json?api_key=pass&api_user=user
+    uri: https://api.sendgrid.com/api/parse.get.json
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_parse_email/should_set_parse_email.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/parse.set.json?api_key=pass&api_user=user&hostname=www.example.com&spam_check=1&url=www.mydomain.com/parse.php
+    uri: https://api.sendgrid.com/api/parse.set.json?hostname=www.example.com&spam_check=1&url=www.mydomain.com/parse.php
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_profile/should_get_profile.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/profile.get.json?api_key=pass&api_user=user
+    uri: https://api.sendgrid.com/api/profile.get.json
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_profile/should_set_first_name.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/profile.set.json?api_key=pass&api_user=user&first_name=test
+    uri: https://api.sendgrid.com/api/profile.set.json?first_name=test
     body:
       encoding: US-ASCII
       string: ''
@@ -46,7 +46,7 @@ http_interactions:
   recorded_at: Fri, 17 Jan 2014 01:52:35 GMT
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/profile.get.json?api_key=pass&api_user=user
+    uri: https://api.sendgrid.com/api/profile.get.json
     body:
       encoding: US-ASCII
       string: ''
@@ -91,7 +91,7 @@ http_interactions:
   recorded_at: Fri, 17 Jan 2014 01:52:36 GMT
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/profile.set.json?api_key=pass&api_user=user&first_name=Reseller
+    uri: https://api.sendgrid.com/api/profile.set.json?first_name=Reseller
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_spam/should_get_spam_emails.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/spamreports.get.json?api_key=pass&api_user=user
+    uri: https://api.sendgrid.com/api/spamreports.get.json
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_spam/should_try_delete_not_existing_spam_emails.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/spamreports.delete.json?api_key=pass&api_user=user&email=test@example.com
+    uri: https://api.sendgrid.com/api/spamreports.delete.json?email=test@example.com
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_unsubscribe/should_add_unsubscribe_emails.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/unsubscribes.add.json?api_key=pass&api_user=user&email=test@example.com
+    uri: https://api.sendgrid.com/api/unsubscribes.add.json?email=test@example.com
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_unsubscribe/should_delete_unsubscribe_email.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/unsubscribes.delete.json?api_key=pass&api_user=user&email=test@example.com
+    uri: https://api.sendgrid.com/api/unsubscribes.delete.json?email=test@example.com
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_unsubscribe/should_get_unsubscribe_emails.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/unsubscribes.get.json?api_key=pass&api_user=user
+    uri: https://api.sendgrid.com/api/unsubscribes.get.json
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_unsubscribe/should_try_delete_not_existing_unsubscribe_emails.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/unsubscribes.delete.json?api_key=pass&api_user=user&email=test@example.com
+    uri: https://api.sendgrid.com/api/unsubscribes.delete.json?email=test@example.com
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/helper/_create_sub_user_account/should_create_sub_user_account.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://sendgrid.com/apiv2/customer.add.json?address=555%20anystreet&api_key=pass&api_user=user&city=any%20city&confirm_password=somepass&country=US&email=email@email.com&first_name=home&last_name=simpson&password=somepass&phone=555-555&state=CA&username=test-6&website=someurl.com&zip=91234
+    uri: https://sendgrid.com/apiv2/customer.add.json?address=555%20anystreet&city=any%20city&confirm_password=somepass&country=US&email=email@email.com&first_name=home&last_name=simpson&password=somepass&phone=555-555&state=CA&username=test-6&website=someurl.com&zip=91234
     body:
       encoding: US-ASCII
       string: ''
@@ -46,7 +46,7 @@ http_interactions:
   recorded_at: Fri, 17 Jan 2014 02:05:33 GMT
 - request:
     method: get
-    uri: https://sendgrid.com/apiv2/customer.enable.json?api_key=pass&api_user=user&user=test-6
+    uri: https://sendgrid.com/apiv2/customer.enable.json?user=test-6
     body:
       encoding: US-ASCII
       string: ''
@@ -90,7 +90,7 @@ http_interactions:
   recorded_at: Fri, 17 Jan 2014 02:05:35 GMT
 - request:
     method: get
-    uri: https://sendgrid.com/apiv2/customer.sendip.json?api_key=pass&api_user=user&ip%5B0%5D=192.254.126.178&set=specify&task=append&user=test-6
+    uri: https://sendgrid.com/apiv2/customer.sendip.json?ip%5B0%5D=192.254.126.178&set=specify&task=append&user=test-6
     body:
       encoding: US-ASCII
       string: ''
@@ -134,7 +134,7 @@ http_interactions:
   recorded_at: Fri, 17 Jan 2014 02:05:37 GMT
 - request:
     method: get
-    uri: https://sendgrid.com/apiv2/customer.apps.json?api_key=pass&api_user=user&name=opentrack&task=activate&user=test-6
+    uri: https://sendgrid.com/apiv2/customer.apps.json?name=opentrack&task=activate&user=test-6
     body:
       encoding: US-ASCII
       string: ''
@@ -178,7 +178,7 @@ http_interactions:
   recorded_at: Fri, 17 Jan 2014 02:05:39 GMT
 - request:
     method: get
-    uri: https://sendgrid.com/apiv2/customer.apps.json?api_key=pass&api_user=user&name=clicktrack&task=activate&user=test-6
+    uri: https://sendgrid.com/apiv2/customer.apps.json?name=clicktrack&task=activate&user=test-6
     body:
       encoding: US-ASCII
       string: ''
@@ -266,7 +266,7 @@ http_interactions:
   recorded_at: Fri, 17 Jan 2014 02:05:43 GMT
 - request:
     method: get
-    uri: https://sendgrid.com/apiv2/customer.auth.json?api_key=pass&api_user=user&password=somepass&user=test-6
+    uri: https://sendgrid.com/apiv2/customer.auth.json?password=somepass&user=test-6
     body:
       encoding: US-ASCII
       string: ''