sendgrid4r 0.5.0 → 1.0.0

data/spec/rest/stats/global_spec.rb

@@ -5,9 +5,7 @@ describe SendGrid4r::REST::Stats::Global do
   describe 'integration test', :it do
     before do
       Dotenv.load
-      @client = SendGrid4r::Client.new(
-        username: ENV['SENDGRID_USERNAME'],
-        password: ENV['SENDGRID_PASSWORD'])
+      @client = SendGrid4r::Client.new(api_key: ENV['API_KEY'])
     end
 
     context 'without block call' do
@@ -38,7 +36,7 @@ describe SendGrid4r::REST::Stats::Global do
               expect(stat.metrics.unsubscribes.nil?).to be(false)
             end
           end
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -60,7 +58,7 @@ describe SendGrid4r::REST::Stats::Global do
               expect(stat.metrics).to be_a(SendGrid4r::REST::Stats::Metric)
             end
           end
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end

data/spec/rest/stats/parse_spec.rb

@@ -5,9 +5,7 @@ describe SendGrid4r::REST::Stats::Parse do
   describe 'integration test', :it do
     before do
       Dotenv.load
-      @client = SendGrid4r::Client.new(
-        username: ENV['SENDGRID_USERNAME'],
-        password: ENV['SENDGRID_PASSWORD'])
+      @client = SendGrid4r::Client.new(api_key: ENV['API_KEY'])
     end
 
     context 'without block call' do
@@ -41,26 +39,5 @@ describe SendGrid4r::REST::Stats::Parse do
         end
       end
     end
-
-    context 'with block call' do
-      it '#get_parse_stats with all params' do
-        @client.get_parse_stats(
-          start_date: '2015-01-01',
-          end_date: '2015-01-02',
-          aggregated_by: SendGrid4r::REST::Stats::AggregatedBy::WEEK
-        ) do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Stats.create_top_stats(
-              JSON.parse(resp)
-            )
-          expect(resp).to be_a(Array)
-          resp.each do |stat|
-            expect(stat).to be_a(SendGrid4r::REST::Stats::TopStat)
-          end
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPOK)
-        end
-      end
-    end
   end
 end

data/spec/rest/stats/subuser_spec.rb

@@ -5,10 +5,8 @@ describe SendGrid4r::REST::Stats::Subuser do
   describe 'integration test', :it do
     before do
       Dotenv.load
-      @client = SendGrid4r::Client.new(
-        username: ENV['SILVER_SENDGRID_USERNAME'],
-        password: ENV['SILVER_SENDGRID_PASSWORD'])
-      @subuser = ENV['SILVER_SUBUSER']
+      @client = SendGrid4r::Client.new(api_key: ENV['SILVER_API_KEY'])
+      @subuser = ENV['SUBUSER2']
     end
 
     context 'without block call' do
@@ -42,7 +40,7 @@ describe SendGrid4r::REST::Stats::Subuser do
               expect(stat.metrics.unsubscribes.nil?).to be(false)
             end
           end
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -64,7 +62,7 @@ describe SendGrid4r::REST::Stats::Subuser do
               expect(stat.metrics).to be_a(SendGrid4r::REST::Stats::Metric)
             end
           end
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -78,7 +76,7 @@ describe SendGrid4r::REST::Stats::Subuser do
             expect(stat).to be_a(SendGrid4r::REST::Stats::Stat)
             expect(stat.metrics).to be_a(SendGrid4r::REST::Stats::Metric)
           end
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -99,52 +97,11 @@ describe SendGrid4r::REST::Stats::Subuser do
             expect(stat).to be_a(SendGrid4r::REST::Stats::Stat)
             expect(stat.metrics).to be_a(SendGrid4r::REST::Stats::Metric)
           end
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
       end
     end
-
-    context 'with block call' do
-      it '#get_subusers_stats with all params' do
-        @client.get_subusers_stats(
-          start_date: '2015-01-01',
-          end_date: '2015-01-02',
-          aggregated_by: SendGrid4r::REST::Stats::AggregatedBy::WEEK,
-          subusers: @subuser
-        ) do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Stats.create_top_stats(
-              JSON.parse(resp)
-            )
-          expect(resp).to be_a(Array)
-          resp.each do |stat|
-            expect(stat).to be_a(SendGrid4r::REST::Stats::TopStat)
-          end
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPOK)
-        end
-      end
-
-      it '#get_subusers_stats_sums with all params' do
-        @client.get_subusers_stats_sums(
-          start_date: '2015-01-01',
-          end_date: '2015-01-02',
-          sort_by_metric: 'opens',
-          sort_by_direction: 'desc',
-          limit: 5,
-          offset: 0
-        ) do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Stats.create_top_stat(
-              JSON.parse(resp)
-            )
-          expect(resp).to be_a(SendGrid4r::REST::Stats::TopStat)
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPOK)
-        end
-      end
-    end
   end
 end

data/spec/rest/subusers/subusers_spec.rb

@@ -6,18 +6,28 @@ describe SendGrid4r::REST::Subusers do
     before do
       begin
         Dotenv.load
-        @client = SendGrid4r::Client.new(
-          username: ENV['SILVER_SENDGRID_USERNAME'],
-          password: ENV['SILVER_SENDGRID_PASSWORD'])
+        @client = SendGrid4r::Client.new(api_key: ENV['SILVER_API_KEY'])
         @username1 = ENV['SUBUSER1']
-        @username2 = ENV['SILVER_SUBUSER']
-        @username3 = ENV['SILVER_SUBUSER2']
-        @email1 = ENV['SUBMAIL1']
-        @password1  = ENV['SUBPASS1']
+        @username2 = ENV['SUBUSER2']
+        @username3 = ENV['SUBUSER3']
+        @email1 = ENV['MAIL']
+        @password1  = ENV['PASS']
 
         @ip = @client.get_ips[0].ip
         # celan up test env
-      rescue => e
+        begin
+          @client.delete_subuser(username: @username3)
+        rescue => e
+          puts e.inspect
+        end
+
+        @subuser3 = @client.post_subuser(
+          username: @username3,
+          email: @email1,
+          password: @password1,
+          ips: [@ip]
+        )
+      rescue RestClient::ExceptionWithResponse => e
         puts e.inspect
         raise e
       end
@@ -31,7 +41,7 @@ describe SendGrid4r::REST::Subusers do
           subusers.each do |subuser|
             expect(subuser).to be_a(SendGrid4r::REST::Subusers::Subuser)
           end
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -39,104 +49,112 @@ describe SendGrid4r::REST::Subusers do
 
       it '#post_subuser' do
         begin
-          pending 'got RestClient::Forbidden:'
-          subuser2 = @client.post_subuser(
-            username: @username2,
-            email: @email2,
-            password: @password2,
-            ips: [@ip]
-          )
-          expect(subuser2).to be_a(SendGrid4r::REST::Subusers::Subuser)
-          expect(subuser2.username).to eq(@username2)
-          expect(subuser2.email).to eq(@email2)
-          expect(subuser2.password).to eq(@password2)
-          expect(subuser2.ips).to be_a(Array)
-        rescue => e
+          expect(@subuser3).to be_a(SendGrid4r::REST::Subusers::Subuser)
+          expect(@subuser3.username).to eq(@username3)
+          expect(@subuser3.email).to eq(@email1)
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
       end
 
-      it '#get_subuser_reputation' do
+      it '#patch_subuser' do
         begin
-          params = []
-          params.push(@username2)
-          params.push(@username3)
-          subusers = @client.get_subuser_reputation(usernames: params)
-          expect(subusers).to be_a(Array)
-          subusers.each do |subuser|
-            expect(subuser).to be_a(SendGrid4r::REST::Subusers::Subuser)
-          end
-        rescue => e
+          @client.patch_subuser(username: @username3, disabled: true)
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
       end
 
-      it '#put_subuser_assigned_ips' do
+      it '#delete_subuser' do
         begin
-          pending 'Invalid JSON'
-          subuser = @client.put_subuser_assigned_ips(username: @username2)
-          expect(subuser.ips).to be_a(Array)
-          subuser.ips.each do |ip|
-            expect(ip).to be_a(String)
-          end
-        rescue => e
+          @client.delete_subuser(username: @username3)
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
       end
-    end
 
-    context 'with block call' do
-      it '#get_subusers' do
-        @client.get_subusers(limit: 100, offset: 0) do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Subusers.create_subusers(JSON.parse(resp))
-          expect(resp).to be_a(Array)
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPOK)
+      it '#get_subuser_monitor' do
+        begin
+          monitor = @client.get_subuser_monitor(
+            username: @username3, email: @email1, frequency: 10
+          )
+          expect(monitor).to be_a(SendGrid4r::REST::Subusers::Monitor)
+        rescue RestClient::ExceptionWithResponse => e
+          puts e.inspect
+          raise e
         end
       end
 
-      it '#post_subuser' do
-        pending 'got RestClient::Forbidden:'
-        @client.post_subuser(
-          username: @username2,
-          email: @email2,
-          password: @password2,
-          ips: [@ip]
-        ) do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Subusers.create_subuser(JSON.parse(resp))
-          expect(resp).to be_a(SendGrid4r::REST::Subusers::Subuser)
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPCreated)
+      it '#post_subuser_monitor' do
+        begin
+          monitor = @client.post_subuser_monitor(
+            username: @username3, email: @email1, frequency: 10
+          )
+          expect(monitor).to be_a(SendGrid4r::REST::Subusers::Monitor)
+        rescue RestClient::ExceptionWithResponse => e
+          puts e.inspect
+          raise e
+        end
+      end
+
+      it '#put_subuser_monitor' do
+        begin
+          @client.post_subuser_monitor(
+            username: @username3, email: @email1, frequency: 10
+          )
+          monitor = @client.put_subuser_monitor(
+            username: @username3, email: @email1, frequency: 10
+          )
+          expect(monitor).to be_a(SendGrid4r::REST::Subusers::Monitor)
+        rescue RestClient::ExceptionWithResponse => e
+          puts e.inspect
+          raise e
+        end
+      end
+
+      it '#delete_subuser_monitor' do
+        begin
+          @client.post_subuser_monitor(
+            username: @username3, email: @email1, frequency: 10
+          )
+          @client.delete_subuser_monitor(username: @username3)
+        rescue RestClient::ExceptionWithResponse => e
+          puts e.inspect
+          raise e
         end
       end
 
       it '#get_subuser_reputation' do
-        @client.get_subuser_reputation(
-          usernames: [@username2]
-        ) do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Subusers.create_subusers(JSON.parse(resp))
-          expect(resp).to be_a(Array)
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPOK)
+        begin
+          params = []
+          params.push(@username1)
+          params.push(@username2)
+          subusers = @client.get_subuser_reputation(usernames: params)
+          expect(subusers).to be_a(Array)
+          subusers.each do |subuser|
+            expect(subuser).to be_a(SendGrid4r::REST::Subusers::Subuser)
+          end
+        rescue RestClient::ExceptionWithResponse => e
+          puts e.inspect
+          raise e
         end
       end
 
       it '#put_subuser_assigned_ips' do
-        pending 'Invalid JSON'
-        @client.put_subuser_assigned_ips(
-          username: @username2
-        ) do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Subusers.create_subuser(JSON.parse(resp))
-          expect(resp).to be_a(SendGrid4r::REST::Subusers::Subuser)
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPOK)
+        begin
+          subuser = @client.put_subuser_assigned_ips(
+            username: @username2, ips: [@ip]
+          )
+          expect(subuser.ips).to be_a(Array)
+          subuser.ips.each do |ip|
+            expect(ip).to be_a(String)
+          end
+        rescue RestClient::ExceptionWithResponse => e
+          puts e.inspect
+          raise e
         end
       end
     end
@@ -190,6 +208,15 @@ describe SendGrid4r::REST::Subusers do
       )
     end
 
+    let(:monitor) do
+      JSON.parse(
+        '{'\
+          '"email": "test@example.com",'\
+          '"frequency": 500'\
+        '}'
+      )
+    end
+
     it '#get_subusers' do
       allow(client).to receive(:execute).and_return(subusers)
       actual = client.get_subusers(limit: 0, offset: 0, username: 'aaa')
@@ -207,6 +234,48 @@ describe SendGrid4r::REST::Subusers do
       expect(actual).to be_a(SendGrid4r::REST::Subusers::Subuser)
     end
 
+    it '#patch_subuser' do
+      allow(client).to receive(:execute).and_return(subuser)
+      actual = client.patch_subuser(username: '', disabled: true)
+      expect(actual).to be_a(SendGrid4r::REST::Subusers::Subuser)
+    end
+
+    it '#delete_subuser' do
+      allow(client).to receive(:execute).and_return('')
+      actual = client.delete_subuser(username: '')
+      expect(actual).to eq('')
+    end
+
+    it '#get_subuser_monitor' do
+      allow(client).to receive(:execute).and_return(monitor)
+      actual = client.get_subuser_monitor(
+        username: '', email: '', frequency: 1
+      )
+      expect(actual).to be_a(SendGrid4r::REST::Subusers::Monitor)
+    end
+
+    it '#post_subuser_monitor' do
+      allow(client).to receive(:execute).and_return(monitor)
+      actual = client.post_subuser_monitor(
+        username: '', email: '', frequency: 1
+      )
+      expect(actual).to be_a(SendGrid4r::REST::Subusers::Monitor)
+    end
+
+    it '#put_subuser_monitor' do
+      allow(client).to receive(:execute).and_return(monitor)
+      actual = client.put_subuser_monitor(
+        username: '', email: '', frequency: 1
+      )
+      expect(actual).to be_a(SendGrid4r::REST::Subusers::Monitor)
+    end
+
+    it '#delete_subuser_monitor' do
+      allow(client).to receive(:execute).and_return('')
+      actual = client.delete_subuser_monitor(username: '')
+      expect(actual).to eq('')
+    end
+
     it '#get_subuser_reputation' do
       allow(client).to receive(:execute).and_return(subusers)
       actual = client.get_subuser_reputation(usernames: [])
@@ -217,9 +286,8 @@ describe SendGrid4r::REST::Subusers do
     end
 
     it '#put_subuser_assigned_ips' do
-      pending 'waiting for sendgrid documentation update'
       allow(client).to receive(:execute).and_return(subuser)
-      actual = client.put_subuser_assigned_ips('', [])
+      actual = client.put_subuser_assigned_ips(username: '', ips: [])
       expect(actual).to be_a(SendGrid4r::REST::Subusers::Subuser)
     end
 
@@ -242,5 +310,12 @@ describe SendGrid4r::REST::Subusers do
       end
       expect(actual.disabled).to eq(false)
     end
+
+    it 'creates monitor instance' do
+      actual = SendGrid4r::REST::Subusers.create_monitor(monitor)
+      expect(actual).to be_a(SendGrid4r::REST::Subusers::Monitor)
+      expect(actual.email).to eq('test@example.com')
+      expect(actual.frequency).to eq(500)
+    end
   end
 end

data/spec/rest/templates/templates_spec.rb

@@ -6,36 +6,43 @@ describe SendGrid4r::REST::Templates do
     before do
       begin
         Dotenv.load
-        @client = SendGrid4r::Client.new(
-          username: ENV['SENDGRID_USERNAME'],
-          password: ENV['SENDGRID_PASSWORD'])
+        @client = SendGrid4r::Client.new(api_key: ENV['SILVER_API_KEY'])
         @template_name1 = 'template_test1'
         @template_name2 = 'template_test2'
         @template_edit1 = 'template_edit1'
+        @version_name1 = 'version_test1'
+        @factory = SendGrid4r::Factory::VersionFactory.new
 
         # celan up test env
         tmps = @client.get_templates
         tmps.templates.each do |tmp|
-          @client.delete_template(tmp.id) if tmp.name == @template_name1
-          @client.delete_template(tmp.id) if tmp.name == @template_name2
-          @client.delete_template(tmp.id) if tmp.name == @template_edit1
+          delete_template(tmp) if tmp.name == @template_name1
+          delete_template(tmp) if tmp.name == @template_name2
+          delete_template(tmp) if tmp.name == @template_edit1
         end
         # post a template
-        @template1 = @client.post_template(@template_name1)
-      rescue => e
+        @template1 = @client.post_template(name: @template_name1)
+      rescue RestClient::ExceptionWithResponse => e
         puts e.inspect
         raise e
       end
     end
 
+    def delete_template(tmp)
+      tmp.versions.each do |ver|
+        @client.delete_version(template_id: tmp.id, version_id: ver.id)
+      end
+      @client.delete_template(template_id: tmp.id)
+    end
+
     context 'without block call' do
       it '#post_template' do
         begin
-          new_template = @client.post_template(@template_name2)
+          new_template = @client.post_template(name: @template_name2)
           expect(new_template.id).to be_a(String)
           expect(new_template.name).to eq(@template_name2)
           expect(new_template.versions).to be_a(Array)
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -56,7 +63,7 @@ describe SendGrid4r::REST::Templates do
               expect(ver.updated_at).to be_a(String)
             end
           end
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -64,7 +71,11 @@ describe SendGrid4r::REST::Templates do
 
       it '#patch_template' do
         begin
-          tmp = @client.patch_template(@template1.id, @template_edit1)
+          version = @factory.create(name: @version_name1)
+          @client.post_version(template_id: @template1.id, version: version)
+          tmp = @client.patch_template(
+            template_id: @template1.id, name: @template_edit1
+          )
           expect(tmp.id).to be_a(String)
           expect(tmp.name).to be_a(String)
           expect(tmp.versions).to be_a(Array)
@@ -75,7 +86,7 @@ describe SendGrid4r::REST::Templates do
             expect(ver.name).to be_a(String)
             expect(ver.updated_at).to be_a(String)
           end
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -83,10 +94,10 @@ describe SendGrid4r::REST::Templates do
 
       it '#get_template' do
         begin
-          tmp = @client.get_template(@template1.id)
+          tmp = @client.get_template(template_id: @template1.id)
           expect(tmp.id).to eq(@template1.id)
           expect(tmp.versions).to eq(@template1.versions)
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -94,73 +105,13 @@ describe SendGrid4r::REST::Templates do
 
       it '#delete_template' do
         begin
-          @client.delete_template(@template1.id)
-        rescue => e
+          @client.delete_template(template_id: @template1.id)
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
       end
     end
-
-    context 'with block call' do
-      it '#post_template' do
-        @client.post_template(@template_name2) do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Templates.create_template(
-              JSON.parse(resp)
-            )
-          expect(resp).to be_a(SendGrid4r::REST::Templates::Template)
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPCreated)
-        end
-      end
-
-      it '#get_templates' do
-        @client.get_templates do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Templates.create_templates(
-              JSON.parse(resp)
-            )
-          expect(resp).to be_a(SendGrid4r::REST::Templates::Templates)
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPOK)
-        end
-      end
-
-      it '#get_template' do
-        @client.get_template(@template1.id) do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Templates.create_template(
-              JSON.parse(resp)
-            )
-          expect(resp).to be_a(SendGrid4r::REST::Templates::Template)
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPOK)
-        end
-      end
-
-      it '#patch_template' do
-        @client.patch_template(
-          @template1.id, @template_edit1
-        ) do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Templates.create_template(
-              JSON.parse(resp)
-            )
-          expect(resp).to be_a(SendGrid4r::REST::Templates::Template)
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPOK)
-        end
-      end
-
-      it '#delete_template' do
-        @client.delete_template(@template1.id) do |resp, req, res|
-          expect(resp).to eq('')
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPNoContent)
-        end
-      end
-    end
   end
 
   describe 'unit test', :ut do
@@ -206,7 +157,7 @@ describe SendGrid4r::REST::Templates do
 
     it '#post_template' do
       allow(client).to receive(:execute).and_return(template)
-      actual = client.post_template('')
+      actual = client.post_template(name: '')
       expect(actual).to be_a(SendGrid4r::REST::Templates::Template)
     end
 
@@ -218,19 +169,19 @@ describe SendGrid4r::REST::Templates do
 
     it '#patch_template' do
       allow(client).to receive(:execute).and_return(template)
-      actual = client.patch_template('', '')
+      actual = client.patch_template(template_id: '', name: '')
       expect(actual).to be_a(SendGrid4r::REST::Templates::Template)
     end
 
     it '#get_template' do
       allow(client).to receive(:execute).and_return(template)
-      actual = client.get_template('')
+      actual = client.get_template(template_id: '')
       expect(actual).to be_a(SendGrid4r::REST::Templates::Template)
     end
 
     it '#delete_template' do
       allow(client).to receive(:execute).and_return('')
-      actual = client.delete_template('')
+      actual = client.delete_template(template_id: '')
       expect(actual).to eq('')
     end