colissimo_fuel_adjustment_coefficients 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5eeaf13f6472c842c26193b3b01e47309d9a20172ba7bc0223976607b2385315
-  data.tar.gz: e437462a2be5a03025da8fca116b9199dd2a31063e2799a484f225f784f80472
+  metadata.gz: eaabe681fb19bbf0d951eb3af72ce6bf4798779727d8e0a8f8e1f06ed47e9153
+  data.tar.gz: eb85387440ca0ce106dd489c12a99b8e7c14c1546055113b649f71f555f4ddef
 SHA512:
-  metadata.gz: 44830e91c5c18fceabb62fcc00559baa41f092a93407f0073d5e8a7845c6ab4d5d7465809a0b4fbad66958fd6ede0ebbf276027abde8447fdd4003e1c7ba49d6
-  data.tar.gz: 1e13a11b9b4a6d56b4a033b3916f8e57fc17d69c183e3d9ce74d490953440d973b96b03bac2feaf9ae931439c5c396ead576d8ebf77f713d54ce84e8c82a1726
+  metadata.gz: 95f980e621b44eba7d358d794c9f29b36b7f338e00e6b343fb9b6de62151b6459000f38685671bc710c92897504b64229bf69d4810320c149a5cbcfe5b7e981e
+  data.tar.gz: 1456f7d91c604fd3a9359824fa2148ac9b83c9c2d59edfba3b8d4ab25e45b12c9aeac40f1a66a237a046a4749b3da02907cef82e30912c88a0c83470a6282680

data/.rubocop.yml

@@ -10,7 +10,7 @@ Style/StringLiterals:
 Style/GuardClause:
   Exclude:
     - './*.gemspec'
-  
+
 Metrics/BlockLength:
   Exclude:
     - './*.gemspec'
@@ -19,3 +19,6 @@ Metrics/LineLength:
   Exclude:
     - './*.gemspec'
 
+Metrics/AbcSize:
+  Exclude:
+    - 'test/colissimo_fuel_adjustment_coefficients_test.rb'

data/CHANGELOG.md

@@ -1,11 +1,19 @@
 # Change Log
 
+## [v0.3.0](https://github.com/levups/colissimo_fuel_adjustment_coefficients/tree/v0.3.0) (2018-11-19)
+[Full Changelog](https://github.com/levups/colissimo_fuel_adjustment_coefficients/compare/v0.2.2...v0.3.0)
+
+**Closed issues:**
+
+- Replace Oga usage with plain standard REXML parsing? [\#13](https://github.com/levups/colissimo_fuel_adjustment_coefficients/issues/13)
+
+**Merged pull requests:**
+
+- Replace oga with REXML [\#14](https://github.com/levups/colissimo_fuel_adjustment_coefficients/pull/14) ([bobmaerten](https://github.com/bobmaerten))
+
 ## [v0.2.2](https://github.com/levups/colissimo_fuel_adjustment_coefficients/tree/v0.2.2) (2018-11-16)
 [Full Changelog](https://github.com/levups/colissimo_fuel_adjustment_coefficients/compare/v0.2.1...v0.2.2)
 
-- Correct homepage value in gemspec
-- Update README
-
 ## [v0.2.1](https://github.com/levups/colissimo_fuel_adjustment_coefficients/tree/v0.2.1) (2018-11-16)
 [Full Changelog](https://github.com/levups/colissimo_fuel_adjustment_coefficients/compare/v0.2.0...v0.2.1)
 
@@ -39,4 +47,4 @@
 ## [v0.1.0](https://github.com/levups/colissimo_fuel_adjustment_coefficients/tree/v0.1.0) (2017-05-23)
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Gemfile.lock

@@ -1,17 +1,14 @@
 PATH
   remote: .
   specs:
-    colissimo_fuel_adjustment_coefficients (0.2.2)
+    colissimo_fuel_adjustment_coefficients (0.3.0)
       http (~> 4.0)
-      oga (~> 2.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    ansi (1.5.0)
-    ast (2.4.0)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     http (4.0.0)
@@ -25,14 +22,8 @@ GEM
     http_parser.rb (0.6.0)
     minitest (5.11.3)
     minitest-stub_any_instance (1.0.2)
-    oga (2.15)
-      ast
-      ruby-ll (~> 2.1)
     public_suffix (3.0.3)
     rake (12.3.1)
-    ruby-ll (2.1.2)
-      ansi
-      ast
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)

data/colissimo_fuel_adjustment_coefficients.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "colissimo_fuel_adjustment_coefficients"
-  s.version     = "0.2.2"
+  s.version     = "0.3.0"
   s.authors     = ["Bob Maerten", "Clément Joubert"]
   s.email       = ["bob@levups.com", "clement@levups.com"]
 
@@ -36,7 +36,6 @@ Gem::Specification.new do |s|
   s.signing_key = File.expand_path("~/.ssh/bob_levups-gem-private_key.pem") if $PROGRAM_NAME.end_with?("gem")
 
   s.add_dependency "http", "~> 4.0"
-  s.add_dependency "oga", "~> 2.10"
 
   s.add_development_dependency "bundler", "~> 1.17"
   s.add_development_dependency "minitest", "~> 5.1"

data/lib/colissimo_fuel_adjustment_coefficients.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'bigdecimal'
-require 'http'
-require 'oga'
+require "bigdecimal"
+require "http"
+require "rexml/document"
 
 # Excepted XML is like:
 #   <indice_gazole>
@@ -16,29 +16,33 @@ require 'oga'
 #     </cap>
 #   <indice_gazole>
 class ColissimoFuelAdjustmentCoefficients
+  include REXML
+
   def initialize
-    @document = ::Oga.parse_xml response.to_s
-    @cap = @document.at_xpath('indice_gazole/cap/cap_mois') ||
-           Oga::XML::Element.new
+    @parsed_values = {}
+    return unless xml_root
+
+    caps  = xml_root.elements.first
+    month = caps.elements.first
+    month.elements.each do |element|
+      @parsed_values[element.name] = element.text
+    end
   end
 
   def url
-    'https://www.colissimo.entreprise.laposte.fr/fr/system/files/imagescontent/docs/indice_gazole.xml'
+    "https://www.colissimo.entreprise.laposte.fr/fr/system/files/imagescontent/docs/indice_gazole.xml"
   end
 
   def time_period
-    el = @cap.at_xpath('titre')
-    return unless el
-
-    el.text
+    @parsed_values["titre"]
   end
 
   def air_multiplier
-    format_multiplier 'aerien'
+    format_multiplier @parsed_values["aerien"]
   end
 
   def road_multiplier
-    format_multiplier 'routier'
+    format_multiplier @parsed_values["routier"]
   end
 
   private
@@ -46,18 +50,21 @@ class ColissimoFuelAdjustmentCoefficients
   def response
     ::HTTP.timeout(10).get(url)
   rescue HTTP::Error
-    ''
+    ""
+  end
+
+  def xml_root
+    doc = Document.new response.to_s
+    doc.root
   end
 
-  def format_multiplier(kind)
-    el = @cap.at_css(kind)
-    return unless el
+  def format_multiplier(value)
+    return unless value
 
-    multiplier = el.text
-    multiplier.tr!('%', '')
-    multiplier.tr!(',', '.')
+    value.tr!("%", "")
+    value.tr!(",", ".")
 
-    number = (multiplier.to_f / 100 + 1).round(4)
+    number = (value.to_f / 100 + 1).round(4)
     BigDecimal(number.to_s)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: colissimo_fuel_adjustment_coefficients
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Bob Maerten
@@ -51,20 +51,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: oga
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.10'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement