vodacom 0.0.1 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 616e8f37264023776722f3257b0a3f2f0fb81c44ac7be438e4b1696944e55bbf
-  data.tar.gz: 622956d5c44f8212bad1e9f8c9e082708373e9b45884701403c39bdfa4c754ff
+  metadata.gz: 1cfd7dcc069393e5c95d19df0ab261d5870e41bda195542a1d2ecdd7dbedf991
+  data.tar.gz: 573098b0e6667b444f13b32a51a85ebcfe2fc3a89a2542652ab96b73cf6fe524
 SHA512:
-  metadata.gz: 937f6afefe92045f0483fa7a678a8f53ae9033cf3a9da1e25991a6cab361ff619e5cb0224f0758a426889406926f52fd86f2107741db9c3624581096cafd17a8
-  data.tar.gz: 0a6bff1375032eb927764f2907e184ff9a3545d677c7628a219dde7957b0e0156b2ff59e474226f6e54a0073a4912f9966a01930bf4e3f5f153a026513e80bd5
+  metadata.gz: ea966658fbf09c3f0c4c5b6341a9c3b15891b721fc32add5343ce3ab7b1fd3000c72d2177618bf570ea48ed6bb47b555dffd95b44e4cee09c08700628dcab7f9
+  data.tar.gz: 9cb8fc7eedc9e336b7ae5087c695bf60b55ad5da015a5902bf4a65c7a448503b873d507d044b77ed1b92cca059bbee5d31d4500b1e9e94fdeed7f4008074042f

data/.ruby-version

@@ -1 +1 @@
-2.6.3
+ruby-3.1.2

data/Gemfile.lock

@@ -1,113 +1,111 @@
 PATH
   remote: .
   specs:
-    vodacom (0.0.1)
-      active_attr (~> 0.15)
-      httparty (~> 0.18)
-      nokogiri (~> 1.11.2)
+    vodacom (0.0.3)
+      active_attr (~> 0.15.4)
+      httparty (~> 0.20.0)
+      nokogiri (~> 1.13.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.1.3)
-      actionview (= 6.1.3)
-      activesupport (= 6.1.3)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.1)
+      actionview (= 7.0.1)
+      activesupport (= 7.0.1)
+      rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.1.3)
-      activesupport (= 6.1.3)
+    actionview (7.0.1)
+      activesupport (= 7.0.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    active_attr (0.15.2)
-      actionpack (>= 3.0.2, < 7.0)
-      activemodel (>= 3.0.2, < 7.0)
-      activesupport (>= 3.0.2, < 7.0)
-    activemodel (6.1.3)
-      activesupport (= 6.1.3)
-    activesupport (6.1.3)
+    active_attr (0.15.4)
+      actionpack (>= 3.0.2, < 7.1)
+      activemodel (>= 3.0.2, < 7.1)
+      activesupport (>= 3.0.2, < 7.1)
+    activemodel (7.0.1)
+      activesupport (= 7.0.1)
+    activesupport (7.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
     builder (3.2.4)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     crack (0.4.5)
       rexml
     crass (1.0.6)
     erubi (1.10.0)
     hashdiff (1.0.1)
-    httparty (0.18.1)
+    httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.8.9)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    loofah (2.9.0)
+    loofah (2.13.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
-    minitest (5.14.4)
-    minitest-focus (1.1.2)
+    mime-types-data (3.2022.0105)
+    minitest (5.15.0)
+    minitest-focus (1.3.1)
       minitest (>= 4, < 6)
-    minitest-reporters (1.4.3)
+    minitest-reporters (1.5.0)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    mocha (1.11.2)
+    mocha (1.13.0)
     multi_xml (0.6.0)
-    nokogiri (1.11.2-x86_64-linux)
+    nokogiri (1.13.1-x86_64-linux)
       racc (~> 1.4)
-    pry (0.14.0)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    rake (13.0.3)
-    rexml (3.2.4)
+    rake (13.0.6)
+    rexml (3.2.5)
     ruby-progressbar (1.11.0)
     timecop (0.9.4)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    webmock (3.8.3)
-      addressable (>= 2.3.6)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.4.2)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  bundler (~> 2.2.14)
-  minitest (~> 5.0)
-  minitest-focus (~> 1.1.2)
-  minitest-reporters (~> 1.4.2)
-  mocha (~> 1.11.2)
-  pry (~> 0.13)
-  rake (~> 13.0)
+  bundler (~> 2.3.5)
+  minitest (~> 5.15.0)
+  minitest-focus (~> 1.3.1)
+  minitest-reporters (~> 1.5.0)
+  mocha (~> 1.13.0)
+  pry (~> 0.14.1)
+  rake (~> 13.0.6)
   timecop (~> 0.9.1)
   vodacom!
-  webmock (~> 3.8.3)
+  webmock (~> 3.14.0)
 
 BUNDLED WITH
-   2.2.14
+   2.3.5

data/README.md

@@ -23,7 +23,10 @@ Or install it yourself as:
 
 ```ruby
   require 'vodacom'
-  client  = Vodacom::Client.new(key: 'your key', secret: 'your secret')
+  client  = Vodacom::Client.new(username: 'your key', password: 'your password from vodacom website')
+
+  phone_number = "27...."
+  client.balance(phone_number)
 ```
 
 ### Endpoints

data/lib/vodacom/client.rb

@@ -10,17 +10,8 @@ module Vodacom
       :base_path,
       :port,
       :login_response,
-      # :gateway_session,
-      # :gateway_session_expiry,
-      # :vopToken,
-      # :vopToken_expiry,
-      # :vod_web_auth_token,
-      # :vod_web_auth_token_expiry,
-      # :jsessionid,
-      # :jsessionid_expiry,
-      # :oauth2_apps_token_db,
-      # :oauth2_apps_token_db_expiry,
-      :raw_cookie
+      :raw_cookie,
+      :expiry
 
     def initialize(username:, password:, base_path: 'https://www.vodacom.co.za/cloud', port: 80)
       @username = username
@@ -41,7 +32,7 @@ module Vodacom
     def balance(phone_number)
       start_time = get_micro_second_time
 
-      login unless raw_cookie
+      login unless (raw_cookie && (expiry.to_i > Time.now.to_i))
       response = HTTParty.send(
         :get,
         "#{BALANCE_PATH}#{phone_number}",
@@ -80,11 +71,7 @@ module Vodacom
       @login_response = construct_response_object(response, LOGIN_PATH, start_time, end_time)
 
       @raw_cookie = @login_response.dig("headers").dig("set-cookie")
-      # @gateway_session, _ = parse_cookie(raw_cookie, 'gatewaysession')
-      # @vopToken, @vopToken_expiry = parse_cookie(raw_cookie, 'vopToken')
-      # @vod_web_auth_token, @vod_web_auth_token_expiry = parse_cookie(raw_cookie, 'vod-web-auth-token')
-      # @jsessionid, @jsessionid_expiry = parse_cookie(raw_cookie, 'JSESSIONID')
-      # @oauth2_apps_token_db, @oauth2_apps_token_db_expiry = parse_cookie(raw_cookie, 'OAuth2AppsTokenDB')
+      _, @expiry = parse_cookie(raw_cookie, 'OAuth2AppsTokenDB')
     end
 
     # def authorise_and_send(http_method:, path:, payload: {}, params: {})

data/lib/vodacom/version.rb

@@ -1,3 +1,3 @@
 module Vodacom
-  VERSION = "0.0.1"
+  VERSION = "0.0.4"
 end

data/vodacom.gemspec

@@ -22,19 +22,19 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "httparty", "~> 0.18"
+  spec.add_dependency "httparty", "~> 0.20.0"
   # spec.add_dependency "httparty_with_cookies", "~> 0.2.2"
-  spec.add_dependency "active_attr", "~> 0.15"
-  spec.add_dependency "nokogiri", "~> 1.11.2"
+  spec.add_dependency "active_attr", "~> 0.15.4"
+  spec.add_dependency "nokogiri", "~> 1.13.1"
 
   # Development dependancies
-  spec.add_development_dependency "bundler", "~> 2.2.14"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "minitest-focus", "~> 1.1.2"
-  spec.add_development_dependency "minitest-reporters", "~> 1.4.2"
+  spec.add_development_dependency "bundler", "~> 2.3.5"
+  spec.add_development_dependency "rake", "~> 13.0.6"
+  spec.add_development_dependency "minitest", "~> 5.15.0"
+  spec.add_development_dependency "minitest-focus", "~> 1.3.1"
+  spec.add_development_dependency "minitest-reporters", "~> 1.5.0"
   spec.add_development_dependency "timecop", "~> 0.9.1"
-  spec.add_development_dependency "mocha", "~> 1.11.2"
-  spec.add_development_dependency "pry", "~> 0.13"
-  spec.add_development_dependency "webmock", "~> 3.8.3"
+  spec.add_development_dependency "mocha", "~> 1.13.0"
+  spec.add_development_dependency "pry", "~> 0.14.1"
+  spec.add_development_dependency "webmock", "~> 3.14.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vodacom
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.4
 platform: ruby
 authors:
 - trex22
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-13 00:00:00.000000000 Z
+date: 2022-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -16,112 +16,112 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: active_attr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 0.15.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 0.15.4
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.13.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.14
+        version: 2.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.14
+        version: 2.3.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.15.0
 - !ruby/object:Gem::Dependency
   name: minitest-focus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -142,42 +142,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: 0.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.3
+        version: 3.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.3
+        version: 3.14.0
 description: A client for using the Vodacom API in Ruby. This is an unofficial project.
 email:
 - contact@jasonchalom.com
@@ -204,7 +204,7 @@ homepage: https://github.com/TRex22/vodacom-client
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -219,8 +219,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.3.4
+signing_key:
 specification_version: 4
 summary: A client for using the Vodacom API in Ruby.
 test_files: []