fuel_surcharge 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f68cb01ef88675ef0ca5094c6ea5712cb669b111d4ec25c902fe6a2a4eaffc1d
-  data.tar.gz: 5fa8a822c054f84fa35b3180b9d8b439d953a7f87f3a24d4f38b3c49ac593945
+  metadata.gz: a6db529ef07a052e6406c2cc32c414bfd6a8cca577ab239c78bb3622cb326a93
+  data.tar.gz: 29f736220eb3c8c7ef87a02ae2c02a9812f280cf4c0a9590adaffb76df02a26b
 SHA512:
-  metadata.gz: ea6cc3b909404bd3020fd6bea0e7c9f06988ee3beee2c6ea39a547d9571e19e84ba1cc1879bd1efb6e8f5922535eec01ad6c814a62a599768520f67aea9b1272
-  data.tar.gz: e295ab64de727767269256b972f4ba5d627734c4f9a5f479b4c8eedf6bb94330ea26803dc77018978d5cbb9dfda14eb8eea2cf577f953e39cd8d9b466d8646d4
+  metadata.gz: 9775e48cea5cf6b9aa79fb078e75480d8545a9716ec7a8daa3865468ddcf1a7410043da62249baa43dd2cfe0423e5591a6c1d54e28879d9621684cd2f062cfa2
+  data.tar.gz: 2bb3b0601f7331ba9b27ca87b2bdc0c2119cee206729e79119248ec070ca132622ca7ac09cb9e7ae365dfa9e4dc4a650b9f1aa7f62ecc9e0e13298a790cc4a93

data/.github_changelog_generator

@@ -1 +1 @@
-future-release=1.2.1
+future-release=1.2.2

data/CHANGELOG.md

@@ -1,7 +1,18 @@
 # Change Log
 
-## [1.2.1](https://github.com/levups/fuel_surcharge/tree/1.2.1) (2019-07-22)
-[Full Changelog](https://github.com/levups/fuel_surcharge/compare/v1.2.0...1.2.1)
+## [1.2.2](https://github.com/levups/fuel_surcharge/tree/1.2.2) (2019-08-01)
+[Full Changelog](https://github.com/levups/fuel_surcharge/compare/v1.2.1...1.2.2)
+
+**Fixed bugs:**
+
+- TNT website change, again… [\#58](https://github.com/levups/fuel_surcharge/issues/58)
+
+**Merged pull requests:**
+
+- Correct TNT website parsing [\#59](https://github.com/levups/fuel_surcharge/pull/59) ([bobmaerten](https://github.com/bobmaerten))
+
+## [v1.2.1](https://github.com/levups/fuel_surcharge/tree/v1.2.1) (2019-07-22)
+[Full Changelog](https://github.com/levups/fuel_surcharge/compare/v1.2.0...v1.2.1)
 
 **Fixed bugs:**
 
@@ -9,6 +20,7 @@
 
 **Merged pull requests:**
 
+- Release v1.2.1 [\#57](https://github.com/levups/fuel_surcharge/pull/57) ([bobmaerten](https://github.com/bobmaerten))
 - Adapt to TNT / Chronopost website structure changes [\#56](https://github.com/levups/fuel_surcharge/pull/56) ([bobmaerten](https://github.com/bobmaerten))
 - Bump rake from 12.3.2 to 12.3.3 [\#54](https://github.com/levups/fuel_surcharge/pull/54) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 - Update standard requirement from ~\> 0.0.39 to ~\> 0.1.0 [\#53](https://github.com/levups/fuel_surcharge/pull/53) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fuel_surcharge (1.2.1)
+    fuel_surcharge (1.2.2)
       http (~> 4.0)
 
 GEM

data/lib/fuel_surcharge/html_scanner.rb

@@ -8,10 +8,10 @@ module FuelSurcharge
       @scanner = StringScanner.new(source.to_s)
     end
 
-    def upcoming(tag)
+    def upcoming(tag, attribute = nil)
       return if @scanner.eos?
 
-      opening = "<#{tag}[^>]*>"
+      opening = attribute ? "<#{tag}\s[^>]*#{attribute}[^>]*>" : "<#{tag}[^>]*>"
       closing = "</#{tag}>"
       return unless @scanner.exist?(/#{opening}/) && @scanner.exist?(/#{closing}/)
 
@@ -22,11 +22,11 @@ module FuelSurcharge
       chunk[0...chunk.size - closing.size].strip
     end
 
-    def all(tag)
+    def all(tag, attribute = nil)
       chunks = []
       return chunks if @scanner.eos?
 
-      while (chunk = upcoming(tag))
+      while (chunk = upcoming(tag, attribute))
         chunks << chunk
       end
       chunks

data/lib/fuel_surcharge/tnt.rb

@@ -16,7 +16,9 @@ module FuelSurcharge
     end
 
     def air_percentage
-      air_value&.last&.to_s
+      if (value = air_value&.dig("list", 0, "surcharge"))
+        value.tr(".", ",") << "%"
+      end
     end
 
     def road_multiplier
@@ -33,21 +35,29 @@ module FuelSurcharge
 
     private
 
-    ROAD_VALUES_REGEX = /Surcharge d[e\' ]+ (\w+ \d{4}) : (.+%)</.freeze
-    AIR_VALUES_REGEX  = /Surcharge du \d+ au \d+ (\w+ \d{4}) : (.*%)</.freeze
+    def json_air_url
+      "https://www.tnt.com/express/getDynamicData.europe.json"
+    end
 
     def air_value
-      response.to_s.scan(AIR_VALUES_REGEX).first
+      return if (json = air_response.to_s).empty?
+
+      JSON.parse(json)
     end
 
+    ROAD_VALUES_REGEX = /Surcharge d[e\' ]+ (\w+ \d{4}) : (.+%)</.freeze
     def road_value
-      response.to_s.scan(ROAD_VALUES_REGEX).first
+      road_response.to_s.scan(ROAD_VALUES_REGEX).first
     end
 
-    def response
+    def road_response
       @response ||= HTTPRequest.new(url).response
     end
 
+    def air_response
+      @air_response ||= HTTPRequest.new(json_air_url).response
+    end
+
     FRENCH_MONTHS_NAMES = %w[
       janvier
       février

data/lib/fuel_surcharge/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FuelSurcharge
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fuel_surcharge
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Bob Maerten
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-22 00:00:00.000000000 Z
+date: 2019-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http