convertator 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc7a6facbe3c191895e300323d3edef1ade43fb6
-  data.tar.gz: eaa33fe8665055b55049f7cef821f3402bb06432
+  metadata.gz: 022c887fe0bd212569243795a54a18e0b746dc23
+  data.tar.gz: 0acc04318bf82853fef66660e2aee623c626f8be
 SHA512:
-  metadata.gz: eaa2be165648f8ecd29ff4e29e62409a2021e6a8fc81d10bb6c608827de6f767554537fc02ec4a6891a8cc6f108211084edf8c66f9b5ae2aa16ccff69d4fa4da
-  data.tar.gz: 727eb42164a427c3ab1c6bde3ba300c93adcc0f3259617cfce71637dd859f036e57de32ffe80786fd6d8c777d0a97a9d8f522096c0950a0bc9755a8cc022e7e0
+  metadata.gz: 154ac3ec7baebf2b6fa19b707ddd990c9e300591e0a540ac040cb96d4aa096adf3fd27db89401722de79362ea8c139f9618bd1c5dff907928449f2fe6fb5382f
+  data.tar.gz: 44c39d3a310f2aeb0a850f0488536275a10766cdcdd3254ce2196cc9d37966a827023060b3fc2b12dd89a50be05aac0c4cb534f092743dbeef91119c9634fd72

data/README.md

@@ -4,8 +4,8 @@ A simple currency converter which can use different sources to fetch rates and p
 
 [![Gem Version](https://badge.fury.io/rb/convertator.svg)](https://badge.fury.io/rb/convertator)
 
-## Usage
 
+## Usage
 
 **Simple example**
 
@@ -13,27 +13,39 @@ A simple currency converter which can use different sources to fetch rates and p
 require 'convertator/converter'
 
 converter = Convertator::Converter.new
-converter.convert(100, :RUB, :USD)
+converter.convert(100, :USD, :RUB)
 => 0.55e4
-converter.convert_digits(100, :RUB, :USD)
+converter.convert_digits(100, :USD, :RUB)
 => "5500.0"
 ```
 
-
 **Multi convertion**
 
 ```ruby
-Convertator::Converter.new.convert_multi_s(100, :GBP, [:AMD, :RUB, :GBP])
-=> ["15.7142857144", "1.4285714286", "100.0"]
+Convertator::Converter.new(:static).convert_multi_s(100, :GBP, [:AMD, :RUB, :GBP])
+=> ["47.12398", "3336.69827", "100.0"]
 ```
 
-
 **Define accuracy and handler**
 
 ```ruby
 Convertator::Converter.new(:static, 7)
 ```
 
+**Use file cache middleware**
+
+```ruby
+irb(main):002:0> require 'convertator/middlewares/file_cache_middleware'
+=> true
+irb(main):003:0> converter = Convertator::Converter.new do |c|
+irb(main):004:1*   c.add Convertator::Middlewares::FileCacheMiddleware.new('/tmp/convertator.cache')
+irb(main):005:1> end
+=> #<Convertator::Converter:0x005642ede40a58>
+converter.convert_s(100, :GBP, :RUB)
+=> 7000.0
+```
+
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -50,9 +62,6 @@ Or install it yourself as:
 
     $ gem install convertator
 
-## Usage
-
-TODO: Write usage instructions here
 
 ## Development
 
@@ -60,6 +69,7 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/convertator. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/lib/convertator/converter.rb

@@ -10,10 +10,17 @@ module Convertator
     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)
@@ -28,11 +35,11 @@ module Convertator
     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)
@@ -49,6 +56,16 @@ module Convertator
 
     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)
@@ -71,9 +88,5 @@ module Convertator
         "#{name.downcase}_provider"
       )
     end
-
-    def normalize_currency(currency)
-      currency.to_sym.upcase
-    end
   end
 end

data/lib/convertator/middleware.rb

@@ -0,0 +1,10 @@
+module Convertator
+  class Middleware
+    attr_accessor :prev
+
+    def call
+      raise ::NotImplementedError,
+            'Method call should be implemented by every middleware'
+    end
+  end
+end

data/lib/convertator/middlewares/file_cache_middleware.rb

@@ -0,0 +1,50 @@
+require 'convertator/middleware'
+require 'json'
+
+module Convertator
+  module Middlewares
+    class FileCacheMiddleware < ::Convertator::Middleware
+      DEFAULT_TTL = 3600
+
+      def initialize(file, ttl = DEFAULT_TTL)
+        @file = file_open(file)
+        @ttl = ttl
+      end
+
+      def call
+        @file.flock(::File::LOCK_EX)
+        if file_zero? || file_old?
+          data = @prev.call
+          file_write(data.to_json)
+        else
+          data = JSON.parse(file_read)
+        end
+        @file.flock(::File::LOCK_UN)
+        data
+      end
+
+      private
+
+      def file_read
+        ::File.read(@file.path)
+      end
+
+      def file_zero?
+        File.zero? @file.path
+      end
+
+      def file_open(file)
+        ::File.new(file, 'w+')
+      end
+
+      def file_write(data)
+        @file.rewind
+        @file.write data
+      end
+
+      def file_old?
+        @ttl < (::Time.new.to_i - @file.mtime.to_i)
+      end
+    end
+  end
+end

data/lib/convertator/providers/cbr_provider.rb

@@ -3,10 +3,10 @@ require 'rexml/document'
 
 module Convertator
   module Providers
-    class CbrProvider
+    class CbrProvider < Middleware
       SERVICE_URI = 'http://www.cbr.ru/scripts/xml_daily.asp'.freeze
 
-      def new_rates
+      def call
         default_rates.merge parse(fetch)
       end
 

data/lib/convertator/providers/static_provider.rb

@@ -1,14 +1,10 @@
 module Convertator
   module Providers
-    class StaticProvider < BaseProvider
+    class StaticProvider < Middleware
       attr_writer :rates
 
-      def initialize
-        @rates = {}
-      end
-
-      def new_rates
-        @rates
+      def call
+        @rates || {}
       end
     end
   end

data/lib/convertator/utils.rb

@@ -0,0 +1,13 @@
+module Convertator
+  module Utils
+    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
+  end
+end

data/lib/convertator/version.rb

@@ -1,3 +1,3 @@
 module Convertator
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: convertator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Ivan Zinovyev
@@ -100,10 +100,12 @@ files:
 - bin/setup
 - convertator.gemspec
 - lib/convertator.rb
-- lib/convertator/base_provider.rb
 - lib/convertator/converter.rb
+- lib/convertator/middleware.rb
+- lib/convertator/middlewares/file_cache_middleware.rb
 - lib/convertator/providers/cbr_provider.rb
 - lib/convertator/providers/static_provider.rb
+- lib/convertator/utils.rb
 - lib/convertator/version.rb
 homepage: https://github.com/zinovyev/convertator
 licenses:

data/lib/convertator/base_provider.rb

@@ -1,8 +0,0 @@
-module Convertator
-  class BaseProvider
-    def new_rates
-      raise ::NotImplementedError,
-            'Method new_rates should be implemented by every rates provider'
-    end
-  end
-end