cyberbiz_express 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff1ad3ce920e07604d23e60c0cdfcb7e13deb3ebeb02fb8de56ccd09183659a0
-  data.tar.gz: 547d99cded94c62fb1b6bdeb736af8c49186c4203d5c89d520d91b427c54626d
+  metadata.gz: 20f7923a1d278a9439feb803ee7fa82c3c41d0279f44e326863b45c94788c54f
+  data.tar.gz: d0bae4941bb781aab25b139e50e74462fcd06e6f012ef36980fba9b8bca25969
 SHA512:
-  metadata.gz: ecdcc6ad805f4eaf1abe2d91c0ec1b813a430b3800e2aaa69cbe3107c04eab64d10c5ad9b6f5c9b169f996b1a6ac1fece73abfa777b2420e887ae3f07d0d1190
-  data.tar.gz: 29467a81ed6028be3853666c65ddaeb55804ff25988345a23fc1b0b068882f5e587c8838afc8c458cca8bbd9af2b15d788c001c843d0317e6fce38ad64f1c6cc
+  metadata.gz: 41bb51bf680c75448efc850bebc3c6c91c3439593b3decc29f83df1077fa259d0a2e60c023238a991882798d1cbcca74836e79ae76f813bdf53dd35ea4fb017a
+  data.tar.gz: 4b864b996a121c6563a53978ba527e66dc4b3e78e3afa2864e093088a4d72fca381eb0eb87aace3346cc28637ad17e706280f9f66aab3094828e0a6493ef05c0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cyberbiz_express (0.1.8)
+    cyberbiz_express (0.1.10)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -39,6 +39,11 @@ CyberbizExpress::NinjaVan.configure do |config|ÂÂÂÂ
 end
 ```
 
+### access_token
+```ruby
+CyberbizExpress::NinjaVan::Api.new('ninja_van').access_token
+```
+
 ### submit_order
 
 ```ruby
@@ -84,17 +89,17 @@ options = {
   pickup_instructions: 'If recipient is not around, leave parcel in power riser.',
   delivery_instructions: 'Hello Ninja Van!',
 }
-CyberbizExpress::NinjaVan::Api.new('ninja_van').submit_order(order, shipping_address, shop, options)
+CyberbizExpress::NinjaVan::Api.new('ninja_van', access_token: access_token).submit_order(order, shipping_address, shop, options)
 ```
 
 ### update_order
 
 ```ruby
-CyberbizExpress::NinjaVan::Api.new('ninja_van').update_order('CYB14530O1103', {})
+CyberbizExpress::NinjaVan::Api.new('ninja_van', access_token: access_token).update_order('CYB14530O1103', {})
 ```
 
 ### cancel_order
 
 ```ruby
-CyberbizExpress::NinjaVan::Api.new('ninja_van').cancel_order('FF0194810413', {}, {}, {})
+CyberbizExpress::NinjaVan::Api.new('ninja_van', access_token: access_token).cancel_order('FF0194810413', {}, {}, {})
 ```

data/lib/cyberbiz_express/express_base.rb

@@ -2,6 +2,10 @@
 
 module CyberbizExpress
   module ExpressBase
+    def access_token
+      raise(NoMethodError, "There is no access_token API for #{@tracking_company}")
+    end
+
     def estimate_fee(_order)
       raise(NoMethodError, "There is no estimate_fee API for #{@tracking_company}")
     end

data/lib/cyberbiz_express/ninja_van/api.rb

@@ -10,10 +10,15 @@ module CyberbizExpress
     class Api
       include ::CyberbizExpress::ExpressBase
 
-      def initialize(tracking_company, logger: nil)
+      def initialize(tracking_company, access_token: nil, logger: nil)
         @logger = logger || Logger.new($stdout)
         @tracking_company = tracking_company
-        @access_token = nil
+        @access_token = access_token
+      end
+
+      def access_token
+        @access_token ||= fetch_access_token
+        handle_response(true, { access_token: @access_token })
       end
 
       def submit_order(order, shipping_address, shop, options)
@@ -38,7 +43,8 @@ module CyberbizExpress
         response = https.request(request)
         record_result('submit_order', request, response)
 
-        handle_response(true, response.body)
+        json = JSON.parse(response.body)
+        handle_response(!json['requested_tracking_number'].nil?, json)
       end
 
       def update_order(order_number, _shipping_address)
@@ -53,8 +59,7 @@ module CyberbizExpress
         response = https.request(request)
         record_result('update_order', request, response)
 
-        json = JSON.parse(response.body)
-        handle_response(!json['requested_tracking_number'].nil?, json)
+        response.body
       end
 
       def cancel_order(tracking_number, _order_number, _shop_info, _reason)

data/lib/cyberbiz_express/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CyberbizExpress
-  VERSION = '0.1.8'
+  VERSION = '0.1.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cyberbiz_express
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - Roelly
@@ -33,6 +33,8 @@ files:
 - cyberbiz_express-0.1.5.gem
 - cyberbiz_express-0.1.6.gem
 - cyberbiz_express-0.1.7.gem
+- cyberbiz_express-0.1.8.gem
+- cyberbiz_express-0.1.9.gem
 - cyberbiz_express.gemspec
 - lib/cyberbiz_express/express_base.rb
 - lib/cyberbiz_express/ninja_van/api.rb