baruwa 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9754572f342b11ecffd0ac8ed4d695982ca4ec3657dc187d0be0a3755f1816d2
-  data.tar.gz: 61114a2dc74e23b12233fa9fea07526aa86639637eb362dd03c43b7306777ff3
+  metadata.gz: 98a49c3c355263fa0b34c06735cf84cacab2177d87cba109096e4e2ed2e42d18
+  data.tar.gz: bbbe3376f70e9503519f865c153f39903f85d3726445c68ca5e14634b801f2d5
 SHA512:
-  metadata.gz: d64692fe0278e33ecbf9cb8b108c7ff6a49e610ed85cd29d29b2bfe390fc9aca7f52cab011e5669f227909ebcdcf71a4aa3766a8b65f20ca9c7e7a945e168d45
-  data.tar.gz: acefdb6ec00a76ce5f06bc47e98e1b76a81f824f2be6c62d65ec521665ad7043339697be8b7311f149ccd5145b48141bee1c280aedce3b5422a7790bcc7339cc
+  metadata.gz: e7169056fba40e26ab2f04a4c9107c4d31064762a601ed5dd4cca730362ad2f84affd7b0fcbc8fcc4498412be9db24b6f770e659c48bcd9310bf1654e041c4ef
+  data.tar.gz: f5a65a3aff8ca33291c20c101aa518bc6af27caf2cc82d28584611e36da04b6156c5d3c41701ca3e85505d15832f16dedde6689c81a7fbbf57728f10389d201e

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 pkg/*
 coverage
+bin/*

data/Gemfile

@@ -7,4 +7,5 @@ group :test do
     gem 'simplecov', :require => false
     gem 'codecov', :require => false
     gem "codeclimate-test-reporter", :require => false
+    gem 'rspec_junit_formatter', :require => false
 end

data/README.md

@@ -2,8 +2,8 @@
 
 This gem provides bindings for the [Baruwa](https://www.baruwa.com/) [REST API](https://www.baruwa.com/docs/api/)
 
-[![Build Status](https://travis-ci.org/akissa/baruwa-ruby.svg?branch=master)](https://travis-ci.org/akissa/baruwa-ruby)
-[![codecov](https://codecov.io/gh/akissa/baruwa-ruby/branch/master/graph/badge.svg)](https://codecov.io/gh/akissa/baruwa-ruby)
+[![Build Status](https://travis-ci.org/baruwa-enterprise/baruwa-ruby.svg?branch=master)](https://travis-ci.org/baruwa-enterprise/baruwa-ruby)
+[![codecov](https://codecov.io/gh/baruwa-enterprise/baruwa-ruby/branch/master/graph/badge.svg)](https://codecov.io/gh/baruwa-enterprise/baruwa-ruby)
 [![Gem Version](https://badge.fury.io/rb/baruwa.svg)](https://badge.fury.io/rb/baruwa)
 [![MPLv2 License](https://img.shields.io/badge/license-MPLv2-blue.svg?style=flat-square)](https://www.mozilla.org/MPL/2.0/)
 
@@ -25,7 +25,7 @@ Or install it yourself as:
 
 ## Contributing
 
-1. Fork it (https://github.com/akissa/baruwa-ruby/fork)
+1. Fork it (https://github.com/baruwa-enterprise/baruwa-ruby/fork)
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
@@ -35,4 +35,4 @@ Or install it yourself as:
 ## License
 
 All code is licensed under the
-[MPLv2 License](https://github.com/akissa/baruwa-ruby/blob/master/LICENSE)
+[MPLv2 License](https://github.com/baruwa-enterprise/baruwa-ruby/blob/master/LICENSE)

data/baruwa.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.version     = Baruwa::VERSION
   s.authors     = ["Andrew Colin Kissa"]
   s.email       = ["andrew@topdog.za.net"]
-  s.homepage    = "https://github.com/akissa/baruwa-ruby"
+  s.homepage    = "https://github.com/baruwa-enterprise/baruwa-ruby"
   s.summary     = %q{Ruby bindings for the Baruwa REST API}
   s.description = %q{Gem to access the Baruwa REST API in ruby and ruby on rails applications.}
   s.license     = "MPL-2.0"

data/lib/baruwa.rb

@@ -121,9 +121,13 @@ class BaruwaAPI
       @ssl_verify = ssl_verify
     end
 
-    def get_users
+    def get_users(page=nil)
         # get users
-        call_api(ENDPOINTS[:users][:list])
+        params = {}
+        if page.is_a? Integer then
+            params[:page] = page
+        end
+        call_api(ENDPOINTS[:users][:list], [], false, params)
     end
 
     def get_user(userid)
@@ -171,9 +175,13 @@ class BaruwaAPI
         call_api(ENDPOINTS[:aliases][:delete], [addressid], data)
     end
 
-    def get_domains
+    def get_domains(page=nil)
         # get domains
-        call_api(ENDPOINTS[:domains][:list])
+        params = {}
+        if page.is_a? Integer then
+            params[:page] = page
+        end
+        call_api(ENDPOINTS[:domains][:list], [], false, params)
     end
 
     def get_domain(domainid)
@@ -201,9 +209,13 @@ class BaruwaAPI
         call_api(ENDPOINTS[:domains][:delete], [domainid])
     end
 
-    def get_domainaliases(domainid)
+    def get_domainaliases(domainid, page=nil)
         # get domain aliases
-        call_api(ENDPOINTS[:domainaliases][:list], [domainid])
+        params = {}
+        if page.is_a? Integer then
+            params[:page] = page
+        end
+        call_api(ENDPOINTS[:domainaliases][:list], [domainid], false, params)
     end
 
     def get_domainalias(domainid, aliasid)
@@ -226,9 +238,13 @@ class BaruwaAPI
         call_api(ENDPOINTS[:domainaliases][:delete], [domainid, aliasid], data)
     end
 
-    def get_domain_smarthosts(domainid)
+    def get_domain_smarthosts(domainid, page=nil)
         # get domain smarthosts
-        call_api(ENDPOINTS[:domainsmarthosts][:list], [domainid])
+        params = {}
+        if page.is_a? Integer then
+            params[:page] = page
+        end
+        call_api(ENDPOINTS[:domainsmarthosts][:list], [domainid], false, params)
     end
 
     def get_domain_smarthost(domainid, smarthostid)
@@ -251,9 +267,13 @@ class BaruwaAPI
         call_api(ENDPOINTS[:domainsmarthosts][:delete], [domainid, smarthostid], data)
     end
 
-    def get_deliveryservers(domainid)
+    def get_deliveryservers(domainid, page=nil)
         # get delivery servers
-        call_api(ENDPOINTS[:deliveryservers][:list], [domainid])
+        params = {}
+        if page.is_a? Integer then
+            params[:page] = page
+        end
+        call_api(ENDPOINTS[:deliveryservers][:list], [domainid], false, params)
     end
 
     def get_deliveryserver(domainid, serverid)
@@ -276,9 +296,13 @@ class BaruwaAPI
         call_api(ENDPOINTS[:deliveryservers][:delete], [domainid, serverid], data)
     end
 
-    def get_user_deliveryservers(domainid)
+    def get_user_deliveryservers(domainid, page=nil)
         # get delivery servers
-        call_api(ENDPOINTS[:userdeliveryservers][:list], [domainid])
+        params = {}
+        if page.is_a? Integer then
+            params[:page] = page
+        end
+        call_api(ENDPOINTS[:userdeliveryservers][:list], [domainid], false, params)
     end
 
     def get_user_deliveryserver(domainid, serverid)
@@ -301,9 +325,13 @@ class BaruwaAPI
         call_api(ENDPOINTS[:userdeliveryservers][:delete], [domainid, serverid], data)
     end
 
-    def get_authservers(domainid)
+    def get_authservers(domainid, page=nil)
         # get auth servers
-        call_api(ENDPOINTS[:authservers][:list], [domainid])
+        params = {}
+        if page.is_a? Integer then
+            params[:page] = page
+        end
+        call_api(ENDPOINTS[:authservers][:list], [domainid], false, params)
     end
 
     def get_authserver(domainid, serverid)
@@ -366,9 +394,13 @@ class BaruwaAPI
         call_api(ENDPOINTS[:radiussettings][:delete], [domainid, serverid, settingsid], data)
     end
 
-    def get_organizations
+    def get_organizations(page=nil)
         # get organizations
-        call_api(ENDPOINTS[:organizations][:list])
+        params = {}
+        if page.is_a? Integer then
+            params[:page] = page
+        end
+        call_api(ENDPOINTS[:organizations][:list], [], false, params)
     end
 
     def get_organization(orgid)
@@ -411,9 +443,13 @@ class BaruwaAPI
         call_api(ENDPOINTS[:relays][:delete], [relayid], data)
     end
 
-    def get_fallbackservers(orgid)
+    def get_fallbackservers(orgid, page=nil)
         # get fallback servers
-        call_api(ENDPOINTS[:fallbackservers][:list], [orgid])
+        params = {}
+        if page.is_a? Integer then
+            params[:page] = page
+        end
+        call_api(ENDPOINTS[:fallbackservers][:list], [orgid], false, params)
     end
 
     def get_fallbackserver(serverid)
@@ -436,9 +472,13 @@ class BaruwaAPI
         call_api(ENDPOINTS[:fallbackservers][:delete], [serverid], data)
     end
 
-    def get_org_smarthosts(orgid)
+    def get_org_smarthosts(orgid, page=nil)
         # get organization smarthosts
-        call_api(ENDPOINTS[:orgsmarthosts][:list], [orgid])
+        params = {}
+        if page.is_a? Integer then
+            params[:page] = page
+        end
+        call_api(ENDPOINTS[:orgsmarthosts][:list], [orgid], false, params)
     end
 
     def get_org_smarthost(orgid, smarthostid)
@@ -482,7 +522,7 @@ class BaruwaAPI
             endpoint_string = endpoint[:name]
         end
         url_string = @baruwa_url + endpoint_string
-        url_string << params if params
+        url_string = url_string + '?' + get_params(params) if params
         uri = URI.parse(url_string)
         return uri
     end

data/lib/baruwa/version.rb

@@ -7,5 +7,5 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 module Baruwa
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/baruwa_authservers_spec.rb

@@ -21,6 +21,19 @@ describe 'Test Authentication Settings' do
         expect(WebMock).to have_requested(:get, "#{@baruwapi.instance_variable_get(:@baruwa_url)}/authservers/#{domainid}")
     end
 
+    it 'should get auth servers with pagination' do
+        page = 1
+        domainid = 10
+        stub_request(:get, "https://testbaruwa.com/api/v1/authservers/#{domainid}?page=#{page}").
+        with(:body => false,
+            :headers => {'Accept'=>'*/*',
+                        'User-Agent'=>'BaruwaAPI-Ruby',
+                        'Authorization'=>'Bearer 6e2347bc-278e-42f6-a84b-fa1766140cbd'}).
+        to_return(:status => 200, :body => "", :headers => {})
+        @baruwapi.get_authservers(domainid, page)
+        expect(WebMock).to have_requested(:get, "#{@baruwapi.instance_variable_get(:@baruwa_url)}/authservers/#{domainid}?page=#{page}")
+    end
+
     it 'should get auth server' do
         domainid = 10
         serverid = 10

data/spec/baruwa_deliveryservers_spec.rb

@@ -21,6 +21,19 @@ describe 'Test Delivery servers' do
         expect(WebMock).to have_requested(:get, "#{@baruwapi.instance_variable_get(:@baruwa_url)}/deliveryservers/#{domainid}")
     end
 
+    it 'should get delivery servers with pagination' do
+        page = 1
+        domainid = 10
+        stub_request(:get, "https://testbaruwa.com/api/v1/deliveryservers/#{domainid}?page=#{page}").
+        with(:body => false,
+            :headers => {'Accept'=>'*/*',
+                        'User-Agent'=>'BaruwaAPI-Ruby',
+                        'Authorization'=>'Bearer 6e2347bc-278e-42f6-a84b-fa1766140cbd'}).
+        to_return(:status => 200, :body => "", :headers => {})
+        @baruwapi.get_deliveryservers(domainid, page)
+        expect(WebMock).to have_requested(:get, "#{@baruwapi.instance_variable_get(:@baruwa_url)}/deliveryservers/#{domainid}?page=#{page}")
+    end
+
     it 'should get a delivery server' do
         domainid = 10
         serverid = 10

data/spec/baruwa_domainalias_spec.rb

@@ -21,6 +21,19 @@ describe 'Test Domain Aliases' do
         expect(WebMock).to have_requested(:get, "#{@baruwapi.instance_variable_get(:@baruwa_url)}/domainaliases/#{domainid}")
     end
 
+    it 'should get domain aliases with pagination' do
+        page = 1
+        domainid = 10
+        stub_request(:get, "https://testbaruwa.com/api/v1/domainaliases/#{domainid}?page=#{page}").
+        with(:body => false,
+            :headers => {'Accept'=>'*/*',
+                        'User-Agent'=>'BaruwaAPI-Ruby',
+                        'Authorization'=>'Bearer 6e2347bc-278e-42f6-a84b-fa1766140cbd'}).
+        to_return(:status => 200, :body => "", :headers => {})
+        @baruwapi.get_domainaliases(domainid, page)
+        expect(WebMock).to have_requested(:get, "#{@baruwapi.instance_variable_get(:@baruwa_url)}/domainaliases/#{domainid}?page=#{page}")
+    end
+
     it 'should get a domain alias' do
         domainid = 10
         aliasid = 1

data/spec/baruwa_domains_spec.rb

@@ -40,6 +40,18 @@ describe 'Test Domains' do
         expect(WebMock).to have_requested(:get, "#{@baruwapi.instance_variable_get(:@baruwa_url)}/domains")
     end
 
+    it 'should get domains with pagination' do
+        page = 1
+        stub_request(:get, "https://testbaruwa.com/api/v1/domains?page=#{page}").
+        with(:body => false,
+            :headers => {'Accept'=>'*/*',
+                        'User-Agent'=>'BaruwaAPI-Ruby',
+                        'Authorization'=>'Bearer 6e2347bc-278e-42f6-a84b-fa1766140cbd'}).
+        to_return(:status => 200, :body => "", :headers => {})
+        @baruwapi.get_domains(page)
+        expect(WebMock).to have_requested(:get, "#{@baruwapi.instance_variable_get(:@baruwa_url)}/domains?page=#{page}")
+    end
+
     it 'should get a domain' do
         domainid = 10
         stub_request(:get, "https://testbaruwa.com/api/v1/domains/#{domainid}").

data/spec/baruwa_fallbackservers_spec.rb

@@ -21,6 +21,19 @@ describe 'Test Fallback servers' do
         expect(WebMock).to have_requested(:get, "#{@baruwapi.instance_variable_get(:@baruwa_url)}/fallbackservers/list/#{orgid}")
     end
 
+    it 'should get Fallback servers with pagination' do
+        page = 1
+        orgid = 10
+        stub_request(:get, "https://testbaruwa.com/api/v1/fallbackservers/list/#{orgid}?page=#{page}").
+        with(:body => false,
+            :headers => {'Accept'=>'*/*',
+                        'User-Agent'=>'BaruwaAPI-Ruby',
+                        'Authorization'=>'Bearer 6e2347bc-278e-42f6-a84b-fa1766140cbd'}).
+        to_return(:status => 200, :body => "", :headers => {})
+        @baruwapi.get_fallbackservers(orgid, page)
+        expect(WebMock).to have_requested(:get, "#{@baruwapi.instance_variable_get(:@baruwa_url)}/fallbackservers/list/#{orgid}?page=#{page}")
+    end
+
     it 'should get a Fallback server' do
         serverid = 10
         stub_request(:get, "https://testbaruwa.com/api/v1/fallbackservers/#{serverid}").

data/spec/baruwa_organizations_spec.rb

@@ -20,6 +20,18 @@ describe 'Test Organizations' do
         expect(WebMock).to have_requested(:get, "#{@baruwapi.instance_variable_get(:@baruwa_url)}/organizations")
     end
 
+    it 'should get organizations with pagination' do
+        page = 1
+        stub_request(:get, "https://testbaruwa.com/api/v1/organizations?page=#{page}").
+        with(:body => false,
+            :headers => {'Accept'=>'*/*',
+                        'User-Agent'=>'BaruwaAPI-Ruby',
+                        'Authorization'=>'Bearer 6e2347bc-278e-42f6-a84b-fa1766140cbd'}).
+        to_return(:status => 200, :body => "", :headers => {})
+        @baruwapi.get_organizations(page)
+        expect(WebMock).to have_requested(:get, "#{@baruwapi.instance_variable_get(:@baruwa_url)}/organizations?page=#{page}")
+    end
+
     it 'should get an organization' do
         orgid = 10
         stub_request(:get, "https://testbaruwa.com/api/v1/organizations/#{orgid}").

data/spec/baruwa_orgsmarthosts_spec.rb

@@ -21,6 +21,19 @@ describe 'Test Organization Smarthosts' do
         expect(WebMock).to have_requested(:get, "#{@baruwapi.instance_variable_get(:@baruwa_url)}/organizations/smarthosts/#{orgid}")
     end
 
+    it 'should get organization smarthosts with pagination' do
+        page = 1
+        orgid = 10
+        stub_request(:get, "https://testbaruwa.com/api/v1/organizations/smarthosts/#{orgid}?page=#{page}").
+        with(:body => false,
+            :headers => {'Accept'=>'*/*',
+                        'User-Agent'=>'BaruwaAPI-Ruby',
+                        'Authorization'=>'Bearer 6e2347bc-278e-42f6-a84b-fa1766140cbd'}).
+        to_return(:status => 200, :body => "", :headers => {})
+        @baruwapi.get_org_smarthosts(orgid, page)
+        expect(WebMock).to have_requested(:get, "#{@baruwapi.instance_variable_get(:@baruwa_url)}/organizations/smarthosts/#{orgid}?page=#{page}")
+    end
+
     it 'should get a organization smarthost' do
         orgid = 10
         smarthostid = 1

data/spec/baruwa_smarthosts_spec.rb

@@ -21,6 +21,19 @@ describe 'Test Domain Smarthosts' do
         expect(WebMock).to have_requested(:get, "#{@baruwapi.instance_variable_get(:@baruwa_url)}/domains/smarthosts/#{domainid}")
     end
 
+    it 'should get domain smarthosts with pagination' do
+        page = 1
+        domainid = 10
+        stub_request(:get, "https://testbaruwa.com/api/v1/domains/smarthosts/#{domainid}?page=#{page}").
+        with(:body => false,
+            :headers => {'Accept'=>'*/*',
+                        'User-Agent'=>'BaruwaAPI-Ruby',
+                        'Authorization'=>'Bearer 6e2347bc-278e-42f6-a84b-fa1766140cbd'}).
+        to_return(:status => 200, :body => "", :headers => {})
+        @baruwapi.get_domain_smarthosts(domainid, page)
+        expect(WebMock).to have_requested(:get, "#{@baruwapi.instance_variable_get(:@baruwa_url)}/domains/smarthosts/#{domainid}?page=#{page}")
+    end
+
     it 'should get a domain smarthost' do
         domainid = 10
         smarthostid = 1

data/spec/{baruwa_user_deliveryservers.rb → baruwa_user_deliveryservers_spec.rb}

@@ -21,6 +21,19 @@ describe 'Test User Delivery servers' do
         expect(WebMock).to have_requested(:get, "#{@baruwapi.instance_variable_get(:@baruwa_url)}/userdeliveryservers/#{domainid}")
     end
 
+    it 'should get user delivery servers with pagination' do
+        page = 1
+        domainid = 10
+        stub_request(:get, "https://testbaruwa.com/api/v1/userdeliveryservers/#{domainid}?page=#{page}").
+        with(:body => false,
+            :headers => {'Accept'=>'*/*',
+                        'User-Agent'=>'BaruwaAPI-Ruby',
+                        'Authorization'=>'Bearer 6e2347bc-278e-42f6-a84b-fa1766140cbd'}).
+        to_return(:status => 200, :body => "", :headers => {})
+        @baruwapi.get_user_deliveryservers(domainid, page)
+        expect(WebMock).to have_requested(:get, "#{@baruwapi.instance_variable_get(:@baruwa_url)}/userdeliveryservers/#{domainid}?page=#{page}")
+    end
+
     it 'should get a user delivery server' do
         domainid = 10
         serverid = 10

data/spec/baruwa_users_spec.rb

@@ -36,6 +36,18 @@ describe 'Test Users' do
         expect(WebMock).to have_requested(:get, "#{@baruwapi.instance_variable_get(:@baruwa_url)}/users")
     end
 
+    it 'should get users with pagination' do
+        page = 1
+        stub_request(:get, "https://testbaruwa.com/api/v1/users?page=#{page}").
+        with(:body => false,
+            :headers => {'Accept'=>'*/*',
+                        'User-Agent'=>'BaruwaAPI-Ruby',
+                        'Authorization'=>'Bearer 6e2347bc-278e-42f6-a84b-fa1766140cbd'}).
+        to_return(:status => 200, :body => "", :headers => {})
+        @baruwapi.get_users(page)
+        expect(WebMock).to have_requested(:get, "#{@baruwapi.instance_variable_get(:@baruwa_url)}/users?page=#{page}")
+    end
+
     it 'should get a user' do
         userid = 20
         stub_request(:get, "https://testbaruwa.com/api/v1/users/#{userid}").

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baruwa
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Andrew Colin Kissa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-16 00:00:00.000000000 Z
+date: 2019-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,7 +73,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".codeclimate.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -99,10 +98,10 @@ files:
 - spec/baruwa_relays_spec.rb
 - spec/baruwa_smarthosts_spec.rb
 - spec/baruwa_status_spec.rb
-- spec/baruwa_user_deliveryservers.rb
+- spec/baruwa_user_deliveryservers_spec.rb
 - spec/baruwa_users_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/akissa/baruwa-ruby
+homepage: https://github.com/baruwa-enterprise/baruwa-ruby
 licenses:
 - MPL-2.0
 metadata: {}
@@ -140,6 +139,6 @@ test_files:
 - spec/baruwa_relays_spec.rb
 - spec/baruwa_smarthosts_spec.rb
 - spec/baruwa_status_spec.rb
-- spec/baruwa_user_deliveryservers.rb
+- spec/baruwa_user_deliveryservers_spec.rb
 - spec/baruwa_users_spec.rb
 - spec/spec_helper.rb

data/.codeclimate.yml

@@ -1,12 +0,0 @@
----
-engines:
-  fixme:
-      enabled: true
-  rubocop:
-      enabled: true
-ratings:
-    paths:
-        - "**.rb"
-exclude_paths:
-    - "**.yml"
-    - spec/**/*