chronopost_fuel_adjustment_coefficients 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e63ff2881d070db0c4320205b17fcb803c5e36996622c25500fd495f327fb7a7
-  data.tar.gz: 2f16f0f38ac807d6b9e64bf095e3ae46bc83ab037af97ca8cf78adb1986c0b1e
+  metadata.gz: af263a1e2c77dcbb83f0620f19ec996774b6738ec010171a3ba30bc85fa0b8bf
+  data.tar.gz: 0d80c679e23e88d20287891e3ff097161bb2cd9d5585814e64d454d28a9d77e3
 SHA512:
-  metadata.gz: 3d8a576bcf361ab3d03bcc49db1e7f0b7ba03a2dc9a3498e897c3c170e144f8975080d331dcf129908bb77fcc69a35e5c96e59121daa362eee6bbfde223ae569
-  data.tar.gz: 97285431befdfa43ec86408f33149b22f11c655b70226cc0911ab8bfc831aea3e8aaa65147a998b2dc946d2ed1078387c7ba7e103fa5a057777fe7f5b3e4a4d1
+  metadata.gz: ff27cc4b0a8753a0c4c8e9b023418d989b334fb1f55a22677624c5d133760d77f41ccc8073a4cb1dc06d48e24dc04b81d054f2c462cd7400079ec77cc94a144e
+  data.tar.gz: f1eeba4c765f5b1452e5301201f01919014a8799c5f085d481357a7dad348f547e786bd2d7e60904e06809999ded9e16bb00ebf6ee67ecdab63791b5551a1217

data/.rubocop.yml

@@ -7,7 +7,7 @@ Style/StringLiterals:
 Style/GuardClause:
   Exclude:
     - './*.gemspec'
-  
+
 Metrics/BlockLength:
   Exclude:
     - './*.gemspec'
@@ -16,3 +16,14 @@ Metrics/LineLength:
   Exclude:
     - './*.gemspec'
 
+Lint/AssignmentInCondition:
+  Enabled: false
+
+Metrics/MethodLength:
+  Exclude:
+    - 'lib/chronopost_fuel_adjustment_coefficients.rb'
+
+Metrics/AbcSize:
+  Exclude:
+    - 'lib/chronopost_fuel_adjustment_coefficients.rb'
+    - 'test/chronopost_fuel_adjustment_coefficients_test.rb'

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Change Log
 
+## [v0.3.0](https://github.com/levups/chronopost_fuel_adjustment_coefficients/tree/v0.3.0) (2018-11-27)
+[Full Changelog](https://github.com/levups/chronopost_fuel_adjustment_coefficients/compare/v0.2.1...v0.3.0)
+
+**Closed issues:**
+
+- Replace Oga usage with plain standard REXML parsing? [\#18](https://github.com/levups/chronopost_fuel_adjustment_coefficients/issues/18)
+
+**Merged pull requests:**
+
+- Replace oga with plain string parsing [\#19](https://github.com/levups/chronopost_fuel_adjustment_coefficients/pull/19) ([bobmaerten](https://github.com/bobmaerten))
+- Prepare for official gem release [\#17](https://github.com/levups/chronopost_fuel_adjustment_coefficients/pull/17) ([bobmaerten](https://github.com/bobmaerten))
+
+## [v0.2.1](https://github.com/levups/chronopost_fuel_adjustment_coefficients/tree/v0.2.1) (2018-11-16)
+[Full Changelog](https://github.com/levups/chronopost_fuel_adjustment_coefficients/compare/v0.2.0...v0.2.1)
+
+**Closed issues:**
+
+- Sign gem before publishing it [\#16](https://github.com/levups/chronopost_fuel_adjustment_coefficients/issues/16)
+- Comply to `bundle gem` defaults [\#15](https://github.com/levups/chronopost_fuel_adjustment_coefficients/issues/15)
+
 ## [v0.2.0](https://github.com/levups/chronopost_fuel_adjustment_coefficients/tree/v0.2.0) (2018-11-14)
 [Full Changelog](https://github.com/levups/chronopost_fuel_adjustment_coefficients/compare/v0.1.1...v0.2.0)
 

data/Gemfile.lock

@@ -1,17 +1,14 @@
 PATH
   remote: .
   specs:
-    chronopost_fuel_adjustment_coefficients (0.2.1)
+    chronopost_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/chronopost_fuel_adjustment_coefficients.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "chronopost_fuel_adjustment_coefficients"
-  s.version     = "0.2.1"
+  s.version     = "0.3.0"
   s.authors     = ["Bob Maerten", "Clément Joubert"]
   s.email       = ["bob@levups.com", "clement@levups.com"]
 
@@ -10,17 +10,12 @@ Gem::Specification.new do |s|
   s.homepage    = "https://rubygems.org/gems/chronopost_fuel_adjustment_coefficients"
   s.license     = "MIT"
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  if s.respond_to?(:metadata)
-    s.metadata["allowed_push_host"] = "https://rubygems.org"
-
-    s.metadata["homepage_uri"]    = s.homepage
-    s.metadata["source_code_uri"] = "https://github.com/levups/chronopost_fuel_adjustment_coefficients"
-    s.metadata["changelog_uri"]   = "https://github.com/levups/chronopost_fuel_adjustment_coefficients/blob/master/CHANGELOG.md"
-  else
-    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
-  end
+  s.metadata = {
+    "bug_tracker_uri" => "https://github.com/levups/chronopost_fuel_adjustment_coefficients/issues",
+    "changelog_uri" => "https://github.com/levups/chronopost_fuel_adjustment_coefficients/blob/master/CHANGELOG.md",
+    "homepage_uri" => "https://rubygems.org/gems/chronopost_fuel_adjustment_coefficients",
+    "source_code_uri" => "https://github.com/levups/chronopost_fuel_adjustment_coefficients"
+  }
 
   s.bindir        = "exe"
   s.executables   = "chronopost_fuel_adjustment_coefficients"
@@ -36,7 +31,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/chronopost_fuel_adjustment_coefficients.rb

@@ -2,32 +2,20 @@
 
 require 'bigdecimal'
 require 'http'
-require 'oga'
 
 class ChronopostFuelAdjustmentCoefficients
-  def initialize
-    @document = ::Oga.parse_html response.to_s
-  end
-
-  def time_period
-    el = @document.at_css('table.ch-table thead tr th:last-child')
-    return unless el
+  attr_reader :time_period
 
-    el.text.strip.gsub(/\s+/, ' ')
+  def initialize
+    @time_period, @routier, @aerien = extracted_content
   end
 
   def air_multiplier
-    el = @document.at_css('table.ch-table tbody tr:last-child td:last-child')
-    return unless el
-
-    format_multiplier el.text
+    format_multiplier @aerien
   end
 
   def road_multiplier
-    el = @document.at_css('table.ch-table tbody tr td:last-child')
-    return unless el
-
-    format_multiplier el.text
+    format_multiplier @routier
   end
 
   def url
@@ -42,7 +30,26 @@ class ChronopostFuelAdjustmentCoefficients
     ''
   end
 
+  def extracted_content
+    html = response.to_s.delete("\n").gsub(/\s+/, " ")
+
+    return [] unless tables = html.split("<table ")[1]
+    return [] unless table  = tables.split("<h2>Principe</h2>").first
+    return [] unless head   = table.scan(%r{<thead>.*</thead>}).first
+    return [] unless period = head.match(%r{<p>(?<content>.*)</p>})
+    return [] unless body   = table.scan(%r{<tbody><tr>.*</tr></tbody>}).first
+
+    time_period  = period[:content].sub("<br />", "")
+    adjustements = body.split("</tr><tr>").map do |line|
+      line.to_s.rpartition("</td>").first.rpartition(">").last
+    end
+
+    [time_period, adjustements[0], adjustements[1]]
+  end
+
   def format_multiplier(string)
+    return unless string
+
     number = (string.to_f / 100 + 1).round(4)
     BigDecimal(number.to_s)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronopost_fuel_adjustment_coefficients
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  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
@@ -148,10 +134,10 @@ homepage: https://rubygems.org/gems/chronopost_fuel_adjustment_coefficients
 licenses:
 - MIT
 metadata:
-  allowed_push_host: https://rubygems.org
+  bug_tracker_uri: https://github.com/levups/chronopost_fuel_adjustment_coefficients/issues
+  changelog_uri: https://github.com/levups/chronopost_fuel_adjustment_coefficients/blob/master/CHANGELOG.md
   homepage_uri: https://rubygems.org/gems/chronopost_fuel_adjustment_coefficients
   source_code_uri: https://github.com/levups/chronopost_fuel_adjustment_coefficients
-  changelog_uri: https://github.com/levups/chronopost_fuel_adjustment_coefficients/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths: