sendgrid4r 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d7f4961aa315c9383c28064b91f827b5649cca5
-  data.tar.gz: 97bcf08a8000e314ac46d0641078112bb83eeb2e
+  metadata.gz: eb7caee98231bb2a059edc759bb2a60ed9e36998
+  data.tar.gz: 851393635739f5d439861e41a658e7fefbc28201
 SHA512:
-  metadata.gz: 764e730d5f55c68eb2b1d9269b16b50419040f023ffc1e316842fa83607ea4f9f2333a72027318b136f8c0571a741b544a7d3840b6ced14c38172658b30b3c8d
-  data.tar.gz: ccf33b5cb94663a33d54b49cf21b5fed12f4a180ce208b6f78c2938a227907518d57770c7c4da73fcc9a6e0a46ad33341127f41c14180f9de6beb1b65455446f
+  metadata.gz: 24f52934d7a0f7832b835fe47fc925d617dd1822673b8496d51a3f200b4b0329dcd5ff421b04605cd3db71e17ead302a926632684294ab6807594e5f45049510
+  data.tar.gz: 0e0e57d4ab406865b937ec4478e61476b935c18315bb17f8fc717a9be99d679776dfebead26c257712b75ae99e80c54959592c3cc655af3d48d8de2bab15cbc0

data/lib/auth.rb

@@ -9,7 +9,7 @@ module SendGrid4r
     attr_reader :username, :password, :api_key
 
     def initialize(
-      username: username, password: password, api_key: api_key = nil
+      username: nil, password: nil, api_key: nil
     )
       @username = username
       @password = password

data/lib/client.rb

@@ -16,7 +16,7 @@ module SendGrid4r
     include SendGrid4r::REST::API
 
     def initialize(
-      username: username, password: password, api_key: api_key = nil
+      username: nil, password: nil, api_key: nil
     )
       @auth = Auth.new(username: username, password: password, api_key: api_key)
     end

data/lib/sendgrid4r/rest/request.rb

@@ -35,16 +35,13 @@ module SendGrid4r
 
       def execute(method, auth, endpoint, params, payload, &block)
         args = create_args(method, auth, endpoint, params, payload)
-        if block_given?
-          RestClient::Request.execute(args, &block)
-          return nil
-        end
-        body = RestClient::Request.execute(args)
-        if body.nil? || body.length < 2
-          body
-        else
-          JSON.parse(body)
-        end
+        body = RestClient::Request.execute(args, &block)
+        return nil if block_given?
+        return JSON.parse(body) unless body.nil? || body.length < 2
+        body
+      rescue RestClient::TooManyRequests => e
+        sleep e.response.headers[:x_ratelimit_reset].to_i - Time.now.to_i
+        retry
       end
 
       def create_args(method, auth, endpoint, params, payload)

data/lib/sendgrid4r/rest/users/users.rb

@@ -42,7 +42,7 @@ module SendGrid4r
         SendGrid4r::REST::Users.create_profile(resp)
       end
 
-      def patch_user_profile(params: params, &block)
+      def patch_user_profile(params: nil, &block)
         endpoint = SendGrid4r::REST::Users.url
         resp = patch(@auth, endpoint, params, &block)
         SendGrid4r::REST::Users.create_profile(resp)

data/lib/sendgrid4r/version.rb

@@ -2,5 +2,5 @@
 # SendGrid API v3 wrapper implementation.
 #
 module SendGrid4r
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/sendgrid4r.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency('rest-client', '>=1.8.0', '<1.9.0')
   spec.add_development_dependency('rubocop', '>=0.29.0', '<0.30.0')
-  spec.add_development_dependency('bundler', '>=1.6.0', '<1.8.0')
+  spec.add_development_dependency('bundler', '>=1.6.0', '<1.11.0')
   spec.add_development_dependency('rspec', '3.1.0')
   spec.add_development_dependency('dotenv', '>=0.11.0', '<0.12.0')
 end

data/spec/client_spec.rb

@@ -258,7 +258,7 @@ describe SendGrid4r::Client do
 
     describe 'VERSION' do
       it 'returns VERSION value' do
-        expect(SendGrid4r::VERSION).to eq('1.2.0')
+        expect(SendGrid4r::VERSION).to eq('1.2.1')
       end
     end
   end

data/spec/rest/api_keys/api_keys_spec.rb

@@ -52,7 +52,6 @@ describe SendGrid4r::REST::ApiKeys do
           expect(api_key2.name).to eq(@name2)
           expect(api_key2.api_key_id).to be_a(String)
           expect(api_key2.api_key).to be_a(String)
-          expect(api_key2.scope_set_id).to be_a(String)
         rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e

data/spec/rest/settings/partner_spec.rb

@@ -22,6 +22,7 @@ describe SendGrid4r::REST::Settings::Partner do
       end
 
       it '#get_settings_new_relic' do
+        pending 'invalid json received'
         begin
           actual = @client.get_settings_new_relic
           expect(actual).to be_a(
@@ -34,6 +35,7 @@ describe SendGrid4r::REST::Settings::Partner do
       end
 
       it '#patch_settings_new_relic' do
+        pending 'invalid json received'
         begin
           # get original settings
           actual = @client.get_settings_new_relic
@@ -50,6 +52,7 @@ describe SendGrid4r::REST::Settings::Partner do
       end
 
       it '#get_settings_sendwithus' do
+        pending 'entry not found'
         begin
           actual = @client.get_settings_sendwithus
           expect(actual).to be_a(SendGrid4r::REST::Settings::Partner::Partner)
@@ -60,6 +63,7 @@ describe SendGrid4r::REST::Settings::Partner do
       end
 
       it '#patch_settings_sendwithus' do
+        pending 'entry not found'
         begin
           # get original settings
           actual = @client.get_settings_sendwithus

data/spec/rest/stats/subuser_spec.rb

@@ -7,6 +7,17 @@ describe SendGrid4r::REST::Stats::Subuser do
       Dotenv.load
       @client = SendGrid4r::Client.new(api_key: ENV['SILVER_API_KEY'])
       @subuser = ENV['SUBUSER2']
+      @email1 = ENV['MAIL']
+      @password1 = ENV['PASS']
+      @ip = ENV['IP']
+      subusers = @client.get_subusers
+      count = subusers.count { |subuser| subuser.username == @subuser }
+      @client.post_subuser(
+        username: @subuser,
+        email: @email1,
+        password: @password1,
+        ips: [@ip]
+      ) if count == 0
     end
 
     context 'without block call' do

data/spec/rest/subusers/subusers_spec.rb

@@ -12,15 +12,16 @@ describe SendGrid4r::REST::Subusers do
         @username3 = ENV['SUBUSER3']
         @email1 = ENV['MAIL']
         @password1  = ENV['PASS']
-
         @ip = @client.get_ips[0].ip
         # celan up test env
-        begin
-          @client.delete_subuser(username: @username3)
-        rescue => e
-          puts e.inspect
-        end
-
+        subusers = @client.get_subusers
+        count1 = subusers.count { |subuser| subuser.username == @username1 }
+        @client.delete_subuser(username: @username1) unless count1 == 0
+        count2 = subusers.count { |subuser| subuser.username == @username2 }
+        @client.delete_subuser(username: @username2) unless count2 == 0
+        count3 = subusers.count { |subuser| subuser.username == @username3 }
+        @client.delete_subuser(username: @username3) unless count3 == 0
+        # create a subuser
         @subuser3 = @client.post_subuser(
           username: @username3,
           email: @email1,
@@ -61,6 +62,7 @@ describe SendGrid4r::REST::Subusers do
       it '#patch_subuser' do
         begin
           @client.patch_subuser(username: @username3, disabled: true)
+          @client.patch_subuser(username: @username3, disabled: false)
         rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
@@ -130,8 +132,7 @@ describe SendGrid4r::REST::Subusers do
       it '#get_subuser_reputation' do
         begin
           params = []
-          params.push(@username1)
-          params.push(@username2)
+          params.push(@username3)
           subusers = @client.get_subuser_reputation(usernames: params)
           expect(subusers).to be_a(Array)
           subusers.each do |subuser|
@@ -146,7 +147,7 @@ describe SendGrid4r::REST::Subusers do
       it '#put_subuser_assigned_ips' do
         begin
           subuser = @client.put_subuser_assigned_ips(
-            username: @username2, ips: [@ip]
+            username: @username3, ips: [@ip]
           )
           expect(subuser.ips).to be_a(Array)
           subuser.ips.each do |ip|

data/spec/rest/whitelabel/domains_spec.rb

@@ -13,21 +13,51 @@ describe SendGrid4r::REST::Whitelabel::Domains do
         @ip = ENV['IP']
         @subuser1 = ENV['SUBUSER1']
         @subuser2 = ENV['SUBUSER2']
-
+        @email1 = ENV['MAIL']
+        @password1 = ENV['PASS']
+        @ip = ENV['IP']
         # celan up test env(lists)
+        @id1 = nil
+        @id2 = nil
+        @id3 = nil
         domains = @client.get_wl_domains
         domains.each do |domain|
           if domain.subdomain == "#{@subdomain_name}1" &&
              domain.domain == @domain_name
-            @client.delete_wl_domain(id: domain.id)
+            @id1 = domain.id
           end
           if domain.subdomain == "#{@subdomain_name}2" &&
              domain.domain == @domain_name
-            @client.delete_wl_domain(id: domain.id)
+            @id2 = domain.id
+          end
+          if domain.subdomain == "#{@subdomain_name}3" &&
+             domain.domain == @domain_name
+            @id3 = domain.id
           end
         end
-
         # post domain
+        @domain1 = @client.post_wl_domain(
+          domain: @domain_name, subdomain: @subdomain_name + '1',
+          username: @username, ips: nil,
+          automatic_security: true, custom_spf: false, default: false
+        ) if @id1.nil?
+        @domain2 = @client.post_wl_domain(
+          domain: @domain_name, subdomain: @subdomain_name + '2',
+          username: @username, ips: nil,
+          automatic_security: false, custom_spf: true, default: false
+        ) if @id2.nil?
+        @domain3 = @client.post_wl_domain(
+          domain: @domain_name, subdomain: @subdomain_name + '3',
+          username: @username, ips: nil,
+          automatic_security: true, custom_spf: false, default: false
+        ) if @id3.nil?
+        # make a default
+        @id1 = @domain1.id if @id1.nil?
+        @id2 = @domain2.id if @id2.nil?
+        @id3 = @domain3.id if @id3.nil?
+        @client.patch_wl_domain(id: @id3, default: true)
+        @client.delete_wl_domain(id: @id1)
+        @client.delete_wl_domain(id: @id2)
         @domain1 = @client.post_wl_domain(
           domain: @domain_name, subdomain: @subdomain_name + '1',
           username: @username, ips: nil,
@@ -38,6 +68,16 @@ describe SendGrid4r::REST::Whitelabel::Domains do
           username: @username, ips: nil,
           automatic_security: false, custom_spf: true, default: false
         )
+        # clean subusers
+        subusers = @client.get_subusers
+        count = subusers.count { |subuser| subuser.username == @subuser1 }
+        @client.delete_subuser(username: @subuser1) if count == 1
+        @client.post_subuser(
+          username: @subuser1,
+          email: @email1,
+          password: @password1,
+          ips: [@ip]
+        )
       rescue RestClient::ExceptionWithResponse => e
         puts e.inspect
         raise e

data/spec/rest/whitelabel/ips_spec.rb

@@ -15,15 +15,12 @@ describe SendGrid4r::REST::Whitelabel::Ips do
         # celan up test env(lists)
         ips = @client.get_wl_ips
         ips.each do |ip|
-          @client.delete_wl_ip(
-            id: ip.id
-          ) if ip.subdomain == @subdomain_name && ip.domain == @domain_name
+          @client.delete_wl_ip(id: ip.id)
         end
 
         @ipw = @client.post_wl_ip(
           ip: @ip, subdomain: @subdomain_name, domain: @domain_name
         )
-
       rescue RestClient::ExceptionWithResponse => e
         puts e.inspect
         raise e

data/spec/rest/whitelabel/links_spec.rb

@@ -11,19 +11,47 @@ describe SendGrid4r::REST::Whitelabel::Links do
         @domain_name = ENV['DOMAIN']
         @username = ENV['USERNAME']
         @subuser1 = ENV['SUBUSER1']
-
-        # celan up test env(lists)
+        @email1 = ENV['MAIL']
+        @password1 = ENV['PASS']
+        @ip = @client.get_ips[0].ip
+        # celan up test env
+        @id1 = nil
+        @id2 = nil
         links = @client.get_wl_links
         links.each do |link|
           if link.subdomain == "#{@subdomain_name}1" &&
              link.domain == @domain_name
-            @client.delete_wl_link(id: link.id)
+            @id1 = link.id
+          end
+          if link.subdomain == "#{@subdomain_name}2" &&
+             link.domain == @domain_name
+            @id2 = link.id
           end
         end
-
         # post link
         @link1 = @client.post_wl_link(
           subdomain: @subdomain_name + '1', domain: @domain_name, default: false
+        ) if @id1.nil?
+        @link2 = @client.post_wl_link(
+          subdomain: @subdomain_name + '2', domain: @domain_name, default: false
+        ) if @id2.nil?
+        # make a default
+        @id1 = @link1.id if @id1.nil?
+        @id2 = @link2.id if @id2.nil?
+        @client.patch_wl_link(id: @id1, default: true)
+        @client.delete_wl_link(id: @id2)
+        @link2 = @client.post_wl_link(
+          subdomain: @subdomain_name + '2', domain: @domain_name, default: false
+        )
+        # create a subuser
+        subusers = @client.get_subusers
+        count = subusers.count { |subuser| subuser.username == @subuser1 }
+        @client.delete_subuser(username: @subuser1) if count == 1
+        @client.post_subuser(
+          username: @subuser1,
+          email: @email1,
+          password: @password1,
+          ips: [@ip]
         )
       rescue RestClient::ExceptionWithResponse => e
         puts e.inspect
@@ -49,18 +77,18 @@ describe SendGrid4r::REST::Whitelabel::Links do
 
       it '#post_wl_link' do
         begin
-          expect(@link1).to be_a(SendGrid4r::REST::Whitelabel::Links::Link)
-          expect(@link1.domain).to eq(@domain_name)
-          expect(@link1.subdomain).to eq(@subdomain_name + '1')
-          expect(@link1.username).to eq(@username)
-          expect(@link1.user_id).to be_a(Numeric)
-          expect(@link1.default).to eq(false)
-          expect(@link1.valid).to eq(false)
-          expect(@link1.legacy).to eq(false)
-          expect(@link1.dns.domain_cname).to be_a(
+          expect(@link2).to be_a(SendGrid4r::REST::Whitelabel::Links::Link)
+          expect(@link2.domain).to eq(@domain_name)
+          expect(@link2.subdomain).to eq(@subdomain_name + '2')
+          expect(@link2.username).to eq(@username)
+          expect(@link2.user_id).to be_a(Numeric)
+          expect(@link2.default).to eq(true)
+          expect(@link2.valid).to eq(false)
+          expect(@link2.legacy).to eq(false)
+          expect(@link2.dns.domain_cname).to be_a(
             SendGrid4r::REST::Whitelabel::Links::Record
           )
-          expect(@link1.dns.owner_cname).to be_a(
+          expect(@link2.dns.owner_cname).to be_a(
             SendGrid4r::REST::Whitelabel::Links::Record
           )
         rescue RestClient::ExceptionWithResponse => e
@@ -71,19 +99,19 @@ describe SendGrid4r::REST::Whitelabel::Links do
 
       it '#get_wl_link' do
         begin
-          link1 = @client.get_wl_link(id: @link1.id)
-          expect(link1).to be_a(SendGrid4r::REST::Whitelabel::Links::Link)
-          expect(link1.domain).to eq(@domain_name)
-          expect(link1.subdomain).to eq(@subdomain_name + '1')
-          expect(link1.username).to eq(@username)
-          expect(link1.user_id).to be_a(Numeric)
-          expect(link1.default).to eq(false)
-          expect(link1.valid).to eq(false)
-          expect(link1.legacy).to eq(false)
-          expect(link1.dns.domain_cname).to be_a(
+          link2 = @client.get_wl_link(id: @link2.id)
+          expect(link2).to be_a(SendGrid4r::REST::Whitelabel::Links::Link)
+          expect(link2.domain).to eq(@domain_name)
+          expect(link2.subdomain).to eq(@subdomain_name + '2')
+          expect(link2.username).to eq(@username)
+          expect(link2.user_id).to be_a(Numeric)
+          expect(link2.default).to eq(true)
+          expect(link2.valid).to eq(false)
+          expect(link2.legacy).to eq(false)
+          expect(link2.dns.domain_cname).to be_a(
             SendGrid4r::REST::Whitelabel::Links::Record
           )
-          expect(link1.dns.owner_cname).to be_a(
+          expect(link2.dns.owner_cname).to be_a(
             SendGrid4r::REST::Whitelabel::Links::Record
           )
         rescue RestClient::ExceptionWithResponse => e
@@ -94,19 +122,19 @@ describe SendGrid4r::REST::Whitelabel::Links do
 
       it '#patch_wl_link' do
         begin
-          link1 = @client.patch_wl_link(id: @link1.id, default: false)
-          expect(link1).to be_a(SendGrid4r::REST::Whitelabel::Links::Link)
-          expect(link1.domain).to eq(@domain_name)
-          expect(link1.subdomain).to eq(@subdomain_name + '1')
-          expect(link1.username).to eq(@username)
-          expect(link1.user_id).to be_a(Numeric)
-          expect(link1.default).to eq(false)
-          expect(link1.valid).to eq(false)
-          expect(link1.legacy).to eq(false)
-          expect(link1.dns.domain_cname).to be_a(
+          link2 = @client.patch_wl_link(id: @link2.id, default: true)
+          expect(link2).to be_a(SendGrid4r::REST::Whitelabel::Links::Link)
+          expect(link2.domain).to eq(@domain_name)
+          expect(link2.subdomain).to eq(@subdomain_name + '2')
+          expect(link2.username).to eq(@username)
+          expect(link2.user_id).to be_a(Numeric)
+          expect(link2.default).to eq(true)
+          expect(link2.valid).to eq(false)
+          expect(link2.legacy).to eq(false)
+          expect(link2.dns.domain_cname).to be_a(
             SendGrid4r::REST::Whitelabel::Links::Record
           )
-          expect(link1.dns.owner_cname).to be_a(
+          expect(link2.dns.owner_cname).to be_a(
             SendGrid4r::REST::Whitelabel::Links::Record
           )
         rescue RestClient::ExceptionWithResponse => e
@@ -117,7 +145,7 @@ describe SendGrid4r::REST::Whitelabel::Links do
 
       it '#delete_wl_link' do
         begin
-          @client.delete_wl_link(id: @link1.id)
+          @client.delete_wl_link(id: @id1)
         rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
@@ -136,7 +164,7 @@ describe SendGrid4r::REST::Whitelabel::Links do
 
       it '#validate_wl_link' do
         begin
-          result1 = @client.validate_wl_link(id: @link1.id)
+          result1 = @client.validate_wl_link(id: @id1)
           expect(result1).to be_a(
             SendGrid4r::REST::Whitelabel::Links::Result
           )
@@ -168,7 +196,7 @@ describe SendGrid4r::REST::Whitelabel::Links do
       it '#associate_wl_link' do
         begin
           @client.associate_wl_link(
-            id: @link1.id, username: @subuser1
+            id: @id1, username: @subuser1
           )
         rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
@@ -179,7 +207,7 @@ describe SendGrid4r::REST::Whitelabel::Links do
       it '#disassociate_wl_link' do
         begin
           @client.associate_wl_link(
-            id: @link1.id, username: @subuser1
+            id: @id1, username: @subuser1
           )
           @client.disassociate_wl_link(username: @subuser1)
         rescue RestClient::ExceptionWithResponse => e

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sendgrid4r
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - awwa500@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -59,7 +59,7 @@ dependencies:
         version: 1.6.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: 1.6.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement