infobeep 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 579c6166aa3d343621867ac8f318194689360665
-  data.tar.gz: 7d1d88e6da3830dcf223076381f4f0fc66f073f8
+  metadata.gz: 1587ca94de8b7d9a015391b3018d379842b66a31
+  data.tar.gz: f9888c6361093ca34e1f36b05be7e930a67d36b5
 SHA512:
-  metadata.gz: 464f148aad810295414e9e0e440f2ffadee2f41f6bf734dc266c00784fe7294b260483201701fedfafcbbc7f887ccea2f7fe73b37345fb1a21234600732e49b6
-  data.tar.gz: 7f954f622cf01d56d1449a3122cb477f828357c30e9c7be1c63e0d7d601f14ec1190df32499a6299609d67a589694c98e19e35c896cc5f72f876f22ba7451109
+  metadata.gz: 035a669989722c7dae9479dca0e90fdb8bcdce5a859b155ee4e8a0883f2a27e554f1fd56e5aae1ed00ae4e651c0edc7509b88de689a2a9ff77077a138bc8073a
+  data.tar.gz: 0a5fd0ba388609a7ba4d263bb4d5fe6898c6f1188b8582729e5639a381a79859c4f04282530faa3c639a78021d89b1e04d58595e19b5422a6ba2c56492c45fd3

data/lib/infobeep/client.rb

@@ -4,7 +4,7 @@ require 'rest-client'
 
 module Infobeep
 
-  class BaseClient
+  class Client
     API_BASE_URL = 'https://api.infobip.com/'
 
     def initialize(username, password)
@@ -12,29 +12,8 @@ module Infobeep
       @password = password
     end
 
-    def authentication_headers
-      auth_string = ::Base64.encode64("#{@username}:#{@password}").strip
-      {'Authorization': "Basic #{auth_string}"}
-    end
-
-    def client_headers
-      hsh = {
-          'User-Agent': "Infobeep-#{Infobeep::VERSION}",
-          'Content-Type': 'application/json',
-          'accept': 'application/json'
-      }
-      hsh.merge!(authentication_headers)
-      hsh
-    end
-
-  end
-
-
-  class SMSClient < BaseClient
-    SMS_API_BASE_URL = "#{API_BASE_URL}sms/1/"
-
     def send_request(sms_request)
-      url = SMS_API_BASE_URL + sms_request.route
+      url = API_BASE_URL + sms_request.route
       method = sms_request.http_method
       headers = client_headers.merge(sms_request.headers)
       payload = sms_request.payload
@@ -49,6 +28,21 @@ module Infobeep
       sms_request.response_class.new(response_hash)
     end
 
+    def authentication_headers
+      auth_string = ::Base64.encode64("#{@username}:#{@password}").strip
+      {'Authorization': "Basic #{auth_string}"}
+    end
+
+    def client_headers
+      hsh = {
+          'User-Agent': "Infobeep-#{Infobeep::VERSION}",
+          'Content-Type': 'application/json',
+          'accept': 'application/json'
+      }
+      hsh.merge!(authentication_headers)
+      hsh
+    end
+
   end
 
 end

data/lib/infobeep/models.rb

@@ -37,6 +37,11 @@ module Infobeep
     attribute :currency, String
   end
 
+  class AccountBalance < Model
+    attribute :balance, BigDecimal
+    attribute :currency, String
+  end
+
   class SMSResponseDetail < Model
     attribute :to, String
     attribute :status, Status

data/lib/infobeep/requests/account_balance_request.rb

@@ -0,0 +1,18 @@
+require 'json'
+
+module Infobeep
+  class AccountBalanceRequest < BaseRequestModel
+
+    def http_method
+      :get
+    end
+
+    def route
+      'account/1/balance'
+    end
+
+    def response_class
+      AccountBalance
+    end
+  end
+end

data/lib/infobeep/requests/bulk_sms_request.rb

@@ -16,7 +16,7 @@ module Infobeep
     end
 
     def route
-      'text/advanced'
+      'sms/1/text/advanced'
     end
 
     def response_class

data/lib/infobeep/requests/sms_log_request.rb

@@ -18,7 +18,7 @@ module Infobeep
     end
 
     def route
-      'logs'
+      'sms/1/logs'
     end
 
     def response_class

data/lib/infobeep/requests/sms_report_request.rb

@@ -11,7 +11,7 @@ module Infobeep
     end
 
     def route
-      'reports'
+      'sms/1/reports'
     end
 
     def response_class

data/lib/infobeep/requests/sms_request.rb

@@ -24,7 +24,7 @@ module Infobeep
     end
 
     def route
-      'text/advanced'
+      'sms/1/text/advanced'
     end
 
     def http_method

data/lib/infobeep/requests.rb

@@ -2,4 +2,5 @@ require "infobeep/requests/base_request_model"
 require "infobeep/requests/sms_request"
 require "infobeep/requests/bulk_sms_request"
 require "infobeep/requests/sms_log_request"
-require "infobeep/requests/sms_report_request"
+require "infobeep/requests/sms_report_request"
+require "infobeep/requests/account_balance_request"

data/lib/infobeep/version.rb

@@ -1,3 +1,3 @@
 module Infobeep
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infobeep
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Favourite Onwuemene
@@ -86,6 +86,7 @@ files:
 - lib/infobeep/client.rb
 - lib/infobeep/models.rb
 - lib/infobeep/requests.rb
+- lib/infobeep/requests/account_balance_request.rb
 - lib/infobeep/requests/base_request_model.rb
 - lib/infobeep/requests/bulk_sms_request.rb
 - lib/infobeep/requests/sms_log_request.rb