justexchangerates 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07fe3d9e86c5852b0b6a28522b9b1c49dc5ffee2
-  data.tar.gz: 0d5bed34f067c7864bbd88760321c398b0464007
+  metadata.gz: 1571659794639751cd6da74bff7940ec151fdf79
+  data.tar.gz: c676d5c2d029f620a15e667e1f8bbd3edca31e46
 SHA512:
-  metadata.gz: 786b6d5a46de8ca246410164bd10f6c6ea4990c833a0995962f8e46d89eacf1118a7ed5e4d1f19917226589ecb682c5acb41b9ca539d4b40a5a9889e344205e4
-  data.tar.gz: da4a9d0bdfd0417087187ca7c7c4ed230fbab3a71bced3b45147cf7a61e90a21e0844155ff2e50b4ecc8154ee3766cca6762fb17a7ceafa8990d0b9703356ce4
+  metadata.gz: 5eca2a98653e5cda26eac351eb253dd4bf359aeffb1c4b89c139bbe1b41c1b906f6eb4e37571edfb6a32febe51a9ece5c2ff57c8ad1b3da866dd2cc152139386
+  data.tar.gz: 5ceb1dd8e8cbaa0b2bccdd3bc7f3a09bcf5d03d7da670263d74a74f45f845ffeae9359ebfcdf307b11c746ea75d2d681e4458e29dfb51509f2dd148d4f7efa5e

data/lib/justexchangerates.rb

@@ -5,16 +5,20 @@
 require 'json'
 require 'open-uri'
 require 'chronic_duration'
+require 'open_exchange_rates'
 
 
+# Note: To use this gem you need an **app id** which you can get when 
+# registering for free from https://openexchangerates.org/signup/free
+
 class JustExchangeRates
 
   attr_reader *%i(base date rates)
 
-  def initialize(api:'https://api.fixer.io/latest?base=', base: 'USD', 
-                 cache_refresh: '1 week', cache_path: '.', debug: false)
+  def initialize(base: 'USD', cache_refresh: '1 week', cache_path: '.', \
+                 debug: false, app_id: nil)
 
-    @url, @base, @debug = api, base, debug
+    @base, @debug, @app_id, @cache_refresh = base, debug, app_id, cache_refresh
     
     filename = 'justexchangerates_' + base.downcase + '.json'    
     @cache_filepath = File.join(cache_path, filename)
@@ -23,60 +27,57 @@ class JustExchangeRates
             
       if File.exists? @cache_filepath then
         
-        h2 = JSON.parse(File.read @cache_filepath)
-        seconds = ChronicDuration.parse(cache_refresh) 
-
-        if (Time.parse(h2['date']) + seconds) < Time.now then
-          fetch_rates
-        else
-          puts 'fetching rates from local cache ...' if @debug
-          h2
-        end
+        JSON.parse(File.read(@cache_filepath), {:symbolize_names => true})
         
       else
-        fetch_rates
+        {base: @base, date: Time.now, rates: {}}
       end        
-      
-    else
-      
-      fetch_rates
-      
+            
     end
     
-
-    @base, @date, @rates = h['base'], h['date'], h['rates']    
+    puts 'h: ' + h.inspect if debug
+    
+    @base, @date, @rates = h[:base], h[:date], h[:rates]    
   
   end
 
   def rate(currency)
-    @rates[currency.upcase]
+    
+    if @rates.has_key? currency.upcase.to_sym then
+      
+      seconds = ChronicDuration.parse(@cache_refresh) 
+      puts 'seconds: ' + seconds.inspect if @debug
+      t = (Time.parse(rates[currency.upcase.to_sym].last) \
+          + seconds)
+      puts 't: ' + t.inspect if @debug
+      if t > Time.now then
+        rates[currency.upcase.to_sym].first
+      else
+        fetch_rate currency
+      end
+      
+    else
+      fetch_rate currency
+    end
+    
   end
   
+  
   private
   
-  def fetch_rates()
-
-    response = open(@url + @base.upcase)
-
-    if response.status.last == "OK" then
-
-      h = JSON.parse(response.read)
-      h['date'] = Time.now
-      File.write @cache_filepath, h.to_json
-      h
-
-    else
-      puts "JustExchangeRates API error %s : %s" % response.status
-      {}
-    end          
+  def fetch_rate(currency)
     
-  end
-
-end
-
-if __FILE__ == $0 then
-
-  jer = JustExchangeRates.new(base: 'USD')
-  jer.rate(VARGS.first) # e.g. GBP #=> 0.73792
+    puts 'inside fetch_rate' if @debug
+    fx = OpenExchangeRates::Rates.new(:app_id => @app_id)        
+    
+    rate = fx.convert(1, :from => "USD", :to => currency)
+    puts "currency: %s rate: %s" % [currency, rate] if @debug
+    
+    @rates[currency.upcase.to_sym] = [rate, Time.now.to_s]
+    File.write @cache_filepath, \
+        {base: @base, date: @date, rates: @rates}.to_json
+    rate
+    
+  end  
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: justexchangerates
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -30,7 +30,7 @@ cert_chain:
   wxj+BoAMVbJfP/AfQ46F5erI2X10cQzKt41kZwYasgu98+v6KOKzR+J/d7nKaVJ/
   BL0=
   -----END CERTIFICATE-----
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_duration
@@ -52,6 +52,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.6
+- !ruby/object:Gem::Dependency
+  name: open_exchange_rates
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 description: 
 email: james@jamesrobertson.eu
 executables: []