t2_airtime 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6e8d1b5cfa93a9f398cc58bd1089bfc128a0dd0
-  data.tar.gz: e75396f390b165e992e87e37d75557fb82a7c427
+  metadata.gz: 4f76c758dc19f0a18801723bce129f79b3901ef2
+  data.tar.gz: 939e2277d01c62ef4d24ca7f772305352e0569c5
 SHA512:
-  metadata.gz: ae9a53249041d93c36146080f8cefa03052c5d90b32afe117d097f0333b68c835672a0aad09aefe1bdf0a61204a328371c52331a6bb1eb1010569aee16c2ff1d
-  data.tar.gz: 764234e7bfbfd290da1effb363c223ad7c21193df6e30c10ed5c200b674db654324ea18d2d2505cbf2e66adb5cf0032b9a3c0c50abc1e7b8ff010d82d8b40f99
+  metadata.gz: 7d734a1bd8ac1b49d86311205f4d4be15b0c3728de5132a440f6816010f529ef413cabf0dbfec74fb07adfd4effd8908cf568234499fe36e7820b43394f17d9f
+  data.tar.gz: 2f0f8aa5be119dda169c520b01c54cea00804c452f0d612c53f28fdffb90d280c330cd908984960149e633e3d6aefb69772af8970e1cbb244366302529169710

data/lib/t2_airtime/api.rb

@@ -146,7 +146,8 @@ module T2Airtime
     # portability if you are able to know the destination operator.        
     # return_promo
     # Setting this to “1” will return the current  promotion related to the transaction’s operator.    
-    def msisdn_info(destination_msisdn, operator_id=nil, 
+    def msisdn_info(destination_msisdn, 
+                    operator_id=nil, 
                     delivered_amount_info=1, return_service_fee=1, return_promo=1)
       @params = {
         destination_msisdn: destination_msisdn,
@@ -157,13 +158,6 @@ module T2Airtime
       self.oid = operator_id
       run_action :msisdn_info
     end
-
-    # Get information about a phone number
-    def phone_search(number, operator_id=nil)
-      information = msisdn_info(number, operator_id).information
-      information[:product_list] = information[:product_list].split(",")
-      information
-    end    
     
     # This method is used to reserve an ID in the system. This ID can then be
     # used in the “topup” or “simulation” requests.
@@ -241,34 +235,32 @@ module T2Airtime
     #   i) Not used if info_type = “countries”
     #  ii) countryid of the requested country if info_type = “country”
     # iii) operatorid of the requested operator if info_type = “operator”
-
     def price_list(info_type, content=nil)
       @params[:info_type] = info_type
       content && @params[:content] = content
       run_action :pricelist
     end
 
-    def country_list
-      price_list('countries')           
-    end
+    # Convenience method to get the country list
+    def country_list() price_list('countries') end
 
-    def operator_list(country_api_id)
-      price_list('country', country_api_id)       
-    end 
+    # Convenience method to get the operators list for a given country
+    # @country_aid the airtime id of the country
+    def operator_list(country_aid) price_list('country', country_aid) end 
         
-    def product_list(operator_api_id)
-      price_list('operator', operator_api_id)       
-    end 
+    # Convenience method to get the product list for a given operator
+    # @operator_aid the airtime id of the operator    
+    def product_list(operator_aid) price_list('operator', operator_aid) end 
 
     # Operator Logo URL
-    def operator_logo_url(operator_id, size=1)
-      "#{T2Airtime::PROTOCOL}://#{T2Airtime::OPLOGO_DN}.#{T2Airtime::DOMAIN}/logo-#{operator_id}-#{size}.png"    
+    def operator_logo_url(operator_aid, size=1)
+      "#{T2Airtime::PROTOCOL}://#{T2Airtime::OPLOGO_DN}.#{T2Airtime::DOMAIN}/logo-#{operator_aid}-#{size}.png"    
     end     
 
     private
 
-    def oid=(operator_id)
-      @params[:operatorid] = operator_id.to_i if operator_id.is_a?(Integer)
+    def oid=(operator_aid)
+      operator_aid.is_a?(Integer) && @params[:operatorid] = Integer(operator_aid)
     end
 
     def to_time(time)

data/lib/t2_airtime/base.rb

@@ -16,9 +16,7 @@ module T2Airtime
     def run_action(name, method=:get)
       request = T2Airtime::Request.new(@user, @password, @url, name, @params)
       request.run(method).on_complete do |reply|
-        reply = T2Airtime::Reply.new(reply)
-        #raise ::T2Airtime::Error.new @reply.error_code, @reply.error_message unless @reply.success?
-        return reply.data
+        return T2Airtime::Reply.new(reply)
       end
     end
     

data/lib/t2_airtime/reply.rb

@@ -1,58 +1,39 @@
 module T2Airtime
   class Reply
     
-    def initialize(reply)
-      @response = reply.to_hash
-    end
+    def initialize(reply) @response = Hash(reply) end
 
     def data
       hash = {}
       @response[:body].lines.each do |line|
         key, value = line.strip.split "="
-        hash[key.to_sym] = (key == "error_code") ? value.to_i : value
+        hash[key.to_sym] = (key == "error_code") ? Integer(value) : value
       end; hash
     end
 
-    def status
-      @response[:status]
+    def information
+      data.reject do |key, value|
+        [:authentication_key, :error_code, :error_txt].include?(key)
+      end
     end
 
-    def error_code
-      data[:error_code]
-    end
+    def success?() status == 200 && error_code == 0 end
 
-    def error_message
-      data[:error_txt]
-    end
+    def status() @response[:status] end
 
-    def success?
-      status == 200 && error_code == 0
-    end
+    def error_code() data[:error_code] end
 
-    def url
-      @response[:url].to_s
-    end
+    def error_message() data[:error_txt] end
 
-    def information
-      data.reject do |key, value|
-        [:authentication_key, :error_code, :error_txt].include?(key)
-      end
-    end
+    def url() "#{@response[:url]}" end
 
-    def message
-      information[:info_txt]
-    end
+    def message() information[:info_txt] end
 
-    def auth_key
-      data[:authentication_key]
-    end
+    def auth_key() data[:authentication_key] end
 
-    def headers
-      @response[:response_headers]
-    end
+    def headers() @response[:response_headers] end
+
+    def raw() @response[:body] end
 
-    def raw
-      @response[:body]
-    end
   end
 end

data/lib/t2_airtime/rest.rb

@@ -3,12 +3,13 @@ module T2Airtime
   class Country
 
     def self.all
-        serialize_reply(T2Airtime::API.api.country_list)
+        reply = T2Airtime::API.api.country_list
+        reply.success? ? serialize_reply(reply.data) : []
     end
 
-    def self.serialize_reply(reply)
-        names = reply[:country].split(",") 
-        ids = reply[:countryid].split(",")
+    def self.serialize_reply(data)
+        names = data[:country].split(",") 
+        ids = data[:countryid].split(",")
         ids.each_with_index.map{|id, n| {
           name: names[n], 
           aid: Integer(id)
@@ -21,15 +22,20 @@ module T2Airtime
 
     def self.all
         countries = T2Airtime::Country.all
-        countries.flat_map{|country| serialize_reply(T2Airtime::API.api.operator_list(country[:aid]))}        
+        unless countries.empty?
+          countries.flat_map{|country| (
+            reply = T2Airtime::API.api.operator_list(country[:aid])
+            reply.success? ? serialize_reply(reply.data) : []
+          )}        
+        end
     end
 
-    def self.serialize_reply(reply)
-         names = reply[:operator].split(",") 
-         ids = reply[:operatorid].split(",")
+    def self.serialize_reply(data)
+         names = data[:operator].split(",") 
+         ids = data[:operatorid].split(",")
          ids.each_with_index.map{|id, n| {
-           country: reply[:country], 
-           country_aid: Integer(reply[:countryid]),
+           country: data[:country], 
+           country_aid: Integer(data[:countryid]),
            name: names[n], 
            aid: Integer(id)
          }}
@@ -41,19 +47,24 @@ module T2Airtime
 
     def self.all
         operators = T2Airtime::Operator.all
-        operators.flat_map{|operator| serialize_reply(T2Airtime::API.api.product_list(operator[:aid]))}        
+        unless operators.empty?
+          operators.flat_map{|operator| (
+            reply = T2Airtime::API.api.product_list(operator[:aid])
+            reply.success? ? serialize_reply(reply.data) : []
+          )}        
+        end         
     end
 
-    def self.serialize_reply(reply)
-         currency = reply[:destination_currency]
-         retail_prices = reply[:retail_price_list].split(",") 
-         wholesale_prices = reply[:wholesale_price_list].split(",")
-         ids = reply[:product_list].split(",")
+    def self.serialize_reply(data)
+         currency = data[:destination_currency]
+         retail_prices = data[:retail_price_list].split(",") 
+         wholesale_prices = data[:wholesale_price_list].split(",")
+         ids = data[:product_list].split(",")
          ids.each_with_index.map{|id, n| {
-           country: reply[:country], 
-           country_aid: Integer(reply[:countryid]),
-           operator: reply[:operator], 
-           operator_aid: Integer(reply[:operatorid]),           
+           country: data[:country], 
+           country_aid: Integer(data[:countryid]),
+           operator: data[:operator], 
+           operator_aid: Integer(data[:operatorid]),           
            name: "#{id}#{currency}", 
            currency: currency,
            retail_price: retail_prices[n],

data/lib/t2_airtime/version.rb

@@ -1,3 +1,3 @@
 module T2Airtime
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: t2_airtime
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - matteolc
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-26 00:00:00.000000000 Z
+date: 2017-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler