xpanse_2go 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2bb3ad624fd1ac78537bd27941ffbc833f548c6cc866886bbe0af779557bbb1
-  data.tar.gz: b6fad2e2148e7e4f6b841ccc25ded1fc6396d9c8564e291c61ad0716b71a688d
+  metadata.gz: 9680387a41f27d192eea6f37a7f9495cd6de9385a126cb72f0b47f5ec3075512
+  data.tar.gz: 9930b491654c0499ddceb9f9cd8b6d03c02bc84f329d2278e96c1962e86647b5
 SHA512:
-  metadata.gz: 837a6c97a2d16104c3dd81a8d5abda98d25bad4d942e4a08669c6cae2d49ab566ce8b0610d5619792dcb5f716d8ec20cac20b101f03f49a70708a3c95950c692
-  data.tar.gz: 0cf3e33b930a1b30298e0e3205c84eb79704de055b6d9ffa6f9bf0e9455fce4a0fa6a709365ac20ce4f20f081e1ea716e7898a4e51e21c37e18c0bc20283721e
+  metadata.gz: 521ad42898b33ab747c2b2f073aae7e0fd9d3132646ca61fafb26c03c6defd8853b5cf7763c09ee6b8cbb1921683266efbad1c3d3fb1a9cdc636ade2f1eb5d7b
+  data.tar.gz: e28d10494172d051a1e38553e52f41c4f989068fc1b8b853cea68f00768c0a6400f5fe180baa3491a82b2d680da88704ad687c54e6a3f72260aa7bd8063aa50c

data/.vscode/settings.json

@@ -2,6 +2,5 @@
     "editor.fontFamily": "'Roboto Mono for Powerline', Menlo, Monaco, 'Courier New', monospace",
     "editor.fontLigatures": true,
     "workbench.fontAliasing": "auto",
-    "editor.fontSize": 9,
     "editor.tabSize": 2
 }

data/Gemfile.lock

@@ -1,78 +1,74 @@
 PATH
   remote: .
   specs:
-    xpanse_2go (0.1.0)
-      activemodel (~> 5.1)
+    xpanse_2go (0.1.2)
+      activemodel (~> 6.0)
       fast_jsonapi (~> 1.3)
       typhoeus (~> 1.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.2)
-      activesupport (= 5.2.2)
-    activesupport (5.2.2)
+    activemodel (6.0.0)
+      activesupport (= 6.0.0)
+    activesupport (6.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.1, >= 2.1.8)
     ast (2.4.0)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
     diff-lcs (1.3)
-    dotenv (2.7.1)
+    dotenv (2.7.5)
     ethon (0.12.0)
       ffi (>= 1.3.0)
     factory_bot (4.11.1)
       activesupport (>= 3.0.0)
-    faker (1.9.3)
+    faker (1.9.6)
       i18n (>= 0.7)
     fast_jsonapi (1.5)
       activesupport (>= 4.2)
-    ffi (1.10.0)
-    i18n (1.5.3)
+    ffi (1.11.1)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.2)
-    minitest (5.11.3)
-    parallel (1.14.0)
-    parser (2.6.0.0)
+    jaro_winkler (1.5.3)
+    minitest (5.12.2)
+    parallel (1.18.0)
+    parser (2.6.5.0)
       ast (~> 2.4.0)
-    powerpack (0.1.2)
-    psych (3.1.0)
     rainbow (3.0.0)
     rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.65.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
+    rubocop (0.75.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
-      psych (>= 3.1.0)
+      parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
-    rubocop-rspec (1.32.0)
-      rubocop (>= 0.60.0)
-    ruby-progressbar (1.10.0)
-    shoulda-matchers (4.0.1)
-      activesupport (>= 4.2.0)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    rubocop-rspec (1.36.0)
+      rubocop (>= 0.68.1)
+    ruby-progressbar (1.10.1)
     thread_safe (0.3.6)
     typhoeus (1.3.1)
       ethon (>= 0.9.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.4.1)
+    unicode-display_width (1.6.0)
+    zeitwerk (2.2.0)
 
 PLATFORMS
   ruby
@@ -80,13 +76,12 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.0)
   dotenv (~> 2.5)
-  factory_bot (~> 4.8)
+  factory_bot (~> 4.11)
   faker (~> 1.9)
   rake (~> 10.0)
   rspec (~> 3.0)
   rubocop-rspec (~> 1.32)
-  shoulda-matchers (~> 4.0)
   xpanse_2go!
 
 BUNDLED WITH
-   2.0.1
+   2.0.2

data/README.md

@@ -48,8 +48,8 @@ Or install it yourself as:
 [x] Xpanse2go::PackageItem
 [x] Add Typhoeus sample
 [] Add Typhoeus and connect to the Sandbox
-[] xport.it
-    [] Receive webhook updates
-[] Create xport.it microservice
-    [] Generating AWB indexes
-    [] Fetching an available AWB
+[x] xport.it
+    [x] Receive webhook updates
+[x] Create xport.it microservice
+    [x] Generating AWB indexes
+    [x] Fetching an available AWB

data/lib/xpanse_2go.rb

@@ -2,6 +2,7 @@ module Xpanse2go
   autoload :Configuration, 'xpanse_2go/configuration'
 
   autoload :Order,        'xpanse_2go/order'
+  autoload :Orders,       'xpanse_2go/orders'
   autoload :Address,      'xpanse_2go/address'
   autoload :Package,      'xpanse_2go/package'
   autoload :PackageItem,  'xpanse_2go/package_item'
@@ -16,9 +17,9 @@ module Xpanse2go
 
   def self.url
     if Xpanse2go.configuration.production
-      'https://expressapps.2go.com.ph/2goweb'
+      'https://expressapps.2go.com.ph/2goweb/model/api'
     else
-      'https://expressapps.2go.com.ph/2gowebdev'
+      'https://expressapps.2go.com.ph/2gowebdev/model/api'
     end
   end
 end

data/lib/xpanse_2go/configuration.rb

@@ -1,12 +1,13 @@
 module Xpanse2go
   class Configuration
-    attr_accessor :account_id, :account_number, :token, :production
+    attr_accessor :account_id, :account_number, :account_number_cod, :token, :production
 
     def initialize
-      @account_id     = 'XPANSE'
-      @token          = 'bVHQGxZLML'
-      @account_number = '1'
-      @production     = false
+      @account_id         = 'XPANSE'
+      @token              = 'bVHQGxZLML'
+      @account_number     = '1'
+      @account_number_cod = '1'
+      @production         = false
     end
   end
 end

data/lib/xpanse_2go/orders.rb

@@ -0,0 +1,90 @@
+require 'json'
+require 'typhoeus'
+
+module Xpanse2go
+  class Orders
+    def self.sample_order
+      delivery_address = Xpanse2go::Address.new(
+        customer_name: 'Rick Sanchez',
+        line1: '23F Giza Bldg., Egypt St.',
+        barangay: 'Better Living',
+        city: 'Paranaque City',
+        country: 'Philippines',
+        zip_code: '1600',
+        mobile_number: '09281234567',
+        email_address: 'ricksanchez@gmail.com')
+      
+      pickup_address = Xpanse2go::Address.new(
+        customer_name: 'Juan dela Cruz', 
+        line1: 'L10 B20 Putatan Village', 
+        barangay: 'Putatan', 
+        city: 'Muntinlupa City', 
+        country: 'Philippines', 
+        zip_code: '1958', 
+        mobile_number: '09281234567', 
+        email_address: 'juan_delacruz@yahoo.com.ph')
+
+      item = Xpanse2go::PackageItem.new(
+        quantity: 1, 
+        package_code: 'BOX', 
+        weight: 5, 
+        length: 5, 
+        width: 5, 
+        height: 5, 
+        declared_value: 1000, 
+        description: 'Cellular phone unit')
+      package = Xpanse2go::Package.new.add_item(item)
+
+      order = Xpanse2go::Order.new(delivery_address, pickup_address, package,
+                                  reference_number: '123', awb: '123')
+    end
+
+    def self.request_awb(reference_number)
+      headers     = { 'Content-Type': 'application/json' }
+      req_url     = 'https://xport.it/2go/request_awb'
+      req_options = { headers: headers, body: { 'reference_number': reference_number }.to_json }
+    
+      res = Typhoeus::Request.post(req_url, req_options).body
+      JSON.parse(res, symbolize_names: true)
+    end
+    
+    def self.create_order(delivery_address, pickup_address, package, reference_number, awb)
+      raise 'Not a valid order object' unless order.is_a?(Xpanse2go::Order)
+
+      order = Xpanse2go::Order.new(
+        delivery_address: delivery_address,
+        pickup_address: pickup_address,
+        package: package,
+        reference_number: reference_number,
+        awb: awb)
+      
+      raise 'Order invalid' unless order.valid?
+    
+      headers     = { 'Content-Type': 'application/json' }
+      req_url     = "#{Xpanse2go.url}/shipment_request.asmx/Create"
+      req_options = { headers: headers, body: order.to_json }
+    
+      res = Typhoeus::Request.post(req_url, req_options).body
+      JSON.parse(res, symbolize_names: true)
+    end
+
+    def self.track_order(awb_numbers)
+      awb_numbers = [awb_numbers] if awb_numbers.is_a?(String)
+
+      awb_request = {
+        'd': {
+          "id_": Xpanse2go.configuration.account_id,
+          "token_": Xpanse2go.configuration.token,
+          "tracking_no": awb_numbers
+        }
+      }
+
+      headers     = { 'Content-Type': 'application/json' }
+      req_url     = "#{Xpanse2go.url}/shipment_update.asmx/track"
+      req_options = { headers: headers, body: awb_request.to_json }
+
+      res = Typhoeus::Request.post(req_url, req_options).body
+      JSON.parse(res, symbolize_names: true)
+    end
+  end
+end

data/lib/xpanse_2go/version.rb

@@ -1,3 +1,3 @@
 module Xpanse2go
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.2'.freeze
 end

data/xpanse_2go.gemspec

@@ -22,13 +22,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activemodel',  '~> 5.1'
+  spec.add_dependency 'activemodel',  '~> 6.0'
   spec.add_dependency 'fast_jsonapi', '~> 1.3'
   spec.add_dependency 'typhoeus',     '~> 1.3'
 
   spec.add_development_dependency 'bundler',          '~> 2.0'
   spec.add_development_dependency 'dotenv',           '~> 2.5'
-  spec.add_development_dependency 'factory_bot',      '~> 4.8'
+  spec.add_development_dependency 'factory_bot',      '~> 4.11'
   spec.add_development_dependency 'faker',            '~> 1.9'
   spec.add_development_dependency 'rake',             '~> 10.0'
   spec.add_development_dependency 'rspec',            '~> 3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xpanse_2go
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - David Marquez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-21 00:00:00.000000000 Z
+date: 2019-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: fast_jsonapi
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '4.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '4.11'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -170,13 +170,21 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- docs/2GO Group Express APIs.pdf
+- docs/2GO_Xpanse_LocationMatrix_10april2019.xlsx
+- docs/Shipment Request API.pdf
+- docs/Shipment Update API v2.doc.pdf
+- docs/Shipment Update WebHook.pdf
 - lib/xpanse_2go.rb
 - lib/xpanse_2go/address.rb
 - lib/xpanse_2go/configuration.rb
 - lib/xpanse_2go/order.rb
+- lib/xpanse_2go/orders.rb
 - lib/xpanse_2go/package.rb
 - lib/xpanse_2go/package_item.rb
 - lib/xpanse_2go/version.rb
+- xpanse_2go-0.1.0.gem
+- xpanse_2go-0.1.1.gem
 - xpanse_2go.gemspec
 homepage: https://rubygems.org/gems/xpanse_2go
 licenses: []
@@ -196,8 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: 2GO Ruby API