skv_report 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc6ae7fe836e23e0ff759e7edaead196e1a95bab1765f66533e2b1dd67bd9af9
-  data.tar.gz: 968ae3ac9316ce662fbd8a31c346a6a244b48db2b56927809c869b10252396f5
+  metadata.gz: c31bd0550e519a43a66dd68769bc31ff1fe7b0b31bcbedb00ceb347c2f0aa85c
+  data.tar.gz: b207e0835e2775c0715ac331a8e76ca9f3eb7418af1ecd1f06addb6ea90f4e2b
 SHA512:
-  metadata.gz: a85f7a81c57d0e26ee2097a5698b6a8a6cc54c5c057453323b24d6513aa91f41c9fc7c1bca46e4043a4e263a272c29308e4055f0b9faf4924508479937e4606a
-  data.tar.gz: 7759608c7f40d3472801215b9c1c6a9c02c1dc81d93cd46169e3084d26915e0a99953908cf129b4cdfc61e365e2bec4a1f97360f46f2cd006bbc1fbe9614c5b6
+  metadata.gz: 8ff058a181aacd7bd378aa29b92671b9f1899a6d9839d8818621c682f217066fea9f439efbdc9258d2fc923a1b9af76762cee6774a0b1524ae80e2c5c88dc800
+  data.tar.gz: c3b3244deca7946db8709cdca43b1b15dfa732837b3c900d49591dc378848c522569977fc20fa15d71e69ca46aa120593a3390d85ecfa1f5b1cb11f3ea3689cf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    skv_report (0.2.0)
+    skv_report (0.3.0)
       money (~> 6.14)
       valvat (~> 1.1)
 
@@ -17,19 +17,19 @@ GEM
     builder (3.2.4)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
     gyoku (1.3.1)
       builder (>= 2.1.2)
     httpi (2.4.5)
       rack
       socksify
-    i18n (1.8.7)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
-    money (6.14.0)
+    money (6.14.1)
       i18n (>= 0.6.4, <= 2)
-    nokogiri (1.11.1-x86_64-darwin)
+    nokogiri (1.11.3-x86_64-darwin)
       racc (~> 1.4)
     nori (2.6.0)
     parallel (1.20.1)

data/lib/skv_report/exchange_rates.rb

@@ -9,20 +9,18 @@ module SKVReport
 
     class NoRateForCurrencyError < StandardError; end
 
-    attr_reader :rates, :start_at, :base, :end_at
+    attr_reader :rates, :base_currency
 
     def initialize(rates = {})
-      @rates = rates['rates']
+      @rates = rates['rates'] || rates['dates_with_rates']
       @base_currency = rates['base']
-      @start_at = Date.parse(rates['start_at'])
-      @end_at = Date.parse(rates['end_at'])
     end
 
     def rate_for(from_currency, date)
-      date_for_rate = find_previous_existing_date(Date.parse(date))
-      raise_no_rates_for_date_error(date) if date_for_rate.nil?
+      date_rates = rates[date]
+      raise_no_rates_for_date_error(date) if date_rates.nil?
 
-      rate = rates.dig(date_for_rate.to_s, from_currency.upcase)
+      rate = rates.dig(date, from_currency.upcase)
       return rate unless rate.nil?
 
       raise NoRateForCurrencyError,
@@ -31,20 +29,8 @@ module SKVReport
 
     private
 
-    # Test number of times this recursive method is called?
-    def find_previous_existing_date(date)
-      return nil if date_outside_of_range?(date)
-
-      rates[date.to_s].nil? ? find_previous_existing_date(date - 1) : date
-    end
-
-    def date_outside_of_range?(date)
-      date < start_at || date > end_at
-    end
-
     def raise_no_rates_for_date_error(date)
-      raise NoRatesForDateError,
-            "date: #{date}\nstart_at: #{start_at}\nend_at: #{end_at}"
+      raise NoRatesForDateError, "date: #{date}\navailable_dates: #{rates.keys}"
     end
   end
 end

data/lib/skv_report/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SKVReport
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skv_report
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - frdrkolsson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-17 00:00:00.000000000 Z
+date: 2021-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Generates CSV complete string for Skatteverkets Periodisk Sammanfattning