fafx 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00740a9067c4044fd55665b0c61059c090cb1657
-  data.tar.gz: 61dc5c53fc2d376d850efe43e3397d43f5ab6be5
+  metadata.gz: ac94bcd60e427e6278a8e556d2c93b7e29bc8775
+  data.tar.gz: b89876e35bb697d9c3c5c90a4086f85a2737b074
 SHA512:
-  metadata.gz: 7c3a0cea20e949601b2115f9fd533922d5a81565f576a9903a6d62d0fa237553645d5d423d88f1b4000f172462342560baec3225dccf37d6698dd2cd9c4dda70
-  data.tar.gz: b22882852ddb68ce273973f90e17b67be2ecfdfcd7a23d8543c048c63193d64ffca22ce9e801a1b9cef71cd0f2252aaea388c289acb810926a5180e778a26b21
+  metadata.gz: 06a38db8b00a0512ba636c73669704f33e803f05b501e51f8cd9065b749ba79ff4924d8d5c9c804ce8a99b385d75304e852465140f8e1cbc4ab06ef75fbfe74c
+  data.tar.gz: 5cce51dd705027f9893ec9ce160435c068e73da8466bedefc8261a42e0d9616cfaca5741072ab99fd68feaba311f3a52380f5228dd990c121fa0b832c776d786

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fafx (0.1.0)
+    fafx (0.1.1)
       nokogiri (~> 1.8.2)
 
 GEM

data/README.md

@@ -39,7 +39,7 @@ Fafx::ExchangeRate.most_recent
 # => {"USD"=>1.1571, "JPY"=>128.54, "BGN"=>1.9558, "CZK"=>25.648, ...}
 ```
 
-The `at` function may raise a `KeyError` exception, should the date or currency be unavailable.
+The `at` function may raise a `DateError` or `CurrencyError` exception, should the date or currency be unavailable.
 
 ## Updating the exchange rates data
 
@@ -52,7 +52,7 @@ You can update the exchange rates values either via the **CLI**, **Rake task** o
 ```ruby
 require 'fafx'
 
-Fafx::ExchangeRate.fetch_data_and_save_to_disk
+Fafx::ExchangeRate.update_data
 ```
 
 ---
@@ -63,4 +63,4 @@ One can also schedule a **cron job** (the following example fetches the data eve
 * * * * * . ~/.zshrc; fafx -u
 ```
 
-Note: `. ~/.zshrc` is used to load the environment with the Ruby gems path, because cron uses `PATH=/usr/bin:/usr/sbin` and `SHELL=/usr/bin/sh by default`. Fonts: [here](http://man7.org/linux/man-pages/man5/crontab.5.html) and [here](http://www.adminschoice.com/crontab-quick-reference)
+Note: `. ~/.zshrc` is used to load the environment with the Ruby gems path, because cron uses `PATH=/usr/bin:/usr/sbin` and `SHELL=/usr/bin/sh` by default. Fonts: [here](http://man7.org/linux/man-pages/man5/crontab.5.html) and [here](http://www.adminschoice.com/crontab-quick-reference)

data/fafx.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_runtime_dependency 'nokogiri', '~> 1.8.2'
+  spec.add_runtime_dependency 'nokogiri', '~> 1.8', '>= 1.8.2'
 end

data/lib/fafx.rb

@@ -1,4 +1,5 @@
 require 'fafx/version'
+require 'fafx/core'
 require 'fafx/data_fetcher'
-require 'fafx/er'
+require 'fafx/date_error'
 require 'fafx/exchange_rate'

data/lib/fafx/{er.rb → core.rb}

@@ -1,6 +1,6 @@
 require 'yaml'
 
-class ER
+class Core
   attr_reader :rates, :dates, :currencies
   def initialize
     data = load_data
@@ -10,8 +10,8 @@ class ER
   end
 
   def rates_at(date, curr)
-    raise KeyError, 'Date not available' unless @dates.include?(date)
-    raise KeyError, "#{curr} not found" unless @currencies.include?(curr)
+    raise Fafx::DateError, 'Date not available' unless @dates.include?(date)
+    raise Fafx::CurrencyError, "#{curr} not found" unless @currencies.include?(curr)
     @rates[date][curr]
   end
 
@@ -19,7 +19,7 @@ class ER
 
   def load_data
     rates = "#{File.join(File.dirname(__FILE__))}/rates.yaml"
-    Fafx::ExchangeRate.fetch_data_and_save_to_disk unless File.exist?(rates)
+    Fafx::ExchangeRate.update_data unless File.exist?(rates)
     YAML.load_file(rates)
   end
 end

data/lib/fafx/date_error.rb

@@ -0,0 +1,17 @@
+module Fafx
+  class DateError < StandardError
+    attr_reader :message
+    def initialize(message)
+      super
+      @message = message
+    end
+  end
+
+  class CurrencyError < StandardError
+    attr_reader :message
+    def initialize(message)
+      super
+      @message = message
+    end
+  end
+end

data/lib/fafx/exchange_rate.rb

@@ -1,33 +1,40 @@
 module Fafx
   module ExchangeRate
     def at(date, base, other)
-      ex_rates = ER.new
+      case date.wday
+      when 6 # Saturday
+        date -= 1
+      when 0 # Sunday
+        date -= 2
+      end
+
+      ex_rates = Core.new
       base = ex_rates.rates_at(date.to_s, base)
       other = ex_rates.rates_at(date.to_s, other)
       other / base
     end
 
     def currencies_available
-      ER.new.currencies
+      Core.new.currencies
     end
 
     def dates_available
-      ER.new.dates
+      Core.new.dates
     end
 
     def most_recent
-      ex_rates = ER.new
+      ex_rates = Core.new
       first_date = ex_rates.dates.first
       ex_rates.rates[first_date]
     end
 
-    def fetch_data_and_save_to_disk
+    def update_data
       DataFetcher.save_to_disk
     end
     module_function :at,
                     :currencies_available,
                     :dates_available,
                     :most_recent,
-                    :fetch_data_and_save_to_disk
+                    :update_data
   end
 end

data/lib/fafx/version.rb

@@ -1,3 +1,3 @@
 module Fafx
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fafx
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Frank Kair
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-12 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,6 +57,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.2
   type: :runtime
@@ -64,6 +67,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.2
 description: Lib and CLI to get exchange rates from the European Central Bank
@@ -87,8 +93,9 @@ files:
 - bin/setup
 - fafx.gemspec
 - lib/fafx.rb
+- lib/fafx/core.rb
 - lib/fafx/data_fetcher.rb
-- lib/fafx/er.rb
+- lib/fafx/date_error.rb
 - lib/fafx/exchange_rate.rb
 - lib/fafx/version.rb
 homepage: https://github.com/frankkair/fafx