forex 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5f6042f89c4a24093fee33684c851952e6fccae3
-  data.tar.gz: 81b3446867cb4023b6a7f8e8228845172517d430
+SHA256:
+  metadata.gz: 22d0fe237e6625b35097f1241e18d6b12e18cb43ead901dc86fd736d78c78422
+  data.tar.gz: 97a2f4e7c023344bd4d2805b6588542a34ec5cd340921d8b1177fb259b7318d1
 SHA512:
-  metadata.gz: 56e931e084207454ceab0aa46c60ed53f1d233a41c7e9767f7c587ba73d4ffeebcfe08abdc4107195f0635288832890ef2d5de7f5a7074ff772ccd9add78caaa
-  data.tar.gz: 064bbd57204e53873351ff46e8e98e154cc51c6d3fe4b0838608f1041f53fa9ddfde42c967581d91f9e0cdbbc5ba86fc210ff1c4c57d2fa1da36b00d4ab12c9e
+  metadata.gz: 951a54966ac9e69322fb3147063aee24cc831238c11b4b267d49b2f1771d9365c0e90c291dd139b58c64b4a69a07acc66f13dcc0658d3f35b8d9800e28d42817
+  data.tar.gz: 54cfbfefe037504c1e7ff175bd8b8b7eb93f4482f5ba180cab447dcd34a89721bffaebb2d842ff563353d449b3a414bd13d904af83673ca626f71e70fb33917e

data/.travis.yml

@@ -6,5 +6,5 @@ branches:
   only:
     - master
 script:
-  - bundle exec cucumber -f Fivemat
+  - bundle exec cucumber
   - bundle exec rspec -f Fivemat

data/lib/forex.rb

@@ -2,7 +2,6 @@ require 'nokogiri'
 require 'active_support/core_ext/string'
 
 require "forex/version"
-require "forex/client"
 require "forex/tabular_rates"
 require "forex/trader"
 

data/lib/forex/tabular_rates.rb

@@ -45,7 +45,8 @@ module Forex
     def parse_currency_code(table_row, translations)
       return if table_row.empty?
 
-      currency_code = CurrencyCode.new(table_row[currency_column.to_i].content, translations)
+      content = table_row[currency_column.to_i].content.gsub(/\A[[:space:]]*(.*?)[[:space:]]*\z/) { $1 }
+      currency_code = CurrencyCode.new(content, translations)
       return if currency_code.invalid? ||
         cached_currencies.has_key?(parsed_currency_string = currency_code.to_s)
 
@@ -105,4 +106,3 @@ module Forex
     end
   end
 end
-

data/lib/forex/trader.rb

@@ -1,3 +1,5 @@
+require 'open-uri'
+
 module Forex
   CannotRedefineTrader = Class.new(StandardError)
 
@@ -38,7 +40,7 @@ module Forex
 
     # doc built from the endpoint
     def doc
-      Nokogiri::HTML(Client.new.get_response(endpoint).body)
+      @doc ||= open(endpoint) { |f| Nokogiri::HTML(f.read) }
     end
 
     reset

data/lib/forex/traders/jm/jmmb.rb

@@ -2,29 +2,23 @@ Forex::Trader.define "JMMB" do |t|
   t.base_currency   = "JMD"
   t.name            = "Jamaica Money Market Brokers"
   t.twitter_handle  = "@JMMBGROUP"
-  t.endpoint        = "http://www.jmmb.com/full_rates.php"
+  t.endpoint        = 'https://jm.jmmb.com/rates-fees'
 
   t.rates_parser = ->(doc) do # doc is a nokogiri document
 
     options = {
       currency_code: 0,
       buy_cash: 1,
-      buy_draft: 3,
-      sell_cash: 4,
-      sell_draft: 4
-    }
-
-    translations = {
-      'US$' => 'USD',
-      'TT$' => 'TTD',
+      buy_draft: 2,
+      sell_cash: 3,
+      sell_draft: 3
     }
 
     table =
-      doc.search("[text()*='FX Trading Rates']").first.  # Section with rates
-       ancestors('table').first.                         # Root table for section
+      doc.search("[text()*='FX Rates']").first.  # Section with rates
+       ancestors('div').first.                         # Root table for section
        css("table").first                                # Rates table
 
-    Forex::TabularRates.new(table, options).parse_rates(translations)
+    Forex::TabularRates.new(table, options).parse_rates
   end
 end
-

data/lib/forex/traders/jm/jnbs.rb

@@ -1,8 +1,8 @@
 Forex::Trader.define "JNBS" do |t|
   t.base_currency   = "JMD"
-  t.name            = "Jamaica National Building Society"
+  t.name            = 'JN Bank'
   t.twitter_handle  = "@JamaicaNational"
-  t.endpoint        = "http://www.jnbs.com/fx-rates-2"
+  t.endpoint        = 'https://www.jnbank.com/fx-rates/'
 
   t.rates_parser = ->(doc) do # doc is a nokogiri document
 
@@ -12,9 +12,8 @@ Forex::Trader.define "JNBS" do |t|
       buy_draft: 1,
     }
 
-    table = doc.css(".fx-full").first
+    tbody = doc.css('#fx-big-table tbody').first
 
-    Forex::TabularRates.new(table, options).parse_rates
+    Forex::TabularRates.new(tbody, options).parse_rates
   end
 end
-

data/lib/forex/traders/jm/ncb.rb

@@ -1,20 +1,20 @@
 Forex::Trader.define "NCB" do |t|
   t.base_currency   = "JMD"
   t.name            = "National Commercial Bank"
-  t.endpoint        = "http://www.jncb.com/rates"
+  t.endpoint        = "https://www.jncb.com/Support/Help-Resources/Foreign-Exchange-Services"
   t.twitter_handle  = "@ncbja"
 
   t.rates_parser = ->(doc) do # doc is a nokogiri document
 
     options = {
-      currency_code: 1,
-      sell_cash: 2,
-      buy_cash: 4,
-      buy_draft: 3,
+      currency_code: 0,
+      sell_cash: 1,
+      buy_cash: 3,
+      buy_draft: 2,
     }
 
-    table = doc.css(".fxratestable").first
+    tbody = doc.css("tbody.FxRContainer").first
 
-    Forex::TabularRates.new(table, options).parse_rates
+    Forex::TabularRates.new(tbody, options).parse_rates
   end
 end

data/lib/forex/version.rb

@@ -1,3 +1,3 @@
 module Forex
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/spec/rates/bns.yml

@@ -1,51 +1,51 @@
 ---
 USD:
-  :buy_cash: 101.3
-  :buy_draft: 103.3
-  :sell_cash: 105.0
-  :sell_draft: 105.0
+  :buy_cash: 114.33
+  :buy_draft: 126.73
+  :sell_cash: 131.34
+  :sell_draft: 131.34
 GBP:
-  :buy_cash: 166.06
-  :buy_draft: 169.48
-  :sell_cash: 173.16
-  :sell_draft: 173.16
+  :buy_cash: 167.87
+  :buy_draft: 170.88
+  :sell_cash: 175.9
+  :sell_draft: 175.9
 CAD:
-  :buy_cash: 94.3
-  :buy_draft: 96.71
-  :sell_cash: 99.5
-  :sell_draft: 99.5
+  :buy_cash: 95.38
+  :buy_draft: 97.82
+  :sell_cash: 101.05
+  :sell_draft: 101.05
 EUR:
-  :buy_cash: 135.01
-  :buy_draft: 138.05
-  :sell_cash: 143.82
-  :sell_draft: 143.82
+  :buy_cash: 145.91
+  :buy_draft: 149.2
+  :sell_cash: 155.43
+  :sell_draft: 155.43
 BBD:
-  :buy_cash: 46.23
-  :buy_draft: 50.25
-  :sell_cash: 54.62
-  :sell_draft: 54.62
+  :buy_cash: 51.23
+  :buy_draft:
+  :sell_cash: 68.32
+  :sell_draft: 68.32
 KYD:
-  :buy_cash: 112.4
-  :buy_draft: 117.09
-  :sell_cash: 127.13
-  :sell_draft: 127.13
+  :buy_cash: 137.69
+  :buy_draft: 143.43
+  :sell_cash: 155.9
+  :sell_draft: 155.9
 XCD:
-  :buy_cash: 34.59
-  :buy_draft: 36.41
-  :sell_cash: 40.46
-  :sell_draft: 40.46
+  :buy_cash: 43.27
+  :buy_draft: 45.55
+  :sell_cash: 50.61
+  :sell_draft: 50.61
 JPY:
-  :buy_cash: 0.9341
-  :buy_draft: 0.9833
-  :sell_cash: 1.0573
-  :sell_draft: 1.0573
+  :buy_cash: 1.0655
+  :buy_draft: 1.1216
+  :sell_cash: 1.206
+  :sell_draft: 1.206
 CHF:
-  :buy_cash: 106.8
-  :buy_draft: 110.67
-  :sell_cash: 119.64
-  :sell_draft: 119.64
+  :buy_cash: 121.25
+  :buy_draft: 125.64
+  :sell_cash: 135.83
+  :sell_draft: 135.83
 TTD:
-  :buy_cash: 15.26
-  :buy_draft: 16.06
-  :sell_cash: 17.65
-  :sell_draft: 17.65
+  :buy_cash:
+  :buy_draft: 18.58
+  :sell_cash: 22.08
+  :sell_draft: 22.08

data/spec/rates/cok.yml

@@ -1,26 +1,26 @@
 ---
 USD:
-  :buy_cash: 106.45
-  :buy_draft: 104.2
-  :sell_cash: 108.85
-  :sell_draft: 109.4
+  :buy_cash: 122.1
+  :buy_draft: 119.5
+  :sell_cash: 128.9
+  :sell_draft: 133.5
 CAD:
-  :buy_cash: 93.15
-  :buy_draft: 91.9
-  :sell_cash: 97.0
-  :sell_draft: 98.35
+  :buy_cash: 91.25
+  :buy_draft: 88.1
+  :sell_cash: 98.25
+  :sell_draft: 104.8
 GBP:
-  :buy_cash: 175.1
-  :buy_draft: 162.0
-  :sell_cash: 180.1
-  :sell_draft: 181.4
+  :buy_cash: 160.85
+  :buy_draft: 157.1
+  :sell_cash: 169.85
+  :sell_draft: 175.1
 KYD:
-  :buy_cash: 116.3
-  :buy_draft: 100.0
-  :sell_cash: 123.4
-  :sell_draft: 122.25
+  :buy_cash: 125.25
+  :buy_draft: 122.85
+  :sell_cash: 138.0
+  :sell_draft: 142.5
 EUR:
-  :buy_cash: 143.0
-  :buy_draft: 130.2
-  :sell_cash: 147.0
-  :sell_draft: 148.0
+  :buy_cash: 138.5
+  :buy_draft: 133.5
+  :sell_cash: 148.85
+  :sell_draft: 152.5

data/spec/rates/fgb.yml

@@ -1,21 +1,21 @@
 ---
 USD:
-  :buy_cash: 113.4
-  :buy_draft: 114.4
-  :sell_cash: 115.8
-  :sell_draft: 115.8
+  :buy_cash: 114.6
+  :buy_draft: 127.7
+  :sell_cash: 131.8
+  :sell_draft: 131.8
 CAD:
-  :buy_cash: 87.0
-  :buy_draft: 89.33
-  :sell_cash: 92.5
-  :sell_draft: 92.5
+  :buy_cash: 90.7
+  :buy_draft: 94.7
+  :sell_cash: 101.5
+  :sell_draft: 101.5
 GBP:
-  :buy_cash: 172.2
-  :buy_draft: 175.5
-  :sell_cash: 179.74
-  :sell_draft: 179.74
+  :buy_cash: 160.3
+  :buy_draft: 164.3
+  :sell_cash: 176.0
+  :sell_draft: 176.0
 EUR:
-  :buy_cash: 124.18
-  :buy_draft: 126.97
-  :sell_cash: 132.28
-  :sell_draft: 132.28
+  :buy_cash: 140.2
+  :buy_draft: 144.2
+  :sell_cash: 155.5
+  :sell_draft: 155.5

data/spec/rates/fxtraders.yml

@@ -1,26 +1,26 @@
 ---
 USD:
-  :buy_cash: 113.0
-  :buy_draft: 114.15
-  :sell_cash: 115.25
-  :sell_draft: 115.4
+  :buy_cash: 122.0
+  :buy_draft: 0.0
+  :sell_cash: 129.0
+  :sell_draft: 0.0
 CAD:
-  :buy_cash: 87.45
-  :buy_draft: 87.9
-  :sell_cash: 90.3
-  :sell_draft: 91.2
+  :buy_cash: 92.95
+  :buy_draft: 0.0
+  :sell_cash: 98.65
+  :sell_draft: 0.0
 GBP:
-  :buy_cash: 166.4
-  :buy_draft: 166.8
-  :sell_cash: 170.6
-  :sell_draft: 171.45
+  :buy_cash: 162.7
+  :buy_draft: 0.0
+  :sell_cash: 170.3
+  :sell_draft: 0.0
 KYD:
-  :buy_cash: 111.7
+  :buy_cash: 128.4
   :buy_draft: 0.0
-  :sell_cash: 124.7
+  :sell_cash: 138.4
   :sell_draft: 0.0
 EUR:
-  :buy_cash: 117.05
+  :buy_cash: 142.95
   :buy_draft: 0.0
-  :sell_cash: 123.05
+  :sell_cash: 149.45
   :sell_draft: 0.0

data/spec/rates/jmmb.yml

@@ -1,26 +1,21 @@
 ---
 USD:
-  :buy_cash: 103.45
-  :buy_draft: 104.45
-  :sell_cash: 106.0
-  :sell_draft: 106.0
-TTD:
-  :buy_cash: 14.55
-  :buy_draft: 15.01
-  :sell_cash: 16.92
-  :sell_draft: 16.92
-GBP:
-  :buy_cash: 167.74
-  :buy_draft: 168.74
-  :sell_cash: 174.53
-  :sell_draft: 174.53
+  :buy_cash: 122.5
+  :buy_draft: 127.7
+  :sell_cash: 131.3
+  :sell_draft: 131.3
 EUR:
-  :buy_cash: 138.81
-  :buy_draft: 140.31
-  :sell_cash: 145.68
-  :sell_draft: 145.68
+  :buy_cash: 143.5
+  :buy_draft: 149.5
+  :sell_cash: 155.0
+  :sell_draft: 155.0
+GBP:
+  :buy_cash: 164.7
+  :buy_draft: 170.7
+  :sell_cash: 175.1
+  :sell_draft: 175.1
 CAD:
-  :buy_cash: 95.59
-  :buy_draft: 96.59
-  :sell_cash: 100.56
-  :sell_draft: 100.56
+  :buy_cash: 92.4
+  :buy_draft: 98.4
+  :sell_cash: 100.7
+  :sell_draft: 100.7

data/spec/rates/jnbs.yml

@@ -1,21 +1,21 @@
 ---
 USD:
-  :buy_cash: 102.7
-  :buy_draft: 103.2
-  :sell_cash: 105.25
+  :buy_cash: 111.5
+  :buy_draft: 124.0
+  :sell_cash: 130.15
 GBP:
-  :buy_cash: 167.96
-  :buy_draft: 168.71
-  :sell_cash: 173.85
-CAD:
-  :buy_cash: 96.16
-  :buy_draft: 96.91
-  :sell_cash: 99.79
+  :buy_cash: 160.0
+  :buy_draft: 163.57
+  :sell_cash: 173.89
+CDN:
+  :buy_cash: 90.0
+  :buy_draft: 94.1
+  :sell_cash: 100.07
 KYD:
-  :buy_cash: 95.0
+  :buy_cash: 112.7
   :buy_draft: 
-  :sell_cash: 104.5
+  :sell_cash: 138.05
 EUR:
-  :buy_cash: 135.21
-  :buy_draft: 136.21
-  :sell_cash: 144.71
+  :buy_cash: 137.72
+  :buy_draft: 139.72
+  :sell_cash: 153.81