interests 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9be6b2c88262c28c80dcc15a26d0d5cd851db5e
-  data.tar.gz: 4164f4c6678d69dec248c44f0a0e6bd97448a4a7
+  metadata.gz: f68e0d0ff75ce39417b1d340243d991deaabe1bd
+  data.tar.gz: 6a1a2986ff1dd94b9964db3cbdda96ae9e149ffe
 SHA512:
-  metadata.gz: d215cb2d3b8f87afff1a384d218cca84f26a5fa719b7fb8de306436b801e807250d212cf086b96abb8af221e567937bc4fd355e2704fc148c8c086f0e19ff41b
-  data.tar.gz: a0d653ffb6f2d77d82b6e54b80231d2f101a2e283852d5c08832ffcc9c56056e8fc1e217122af1a5621ff973b9dddf5237e08ab007c602f3b4fa4dafd0b1389e
+  metadata.gz: ae2fe645dd49127775adbdc0250fc558af87828960cb037f3ead28cdc1282355aad3e3ea5858c7624e0b6ca7be7ab17c5322c958dedbf945bfa482514f236ed2
+  data.tar.gz: f665bac846df25cb325f352108cfaf2c1485aa5b354d4c48bb4ba0793cade5c24effd9ed6016c1d6b1c228c9258095188c9524651b54e5562d5c012be29be185

data/README.md

@@ -16,7 +16,7 @@ gem 'interests'
 
 Run the bundle command to install it.
 
-Run generator if needed with:
+Run generator if needed:
 
 ```console
 rails generate interests:config

data/lib/interests/calculator.rb

@@ -17,13 +17,7 @@ module Interests
         prev_rate = nil
         config_rates.sort!{ |x, y| x.date <=> y.date }
         ([blank_rate] + config_rates + [blank_rate(till + 1.day, config_rates.last.rate)]).each_with_index do |rate, i|
-          if i > 0
-            from_date = prev_rate.date
-            to_date = rate.date - 1.day
-            days = (to_date - from_date).to_i
-            day_rate = prev_rate.rate.to_f / 365
-            @rates << OpenStruct.new(from_date: from_date, to_date: to_date, days: days, rate: prev_rate.rate, day_rate: day_rate)
-          end
+          add_to_rates(prev_rate, rate, ) if i > 0
           prev_rate = rate
         end
 
@@ -32,15 +26,7 @@ module Interests
 
       def interests(amount = 0.0, from_date = BEGINNING_OF_COMPUTER_ERA, to_date = Date.today)
         rates(to_date).select{ |rate| rate.to_date >= from_date && rate.from_date <= to_date }.map do |rate|
-          date_beg = [from_date + 1.day, rate.from_date].max
-          date_end = [to_date, rate.to_date].min
-          OpenStruct.new(
-            date_beg: date_beg,
-            date_end: date_end,
-            days: (date_beg..date_end).count,
-            day_rate: rate.day_rate,
-            interests: amount * (date_beg..date_end).count * rate.day_rate
-          )
+          interest_struct([from_date + 1.day, rate.from_date].max, [to_date, rate.to_date].min, amount, rate)
         end
       end
 
@@ -57,6 +43,25 @@ module Interests
       def blank_rate(date = BEGINNING_OF_COMPUTER_ERA, rate = 0.0)
         OpenStruct.new(date: date, rate: rate)
       end
+
+      def add_to_rates(prev_rate, rate)
+        from_date = prev_rate.date
+        to_date = rate.date - 1.day
+        days = (to_date - from_date).to_i
+        day_rate = prev_rate.rate.to_f / 365
+
+        @rates << OpenStruct.new(from_date: from_date, to_date: to_date, days: days, rate: prev_rate.rate, day_rate: day_rate)
+      end
+
+      def interest_struct(date_beg, date_end, amount, rate)
+        OpenStruct.new(
+          date_beg: date_beg,
+          date_end: date_end,
+          days: (date_beg..date_end).count,
+          day_rate: rate.day_rate,
+          interests: amount * (date_beg..date_end).count * rate.day_rate
+        )
+      end
     end
   end
 end

data/lib/interests/version.rb

@@ -1,3 +1,3 @@
 module Interests
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: interests
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Alek Niemczyk