fxpotato 0.6.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc257637544d6f9b0d7f487ebbd242e98dacfc3e
-  data.tar.gz: dfd4392a024947d1e597d8d5e751f0ab388e457f
+  metadata.gz: f1fd9bbd3b50755b6dda523b4588e9bb97ad6814
+  data.tar.gz: d3ffe9890aeeb6f849208538e5c093e5ff8cd83e
 SHA512:
-  metadata.gz: 021fe499b989bcd4a9cd6dc7cf3cbf69eee6078769b99c9292ccdea652de4eda59f988c23eb6a8d281535cc5ec0580130d6c11c53067d802d6e265236ed4ab66
-  data.tar.gz: 2547544a57f5ba2d207ffd5da2bfb367d7e2b7b71a89b99ad88e418181e9d7df9038ce90cfcf00dd97c242d6cbfa629a08a87c82f1ef50360f1faefe34e8842e
+  metadata.gz: c371b803b61128c1a9be2aba59153ed2037bab1fa622a6b64d6bf2447c30e9d3924011b2141d73628be0b611c12e64516e3ad5d98686915a17a85184ab210f3e
+  data.tar.gz: 5c0c5f4a2368724b1d8c7157c5a4355da88378b4ae063f7c4f7e2b66d9826375034ce7ec11ef936992d48ab5905f02b5058307f9a817fce8ad3fcbce9d456907

data/lib/fxpotato/cli.rb

@@ -1,6 +1,7 @@
 require 'thor'
 require 'fxpotato'
 require 'date'
+require 'fxpotato/cli_formatter'
 
 module FxPotato
   class CLI < Thor
@@ -9,7 +10,8 @@ module FxPotato
     def getrate(base, target)
       date = options[:date] || Date.today
       begin
-        puts "Exchange rate from #{base} to #{target} on #{date}: #{FxPotato.at(date, base, target)}"
+        fxrate = FxPotato.at(date, base, target)
+        puts CLIFormatter.result(fxrate)
       rescue RuntimeError => message
         puts message
       end

data/lib/fxpotato/cli_formatter.rb

@@ -0,0 +1,24 @@
+module FxPotato
+  class CLIFormatter
+    def self.result(fxrate)
+      fxrate && fxrate['rate'] ? pass_message(fxrate) : fail_message(fxrate)
+    end
+
+    private
+    def self.pass_message(fxrate)
+      "Exchange rate from #{key_and_rate(fxrate['base'])} to #{key_and_rate(fxrate['target'])} on #{fxrate['date']}: #{fxrate['rate']}"
+    end
+
+    def self.fail_message(fxrate)
+      "Unable to calculate that exchange rate, here's why:\n#{inspect_rate_block(fxrate['base'], fxrate['date'])}\n#{inspect_rate_block(fxrate['target'], fxrate['date'])}"
+    end
+
+    def self.key_and_rate(rate_block)
+      "#{rate_block['key']}(#{rate_block['rate']})"
+    end
+
+    def self.inspect_rate_block(rate_block, date)
+      rate_block['rate'] ? "" : "\tUnable to find rate for #{rate_block['key']} on #{date}"
+    end
+  end
+end

data/lib/fxpotato/fxrate.rb

@@ -0,0 +1,23 @@
+module FxPotato
+  class FxRate
+    attr_reader :base_key, :base_rate, :target_key, :target_rate, :date, :rate
+    def initialize(base_key, base_rate, target_key, target_rate, date, rate)
+      @base_key, @base_rate, @target_key, @target_rate, @date, @rate = base_key, base_rate, target_key, target_rate, date, rate
+    end
+
+    def serialize
+      {
+        'date' => @date,
+        'base' => {
+          'key' => @base_key,
+          'rate' => @base_rate
+        },
+        'target' => {
+          'key' => @target_key,
+          'rate' => @target_rate
+        },
+        'rate' => @rate
+      }
+    end
+  end
+end

data/lib/fxpotato/rate_calculator.rb

@@ -1,7 +1,12 @@
 module FxPotato
   class RateCalculator
     def self.calculate(base, target)
+      return nil unless base && numeric?(base) && target && numeric?(target)
       target / base
     end
+
+    def self.numeric?(thing)
+      Float(thing) != nil rescue false
+    end
   end
 end

data/lib/fxpotato/version.rb

@@ -1,3 +1,3 @@
 module FxPotato
-  VERSION = '0.6.0'
+  VERSION = '1.0.0'
 end

data/lib/fxpotato.rb

@@ -4,21 +4,22 @@ require 'fxpotato/xml_repo'
 require 'fxpotato/rate_store'
 require 'fxpotato/rate_fetcher'
 require 'fxpotato/rate_calculator'
+require 'fxpotato/fxrate'
 require "fxpotato/railtie" if defined?(Rails)
 
 module FxPotato
-  def self.at(date, from_currency, to_currency)
-    raise "Must specify date" if date.nil?
-    raise "Must specify from_currency" if from_currency.nil?
-    raise "Must specify to_currency" if to_currency.nil?
+  def self.at(date, base_key, target_key)
+    base_rate = RateStore.get(self.repo, date, base_key)
+    target_rate = RateStore.get(self.repo, date, target_key)
 
-    from = RateStore.get(self.repo, date, from_currency)
-    raise "Unable to find #{from_currency} on #{date}" if from.nil?
-
-    to = RateStore.get(self.repo, date, to_currency)
-    raise "Unable to find #{to_currency} on #{date}" if to.nil?
-
-    RateCalculator.calculate(from, to)
+    FxRate.new(
+      base_key,
+      base_rate,
+      target_key,
+      target_rate,
+      date,
+      RateCalculator.calculate(base_rate, target_rate)
+    ).serialize
   end
 
   def self.fetch_new_rates

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fxpotato
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Liam Stupid Name Humphreys
@@ -160,6 +160,8 @@ files:
 - fxpotato.gemspec
 - lib/fxpotato.rb
 - lib/fxpotato/cli.rb
+- lib/fxpotato/cli_formatter.rb
+- lib/fxpotato/fxrate.rb
 - lib/fxpotato/paths.rb
 - lib/fxpotato/railtie.rb
 - lib/fxpotato/rate_calculator.rb