t2_airtime 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc3d42284a0dc27d0322214bcde7d80ccb02e20d
-  data.tar.gz: a15023d4e9449635920baa19c4a4405d9984483b
+  metadata.gz: cf789e78f7d18fcb79de60b5966cd044402ed179
+  data.tar.gz: b016dec47ef1358e355c4a206e279087cdf7152b
 SHA512:
-  metadata.gz: 1c78fbe2336823e689ef5492e9db4babbb550639957692ff5a38fa751a3fd924441bf20031b493fea81baea6ea8bad1df371a0de6279efda29c7076f3f13b885
-  data.tar.gz: 7148dfa87929738484e798dcca447ccd0c8f68dca894226dc7d2aaa84714060c139c330499ed24992e3c2cde3c169703ca81474ad44db2f2eff5574b88392e4f
+  metadata.gz: c8b121f72cf0e91d277b95c14b884b08054d1c5c0f25833aa6277c928637dde4a4ee35d49dc363145ece16dc2b0462d5b92051c5e60812b46d28387319c1c13e
+  data.tar.gz: 7ad7d4d131a4c70aa0b081cf6e9cfe345e514fee312b9939504330a8c1e20135cf4f3fbfed03389fd176df25be16cf3b2774164a387c41f2989c3044f7d93a34

data/lib/t2_airtime/serializer.rb

@@ -12,13 +12,11 @@ module T2Airtime
         type: "accounts",
         id: T2Airtime::API.api.user,
         attributes: {
-          type: data[:type],
-          name: data[:name],
-          currency: data[:currency],
-          balance: Float(data[:balance]),
-          wallet: Float(data[:wallet]),
-          "balance-display": T2Airtime::Util.format_price(data[:balance], data[:currency]),          
-          "wallet-display": T2Airtime::Util.format_price(data[:wallet], data[:currency]),
+          "type": data[:type],
+          "name": data[:name],
+          "currency": data[:currency],
+          "balance": Float(data[:balance]),          
+          "wallet": Float(data[:wallet]),
           "fetched-at": T2Airtime::Util.format_time(ts)
         }
       }.as_json
@@ -154,23 +152,19 @@ module T2Airtime
     end
 
     def self.serialize(data, ts="#{Time.zone.now}", qty=nil)
-         return [] if data[:product_list].nil?
-         currency = data[:destination_currency]
-         retail_prices = data[:retail_price_list].split(",") 
-         wholesale_prices = data[:wholesale_price_list].split(",")
+         return [] if data[:product_list].nil?          
          ids = data[:product_list].split(",")
+         retail_prices = data[:retail_price_list].split(",") 
+         wholesale_prices = data[:wholesale_price_list].split(",")         
          ids.take(qty.nil? ? ids.count : qty).each_with_index.map{|id, n| {
            type: "products",
            id: Integer(id), 
            attributes: {
-            "name": "#{id}#{currency}", 
-            "currency": currency,
+            "name": "#{id}#{data[:destination_currency]}", 
+            "currency": data[:destination_currency],
             "local-price": Float(id),
             "retail-price": Float(retail_prices[n]),
             "wholesale-price": Float(wholesale_prices[n]),           
-            "local-price-display": T2Airtime::Util.format_price(id, currency),
-            "retail-price-display": T2Airtime::Util.format_price(retail_prices[n]),
-            "wholesale-price-display": T2Airtime::Util.format_price(wholesale_prices[n]),
             "fetched-at": T2Airtime::Util.format_time(ts)
            },
             relationships: {
@@ -242,9 +236,7 @@ module T2Airtime
           "transaction-error-code": Integer(data[:transaction_error_code]),
           "transaction-error-txt": data[:transaction_error_txt],
           "reference-operator": data[:reference_operator],
-          "product-requested-display": T2Airtime::Util.format_price(data[:product_requested], data[:destination_currency]),
           "actual-product-sent": data[:actual_product_sent],
-          "actual-product-sent-display": T2Airtime::Util.format_price(data[:actual_product_sent], data[:destination_currency]),          
           "sms": data[:sms],
           "cid1": data[:cid1],
           "cid2": data[:cid2],
@@ -254,8 +246,8 @@ module T2Airtime
           "destination-currency": data[:destination_currency],
           "pin-based": data[:pin_based],
           "local-info-amount": data[:local_info_amount],
-          "local-info-amount-display": T2Airtime::Util.format_price(data[:local_info_amount], data[:local_info_currency]),
           "local-info-currency": data[:local_info_currency],
+          "local-info-value": data[:local_info_value],
           "error-code": data[:error_code],
           "error-txt": data[:error_txt],
           "fetched-at": T2Airtime::Util.format_time(ts)
@@ -306,11 +298,8 @@ module T2Airtime
                 "name": "#{data[:product_requested]}#{data[:destination_currency]}",
                 "currency": data[:destination_currency],
                 "wholesale-price": data[:wholesale_price],
-                "wholesale-price-display": T2Airtime::Util.format_price(data[:wholesale_price], data[:originating_currency]),
                 "retail-price": data[:retail_price],
-                "retail-price-display": T2Airtime::Util.format_price(data[:retail_price], data[:originating_currency]),
-                "local-price": data[:local_info_value],
-                "local-price-display": T2Airtime::Util.format_price(data[:local_info_value], data[:local_info_currency])
+                "local-price": Float(data[:product_requested])
               }              
           }
         ]

data/lib/t2_airtime/util.rb

@@ -17,10 +17,6 @@ module T2Airtime
       num > 0 && num < 8 ? numbers[num-1] : numbers
     end 
 
-    def self.format_price(price, currency=(ENV['T2_CURRENCY'] || "USD"))
-      Money.new(Float(price)*100, currency).format
-    end  
-
     def self.format_time(timestr)
       Time.zone.parse(timestr).to_datetime.in_time_zone('UTC').iso8601
     end

data/lib/t2_airtime/version.rb

@@ -1,3 +1,3 @@
 module T2Airtime
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/release

@@ -2,6 +2,6 @@
 set -e
 
 git add .
-git commit -am "Bump to v${0}"
+git commit -am "Bump to v${1}"
 git push origin master
 gem release

data/t2_airtime.gemspec

@@ -29,6 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'dotenv-rails', '~> 2.2', '>= 2.2.1'  
   spec.add_dependency "faraday", "0.9.1"
   spec.add_dependency "countries", "2.1.2"
-  spec.add_dependency "money", "6.9.0"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: t2_airtime
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - matteolc
@@ -114,20 +114,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.1.2
-- !ruby/object:Gem::Dependency
-  name: money
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 6.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 6.9.0
 description: Wrapper methods to interface with [TransferTo](https://www.transfer-to.com/home)
   Airtime API
 email: