sendgrid4r 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee7f5d4ddff55b748d3e2c1159c6e7592328588e
-  data.tar.gz: c5886877939dcee9c13f008e421200fc50e21cce
+  metadata.gz: da33e4bfff93975445c5df1a4bc2d57f81aefef7
+  data.tar.gz: 89f466b9e9bc465e2556097b97f48cc4e2f6c152
 SHA512:
-  metadata.gz: 9238a16524e08f39caa9e92136c2bf2a77199d7f20cfa874acbad2b90e624ac29753c4c59757c7529150ed789b5036149053019d65a637c155df60edb583a2ae
-  data.tar.gz: bacc97586559a131df2bfc27f240ae69cad6609bf7338c500ffe830cc13bf6c14c936959885ca79bae930a6b4c17a62a38c2a2d4d3ef04dc0f8eb1b2605f447e
+  metadata.gz: 67f7b15b77bca858a933297bb46e3983ac6603623be4fa050f3972e5877facd3126a3a18ed3e855a5388cac43cc7ee9366b8e6a61c9319ed2bad5fc8ead801c6
+  data.tar.gz: d740abe0a3629826d8f97d503daecb2325b51f53a63c712b0623c67e91ec5f76ee15800f662a90fe10f1a78bd76c04ad42d051479d4525474c454f7d0631d3f1

data/lib/sendgrid4r/rest/api.rb

@@ -42,7 +42,9 @@ module SendGrid4r
       include SendGrid4r::REST::Users
       include SendGrid4r::REST::Bounces
       include SendGrid4r::REST::CancelScheduledSends
-      include SendGrid4r::REST::Webhooks::ParseApi
+      include SendGrid4r::REST::Webhooks::Event
+      include SendGrid4r::REST::Webhooks::Parse
+      include SendGrid4r::REST::IpAccessManagement
     end
   end
 end

data/lib/sendgrid4r/rest/ip_access_management.rb

@@ -0,0 +1,123 @@
+# -*- encoding: utf-8 -*-
+
+module SendGrid4r
+  module REST
+    #
+    # SendGrid Web API v3 IpAccessManagement
+    #
+    module IpAccessManagement
+      include SendGrid4r::REST::Request
+
+      IpActivities = Struct.new(:result)
+
+      IpActivity = Struct.new(
+        :allowed, :auth_method, :first_at, :ip, :last_at, :location
+      )
+
+      WhitelistedIps = Struct.new(:result)
+
+      WhitelistedIp = Struct.new(:id, :ip, :created_at, :updated_at)
+
+      def self.url_activity
+        "#{BASE_URL}/access_settings/activity"
+      end
+
+      def self.url_whitelist(rule_id = nil)
+        url = "#{BASE_URL}/access_settings/whitelist"
+        url = "#{url}/#{rule_id}" unless rule_id.nil?
+        url
+      end
+
+      def self.create_ip_activities(resp)
+        return resp if resp.nil?
+        result = []
+        resp['result'].each do |activity|
+          result.push(
+            SendGrid4r::REST::IpAccessManagement.create_ip_activity(activity)
+          )
+        end
+        IpActivities.new(result)
+      end
+
+      def self.create_ip_activity(resp)
+        return resp if resp.nil?
+        first_at = Time.at(resp['first_at']) unless resp['first_at'].nil?
+        last_at = Time.at(resp['last_at']) unless resp['last_at'].nil?
+        IpActivity.new(
+          resp['allowed'],
+          resp['auth_method'],
+          first_at,
+          resp['ip'],
+          last_at,
+          resp['location']
+        )
+      end
+
+      def self.create_whitelisted_ips(resp)
+        return resp if resp.nil?
+        result = []
+        resp['result'].each do |whitelisted_ip|
+          result.push(
+            SendGrid4r::REST::IpAccessManagement.create_whitelisted_ip(
+              whitelisted_ip
+            )
+          )
+        end
+        WhitelistedIps.new(result)
+      end
+
+      def self.create_whitelisted_ip(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)
+      end
+
+      def get_ip_activities(limit: nil, &block)
+        endpoint = SendGrid4r::REST::IpAccessManagement.url_activity
+        params = {}
+        params['limit'] = limit unless limit.nil?
+        resp = get(@auth, endpoint, params, &block)
+        SendGrid4r::REST::IpAccessManagement.create_ip_activities(resp)
+      end
+
+      def get_whitelisted_ips(&block)
+        endpoint = SendGrid4r::REST::IpAccessManagement.url_whitelist
+        resp = get(@auth, endpoint, &block)
+        SendGrid4r::REST::IpAccessManagement.create_whitelisted_ips(resp)
+      end
+
+      def post_whitelisted_ips(ips:, &block)
+        endpoint = SendGrid4r::REST::IpAccessManagement.url_whitelist
+        ips = []
+        ips.each do |ip|
+          ip = {}
+          ip['ip'] = ip
+          ip.push(ip)
+        end
+        params = {}
+        params['ips'] = ips
+        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)
+      end
+
+      def get_whitelisted_ip(rule_id:, &block)
+        endpoint = SendGrid4r::REST::IpAccessManagement.url_whitelist(rule_id)
+        resp = get(@auth, endpoint, nil, &block)
+        SendGrid4r::REST::IpAccessManagement.create_whitelisted_ip(resp)
+      end
+
+      def delete_whitelisted_ip(rule_id:, &block)
+        endpoint = SendGrid4r::REST::IpAccessManagement.url_whitelist(rule_id)
+        delete(@auth, endpoint, nil, &block)
+      end
+    end
+  end
+end

data/lib/sendgrid4r/rest/settings/mail.rb

@@ -36,22 +36,6 @@ module SendGrid4r
           )
         end
 
-        EventNotification = Struct.new(
-          :enabled, :url, :group_resubscribe, :delivered, :group_unsubscribe,
-          :spam_report, :bounce, :deferred, :unsubscribe, :processed, :open,
-          :click, :dropped
-        )
-
-        def self.create_event_notification(resp)
-          return resp if resp.nil?
-          EventNotification.new(
-            resp['enabled'], resp['url'], resp['group_resubscribe'],
-            resp['delivered'], resp['group_unsubscribe'], resp['spam_report'],
-            resp['bounce'], resp['deferred'], resp['unsubscribe'],
-            resp['processed'], resp['open'], resp['click'], resp['dropped']
-          )
-        end
-
         Footer = Struct.new(:enabled, :html_content, :plain_content)
 
         def self.create_footer(resp)
@@ -95,10 +79,6 @@ module SendGrid4r
           url
         end
 
-        def self.url_event(path)
-          "#{BASE_URL}/user/webhooks/event/#{path}"
-        end
-
         def get_mail_settings(limit: nil, offset: nil, &block)
           params = {}
           params['limit'] = limit unless limit.nil?
@@ -144,25 +124,6 @@ module SendGrid4r
           SendGrid4r::REST::Settings::Mail.create_bounce_purge(resp)
         end
 
-        def get_settings_event_notification(&block)
-          endpoint = SendGrid4r::REST::Settings::Mail.url_event('settings')
-          resp = get(@auth, endpoint, &block)
-          SendGrid4r::REST::Settings::Mail.create_event_notification(resp)
-        end
-
-        def patch_settings_event_notification(params:, &block)
-          endpoint = SendGrid4r::REST::Settings::Mail.url_event('settings')
-          resp = patch(@auth, endpoint, params.to_h, &block)
-          SendGrid4r::REST::Settings::Mail.create_event_notification(resp)
-        end
-
-        def test_settings_event_notification(url:, &block)
-          params = {}
-          params['url'] = url
-          endpoint = SendGrid4r::REST::Settings::Mail.url_event('test')
-          post(@auth, endpoint, params, &block)
-        end
-
         def get_settings_footer(&block)
           endpoint = SendGrid4r::REST::Settings::Mail.url('footer')
           resp = get(@auth, endpoint, &block)

data/lib/sendgrid4r/rest/webhooks/event.rb

@@ -0,0 +1,56 @@
+# -*- encoding: utf-8 -*-
+
+module SendGrid4r
+  module REST
+    #
+    # SendGrid Web API v3 Webhooks
+    #
+    module Webhooks
+      #
+      # SendGrid Web API v3 Webhooks ParseApi
+      #
+      module Event
+        include SendGrid4r::REST::Request
+
+        def self.url_event(path)
+          "#{BASE_URL}/user/webhooks/event/#{path}"
+        end
+
+        EventNotification = Struct.new(
+          :enabled, :url, :group_resubscribe, :delivered, :group_unsubscribe,
+          :spam_report, :bounce, :deferred, :unsubscribe, :processed, :open,
+          :click, :dropped
+        )
+
+        def self.create_event_notification(resp)
+          return resp if resp.nil?
+          EventNotification.new(
+            resp['enabled'], resp['url'], resp['group_resubscribe'],
+            resp['delivered'], resp['group_unsubscribe'], resp['spam_report'],
+            resp['bounce'], resp['deferred'], resp['unsubscribe'],
+            resp['processed'], resp['open'], resp['click'], resp['dropped']
+          )
+        end
+
+        def get_settings_event_notification(&block)
+          endpoint = SendGrid4r::REST::Webhooks::Event.url_event('settings')
+          resp = get(@auth, endpoint, &block)
+          SendGrid4r::REST::Webhooks::Event.create_event_notification(resp)
+        end
+
+        def patch_settings_event_notification(params:, &block)
+          endpoint = SendGrid4r::REST::Webhooks::Event.url_event('settings')
+          resp = patch(@auth, endpoint, params.to_h, &block)
+          SendGrid4r::REST::Webhooks::Event.create_event_notification(resp)
+        end
+
+        def test_settings_event_notification(url:, &block)
+          params = {}
+          params['url'] = url
+          endpoint = SendGrid4r::REST::Webhooks::Event.url_event('test')
+          post(@auth, endpoint, params, &block)
+        end
+      end
+    end
+  end
+end

data/lib/sendgrid4r/rest/webhooks/parse.rb

@@ -0,0 +1,51 @@
+# -*- encoding: utf-8 -*-
+
+module SendGrid4r
+  module REST
+    #
+    # SendGrid Web API v3 Webhooks
+    #
+    module Webhooks
+      #
+      # SendGrid Web API v3 Webhooks Parse
+      #
+      module Parse
+        include SendGrid4r::REST::Request
+
+        ParseSettings = Struct.new(:result)
+        ParseSetting = Struct.new(:url, :hostname, :spam_check_outgoing)
+
+        def self.url
+          "#{BASE_URL}/user/webhooks/parse/settings"
+        end
+
+        def self.create_parse_settings(resp)
+          return resp if resp.nil?
+          parse_settings = []
+          resp['result'].each do |setting|
+            parse_settings.push(
+              SendGrid4r::REST::Webhooks::Parse.create_parse_setting(
+                setting
+              )
+            )
+          end
+          ParseSettings.new(parse_settings)
+        end
+
+        def self.create_parse_setting(resp)
+          return resp if resp.nil?
+          ParseSetting.new(
+            resp['url'],
+            resp['hostname'],
+            resp['spam_check_outgoing']
+          )
+        end
+
+        def get_parse_settings(&block)
+          resp = get(@auth, SendGrid4r::REST::Webhooks::Parse.url, &block)
+          SendGrid4r::REST::Webhooks::Parse.create_parse_settings(resp)
+        end
+      end
+    end
+  end
+end

data/lib/sendgrid4r/version.rb

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

data/lib/sendgrid4r.rb

@@ -32,6 +32,8 @@ require 'sendgrid4r/rest/contacts/segments'
 
 require 'sendgrid4r/rest/email_activity/email_activity'
 
+require 'sendgrid4r/rest/ip_access_management'
+
 require 'sendgrid4r/rest/ips/addresses'
 require 'sendgrid4r/rest/ips/pools'
 require 'sendgrid4r/rest/ips/warmup'
@@ -49,7 +51,8 @@ require 'sendgrid4r/rest/stats/parse'
 require 'sendgrid4r/rest/stats/stats'
 require 'sendgrid4r/rest/stats/subuser'
 
-require 'sendgrid4r/rest/webhooks/parse_api'
+require 'sendgrid4r/rest/webhooks/event'
+require 'sendgrid4r/rest/webhooks/parse'
 
 require 'sendgrid4r/rest/whitelabel/domains'
 require 'sendgrid4r/rest/whitelabel/ips'

data/spec/client_spec.rb

@@ -277,12 +277,20 @@ describe SendGrid4r::Client do
 
         # Permissions
         expect(@client.respond_to?('get_permissions')).to eq(true)
+
+        # Ip Access Management
+        expect(@client.respond_to?('get_ip_activities')).to eq(true)
+        expect(@client.respond_to?('get_whitelisted_ips')).to eq(true)
+        expect(@client.respond_to?('post_whitelisted_ips')).to eq(true)
+        expect(@client.respond_to?('delete_whitelisted_ips')).to eq(true)
+        expect(@client.respond_to?('get_whitelisted_ip')).to eq(true)
+        expect(@client.respond_to?('delete_whitelisted_ip')).to eq(true)
       end
     end
 
     describe 'VERSION' do
       it 'returns VERSION value' do
-        expect(SendGrid4r::VERSION).to eq('1.5.1')
+        expect(SendGrid4r::VERSION).to eq('1.6.0')
       end
     end
   end

data/spec/rest/ip_access_management_spec.rb

@@ -0,0 +1,262 @@
+# encoding: utf-8
+require File.dirname(__FILE__) + '/../spec_helper'
+
+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)
+        ips = @client.get_whitelisted_ips
+        ips.result.each do |whitelisted_ip|
+          @client.delete_whitelisted_ip(rule_id: whitelisted_ip.id)
+        end
+        @ips = @client.post_whitelisted_ip('0.0.0.0')
+        @id1 = @ips.result[0].id
+      rescue RestClient::ExceptionWithResponse => e
+        puts e.inspect
+        raise e
+      end
+    end
+
+    context 'without block call' do
+      it '#get_ip_activities without limit' do
+        begin
+          activities = @client.get_ip_activities
+          expect(activities).to be_a(
+            SendGrid4r::REST::IpAccessManagement::IpActivities
+          )
+          activities.result.each do |activity|
+            expect(activity).to be_a(
+              SendGrid4r::REST::IpAccessManagement::IpActivity
+            )
+          end
+        rescue RestClient::ExceptionWithResponse => e
+          puts e.inspect
+          raise e
+        end
+      end
+
+      it '#get_ip_activities with limit' do
+        begin
+          activities = @client.get_ip_activities(limit: 1)
+          expect(activities).to be_a(
+            SendGrid4r::REST::IpAccessManagement::IpActivities
+          )
+          activities.result.each do |activity|
+            expect(activity).to be_a(
+              SendGrid4r::REST::IpAccessManagement::IpActivity
+            )
+          end
+        rescue RestClient::ExceptionWithResponse => e
+          puts e.inspect
+          raise e
+        end
+      end
+
+      it '#get_whitelisted_ips' do
+        begin
+          ips = @client.get_whitelisted_ips
+          expect(ips).to be_a(
+            SendGrid4r::REST::IpAccessManagement::WhitelistedIps
+          )
+        rescue RestClient::ExceptionWithResponse => e
+          puts e.inspect
+          raise e
+        end
+      end
+
+      it '#post_whitelisted_ips' do
+        begin
+          ips = @client.post_whitelisted_ips(ips: ['127.0.0.1'])
+          expect(ips).to be_a(
+            SendGrid4r::REST::IpAccessManagement::WhitelistedIps
+          )
+        rescue RestClient::ExceptionWithResponse => e
+          puts e.inspect
+          raise e
+        end
+      end
+
+      it '#delete_whitelisted_ips' do
+        begin
+          @client.delete_whitelisted_ips(ids: [@id1])
+        rescue RestClient::ExceptionWithResponse => e
+          puts e.inspect
+          raise e
+        end
+      end
+
+      it '#get_whitelisted_ip' do
+        begin
+          whitelisted_ip = @client.get_whitelisted_ip(rule_id: @id1)
+          expect(whitelisted_ip).to be_a(
+            SendGrid4r::REST::IpAccessManagement::WhitelistedIp
+          )
+        rescue RestClient::ExceptionWithResponse => e
+          puts e.inspect
+          raise e
+        end
+      end
+
+      it '#delete_whitelisted_ip' do
+        begin
+          expect do
+            @client.delete_whitelisted_ip(rule_id: @id1)
+          end.to raise_error(RestClient::ResourceNotFound)
+        rescue RestClient::ExceptionWithResponse => e
+          puts e.inspect
+          raise e
+        end
+      end
+    end
+  end
+
+  describe 'unit test', :ut do
+    let(:client) do
+      SendGrid4r::Client.new(api_key: '')
+    end
+
+    let(:ip_activities) do
+      JSON.parse(
+        '{'\
+          '"result": ['\
+            '{'\
+              '"allowed": false,'\
+              '"auth_method": "basic",'\
+              '"first_at": 1444087966,'\
+              '"ip": "1.1.1.1",'\
+              '"last_at": 1444406672,'\
+              '"location": "Australia"'\
+            '}, {'\
+              '"allowed": false,'\
+              '"auth_method": "basic",'\
+              '"first_at": 1444087505,'\
+              '"ip": "1.2.3.48",'\
+              '"last_at": 1444087505,'\
+              '"location": "Mukilteo, Washington"'\
+            '}'\
+          ']'\
+        '}'
+      )
+    end
+
+    let(:whitelisted_ips) do
+      JSON.parse(
+        '{'\
+          '"result": ['\
+            '{'\
+              '"id": 1, "ip": "192.168.1.1/32", '\
+              '"created_at": 1441824715, "updated_at": 1441824715'\
+            '},'\
+            '{'\
+              '"id": 2, "ip": "192.168.1.2/32", '\
+              '"created_at": 1441824715, "updated_at": 1441824715'\
+            '},'\
+            '{'\
+              '"id": 3, "ip": "192.168.1.3/32", '\
+              '"created_at": 1441824715, "updated_at": 1441824715'\
+            '}'\
+          ']'\
+        '}'
+      )
+    end
+
+    let(:whitelisted_ip) do
+      JSON.parse(
+        '{'\
+          '"id": 1,'\
+          '"ip": "192.168.1.1",'\
+          '"created_at": 1441824715,'\
+          '"updated_at": 1441824715'\
+        '}'
+      )
+    end
+
+    it '#get_ip_activities' do
+      allow(client).to receive(:execute).and_return(ip_activities)
+      actual = client.get_ip_activities
+      expect(actual).to be_a(SendGrid4r::REST::IpAccessManagement::IpActivities)
+      actual.result.each do |activity|
+        expect(activity).to be_a(
+          SendGrid4r::REST::IpAccessManagement::IpActivity
+        )
+      end
+    end
+
+    it '#get_whitelisted_ips' do
+      allow(client).to receive(:execute).and_return(whitelisted_ips)
+      actual = client.get_whitelisted_ips
+      expect(actual).to be_a(
+        SendGrid4r::REST::IpAccessManagement::WhitelistedIps
+      )
+      actual.result.each do |whitelisted_ip|
+        expect(whitelisted_ip).to be_a(
+          SendGrid4r::REST::IpAccessManagement::WhitelistedIp
+        )
+      end
+    end
+
+    it '#post_whitelisted_ips' do
+      allow(client).to receive(:execute).and_return(whitelisted_ips)
+      actual = client.post_whitelisted_ips(ips: [''])
+      expect(actual).to be_a(
+        SendGrid4r::REST::IpAccessManagement::WhitelistedIps
+      )
+      actual.result.each do |whitelisted_ip|
+        expect(whitelisted_ip).to be_a(
+          SendGrid4r::REST::IpAccessManagement::WhitelistedIp
+        )
+      end
+    end
+
+    it '#delete_whitelisted_ips' do
+      allow(client).to receive(:execute).and_return('')
+      actual = client.delete_whitelisted_ips(ids: [''])
+      expect(actual).to eq('')
+    end
+
+    it '#get_whitelisted_ip' do
+      allow(client).to receive(:execute).and_return(whitelisted_ip)
+      actual = client.get_whitelisted_ip(rule_id: '')
+      expect(actual).to be_a(
+        SendGrid4r::REST::IpAccessManagement::WhitelistedIp
+      )
+    end
+
+    it '#delete_whitelisted_ip' do
+      allow(client).to receive(:execute).and_return('')
+      actual = client.delete_whitelisted_ip(rule_id: '')
+      expect(actual).to eq('')
+    end
+
+    it 'creates ip_activities instance' do
+      actual = SendGrid4r::REST::IpAccessManagement.create_ip_activities(
+        ip_activities
+      )
+      expect(actual.result.length).to eq(2)
+      activity0 = actual.result[0]
+      expect(activity0.allowed).to eq(false)
+      expect(activity0.auth_method).to eq('basic')
+      expect(activity0.first_at).to eq(Time.at(1444087966))
+      expect(activity0.ip).to eq('1.1.1.1')
+      expect(activity0.last_at).to eq(Time.at(1444406672))
+      expect(activity0.location).to eq('Australia')
+    end
+
+    it 'creates whitelisted_ips instance' do
+      actual = SendGrid4r::REST::IpAccessManagement.create_whitelisted_ips(
+        whitelisted_ips
+      )
+      expect(actual.result.length).to eq(3)
+      ip1 = actual.result[0]
+      expect(ip1.id).to eq(1)
+      expect(ip1.ip).to eq('192.168.1.1/32')
+      expect(ip1.created_at).to eq(Time.at(1441824715))
+      expect(ip1.updated_at).to eq(Time.at(1441824715))
+    end
+  end
+end

data/spec/rest/settings/mail_spec.rb

@@ -104,65 +104,6 @@ describe SendGrid4r::REST::Settings::Mail do
         end
       end
 
-      it '#get_settings_event_notification' do
-        begin
-          actual = @client.get_settings_event_notification
-          expect(actual).to be_a(
-            SendGrid4r::REST::Settings::Mail::EventNotification
-          )
-        rescue RestClient::ExceptionWithResponse => e
-          puts e.inspect
-          raise e
-        end
-      end
-
-      it '#patch_settings_event_notification' do
-        begin
-          # get original settings
-          actual = @client.get_settings_event_notification
-          # patch the value
-          actual.enabled = false
-          actual.url = 'http://www.google.com/?=test@test.com'
-          actual.group_resubscribe = true
-          actual.delivered = true
-          actual.group_unsubscribe = true
-          actual.spam_report = true
-          actual.bounce = true
-          actual.deferred = true
-          actual.unsubscribe = true
-          actual.processed = true
-          actual.open = true
-          actual.click = true
-          actual.dropped = true
-          edit = @client.patch_settings_event_notification(params: actual)
-          expect(edit.enabled).to eq(false)
-          expect(edit.url).to eq('http://www.google.com/?=test@test.com')
-          expect(edit.group_resubscribe).to eq(true)
-          expect(edit.delivered).to eq(true)
-          expect(edit.group_unsubscribe).to eq(true)
-          expect(edit.spam_report).to eq(true)
-          expect(edit.bounce).to eq(true)
-          expect(edit.deferred).to eq(true)
-          expect(edit.unsubscribe).to eq(true)
-          expect(edit.processed).to eq(true)
-          expect(edit.open).to eq(true)
-          expect(edit.click).to eq(true)
-          expect(edit.dropped).to eq(true)
-        rescue RestClient::ExceptionWithResponse => e
-          puts e.inspect
-          raise e
-        end
-      end
-
-      it '#test_settings_event_notification' do
-        begin
-          @client.test_settings_event_notification(url: ENV['EVENT_URL'])
-        rescue RestClient::ExceptionWithResponse => e
-          puts e.inspect
-          raise e
-        end
-      end
-
       it '#get_settings_footer' do
         begin
           actual = @client.get_settings_footer
@@ -397,61 +338,6 @@ describe SendGrid4r::REST::Settings::Mail do
       expect(actual.soft_bounces).to eq(1)
     end
 
-    let(:event_notification) do
-      JSON.parse(
-        '{'\
-          '"enabled": true,'\
-          '"url": "url",'\
-          '"group_resubscribe": true,'\
-          '"delivered": true,'\
-          '"group_unsubscribe": true,'\
-          '"spam_report": true,'\
-          '"bounce": true,'\
-          '"deferred": true,'\
-          '"unsubscribe": true,'\
-          '"processed": true,'\
-          '"open": true,'\
-          '"click": true,'\
-          '"dropped": true'\
-        '}'
-      )
-    end
-
-    it '#get_settings_event_notification' do
-      allow(client).to receive(:execute).and_return(event_notification)
-      actual = client.get_settings_event_notification
-      expect(actual).to be_a(
-        SendGrid4r::REST::Settings::Mail::EventNotification
-      )
-    end
-
-    it '#patch_settings_event_notification' do
-      allow(client).to receive(:execute).and_return(event_notification)
-      actual = client.patch_settings_event_notification(params: nil)
-      expect(actual).to be_a(
-        SendGrid4r::REST::Settings::Mail::EventNotification
-      )
-    end
-
-    it 'creates event_notification instance' do
-      actual = SendGrid4r::REST::Settings::Mail.create_event_notification(
-        event_notification
-      )
-      expect(actual.enabled).to eq(true)
-      expect(actual.url).to eq('url')
-      expect(actual.group_resubscribe).to eq(true)
-      expect(actual.delivered).to eq(true)
-      expect(actual.group_unsubscribe).to eq(true)
-      expect(actual.spam_report).to eq(true)
-      expect(actual.bounce).to eq(true)
-      expect(actual.deferred).to eq(true)
-      expect(actual.unsubscribe).to eq(true)
-      expect(actual.processed).to eq(true)
-      expect(actual.open).to eq(true)
-      expect(actual.click).to eq(true)
-      expect(actual.dropped).to eq(true)
-    end
-
     let(:footer) do
       JSON.parse(
         '{'\

data/spec/rest/webhooks/event_spec.rb

@@ -0,0 +1,138 @@
+# encoding: utf-8
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe SendGrid4r::REST::Webhooks::Event do
+  describe 'integration test', :it do
+    before do
+      begin
+        Dotenv.load
+        @client = SendGrid4r::Client.new(api_key: ENV['API_KEY'])
+      rescue RestClient::ExceptionWithResponse => e
+        puts e.inspect
+        raise e
+      end
+    end
+
+    context 'without block call' do
+      it '#get_settings_event_notification' do
+        begin
+          actual = @client.get_settings_event_notification
+          expect(actual).to be_a(
+            SendGrid4r::REST::Webhooks::Event::EventNotification
+          )
+        rescue RestClient::ExceptionWithResponse => e
+          puts e.inspect
+          raise e
+        end
+      end
+
+      it '#patch_settings_event_notification' do
+        begin
+          # get original settings
+          actual = @client.get_settings_event_notification
+          # patch the value
+          actual.enabled = false
+          actual.url = 'http://www.google.com/?=test@test.com'
+          actual.group_resubscribe = true
+          actual.delivered = true
+          actual.group_unsubscribe = true
+          actual.spam_report = true
+          actual.bounce = true
+          actual.deferred = true
+          actual.unsubscribe = true
+          actual.processed = true
+          actual.open = true
+          actual.click = true
+          actual.dropped = true
+          edit = @client.patch_settings_event_notification(params: actual)
+          expect(edit.enabled).to eq(false)
+          expect(edit.url).to eq('http://www.google.com/?=test@test.com')
+          expect(edit.group_resubscribe).to eq(true)
+          expect(edit.delivered).to eq(true)
+          expect(edit.group_unsubscribe).to eq(true)
+          expect(edit.spam_report).to eq(true)
+          expect(edit.bounce).to eq(true)
+          expect(edit.deferred).to eq(true)
+          expect(edit.unsubscribe).to eq(true)
+          expect(edit.processed).to eq(true)
+          expect(edit.open).to eq(true)
+          expect(edit.click).to eq(true)
+          expect(edit.dropped).to eq(true)
+        rescue RestClient::ExceptionWithResponse => e
+          puts e.inspect
+          raise e
+        end
+      end
+
+      it '#test_settings_event_notification' do
+        begin
+          @client.test_settings_event_notification(url: ENV['EVENT_URL'])
+        rescue RestClient::ExceptionWithResponse => e
+          puts e.inspect
+          raise e
+        end
+      end
+    end
+  end
+
+  describe 'unit test', :ut do
+    let(:client) do
+      SendGrid4r::Client.new(api_key: '')
+    end
+
+    let(:event_notification) do
+      JSON.parse(
+        '{'\
+          '"enabled": true,'\
+          '"url": "url",'\
+          '"group_resubscribe": true,'\
+          '"delivered": true,'\
+          '"group_unsubscribe": true,'\
+          '"spam_report": true,'\
+          '"bounce": true,'\
+          '"deferred": true,'\
+          '"unsubscribe": true,'\
+          '"processed": true,'\
+          '"open": true,'\
+          '"click": true,'\
+          '"dropped": true'\
+        '}'
+      )
+    end
+
+    it '#get_settings_event_notification' do
+      allow(client).to receive(:execute).and_return(event_notification)
+      actual = client.get_settings_event_notification
+      expect(actual).to be_a(
+        SendGrid4r::REST::Webhooks::Event::EventNotification
+      )
+    end
+
+    it '#patch_settings_event_notification' do
+      allow(client).to receive(:execute).and_return(event_notification)
+      actual = client.patch_settings_event_notification(params: nil)
+      expect(actual).to be_a(
+        SendGrid4r::REST::Webhooks::Event::EventNotification
+      )
+    end
+
+    it 'creates event_notification instance' do
+      actual = SendGrid4r::REST::Webhooks::Event.create_event_notification(
+        event_notification
+      )
+      expect(actual.enabled).to eq(true)
+      expect(actual.url).to eq('url')
+      expect(actual.group_resubscribe).to eq(true)
+      expect(actual.delivered).to eq(true)
+      expect(actual.group_unsubscribe).to eq(true)
+      expect(actual.spam_report).to eq(true)
+      expect(actual.bounce).to eq(true)
+      expect(actual.deferred).to eq(true)
+      expect(actual.unsubscribe).to eq(true)
+      expect(actual.processed).to eq(true)
+      expect(actual.open).to eq(true)
+      expect(actual.click).to eq(true)
+      expect(actual.dropped).to eq(true)
+    end
+  end
+end

data/spec/rest/webhooks/{parse_api_spec.rb → parse_spec.rb}

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require File.dirname(__FILE__) + '/../../spec_helper'
 
-describe SendGrid4r::REST::Webhooks::ParseApi do
+describe SendGrid4r::REST::Webhooks::Parse do
   describe 'integration test', :it do
     before do
       begin
@@ -15,13 +15,12 @@ describe SendGrid4r::REST::Webhooks::ParseApi do
 
     context 'without block call' do
       it '#get_parse_settings' do
-        pending 'resource not found'
         begin
           parse_settings = @client.get_parse_settings
           expect(parse_settings).to be_a(
-            SendGrid4r::REST::Webhooks::ParseApi::ParseSettings
+            SendGrid4r::REST::Webhooks::Parse::ParseSettings
           )
-          expect(parse_settings.url).to be_a(String)
+          expect(parse_settings.result).to be_a(Array)
         rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
@@ -36,12 +35,26 @@ describe SendGrid4r::REST::Webhooks::ParseApi do
     end
 
     let(:parse_settings) do
+      JSON.parse(
+        '{'\
+          '"result": ['\
+            '{'\
+              '"url": "http://mydomain.com/parse",'\
+              '"hostname": "mail.mydomain.com",'\
+              '"spam_check_outgoing": true'\
+            '}'\
+          ']'\
+        '}'
+      )
+    end
+
+    let(:parse_setting) do
       JSON.parse(
         '{'\
           '"url": "http://mydomain.com/parse",'\
           '"hostname": "mail.mydomain.com",'\
           '"spam_check_outgoing": true'\
-        '}'
+        '}'\
       )
     end
 
@@ -49,20 +62,30 @@ describe SendGrid4r::REST::Webhooks::ParseApi do
       allow(client).to receive(:execute).and_return(parse_settings)
       actual = client.get_parse_settings
       expect(actual).to be_a(
-        SendGrid4r::REST::Webhooks::ParseApi::ParseSettings
+        SendGrid4r::REST::Webhooks::Parse::ParseSettings
       )
     end
 
-    it 'creates parse_settings instance' do
-      actual = SendGrid4r::REST::Webhooks::ParseApi.create_parse_settings(
-        parse_settings
+    it 'creates parse_setting instance' do
+      actual = SendGrid4r::REST::Webhooks::Parse.create_parse_setting(
+        parse_setting
       )
       expect(actual).to be_a(
-        SendGrid4r::REST::Webhooks::ParseApi::ParseSettings
+        SendGrid4r::REST::Webhooks::Parse::ParseSetting
       )
       expect(actual.url).to eq('http://mydomain.com/parse')
       expect(actual.hostname).to eq('mail.mydomain.com')
       expect(actual.spam_check_outgoing).to eq(true)
     end
+
+    it 'creates parse_settings instance' do
+      actual = SendGrid4r::REST::Webhooks::Parse.create_parse_settings(
+        parse_settings
+      )
+      expect(actual).to be_a(
+        SendGrid4r::REST::Webhooks::Parse::ParseSettings
+      )
+      expect(actual.result).to be_a(Array)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sendgrid4r
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - awwa500@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -143,6 +143,7 @@ files:
 - lib/sendgrid4r/rest/contacts/reserved_fields.rb
 - lib/sendgrid4r/rest/contacts/segments.rb
 - lib/sendgrid4r/rest/email_activity/email_activity.rb
+- lib/sendgrid4r/rest/ip_access_management.rb
 - lib/sendgrid4r/rest/ips/addresses.rb
 - lib/sendgrid4r/rest/ips/pools.rb
 - lib/sendgrid4r/rest/ips/warmup.rb
@@ -162,7 +163,8 @@ files:
 - lib/sendgrid4r/rest/templates/templates.rb
 - lib/sendgrid4r/rest/templates/versions.rb
 - lib/sendgrid4r/rest/users.rb
-- lib/sendgrid4r/rest/webhooks/parse_api.rb
+- lib/sendgrid4r/rest/webhooks/event.rb
+- lib/sendgrid4r/rest/webhooks/parse.rb
 - lib/sendgrid4r/rest/whitelabel/domains.rb
 - lib/sendgrid4r/rest/whitelabel/ips.rb
 - lib/sendgrid4r/rest/whitelabel/links.rb
@@ -189,6 +191,7 @@ files:
 - spec/rest/contacts/reserved_fields_spec.rb
 - spec/rest/contacts/segments_spec.rb
 - spec/rest/email_activity/email_activity_spec.rb
+- spec/rest/ip_access_management_spec.rb
 - spec/rest/ips/addresses_spec.rb
 - spec/rest/ips/pools_spec.rb
 - spec/rest/ips/warmup_spec.rb
@@ -207,7 +210,8 @@ files:
 - spec/rest/templates/templates_spec.rb
 - spec/rest/templates/versions_spec.rb
 - spec/rest/users_spec.rb
-- spec/rest/webhooks/parse_api_spec.rb
+- spec/rest/webhooks/event_spec.rb
+- spec/rest/webhooks/parse_spec.rb
 - spec/rest/whitelabel/domains_spec.rb
 - spec/rest/whitelabel/ips_spec.rb
 - spec/rest/whitelabel/links_spec.rb
@@ -258,6 +262,7 @@ test_files:
 - spec/rest/contacts/reserved_fields_spec.rb
 - spec/rest/contacts/segments_spec.rb
 - spec/rest/email_activity/email_activity_spec.rb
+- spec/rest/ip_access_management_spec.rb
 - spec/rest/ips/addresses_spec.rb
 - spec/rest/ips/pools_spec.rb
 - spec/rest/ips/warmup_spec.rb
@@ -276,7 +281,8 @@ test_files:
 - spec/rest/templates/templates_spec.rb
 - spec/rest/templates/versions_spec.rb
 - spec/rest/users_spec.rb
-- spec/rest/webhooks/parse_api_spec.rb
+- spec/rest/webhooks/event_spec.rb
+- spec/rest/webhooks/parse_spec.rb
 - spec/rest/whitelabel/domains_spec.rb
 - spec/rest/whitelabel/ips_spec.rb
 - spec/rest/whitelabel/links_spec.rb

data/lib/sendgrid4r/rest/webhooks/parse_api.rb

@@ -1,37 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-module SendGrid4r
-  module REST
-    #
-    # SendGrid Web API v3 Webhooks
-    #
-    module Webhooks
-      #
-      # SendGrid Web API v3 Webhooks ParseApi
-      #
-      module ParseApi
-        include SendGrid4r::REST::Request
-
-        ParseSettings = Struct.new(:url, :hostname, :spam_check_outgoing)
-
-        def self.url
-          "#{BASE_URL}/webhooks/parse/settings"
-        end
-
-        def self.create_parse_settings(resp)
-          return resp if resp.nil?
-          ParseSettings.new(
-            resp['url'],
-            resp['hostname'],
-            resp['spam_check_outgoing']
-          )
-        end
-
-        def get_parse_settings(&block)
-          resp = get(@auth, SendGrid4r::REST::Webhooks::ParseApi.url, &block)
-          SendGrid4r::REST::Webhooks::ParseApi.create_parse_settings(resp)
-        end
-      end
-    end
-  end
-end