mrpin-sdk 1.0.75 → 1.0.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4feaca6e39dd3a680ab12170570ca60073c8822a
-  data.tar.gz: 828c11bd3f8d7557ab5609c33d3d41558d6136f3
+  metadata.gz: 6b3fc6277056691b958b64a917de5a38145505c3
+  data.tar.gz: f3cd8571f82824cc3c60e003945e2b2e7541222d
 SHA512:
-  metadata.gz: 6fb3d2f64822b60f261dda148a903ec17f06a2283500668bf07d7dc21bb98235085baf83347c18400cd7e653162240ebdcb856ac05a91fe3a724d534c42f4439
-  data.tar.gz: e1d60344d47e1aa3ce6daa136cda86cbab5bdad6b216262a3eee317f9e551120abab702424eb62e520c75e96393ebb8fea00d131ad5e1bce14ca36abc8947d32
+  metadata.gz: 62b5f36d515675773344ec6dbee0b6e02a3c61bbd1f243bd8ae2c3145a093184a81e47e0d5f5851168e4cafe62cb057af7af3bffb26409905e91988dce81ef2f
+  data.tar.gz: a84b5f3c292b5a29ea8965cc60d783c4f696d2ca19e7035c263d778d607fbe0cfb0b58945637216ddc9549ecd5730467c4b9a81e013aa1755e6f48f823a18935

data/lib/mrpin/core/currency_exchanger/currency_exchanger.rb

@@ -3,9 +3,7 @@ class CurrencyExchanger
   def initialize
     @exchangers = []
 
-    if Rails.env.development?
-      @exchangers << ExchangerLocal.new
-    end
+    @exchanger_local = ExchangerLocal.new
 
     @exchangers << ExchangerYahoo.new
     @exchangers << ExchangerFixer.new
@@ -14,25 +12,51 @@ class CurrencyExchanger
 
   public
   def get_rate(from_currency, to_currency)
+    from_currency = from_currency.upcase
+    to_currency   = to_currency.upcase
+
     result = nil
 
     if from_currency == to_currency
       result = 1.0
     else
-      @exchangers.each do |exchanger|
-        begin
 
-          result = exchanger.get_rate(from_currency, to_currency)
+      result = @exchanger_local.get_rate(from_currency, to_currency)
+
+      if result.nil?
+        result = get_rate_and_cache(from_currency, to_currency)
+      end
+    end
+
+    if result.nil? || result == 0
+      if Rails.env.production?
+        assert(false, "can't fetch rate from servers")
+      else
+        result = 1.0
+      end
+    end
+
+    result
+  end
+
+  private
+  def get_rate_and_cache(from_currency, to_currency)
+    from_currency = from_currency.upcase
+    to_currency   = to_currency.upcase
+
+    result = nil
 
-          break if !result.nil? && result > 0
+    @exchangers.each do |exchanger|
+      begin
+        result = exchanger.get_rate(from_currency, to_currency)
 
-        rescue Exception => e
-          AppInfo.instance.on_server_error("Can't fetch currency rate form #{exchanger.class.name}. Error: #{e.message}")
-        end
+        break if !result.nil? && result > 0
+      rescue Exception => e
+        AppInfo.instance.on_server_error("Can't fetch currency rate form #{exchanger.class.name}. Error: #{e.message}")
       end
     end
 
-    assert(!result.nil? && result > 0, "can't fetch rate from servers")
+    @exchanger_local.set_rate(from_currency, to_currency, result)
 
     result
   end

data/lib/mrpin/core/currency_exchanger/local/exchanger_local.rb

@@ -1,10 +1,12 @@
-# used only local
+# used for local cache
 class ExchangerLocal < ExchangerBase
 
   #
   # properties
   #
 
+  EXPIRE_DURATION = 30.minutes
+
   #
   # methods
   #
@@ -13,11 +15,60 @@ class ExchangerLocal < ExchangerBase
   public
   def initialize
     super
+
+    @locker = Mutex.new
+    #key - from + to, value - hash {timestamp_updated_at: rate: }
+    @rates_map = {}
   end
 
   public
   def get_rate(from_currency, to_currency)
-    1.0
+    result = nil
+
+    @locker.synchronize do
+      key = "#{from_currency}_#{to_currency}"
+
+      data = @rates_map[key]
+
+      unless data.nil?
+        updated_at = data[:updated_at]
+        rate       = data[:rate]
+
+        if Time.now.to_i - updated_at > EXPIRE_DURATION
+          @rates_map.delete(key)
+        else
+          result = rate
+        end #check time
+      end #check data
+    end #locker
+
+    result
+  end
+
+  public
+  def set_rate(from_currency, to_currency, rate)
+    return if rate == 0 || rate.nil?
+
+    @locker.synchronize do
+      set_rate_unsafe(from_currency, to_currency, rate)
+      set_rate_unsafe(to_currency, from_currency, 1.to_f / rate)
+    end
+
+    nil
+  end
+
+  private
+  def set_rate_unsafe(from_currency, to_currency, rate)
+    key  = "#{from_currency}_#{to_currency}"
+    data =
+        {
+            updated_at: Time.now.to_i,
+            rate:       rate
+        }
+
+    @rates_map[key] = data
+
+    nil
   end
 
 end

data/mrpin-sdk.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name        = 'mrpin-sdk'
-  spec.version     = '1.0.75'
+  spec.version     = '1.0.76'
   spec.authors     = %w(Gregory Tkach Yakupov Dmitrij)
   spec.email       = %w(gregory.tkach@gmail.com yakupov.dmitrij@gmail.com)
   spec.description = %q{Mrpin sdk for backend development.}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mrpin-sdk
 version: !ruby/object:Gem::Version
-  version: 1.0.75
+  version: 1.0.76
 platform: ruby
 authors:
 - Gregory
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -398,7 +398,6 @@ files:
 - lib/mrpin/core/constants/constants_remote.rb
 - lib/mrpin/core/currency_exchanger/base/exchanger_base.rb
 - lib/mrpin/core/currency_exchanger/currency_exchanger.rb
-- lib/mrpin/core/currency_exchanger/e_currency_type.rb
 - lib/mrpin/core/currency_exchanger/fixer/exchanger_fixer.rb
 - lib/mrpin/core/currency_exchanger/local/exchanger_local.rb
 - lib/mrpin/core/currency_exchanger/yahoo/exchanger_yahoo.rb

data/lib/mrpin/core/currency_exchanger/e_currency_type.rb

@@ -1,8 +0,0 @@
-class ECurrencyType < EnumBase
-
-  ECT_USD = 'USD'
-  ECT_EUR = 'EUR'
-  ECT_RUB = 'RUB'
-  ECT_UAH = 'UAH'
-
-end