sendgrid4r 0.2.0 → 0.3.0

data/spec/categories/categories_spec.rb

@@ -1,38 +1,94 @@
 # encoding: utf-8
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe 'SendGrid4r::REST::Categories' do
-  before :all do
-    Dotenv.load
-    @client = SendGrid4r::Client.new(
-      ENV['SENDGRID_USERNAME'], ENV['SENDGRID_PASSWORD'])
-  end
+describe SendGrid4r::REST::Categories do
+  describe 'integration test' do
+    before do
+      Dotenv.load
+      @client = SendGrid4r::Client.new(
+        username: ENV['SENDGRID_USERNAME'],
+        password: ENV['SENDGRID_PASSWORD'])
+    end
+
+    context 'without block call' do
+      it '#get_categories if no params' do
+        begin
+          categories = @client.get_categories
+          expect(categories.length).to be >= 0
+          categories.each do |category|
+            expect(category.category).to be_a(String)
+          end
+        rescue => e
+          puts e.inspect
+          raise e
+        end
+      end
 
-  context 'always' do
-    it 'is normal when nothing specified' do
-      categories = @client.get_categories
-      expect(true).to eq(categories.is_a?(Array))
-      expect(categories.length >= 0).to eq(true)
-      categories.each do |category|
-        expect(category.category.length > 0).to eq(true)
+      it '#get_categories if name was specified' do
+        begin
+          categories = @client.get_categories('Newsletter')
+          expect(categories.length).to eq(1)
+          categories.each do |category|
+            expect(category.category).to eq('Newsletter')
+          end
+        rescue => e
+          puts e.inspect
+          raise e
+        end
+      end
+
+      it '#get_categories if offset & limit were specified' do
+        begin
+          categories = @client.get_categories(nil, 5, 2)
+          expect(categories.length).to be > 0
+          categories.each do |category|
+            expect(category.category).to be_a(String)
+          end
+        rescue => e
+          puts e.inspect
+          raise e
+        end
       end
     end
 
-    it 'is normal when specify category' do
-      categories = @client.get_categories('Newsletter', nil, nil)
-      expect(true).to eq(categories.is_a?(Array))
-      expect(categories.length).to eq(1)
-      categories.each do |category|
-        expect(category.category).to eq('Newsletter')
+    context 'with block call' do
+      it '#get_categories' do
+        @client.get_categories do |resp, req, res|
+          resp =
+            SendGrid4r::REST::Categories::Categories.create_categories(
+              JSON.parse(resp)
+            )
+          expect(resp).to be_a(Array)
+          resp.each do |category|
+            expect(category).to be_a(
+              SendGrid4r::REST::Categories::Categories::Category
+            )
+          end
+          expect(req).to be_a(RestClient::Request)
+          expect(res).to be_a(Net::HTTPOK)
+        end
       end
     end
+  end
 
-    it 'returns is normal' do
-      categories = @client.get_categories(nil, 5, 2)
-      expect(true).to eq(categories.is_a?(Array))
-      expect(categories.length).to eq(5)
-      categories.each do |category|
-        expect(category.category.length > 0).to eq(true)
+  describe 'unit test' do
+    it 'creates categories instance' do
+      json =
+        '['\
+          '{"category": "cat1"},'\
+          '{"category": "cat2"},'\
+          '{"category": "cat3"},'\
+          '{"category": "cat4"},'\
+          '{"category": "cat5"}'\
+        ']'
+      hash = JSON.parse(json)
+      actual = SendGrid4r::REST::Categories::Categories.create_categories(hash)
+      expect(actual).to be_a(Array)
+      actual.each do |category|
+        expect(category).to be_a(
+          SendGrid4r::REST::Categories::Categories::Category
+        )
+        expect(category.category).to be_a(String)
       end
     end
   end

data/spec/client_spec.rb

@@ -1,14 +1,16 @@
 # encoding: utf-8
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe 'SendGrid4r::Client' do
+describe SendGrid4r::Client do
   before :all do
     Dotenv.load
   end
 
   context 'always' do
     before :all do
-      @client = SendGrid4r::Client.new('username', 'password')
+      @client = SendGrid4r::Client.new(
+        username: 'username',
+        password: 'password')
     end
 
     describe '#initialize' do
@@ -19,6 +21,11 @@ describe 'SendGrid4r::Client' do
 
     describe 'methods' do
       it 'available' do
+        # Api Keys
+        expect(@client.respond_to?('get_api_keys')).to eq(true)
+        expect(@client.respond_to?('post_api_key')).to eq(true)
+        expect(@client.respond_to?('delete_api_key')).to eq(true)
+        expect(@client.respond_to?('patch_api_key')).to eq(true)
         # Advanced Suppression Manager
         # groups
         expect(@client.respond_to?('get_groups')).to eq(true)
@@ -84,7 +91,7 @@ describe 'SendGrid4r::Client' do
         expect(@client.respond_to?('get_devices_stats')).to eq(true)
         expect(@client.respond_to?('get_clients_stats')).to eq(true)
         expect(@client.respond_to?('get_clients_type_stats')).to eq(true)
-        expect(@client.respond_to?('get_esp_stats')).to eq(true)
+        expect(@client.respond_to?('get_mailbox_providers_stats')).to eq(true)
         expect(@client.respond_to?('get_browsers_stats')).to eq(true)
         expect(@client.respond_to?('get_parse_stats')).to eq(true)
         # Contacts
@@ -129,7 +136,7 @@ describe 'SendGrid4r::Client' do
 
     describe 'VERSION' do
       it 'returns VERSION value' do
-        expect(SendGrid4r::VERSION).to eq('0.2.0')
+        expect(SendGrid4r::VERSION).to eq('0.3.0')
       end
     end
   end

data/spec/contacts/custom_fields_spec.rb

@@ -1,59 +1,150 @@
 # encoding: utf-8
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe 'SendGrid4r::REST::Contacts::CustomFields' do
-  before :all do
-    Dotenv.load
-    @client = SendGrid4r::Client.new(
-      ENV['SENDGRID_USERNAME'], ENV['SENDGRID_PASSWORD'])
-    @name = 'birthday'
-    @type = 'text'
-  end
-
-  context 'always' do
-    it 'is normal' do
+describe SendGrid4r::REST::Contacts::CustomFields do
+  describe 'integration test' do
+    before do
       begin
+        Dotenv.load
+        @client = SendGrid4r::Client.new(
+          username: ENV['SENDGRID_USERNAME'],
+          password: ENV['SENDGRID_PASSWORD'])
+        @name1 = 'birthday'
+        @type1 = 'text'
+        @name2 = 'born_at'
+        @type2 = 'date'
+
         # celan up test env
         fields = @client.get_custom_fields
-        expect(fields.custom_fields.length >= 0).to eq(true)
         fields.custom_fields.each do |field|
-          next if field.name != @name
+          next if field.name != @name1 && field.name != @name2
           @client.delete_custom_field(field.id)
         end
         # post a custom field
-        new_field = @client.post_custom_field(@name, @type)
-        expect(new_field.id.is_a?(Fixnum)).to eq(true)
-        expect(new_field.name).to eq(@name)
-        expect(new_field.type).to eq(@type)
-        # post same custom fieled
-        expect do
-          @client.post_custom_field(@name, @type)
-        end.to raise_error(RestClient::BadRequest)
-        # get the custom fields
-        fields = @client.get_custom_fields
-        expect(fields.length >= 1).to eq(true)
-        fields.custom_fields.each do |field|
-          next if field.name != @name
-          expect(field.id).to eq(new_field.id)
-          expect(field.name).to eq(new_field.name)
-          expect(field.type).to eq(new_field.type)
-        end
-        # get a single custom field
-        actual_field = @client.get_custom_field(new_field.id)
-        expect(actual_field.id).to eq(new_field.id)
-        expect(actual_field.name).to eq(new_field.name)
-        expect(actual_field.type).to eq(new_field.type)
-        # delete the custom field
-        @client.delete_custom_field(new_field.id)
-        expect do
-          @client.get_custom_field(new_field.id)
-        end.to raise_error(RestClient::ResourceNotFound)
+        @new_field = @client.post_custom_field(@name1, @type1)
       rescue => e
         puts e.inspect
         raise e
       end
     end
 
+    context 'without block call' do
+      it '#post_custom_field' do
+        begin
+          new_field = @client.post_custom_field(@name2, @type2)
+          expect(new_field.id).to be_a(Fixnum)
+          expect(new_field.name).to eq(@name2)
+          expect(new_field.type).to eq(@type2)
+        rescue => e
+          puts e.inspect
+          raise e
+        end
+      end
+
+      it '#post_custom_field for same key' do
+        begin
+          expect do
+            @client.post_custom_field(@name1, @type1)
+          end.to raise_error(RestClient::BadRequest)
+        rescue => e
+          puts e.inspect
+          raise e
+        end
+      end
+
+      it '#get_custom_fields' do
+        begin
+          fields = @client.get_custom_fields
+          expect(fields.length).to be >= 1
+          fields.custom_fields.each do |field|
+            next if field.name != @name1
+            expect(field.id).to eq(@new_field.id)
+            expect(field.name).to eq(@new_field.name)
+            expect(field.type).to eq(@new_field.type)
+          end
+        rescue => e
+          puts e.inspect
+          raise e
+        end
+      end
+
+      it '#get_custom_field' do
+        begin
+          actual_field = @client.get_custom_field(@new_field.id)
+          expect(actual_field.id).to eq(@new_field.id)
+          expect(actual_field.name).to eq(@new_field.name)
+          expect(actual_field.type).to eq(@new_field.type)
+        rescue => e
+          puts e.inspect
+          raise e
+        end
+      end
+
+      it '#delete_custom_field' do
+        begin
+          @client.delete_custom_field(@new_field.id)
+        rescue => e
+          puts e.inspect
+          raise e
+        end
+      end
+    end
+
+    context 'with block call' do
+      it '#post_custom_field' do
+        @client.post_custom_field(@name2, @type2) do |resp, req, res|
+          resp =
+            SendGrid4r::REST::Contacts::CustomFields.create_field(
+              JSON.parse(resp)
+            )
+          expect(resp).to be_a(SendGrid4r::REST::Contacts::CustomFields::Field)
+          expect(req).to be_a(RestClient::Request)
+          expect(res).to be_a(Net::HTTPCreated)
+        end
+      end
+
+      it '#post_custom_field for same key' do
+        @client.post_custom_field(@name1, @type1) do |_resp, req, res|
+          # TODO: _resp
+          expect(req).to be_a(RestClient::Request)
+          expect(res).to be_a(Net::HTTPBadRequest)
+        end
+      end
+
+      it '#get_custom_fields' do
+        @client.get_custom_fields do |resp, req, res|
+          resp =
+            SendGrid4r::REST::Contacts::CustomFields.create_fields(
+              JSON.parse(resp)
+            )
+          expect(resp).to be_a(SendGrid4r::REST::Contacts::CustomFields::Fields)
+          expect(req).to be_a(RestClient::Request)
+          expect(res).to be_a(Net::HTTPOK)
+        end
+      end
+
+      it '#get_custom_field' do
+        @client.get_custom_field(@new_field.id) do |resp, req, res|
+          resp = SendGrid4r::REST::Contacts::CustomFields.create_field(
+            JSON.parse(resp)
+          )
+          expect(resp).to be_a(SendGrid4r::REST::Contacts::CustomFields::Field)
+          expect(req).to be_a(RestClient::Request)
+          expect(res).to be_a(Net::HTTPOK)
+        end
+      end
+
+      it '#delete_custom_field' do
+        @client.delete_custom_field(@new_field.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' do
     it 'creates field instance' do
       json =
         '{'\
@@ -63,6 +154,7 @@ describe 'SendGrid4r::REST::Contacts::CustomFields' do
         '}'
       hash = JSON.parse(json)
       actual = SendGrid4r::REST::Contacts::CustomFields.create_field(hash)
+      expect(actual).to be_a(SendGrid4r::REST::Contacts::CustomFields::Field)
       expect(actual.id).to eq(1)
       expect(actual.name).to eq('pet')
       expect(actual.type).to eq('text')
@@ -91,11 +183,10 @@ describe 'SendGrid4r::REST::Contacts::CustomFields' do
         '}'
       hash = JSON.parse(json)
       actual = SendGrid4r::REST::Contacts::CustomFields.create_fields(hash)
-      expect(actual.custom_fields.is_a?(Array)).to eq(true)
+      expect(actual).to be_a(SendGrid4r::REST::Contacts::CustomFields::Fields)
+      expect(actual.custom_fields).to be_a(Array)
       actual.custom_fields.each do |field|
-        expect(
-          field.is_a?(SendGrid4r::REST::Contacts::CustomFields::Field)
-        ).to eq(true)
+        expect(field).to be_a(SendGrid4r::REST::Contacts::CustomFields::Field)
       end
     end
   end