lib/convertator/converter.rb in convertator-0.2.0 vs lib/convertator/converter.rb in convertator-0.3.0

@@ -8,14 +8,21 @@
     attr_reader :provider
 
     def initialize(provider = :cbr, accuracy = 10)
       @provider = load_provider(provider)
       @accuracy = accuracy
+      @chain = [] << @provider
+      yield(self) if block_given?
     end
 
+    def add(middleware)
+      middleware.prev = @chain.last
+      @chain << middleware
+    end
+
     def rates
-      @provider.new_rates
+      symbolize_keys(@chain.last.call)
     end
 
     def rate(currency)
       currency = normalize_currency(currency)
       rate = rates[currency]
@@ -26,15 +33,15 @@
     def ratio(currency_from, currency_to)
       round(rate(currency_from) / rate(currency_to))
     end
 
     def convert(amount, currency_from, currency_to)
-      round(amount / ratio(currency_from, currency_to))
+      round(amount * ratio(currency_from, currency_to))
     end
 
     def convert_s(amount, currency_from, currency_to)
-      round(convert(amount, currency_from, currency_to)).to_digits
+      convert(amount, currency_from, currency_to).to_digits
     end
 
     def convert_multi(amount, currency_from, currencies_to)
       currencies_to.map do |currency_to|
         convert(amount, currency_from, currency_to)
@@ -47,10 +54,20 @@
       end
     end
 
     private
 
+    def symbolize_keys(array)
+      array.each_with_object({}) do |(k, v), memo|
+        memo[normalize_currency(k)] = v
+      end
+    end
+
+    def normalize_currency(currency)
+      currency.to_sym.upcase
+    end
+
     def round(value)
       BigDecimal.save_rounding_mode do
         BigDecimal.mode(BigDecimal::ROUND_MODE, :half_up)
         value.round(@accuracy)
       end
@@ -68,12 +85,8 @@
       require ::File.join(
         __dir__,
         'providers',
         "#{name.downcase}_provider"
       )
-    end
-
-    def normalize_currency(currency)
-      currency.to_sym.upcase
     end
   end
 end