money-currencylayer-bank 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc97450bce8ac6e02fc906a21ca0c10860428557
-  data.tar.gz: 371c75e3794e3a7c2be6babd222845eda7cb1ac6
+  metadata.gz: bcc2d3fa0693e5f08c0368924439dfad9e36e744
+  data.tar.gz: 8d0d077b6c485208c35f49740e93054b7a5c8102
 SHA512:
-  metadata.gz: f69464174caabd8f18da9077f579d252f77b5b751bf4032117fbc575efd04a4740f84cf1be1fdb39e1f42791dc1540d5911b168324938108a339facef6bcdce0
-  data.tar.gz: e81c35792af291b86f106ed2c2f1efacc78ffcf035ffa01f70d4e030bb9de77de6f41983ccd0052dc61bf105cf4fde668256c1b5b87566bea6cb7e0017ec122e
+  metadata.gz: 85105563870f9b83c96bc6e2e0a47ea8b6c3328d0ac7d7bfc709fe7f598996cd2cbf5eda05f2e96b34dad0520d793c42d862fc71f591f4f76ea2ab96989e52f8
+  data.tar.gz: 60f70f3a63f6c96883e9e34bc274bc96d343f0458eaeeb59e8fb07f441041f424e1734c87ba2d7d86d49ba005d67606021c08fdf8cff08f6845ddf06226e2696

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Phlegx Systems OG
+Copyright (c) 2017 Phlegx Systems OG
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -40,6 +40,7 @@ See more about Currencylayer product plans on https://currencylayer.com/product.
 * average response time < 20ms
 * supports caching currency rates
 * calculates every pair rate calculating inverse rate or using base currency rate
+* supports multi threading
 
 ## Installation
 
@@ -89,7 +90,7 @@ mclb.secure_connection = true
 # Define cache (string or pathname)
 mclb.cache = 'path/to/file/cache'
 
-# Set money default bank to currencylayer bank
+# Set money default bank to Currencylayer bank
 Money.default_bank = mclb
 ~~~
 
@@ -104,7 +105,7 @@ mclb.source
 # Expires rates if the expiration time is reached.
 mclb.expire_rates!
 
-# Return true if the expiration time is reached.
+# Returns true if the expiration time is reached.
 mclb.expired?
 
 # Get the API source url.
@@ -112,6 +113,9 @@ mclb.source_url
 
 # Get the rates timestamp of the last API request.
 mclb.rates_timestamp
+
+# Get the rates timestamp of loaded rates in memory.
+moxb.rates_mem_timestamp
 ~~~
 
 ### How to exchange
@@ -184,6 +188,7 @@ bundle exec rake
 ## Other Implementations
 
 * Gem [currencylayer](https://github.com/askuratovsky/currencylayer)
+* Gem [money-openexchangerates-bank](https://github.com/phlegx/money-openexchangerates-bank)
 * Gem [money-open-exchange-rates](https://github.com/spk/money-open-exchange-rates)
 * Gem [money-historical-bank](https://github.com/atwam/money-historical-bank)
 * Gem [eu_central_bank](https://github.com/RubyMoney/eu_central_bank)
@@ -207,4 +212,4 @@ bundle exec rake
 
 The MIT License
 
-Copyright (c) 2015 Phlegx Systems OG
+Copyright (c) 2017 Phlegx Systems OG

data/lib/money/bank/currencylayer_bank.rb

@@ -13,7 +13,6 @@ class Money
     class Memory
       # Add method to reset the build in memory store
       # @param [Hash] rt Optional initial exchange rate data.
-      #
       # @return [Object] store.
       def reset!(rt = {})
         transaction { @index = rt }
@@ -32,32 +31,29 @@ class Money
     # CurrencylayerBank base class
     class CurrencylayerBank < Money::Bank::VariableExchange
       # CurrencylayerBank url
-      CL_URL = 'http://apilayer.net/api/live'
+      CL_URL = 'http://apilayer.net/api/live'.freeze
       # CurrencylayerBank secure url
-      CL_SECURE_URL = CL_URL.gsub('http:', 'https:')
+      CL_SECURE_URL = CL_URL.sub('http:', 'https:')
       # Default base currency
-      CL_SOURCE = 'USD'
+      CL_SOURCE = 'USD'.freeze
 
       # Use https to fetch rates from CurrencylayerBank
       # CurrencylayerBank only allows http as connection
       # for the free plan users.
       #
       # @param value [Boolean] true for secure connection
-      #
       # @return [Boolean] chosen secure connection
       attr_accessor :secure_connection
 
       # API must have a valid access_key
       #
       # @param value [String] API access key
-      #
       # @return [String] chosen API access key
       attr_accessor :access_key
 
       # Cache accessor, can be a String or a Proc
       #
       # @param value [String,Pathname,Proc] cache system
-      #
       # @return [String,Pathname,Proc] chosen cache system
       attr_accessor :cache
 
@@ -75,7 +71,6 @@ class Money
       #   ttl_in_seconds = 86400 # will expire the rates in one day
       #
       # @param value [Integer] time to live in seconds
-      #
       # @return [Integer] chosen time to live in seconds
       attr_writer :ttl_in_seconds
 
@@ -87,7 +82,6 @@ class Money
       #   source = 'USD'
       #
       # @param value [String] Currency code, ISO 3166-1 alpha-3
-      #
       # @return [String] chosen base currency
       def source=(value)
         @source = Money::Currency.find(value.to_s).try(:iso_code) || CL_SOURCE
@@ -124,47 +118,23 @@ class Money
       # @param [String] from_currency Currency ISO code. ex. 'USD'
       # @param [String] to_currency Currency ISO code. ex. 'CAD'
       # @param [Numeric] rate Rate to use when exchanging currencies.
-      #
       # @return [Numeric] rate.
       def add_rate(from_currency, to_currency, rate)
         super
       end
 
+      # Alias super method
+      alias super_get_rate get_rate
+
       # Override Money `get_rate` method for caching
       # @param [String] from_currency Currency ISO code. ex. 'USD'
       # @param [String] to_currency Currency ISO code. ex. 'CAD'
       # @param [Hash] opts Options hash to set special parameters.
-      #
       # @return [Numeric] rate.
-      def get_rate(from_currency, to_currency, opts = {}) # rubocop:disable all
+      def get_rate(from_currency, to_currency, opts = {})
         expire_rates!
-        rate = super
-        unless rate
-          # Tries to calculate an inverse rate
-          inverse_rate = super(to_currency, from_currency, opts)
-          if inverse_rate
-            rate = 1.0 / inverse_rate
-            add_rate(from_currency, to_currency, rate)
-          end
-        end
-        unless rate
-          # Tries to calculate a pair rate using base currency rate
-          from_base_rate = super(source, from_currency, opts)
-          unless from_base_rate
-            from_inverse_rate = super(from_currency, source, opts)
-            from_base_rate = 1.0 / from_inverse_rate if from_inverse_rate
-          end
-          to_base_rate = super(source, to_currency, opts)
-          unless to_base_rate
-            to_inverse_rate = super(to_currency, source, opts)
-            to_base_rate = 1.0 / to_inverse_rate if to_inverse_rate
-          end
-          if to_base_rate && from_base_rate
-            rate = to_base_rate / from_base_rate
-            add_rate(from_currency, to_currency, rate)
-          end
-        end
-        rate
+        rate = get_rate_or_calc_inverse(from_currency, to_currency, opts)
+        rate || calc_pair_rate_using_base(from_currency, to_currency, opts)
       end
 
       # Fetch new rates if cached rates are expired or stale
@@ -305,6 +275,7 @@ class Money
       end
 
       # Get raw exchange rates from cache and then from url
+      # @param rescue_straight [Boolean] true for rescue straight, default true
       # @return [String] JSON content
       def raw_rates_careful(rescue_straight = true)
         JSON.parse(read_from_cache.to_s)
@@ -319,6 +290,38 @@ class Money
       rescue JSON::ParserError
         raw_rates_careful(false)
       end
+
+      # Get rate or calculate it as inverse rate
+      # @param [String] from_currency Currency ISO code. ex. 'USD'
+      # @param [String] to_currency Currency ISO code. ex. 'CAD'
+      # @return [Numeric] rate or rate calculated as inverse rate.
+      def get_rate_or_calc_inverse(from_currency, to_currency, opts = {})
+        rate = super_get_rate(from_currency, to_currency, opts)
+        unless rate
+          # Tries to calculate an inverse rate
+          inverse_rate = super_get_rate(to_currency, from_currency, opts)
+          if inverse_rate
+            rate = 1.0 / inverse_rate
+            add_rate(from_currency, to_currency, rate)
+          end
+        end
+        rate
+      end
+
+      # Tries to calculate a pair rate using base currency rate
+      # @param [String] from_currency Currency ISO code. ex. 'USD'
+      # @param [String] to_currency Currency ISO code. ex. 'CAD'
+      # @return [Numeric] rate or nil if cannot calculate rate.
+      def calc_pair_rate_using_base(from_currency, to_currency, opts = {})
+        from_base_rate = get_rate_or_calc_inverse(source, from_currency, opts)
+        to_base_rate   = get_rate_or_calc_inverse(source, to_currency, opts)
+        if to_base_rate && from_base_rate
+          rate = to_base_rate / from_base_rate
+          add_rate(from_currency, to_currency, rate)
+          return rate
+        end
+        nil
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: money-currencylayer-bank
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Egon Zemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money