vncpost_api 0.2.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f818eb7aa98bf14e740e787f2b4a3fa01a02d3fb9d21db37a8335f0b41403fa
-  data.tar.gz: 97817de460715644959343f4311a5d7878bde714cad6c172343bec96122124d4
+  metadata.gz: 9bbe9fcf75e261d11678cbdc15b9b81437585aa9523759e81619b71f2df3c22a
+  data.tar.gz: 28589dfa40030fe7c0b2e66d1d207c1547636dfae57f0592dc451088c12a7ab3
 SHA512:
-  metadata.gz: 79b9f520a1154bcc81119a1aa8a7bf10d5fcab9985a2704c9507365316e6ba7b73d9e765c198f6d29a5370a6ef206335761cc2e556ecc0a793d3d8514a0d5a29
-  data.tar.gz: 4cfa77b46bbbaf778f7e133d86aa26ab6548022450809dd7c20b2c34a97687ff8898e95c5645ab1aeaa40f57386af991768c731dd1f9d84a1fb4fbe7025a0c31
+  metadata.gz: 5760460c1448296ffd68417b87d8d2bd451654f0c54597ef4d98cb73f7c68a78ef7cea5c967be3419e4fb86ea024a044a46ced38f8f792d2286e8685c7285423
+  data.tar.gz: 5badd01e5a8dfff3a6b6fef626cbff5f15a4485076e2fac8455b2f5d16ec3687d8b4e2b763cbb969063cf462abc10a2c7dd34f1090a97eb1406dd67a7a15f6d7

data/.github/workflows/rspec.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ["2.5", "2.6", "2.7"]
+        ruby: ["2.7", "3.0", "3.1"]
       fail-fast: true
     steps:
       - name: Checkout to repo

data/.gitignore

@@ -10,4 +10,5 @@
 # rspec failure tracking
 .rspec_status
 .env
-.pryrc
+.pryrc
+.tool-versions

data/Gemfile.lock

@@ -1,62 +1,62 @@
 PATH
   remote: .
   specs:
-    vncpost_api (0.2.0)
-      activeresource
+    vncpost_api (0.3.1)
+      activeresource (>= 4.1.0)
+      jwt
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.3)
-      activesupport (= 6.0.3)
+    activemodel (7.0.2.4)
+      activesupport (= 7.0.2.4)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activeresource (5.1.1)
-      activemodel (>= 5.0, < 7)
+    activeresource (6.0.0)
+      activemodel (>= 6.0)
       activemodel-serializers-xml (~> 1.0)
-      activesupport (>= 5.0, < 7)
-    activesupport (6.0.3)
+      activesupport (>= 6.0)
+    activesupport (7.0.2.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
     builder (3.2.4)
-    byebug (11.1.1)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.6)
-    diff-lcs (1.3)
-    dotenv (2.7.5)
-    i18n (1.8.2)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    dotenv (2.7.6)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
+    jwt (2.3.0)
     method_source (1.0.0)
-    minitest (5.14.1)
-    pry (0.13.1)
+    minitest (5.15.0)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
+    pry-byebug (3.8.0)
       byebug (~> 11.0)
-      pry (~> 0.13.0)
+      pry (~> 0.10)
     rake (12.3.3)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    zeitwerk (2.3.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
@@ -68,6 +68,7 @@ DEPENDENCIES
   rake (~> 12.0)
   rspec (~> 3.0)
   vncpost_api!
+  zeitwerk
 
 BUNDLED WITH
-   2.1.4
+   2.2.33

data/lib/dev/config.rb

@@ -1,6 +1,6 @@
 def set_config
   VNCPostAPI.configure do |config|
-    config.testing = true 
+    config.testing = true
     config.username = ENV["VNCPOST_USERNAME"]
     config.password = ENV["VNCPOST_PASSWORD"]
   end

data/lib/dev/zeitwerk_loader.rb

@@ -9,6 +9,7 @@ loader.push_dir("./lib")
 loader.collapse("./lib/vncpost_api/resources")
 loader.ignore("#{__dir__}/config.rb")
 loader.ignore("./lib/vncpost_api/exceptions.rb")
+loader.ignore("./lib/vncpost_api/cache.rb")
 loader.enable_reloading
 # loader.log!
 loader.setup

data/lib/vncpost_api/cache.rb

@@ -0,0 +1,5 @@
+module VNCPostAPI
+  mattr_accessor :cache
+
+  self.cache = ActiveSupport::Cache::MemoryStore.new
+end

data/lib/vncpost_api/configuration.rb

@@ -4,23 +4,35 @@ module VNCPostAPI
     alias_method :testing?, :testing
   end
 
-  def self.config
-    @config ||= Configuration.new
-  end
+  class << self
+    def config
+      @config ||= Configuration.new
+    end
 
-  def self.config=(config)
-    @config = config
-  end
+    def configure
+      yield config
+
+      after_configure
+    end
+
+    private
+
+    def after_configure
+      if config.testing?
+        test_site = "http://sgp-seaedi-test.800best.com"
+        VNCPostAPI::Base.site = test_site
+        VNCPostAPI::UserLogin.site = test_site
+      else
+        production_site = "http://sgp-seaedi.800best.com"
+        VNCPostAPI::Base.site = production_site
+        VNCPostAPI::UserLogin.site = production_site
+      end
+      # Tracking is only available on production
+      VNCPostAPI::Tracking.site = "http://pt.vncpost.com"
+
+      return unless defined?(Rails) && Rails.respond_to?(:cache) && Rails.cache.is_a?(ActiveSupport::Cache::Store)
 
-  def self.configure
-    yield config
-    # set the site once user configure
-    if config.testing?
-      VNCPostAPI::Base.site = "http://api.v3.vncpost.com"
-      VNCPostAPI::Tracking.site ="https://pt.v.vncpost.com"
-    else
-      VNCPostAPI::Base.site = "http://u.api.vncpost.com"
-      VNCPostAPI::Tracking.site = "https://pt.vncpost.com"
+      VNCPostAPI.cache = Rails.cache
     end
   end
 end

data/lib/vncpost_api/connection.rb

@@ -4,13 +4,14 @@ module VNCPostAPI
       body = JSON.parse(response.body)
       if body["Message"]
         message = "Failed.".dup
-        message << " Error message: #{body["Message"]}"
+        message << " Message: #{body["Message"]}"
         message
       else
         super
       end
     end
   end
+
   class Connection < ActiveResource::Connection
     private
 

data/lib/vncpost_api/resources/base.rb

@@ -3,9 +3,10 @@ module VNCPostAPI
     self.include_root_in_json = false
     self.include_format_in_path = false
     self.connection_class = VNCPostAPI::Connection
+    self.auth_type = :bearer
 
     def create
-      self.class.retrieve_token
+      connection.bearer_token = UserLogin.get_bearer_token
       format_before_send_request
       super
     rescue => e
@@ -23,26 +24,6 @@ module VNCPostAPI
 
     private
 
-    def self.retrieve_token
-      clear_auth_token
-
-      if VNCPostAPI.config&.username && VNCPostAPI.config&.password
-        response = connection.post("#{Base.site}/User/Login", {
-          Username: VNCPostAPI.config.username,
-          Password: VNCPostAPI.config.password
-        }.to_json)
-        connection.auth_type = :bearer
-        connection.bearer_token = JSON.parse(response.body)["token"]
-      else
-        raise ArgumentError, "Please set the username and password in the config file under the initializer dir"
-      end
-    end
-
-    def self.clear_auth_token
-      connection.auth_type = nil
-      connection.bearer_token = nil
-    end
-
     def format_before_send_request
       @attributes.deep_transform_keys!(&:camelcase)
     end
@@ -55,6 +36,5 @@ module VNCPostAPI
       super
       reset_attributes_format
     end
-
   end
 end

data/lib/vncpost_api/resources/order.rb

@@ -44,7 +44,7 @@ module VNCPostAPI
       return_phone_number: nil
     }
 
-    self.prefix = "/Order/Add"
+    self.prefix = "/VietNamV3/v3/api/process/sears/Order/Add"
     self.element_name = ""
 
     def initialize(attributes = {}, persisted = false)

data/lib/vncpost_api/resources/tracking.rb

@@ -1,17 +1,17 @@
 module VNCPostAPI
+  # Tracking is only available on production
   class Tracking < Base
     self.prefix = "/Track/Order"
     self.element_name = ""
+    self.connection_class = VNCPostAPI::Connection
 
     def self.find(code)
       body = {
         Code: code
       }
-
-      self.retrieve_token
-      
+      connection.bearer_token = UserLogin.get_bearer_token(username: "V9Cus327141793", password: "8DBNvF9Y56nnjNTU")
       response = connection.post(collection_path, body.to_json)
       new(self.format.decode(response.body).deep_transform_keys!(&:underscore))
     end
   end
-end
+end

data/lib/vncpost_api/resources/user_login.rb

@@ -0,0 +1,33 @@
+require "jwt"
+
+module VNCPostAPI
+  class UserLogin < ::ActiveResource::Base
+    self.include_root_in_json = false
+    self.include_format_in_path = false
+    self.prefix = "/VietNamV3/v3/api/process/sears/User/Login"
+    self.element_name = ""
+
+    class << self
+      def get_bearer_token(username: VNCPostAPI.config.username, password: VNCPostAPI.config.password)
+        cache_key = "VNCPostAPI/bearer_token"
+        cached_token = VNCPostAPI.cache.read(cache_key)
+        return cached_token if cached_token
+
+        token = create(Username: username, Password: password).token
+        VNCPostAPI.cache.write(
+          cache_key,
+          token,
+          expires_in: expires_in(token) - 15
+        )
+
+        token
+      end
+
+      private
+
+      def expires_in(jwt)
+        Time.at(JWT.decode(jwt, nil, false)[0]["exp"])
+      end
+    end
+  end
+end

data/lib/vncpost_api/version.rb

@@ -1,3 +1,3 @@
 module VNCPostAPI
-  VERSION = "0.2.1"
+  VERSION = "0.4.0"
 end

data/lib/vncpost_api.rb

@@ -2,11 +2,11 @@ require "vncpost_api/version"
 require "active_resource"
 
 module VNCPostAPI
+  require "vncpost_api/cache"
   require "vncpost_api/configuration"
-
   require "vncpost_api/connection"
-
   require "vncpost_api/resources/base"
-  require "vncpost_api/resources/tracking"
   require "vncpost_api/resources/order"
+  require "vncpost_api/resources/tracking"
+  require "vncpost_api/resources/user_login"
 end

data/vncpost_api.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.summary = "Ruby object based VNCPost API wrapper."
   spec.homepage = "https://github.com/PostCo/vncpost_api"
   spec.license = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org/"
 
@@ -26,10 +26,12 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activeresource"
+  spec.add_dependency "activeresource", ">= 4.1.0"
+  spec.add_dependency "jwt"
 
   spec.add_development_dependency "rspec", "~> 3.2"
   spec.add_development_dependency "dotenv"
+  spec.add_development_dependency "zeitwerk"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "pry"
 end

metadata

@@ -1,17 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: vncpost_api
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Andy Chong
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2022-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+- !ruby/object:Gem::Dependency
+  name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -52,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +108,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - andygg1996personal@gmail.com
 executables: []
@@ -103,11 +131,13 @@ files:
 - lib/dev/config.rb
 - lib/dev/zeitwerk_loader.rb
 - lib/vncpost_api.rb
+- lib/vncpost_api/cache.rb
 - lib/vncpost_api/configuration.rb
 - lib/vncpost_api/connection.rb
 - lib/vncpost_api/resources/base.rb
 - lib/vncpost_api/resources/order.rb
 - lib/vncpost_api/resources/tracking.rb
+- lib/vncpost_api/resources/user_login.rb
 - lib/vncpost_api/version.rb
 - vncpost_api.gemspec
 homepage: https://github.com/PostCo/vncpost_api
@@ -118,7 +148,7 @@ metadata:
   homepage_uri: https://github.com/PostCo/vncpost_api
   source_code_uri: https://github.com/PostCo/vncpost_api
   changelog_uri: https://github.com/PostCo/vncpost_api/releases
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -126,15 +156,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Ruby object based VNCPost API wrapper.
 test_files: []