fuel_surcharge 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e6925a11089e67824b780894dd1e9c0b0d5d04c1557f2a924bdbd15a7f66abc
-  data.tar.gz: 9e8fc90cf801ee0c633bdc09c36d4d15d1de7e243461878d0b110a8460deb085
+  metadata.gz: b2c4e7b0ef853f34f344f17f140f38cdaa0b0bb79d0062f1792339df50cd87c2
+  data.tar.gz: 9a13804af525bb01433aa9cefc6468f12126d73d977bf6198ba604585b17ab0e
 SHA512:
-  metadata.gz: 2b023f34692ec4944e6ba1ca41cfd6bd9a717158cae69893029cc7d4942029abbe49f1decab3d965b20a475c911d04acbb3b916eb1980610ebfc41e9c67034b7
-  data.tar.gz: 0c4bf04e75242132641b57c2c818dc382ecf81630a7e7962b331646c13ab1a6dd4600ea75b44b7472e941dcfadc993c5dfeefc43d5ed5a58241b689286d82dca
+  metadata.gz: dbb44805f053d154e4cf348e9f658cf3be9059a2f3b88e40846355604ae112d4d3da7b99ce445e30cbaad3eaa80c0b548d2ae9e60dee7e6cc589920bdeb98e29
+  data.tar.gz: 1101637160edaed85fb9a49c86762cb86c7e940c020363ffab58401fb6be0e72613732bba46e088fd3a1996cb1739ebe38857b0b27d06a1e10f4d87125835b6a

data/.travis.yml

@@ -1,6 +1,8 @@
 ---
 sudo: false
 
+dist: xenial
+
 language: ruby
 
 rvm:
@@ -17,7 +19,7 @@ cache:
   bundler: true
 
 before_install:
-  - gem install bundler -v 1.17.1
+  - gem install bundler
 
 script:
   - bundle install

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+## [v0.2.0](https://github.com/levups/fuel_surcharge/tree/v0.2.0) (2018-11-28)
+[Full Changelog](https://github.com/levups/fuel_surcharge/compare/v0.1.0...v0.2.0)
+
+**Implemented enhancements:**
+
+- Rename Tnt class to TNT [\#5](https://github.com/levups/fuel_surcharge/issues/5)
+
+**Merged pull requests:**
+
+- Generate changelog with github\_changelog\_generator gem [\#6](https://github.com/levups/fuel_surcharge/pull/6) ([bobmaerten](https://github.com/bobmaerten))
+- Adapt FuelSurcharge::TNT to TNT's website changes  [\#3](https://github.com/levups/fuel_surcharge/pull/3) ([czj](https://github.com/czj))
+- Upgrade Travis CI dist to Xenial [\#2](https://github.com/levups/fuel_surcharge/pull/2) ([czj](https://github.com/czj))
+
 ## [v0.1.0](https://github.com/levups/fuel_surcharge/tree/v0.1.0) (2018-11-25)
 **Merged pull requests:**
 

data/Gemfile.lock

@@ -1,16 +1,34 @@
 PATH
   remote: .
   specs:
-    fuel_surcharge (0.1.0)
+    fuel_surcharge (0.2.0)
       http (~> 4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (5.2.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
+    concurrent-ruby (1.1.3)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
+    faraday (0.15.4)
+      multipart-post (>= 1.2, < 3)
+    faraday-http-cache (2.0.0)
+      faraday (~> 0.8)
+    github_changelog_generator (1.14.3)
+      activesupport
+      faraday-http-cache
+      multi_json
+      octokit (~> 4.6)
+      rainbow (>= 2.1)
+      rake (>= 10.0)
+      retriable (~> 2.1)
     http (4.0.0)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
@@ -20,10 +38,24 @@ GEM
       domain_name (~> 0.5)
     http-form_data (2.1.1)
     http_parser.rb (0.6.0)
+    i18n (1.1.1)
+      concurrent-ruby (~> 1.0)
     minitest (5.11.3)
     minitest-stub_any_instance (1.0.2)
+    multi_json (1.13.1)
+    multipart-post (2.0.0)
+    octokit (4.13.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
     public_suffix (3.0.3)
+    rainbow (3.0.0)
     rake (10.5.0)
+    retriable (2.1.0)
+    sawyer (0.8.1)
+      addressable (>= 2.3.5, < 2.6)
+      faraday (~> 0.8, < 1.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
@@ -34,6 +66,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.17)
   fuel_surcharge!
+  github_changelog_generator (~> 1.14)
   minitest (~> 5.0)
   minitest-stub_any_instance (~> 1.0)
   rake (~> 10.0)

data/Makefile

@@ -0,0 +1,14 @@
+# fuel_surchage/Makefile
+
+# Don't forget : Makefiles use tabs indentation, not spaces !
+.PHONY: test watch
+
+# Aliases to everyday takss faster
+t  : test
+w  : watch
+
+test: ## Run all tests
+	@bundle exec rake test
+
+watch: ## Run tests when a ruby file changes (like Guard)
+	@fd .rb | entr bundle exec rake test

data/Rakefile

@@ -1,4 +1,5 @@
 require "bundler/gem_tasks"
+require "github_changelog_generator/task"
 require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
@@ -7,4 +8,14 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/**/*_test.rb"]
 end
 
+GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+  latest_release = `git tag --sort=taggerdate | tail -n 1`.strip
+  next_release   = "v#{FuelSurcharge::VERSION}"
+
+  config.user                 = "levups"
+  config.project              = "fuel_surcharge"
+  config.future_release       = next_release if next_release > latest_release
+  config.add_issues_wo_labels = false
+end
+
 task default: :test

data/bin/setup

@@ -7,3 +7,4 @@ set -vx
 bundle install
 
 # Do any other automated setup that you need to do here
+brew install entr fd

data/fuel_surcharge.gemspec

@@ -40,6 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "http", "~> 4.0"
 
   spec.add_development_dependency "bundler", "~> 1.17"
+  spec.add_development_dependency "github_changelog_generator", "~> 1.14"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "minitest-stub_any_instance", "~> 1.0"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/fuel_surcharge/tnt.rb

@@ -4,11 +4,14 @@ require "fuel_surcharge/http_request"
 require "fuel_surcharge/string_formatter"
 
 module FuelSurcharge
-  class Tnt
+  class TNT
     using StringFormatter
+
     def initialize
-      @road_values = extracted_values.first
-      @air_values  = extracted_values.last(3).first
+      latest_road_values_position = 0
+      latest_air_values_position = extracted_values.size.div(2)
+      @road_values = extracted_values[latest_road_values_position]
+      @air_values  = extracted_values[latest_air_values_position]
     end
 
     def url
@@ -16,21 +19,15 @@ module FuelSurcharge
     end
 
     def time_period
-      return unless @road_values
-
-      @road_values.first.to_s.strip
+      @road_values&.first&.to_s
     end
 
     def road_percentage
-      return unless @road_values
-
-      @road_values.last.to_s
+      @road_values&.last&.to_s
     end
 
     def air_percentage
-      return unless @air_values
-
-      @air_values.last.to_s
+      @air_values&.last&.to_s
     end
 
     def road_multiplier
@@ -43,6 +40,7 @@ module FuelSurcharge
 
     private
 
+    VALUES_REGEX = /Surcharge d[e\' ]+(.*) : (.*%)</.freeze
     # [
     #   [" novembre 2018 ",  "12,10%"],
     #   ["octobre 2018 ",    "11,95%"],
@@ -52,11 +50,11 @@ module FuelSurcharge
     #   [" septembre 2018 ", "17,50%"]
     # ]
     def extracted_values
-      @extracted_values ||=
-        HTTPRequest.new(url)
-                   .response
-                   .to_s
-                   .scan(/Surcharge d[e']+(.*): (.*)<br>$/)
+      @extracted_values ||= response.to_s.scan(VALUES_REGEX)
+    end
+
+    def response
+      @response ||= HTTPRequest.new(url).response
     end
   end
 end

data/lib/fuel_surcharge/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fuel_surcharge
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Bob Maerten
@@ -35,7 +35,7 @@ cert_chain:
   jT8ozif/0OTSDY7+8Js1LxoE1c1miwLixh66/avBqoFcnMzfSkTmEv2xVoYiCk0M
   CrJThrTFQhqQDaVx
   -----END CERTIFICATE-----
-date: 2018-11-25 00:00:00.000000000 Z
+date: 2018-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -65,6 +65,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.17'
+- !ruby/object:Gem::Dependency
+  name: github_changelog_generator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +137,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
+- Makefile
 - README.md
 - Rakefile
 - bin/console