sendgrid4r 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb7caee98231bb2a059edc759bb2a60ed9e36998
-  data.tar.gz: 851393635739f5d439861e41a658e7fefbc28201
+  metadata.gz: f917e5bad6e118fb4038ed40d03c754cf0c47a29
+  data.tar.gz: 36b3c7f7bf0a50841a9a6970c017f76d41669c67
 SHA512:
-  metadata.gz: 24f52934d7a0f7832b835fe47fc925d617dd1822673b8496d51a3f200b4b0329dcd5ff421b04605cd3db71e17ead302a926632684294ab6807594e5f45049510
-  data.tar.gz: 0e0e57d4ab406865b937ec4478e61476b935c18315bb17f8fc717a9be99d679776dfebead26c257712b75ae99e80c54959592c3cc655af3d48d8de2bab15cbc0
+  metadata.gz: e58bdc185eee38e7a8e07a9ab6720639e65d20fb4484e8ab98b94223a9b100f210bd5cc47be5adc76c58bcc3fe0c4702e898b3e611aa98102a1706fe39f11bc5
+  data.tar.gz: fde6e1b9d2abf15276d6f700a2d169c583752c73b946b364aabb3bdd30f1cabbb5f6564cf7d3756383d3bbaffa33ff3078d246115af1ab02e8e1edc6901d3cfe

data/.rubocop.yml

@@ -7,6 +7,10 @@ MethodLength:
   CountComments: true  # count full line comments?
   Max: 20
 
+# Change limitation of module length
+ModuleLength:
+  Max: 300
+
 # Change limitation of the number of params
 ParameterLists:
   Max: 8
@@ -16,10 +20,6 @@ ParameterLists:
 AbcSize:
   Max: 21
 
-# Change limitation of the number of '/' within %r
-RegexpLiteral:
-  MaxSlashes: 0
-
 # Change numeric literals
 NumericLiterals:
   MinDigits: 20

data/lib/sendgrid4r/rest/stats/advanced.rb

@@ -18,7 +18,7 @@ module SendGrid4r
             aggregated_by: nil,
             country: nil,
             &block
-          )
+        )
           params = {
             start_date: start_date,
             end_date: end_date,
@@ -34,7 +34,7 @@ module SendGrid4r
             end_date: nil,
             aggregated_by: nil,
             &block
-          )
+        )
           params = {
             start_date: start_date,
             end_date: end_date,
@@ -49,7 +49,7 @@ module SendGrid4r
             end_date: nil,
             aggregated_by: nil,
             &block
-          )
+        )
           params = {
             start_date: start_date,
             end_date: end_date,
@@ -65,7 +65,7 @@ module SendGrid4r
             aggregated_by: nil,
             client_type:,
             &block
-          )
+        )
           params = {
             start_date: start_date,
             end_date: end_date,
@@ -83,7 +83,7 @@ module SendGrid4r
             aggregated_by: nil,
             esps: nil,
             &block
-          )
+        )
           params = {
             start_date: start_date,
             end_date: end_date,
@@ -101,7 +101,7 @@ module SendGrid4r
             aggregated_by: nil,
             browsers: nil,
             &block
-          )
+        )
           params = {
             start_date: start_date,
             end_date: end_date,

data/lib/sendgrid4r/rest/stats/stats.rb

@@ -18,7 +18,7 @@ module SendGrid4r
         MONTH = 'month'
       end
 
-      TopStat  = Struct.new(:date, :stats)
+      TopStat = Struct.new(:date, :stats)
       Stat        = Struct.new(:metrics, :name, :type)
       Metric      = Struct.new(
         :blocks,

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

@@ -16,8 +16,10 @@ module SendGrid4r
         :phone, :state, :website, :zip
       )
 
-      def self.url
-        url = "#{BASE_URL}/user/profile"
+      Account = Struct.new(:type, :reputation)
+
+      def self.url(path)
+        url = "#{BASE_URL}/user/#{path}"
         url
       end
 
@@ -37,16 +39,29 @@ module SendGrid4r
         )
       end
 
+      def self.create_account(resp)
+        return resp if resp.nil?
+        Account.new(
+          resp['type'],
+          resp['reputation']
+        )
+      end
+
       def get_user_profile(&block)
-        resp = get(@auth, SendGrid4r::REST::Users.url, nil, &block)
+        resp = get(@auth, SendGrid4r::REST::Users.url('profile'), nil, &block)
         SendGrid4r::REST::Users.create_profile(resp)
       end
 
-      def patch_user_profile(params: nil, &block)
-        endpoint = SendGrid4r::REST::Users.url
+      def patch_user_profile(params:, &block)
+        endpoint = SendGrid4r::REST::Users.url('profile')
         resp = patch(@auth, endpoint, params, &block)
         SendGrid4r::REST::Users.create_profile(resp)
       end
+
+      def get_user_account(&block)
+        resp = get(@auth, SendGrid4r::REST::Users.url('account'), nil, &block)
+        SendGrid4r::REST::Users.create_account(resp)
+      end
     end
   end
 end

data/lib/sendgrid4r/rest/whitelabel/links.rb

@@ -103,9 +103,20 @@ module SendGrid4r
           ValidationResult.new(resp['valid'], resp['reason'])
         end
 
-        def get_wl_links(&block)
+        def get_wl_links(
+          limit: nil, offset: nil, exclude_subusers: nil, username: nil,
+          domain: nil, &block
+        )
+          params = {}
+          params['limit'] = limit unless limit.nil?
+          params['offset'] = offset unless offset.nil?
+          unless exclude_subusers.nil?
+            params['exclude_subusers'] = exclude_subusers
+          end
+          params['username'] = username unless username.nil?
+          params['domain'] = domain unless domain.nil?
           endpoint = SendGrid4r::REST::Whitelabel::Links.url
-          resp = get(@auth, endpoint, nil, &block)
+          resp = get(@auth, endpoint, params, &block)
           SendGrid4r::REST::Whitelabel::Links.create_links(resp)
         end
 

data/lib/sendgrid4r/version.rb

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

data/sendgrid4r.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   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('rubocop', '>=0.29.0', '<0.34.3')
   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')
+  spec.add_development_dependency('rspec', '3.3.0')
+  spec.add_development_dependency('dotenv', '=0.11.0', '<=2.0.2')
 end

data/spec/client_spec.rb

@@ -253,12 +253,13 @@ describe SendGrid4r::Client do
         # Users API
         expect(@client.respond_to?('get_user_profile')).to eq(true)
         expect(@client.respond_to?('patch_user_profile')).to eq(true)
+        expect(@client.respond_to?('get_user_account')).to eq(true)
       end
     end
 
     describe 'VERSION' do
       it 'returns VERSION value' do
-        expect(SendGrid4r::VERSION).to eq('1.2.1')
+        expect(SendGrid4r::VERSION).to eq('1.3.0')
       end
     end
   end

data/spec/rest/subusers/subusers_spec.rb

@@ -11,7 +11,7 @@ describe SendGrid4r::REST::Subusers do
         @username2 = ENV['SUBUSER2']
         @username3 = ENV['SUBUSER3']
         @email1 = ENV['MAIL']
-        @password1  = ENV['PASS']
+        @password1 = ENV['PASS']
         @ip = @client.get_ips[0].ip
         # celan up test env
         subusers = @client.get_subusers

data/spec/rest/users/users_spec.rb

@@ -35,6 +35,16 @@ describe SendGrid4r::REST::Users do
           raise e
         end
       end
+
+      it '#get_user_account' do
+        begin
+          account = @client.get_user_account
+          expect(account).to be_a(SendGrid4r::REST::Users::Account)
+        rescue RestClient::ExceptionWithResponse => e
+          puts e.inspect
+          raise e
+        end
+      end
     end
   end
 
@@ -60,10 +70,37 @@ describe SendGrid4r::REST::Users do
       )
     end
 
+    let(:account) do
+      JSON.parse(
+        '{'\
+          '"type": "free",'\
+          '"reputation": 99.7'\
+        '}'
+      )
+    end
+
     it '#get_user_profile' do
       allow(client).to receive(:execute).and_return(profile)
       actual = client.get_user_profile
       expect(actual).to be_a(SendGrid4r::REST::Users::Profile)
+    end
+
+    it '#patch_user_profile' do
+      allow(client).to receive(:execute).and_return(profile)
+      params = {}
+      params['city'] = 'nakano'
+      actual = client.patch_user_profile(params: params)
+      expect(actual).to be_a(SendGrid4r::REST::Users::Profile)
+    end
+
+    it '#get_user_account' do
+      allow(client).to receive(:execute).and_return(account)
+      actual = client.get_user_account
+      expect(actual).to be_a(SendGrid4r::REST::Users::Account)
+    end
+
+    it 'creates profile instance' do
+      actual = SendGrid4r::REST::Users.create_profile(profile)
       expect(actual.address).to eq('814 West Chapman Avenue')
       expect(actual.city).to eq('Orange')
       expect(actual.company).to eq('SendGrid')
@@ -74,5 +111,11 @@ describe SendGrid4r::REST::Users do
       expect(actual.website).to eq('http://www.sendgrid.com')
       expect(actual.zip).to eq('92868')
     end
+
+    it 'creates account instance' do
+      actual = SendGrid4r::REST::Users.create_account(account)
+      expect(actual.type).to eq('free')
+      expect(actual.reputation).to eq(99.7)
+    end
   end
 end

data/spec/rest/whitelabel/links_spec.rb

@@ -62,7 +62,10 @@ describe SendGrid4r::REST::Whitelabel::Links do
     context 'without block call' do
       it '#get_wl_links' do
         begin
-          links = @client.get_wl_links
+          links = @client.get_wl_links(
+            limit: 100, offset: 0,
+            exclude_subusers: true, username: 'somebody', domain: 'example.com'
+          )
           expect(links).to be_a(Array)
           links.each do |link|
             expect(link).to be_a(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sendgrid4r
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - awwa500@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2015-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -39,7 +39,7 @@ dependencies:
         version: 0.29.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.34.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: 0.29.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.34.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -76,34 +76,34 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.11.0
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.11.0
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 2.0.2
 description: SendGrid Web API v3 module
 email:
 - awwa500@gmail.com
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: SendGrid Web API v3 module