sendgrid4r 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4970f1d3bba5b4f0f5efe8267f7d8b339d50dba4
-  data.tar.gz: f3d6096eb69342dcb0b4d565e159263c588d5847
+  metadata.gz: 2df9fbdd15763250ba845eb33ef85f763c13de0b
+  data.tar.gz: 119cdeda58f5a1cc4b80141e55bafd6c7e48798c
 SHA512:
-  metadata.gz: f4f68701e16a3531a93b5c61adf659ef0da529eeb9df397d3cf3542baf728511394d6aeb8c66e63b13d24ed37d7914277ada11d56717566ff19f8e282826fd34
-  data.tar.gz: 8e13f566ebc9b52bae2d664756ddf8f8eddb496e4b4294c95d9f1216673f067fae2f783b6166eca892127bc64ca4df676ce8c8978c65d1d4cfeccb6802fcf326
+  metadata.gz: 773ed665ffd716b13bd8d1ee2c97db3367f6c8d67422e911308da613407aa5e3f4221096dd8eaddc991745845c827ca64384e9bfe4541ca1855734b9fce31eae
+  data.tar.gz: fbc2f5bd38405a4e1ae287249d341c354080866313b4dd97d6e2c5d94b26da63637fb3ebb7922aff26b90daaa6105c545c5c6b81f24506cf682de3b9a771957e

data/lib/sendgrid4r/rest/ip_access_management.rb

@@ -16,7 +16,9 @@ module SendGrid4r
 
       WhitelistedIps = Struct.new(:result)
 
-      WhitelistedIp = Struct.new(:id, :ip, :created_at, :updated_at)
+      WhitelistedIp = Struct.new(:result)
+
+      WhitelistedIpResult = Struct.new(:id, :ip, :created_at, :updated_at)
 
       def self.url_activity
         "#{BASE_URL}/access_settings/activity"
@@ -58,7 +60,7 @@ module SendGrid4r
         result = []
         resp['result'].each do |whitelisted_ip|
           result.push(
-            SendGrid4r::REST::IpAccessManagement.create_whitelisted_ip(
+            SendGrid4r::REST::IpAccessManagement.create_whitelisted_ip_result(
               whitelisted_ip
             )
           )
@@ -67,10 +69,19 @@ module SendGrid4r
       end
 
       def self.create_whitelisted_ip(resp)
+        return resp if resp.nil?
+        WhitelistedIp.new(
+          SendGrid4r::REST::IpAccessManagement.create_whitelisted_ip_result(
+            resp['result']
+          )
+        )
+      end
+
+      def self.create_whitelisted_ip_result(resp)
         return resp if resp.nil?
         created_at = Time.at(resp['created_at']) unless resp['created_at'].nil?
         updated_at = Time.at(resp['updated_at']) unless resp['updated_at'].nil?
-        WhitelistedIp.new(resp['id'], resp['ip'], created_at, updated_at)
+        WhitelistedIpResult.new(resp['id'], resp['ip'], created_at, updated_at)
       end
 
       def get_ip_activities(limit: nil, &block)
@@ -89,23 +100,23 @@ module SendGrid4r
 
       def post_whitelisted_ips(ips:, &block)
         endpoint = SendGrid4r::REST::IpAccessManagement.url_whitelist
-        ips = []
+        ips_param = []
         ips.each do |ip|
-          ip = {}
-          ip['ip'] = ip
-          ip.push(ip)
+          ip_param = {}
+          ip_param['ip'] = ip
+          ips_param.push(ip_param)
         end
         params = {}
-        params['ips'] = ips
+        params['ips'] = ips_param
         resp = post(@auth, endpoint, params, &block)
         SendGrid4r::REST::IpAccessManagement.create_whitelisted_ips(resp)
       end
 
       def delete_whitelisted_ips(ids:, &block)
         endpoint = SendGrid4r::REST::IpAccessManagement.url_whitelist
-        params = {}
-        params['ids'] = ids
-        delete(@auth, endpoint, params, &block)
+        payload = {}
+        payload['ids'] = ids
+        delete(@auth, endpoint, nil, payload, &block)
       end
 
       def get_whitelisted_ip(rule_id:, &block)

data/lib/sendgrid4r/version.rb

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

data/spec/client_spec.rb

@@ -313,7 +313,7 @@ describe SendGrid4r::Client do
 
     describe 'VERSION' do
       it 'returns VERSION value' do
-        expect(SendGrid4r::VERSION).to eq('1.7.0')
+        expect(SendGrid4r::VERSION).to eq('1.7.1')
       end
     end
   end

data/spec/rest/ip_access_management_spec.rb

@@ -5,17 +5,22 @@ describe SendGrid4r::REST::IpAccessManagement do
   describe 'integration test', :it do
     before do
       begin
-        pending('resource not found')
         Dotenv.load
         @client = SendGrid4r::Client.new(api_key: ENV['SILVER_API_KEY'])
 
         # clean up test env(whitelisted_ips)
+        @ip1 = '192.168.0.1/32'
+        @ip2 = '1.12.34.56/32'
         ips = @client.get_whitelisted_ips
         ips.result.each do |whitelisted_ip|
-          @client.delete_whitelisted_ip(rule_id: whitelisted_ip.id)
+          @client.delete_whitelisted_ip(
+            rule_id: whitelisted_ip.id
+          ) if whitelisted_ip.ip == @ip1 || whitelisted_ip.ip == @ip2
+        end
+        @ips = @client.post_whitelisted_ips(ips: [@ip1])
+        @ips.result.each do |ip|
+          @id1 = ip.id if ip.ip == @ip1
         end
-        @ips = @client.post_whitelisted_ip('0.0.0.0')
-        @id1 = @ips.result[0].id
       rescue RestClient::ExceptionWithResponse => e
         puts e.inspect
         raise e
@@ -71,7 +76,7 @@ describe SendGrid4r::REST::IpAccessManagement do
 
       it '#post_whitelisted_ips' do
         begin
-          ips = @client.post_whitelisted_ips(ips: ['127.0.0.1'])
+          ips = @client.post_whitelisted_ips(ips: [@ip2])
           expect(ips).to be_a(
             SendGrid4r::REST::IpAccessManagement::WhitelistedIps
           )
@@ -104,9 +109,7 @@ describe SendGrid4r::REST::IpAccessManagement do
 
       it '#delete_whitelisted_ip' do
         begin
-          expect do
-            @client.delete_whitelisted_ip(rule_id: @id1)
-          end.to raise_error(RestClient::ResourceNotFound)
+          @client.delete_whitelisted_ip(rule_id: @id1)
         rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
@@ -168,10 +171,12 @@ describe SendGrid4r::REST::IpAccessManagement do
     let(:whitelisted_ip) do
       JSON.parse(
         '{'\
-          '"id": 1,'\
-          '"ip": "192.168.1.1",'\
-          '"created_at": 1441824715,'\
-          '"updated_at": 1441824715'\
+          '"result": {'\
+            '"created_at": 1459011215,'\
+            '"id": 1,'\
+            '"ip": "192.168.1.1/32",'\
+            '"updated_at": 1459011215'\
+          '}'\
         '}'
       )
     end
@@ -195,7 +200,7 @@ describe SendGrid4r::REST::IpAccessManagement do
       )
       actual.result.each do |whitelisted_ip|
         expect(whitelisted_ip).to be_a(
-          SendGrid4r::REST::IpAccessManagement::WhitelistedIp
+          SendGrid4r::REST::IpAccessManagement::WhitelistedIpResult
         )
       end
     end
@@ -208,7 +213,7 @@ describe SendGrid4r::REST::IpAccessManagement do
       )
       actual.result.each do |whitelisted_ip|
         expect(whitelisted_ip).to be_a(
-          SendGrid4r::REST::IpAccessManagement::WhitelistedIp
+          SendGrid4r::REST::IpAccessManagement::WhitelistedIpResult
         )
       end
     end
@@ -258,5 +263,15 @@ describe SendGrid4r::REST::IpAccessManagement do
       expect(ip1.created_at).to eq(Time.at(1441824715))
       expect(ip1.updated_at).to eq(Time.at(1441824715))
     end
+
+    it 'creates whitelisted_ip instance' do
+      actual = SendGrid4r::REST::IpAccessManagement.create_whitelisted_ip(
+        whitelisted_ip
+      )
+      expect(actual.result.id).to eq(1)
+      expect(actual.result.ip).to eq('192.168.1.1/32')
+      expect(actual.result.created_at).to eq(Time.at(1459011215))
+      expect(actual.result.updated_at).to eq(Time.at(1459011215))
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sendgrid4r
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - awwa500@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-05 00:00:00.000000000 Z
+date: 2016-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client