fx_lib 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7faf2c70cf0b0ac42eb025863ebd3a9d1f1fbc00
-  data.tar.gz: 9bd0c3a8e6dce41426adcbe57181433b0b34afd7
+  metadata.gz: 6c6e936eff076ca680c53ee11cd18101d22b69b0
+  data.tar.gz: f6e8d59edabfcbc043fc991b43190a4fe7fb2471
 SHA512:
-  metadata.gz: 2fb1a6ba4bff52b1fb5a63f0b9ba065b6633ddf7ad378a1e970fb57e38546c98cb5f9a51817955f7848c489263c68b804799fb59b1a9014863b3d94c245229ed
-  data.tar.gz: 5a9721a8f3447821109b78c90a78cf2cf4baf3bbca81210144ff630dbf228945e80edb86cfa1ebf51ad2d39dc93257a702ddbd3c38d1564ac99940d68f6f96b3
+  metadata.gz: e5742eec3712897fd9c2f1d6293615135b604b7cea21fd1dc3308b439fd324a56369efe183df379c901f4f3d5d55d189fa7ddd3670b20843906fa231b03a66b6
+  data.tar.gz: 566693ca19eb49c85e30f83f0f7a73ca047c7da9b26fead553aee1a355a67b896fa5365fafa163be37415dafa8fe1260f5795c5536237c1b4dc7877111710e95

data/lib/fx_lib/version.rb

@@ -1,3 +1,3 @@
 module FxLib
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/fx_lib.rb

@@ -38,20 +38,32 @@ module FxLib
       return rate
     end
 
-    def self.fetch_data(url, no_of_days)
+    def self.fetch_data_on(url, date)
       begin
-        if (no_of_days < 1 || no_of_days > 90)
-          raise 'Days should be within 1 and 90'
-        end
         file = open_xml_file(url)
-        no_of_days.times do |d|
-          #ToDo Account for weekends
-          #date    = (Date.today - d - 3).strftime("%Y-%m-%d")
-          date    = (Date.today - d).strftime("%Y-%m-%d")
-          extract = file.xpath("//Cube[@time='#{date}']/Cube")
-          puts date.inspect
-          extract.each do |e|
-            er = FxRate.create(downloaded_at: date, currency: e.attr('currency'), rate: e.attr('rate'))
+        d    = date.strftime("%Y-%m-%d")
+        extract = file.xpath("//Cube[@time='#{d}']/Cube")
+        extract.each do |e|
+          er = FxRate.create(downloaded_at: d, currency: e.attr('currency'), rate: e.attr('rate'))
+          er.save
+        end
+      rescue Exception => e
+        puts e.to_s
+        return e.to_s
+      end
+    end
+
+    def self.fetch_data(url)
+      begin
+        file         = open_xml_file(url)
+        time_cubes   = file.xpath("//Cube[@time]")
+        time_cubes.each do |tc|
+          cubes    = tc.xpath("./Cube")
+          cubes.each do |c|
+            date     = tc.attr('time')
+            currency = c.attr('currency')
+            rate     = c.attr('rate')
+            er       = FxRate.create(downloaded_at: date, currency: currency, rate: rate)
             puts er.inspect
             er.save
           end

data/lib/tasks/db_seed.rake

@@ -1,5 +1,5 @@
 namespace :fx_lib do
   task db_seed: :environment do
-    FxLib::ExchangeRate.fetch_data(ENV['FX_URL'],90)
+    FxLib::ExchangeRate.fetch_data(ENV['FX_URL'])
   end
 end

data/spec/acceptance/fx_lib_spec.rb

@@ -2,7 +2,8 @@ require 'spec_helper'
 require './lib/fx_lib.rb'
 
 describe 'FxLib' do
-  url = "http://www.ecb.europa.eu/stats/eurofxref/eurofxref-hist-90d.xml"
+  #url = "http://www.ecb.europa.eu/stats/eurofxref/eurofxref-hist-90d.xml"
+  url = './spec/internal/eurofx90d.xml'
 
   it 'set up block yields self' do
     FxLib.setup do |config|
@@ -13,28 +14,22 @@ describe 'FxLib' do
   #Tests for fetching data
   it "should have a method ExchangeRate.fetch_data" do
     lambda do
-      FxLib::ExchangeRate.fetch_data(url, 1)
+      FxLib::ExchangeRate.fetch_data(url)
     end.should_not raise_error
   end
 
   it "should have a method for ExchangeRate.at" do
     lambda do
-      FxLib::ExchangeRate.fetch_data(url, 1)
-      date = DateTime.new(2013,12,16)
+      FxLib::ExchangeRate.fetch_data(url)
+      date = DateTime.new(2013,12,13)
       FxLib::ExchangeRate.at(date, 'GBP', 'USD')
     end.should_not raise_error
   end
 
-  #check no_of_days should be > 0 and < 9
-  it 'should check the date range' do
-    str = FxLib::ExchangeRate.fetch_data(url, 0)
-    str.should eq("Days should be within 1 and 90")
-  end
-
   it 'should calculate exchange rate' do
-    FxLib::ExchangeRate.fetch_data(url, 1)
-    date = DateTime.new(2013,12,16)
+    date = DateTime.new(2013,12,13)
+    FxLib::ExchangeRate.fetch_data_on(url, date)
     rate = FxLib::ExchangeRate.at(date, 'GBP', 'USD')
-    rate.should eq(1.6325)
+    rate.should eq(1.627)
   end
 end

data/spec/acceptance/fx_table_spec.rb

@@ -1,12 +1,20 @@
 require 'spec_helper'
+require 'date'
 require './lib/fx_lib.rb'
 
 #test for generating a fx table
 describe 'Generating a fx table' do
-  url = "http://www.ecb.europa.eu/stats/eurofxref/eurofxref-hist-90d.xml"
+  #url = "http://www.ecb.europa.eu/stats/eurofxref/eurofxref-hist-90d.xml"
+  url = './spec/internal/eurofx90d.xml'
 
-  it 'should fetch the data given correct url and date' do
-    FxLib::ExchangeRate.fetch_data(url, 1)
-    expect(FxRate.where(currency: 'USD', rate: '1.3776')).not_to be_empty
+  it 'should fetch all data given correct url' do
+    FxLib::ExchangeRate.fetch_data(url)
+    expect(FxRate.where(currency: 'USD', rate: '1.3727')).not_to be_empty
+  end
+
+  it 'should fetch data for a given date' do
+    date = DateTime.new(2013,12,13)
+    FxLib::ExchangeRate.fetch_data_on(url, date)
+    expect(FxRate.where(currency: 'USD', rate: '1.3727')).not_to be_empty
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fx_lib
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - hsu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord