money-currencylayer-bank 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37108e2aeabffc38f2c89a1db5161ca94d52e00e
-  data.tar.gz: 345f18d20d8cac0d4aa1a9b401021ec93af72301
+  metadata.gz: 2c5a08a77bda99cbfcd572fbd6aec7d24a30e4ea
+  data.tar.gz: 17c697f0262bdedadf2c5bb9019364b10b3b8417
 SHA512:
-  metadata.gz: b10c6233f280ced125b6646341eac9b2e9859581154f8643d1ac984f44ad2018f1a2f53869d0e28d8b8be0fd6758bdc7680fda8880f683c51a35779c8a23e1d8
-  data.tar.gz: 334f01cd4f112a59adad4596b5f105dcaf2bf068c3077abd4f8d16936e6f9c25beed962cbff4f44a3ca654166fe4f43466e3786de95602763c432cc07659ea44
+  metadata.gz: 8afffad25d2b2fe4ae7253d903487253fb838b3a8fe260dda2f2160d80cc896102c4afe1654ca0436e0785ab90178832048088d66761d6c2af1c7a5c6dc8a475
+  data.tar.gz: 033896568dfbe42df8e55042a7255390a2ed93a7257397e04cedd5d9357c2663f130cb5840193f24db752e706f3585e56276400b62574854bff7ee13d65907e2

data/README.md

@@ -1,5 +1,11 @@
 # Money Currencylayer Bank
 
+[![Gem Version](https://badge.fury.io/rb/money-currencylayer-bank.svg)](https://rubygems.org/gems/money-currencylayer-bank)
+[![Build Status](https://secure.travis-ci.org/phlegx/money-currencylayer-bank.svg?branch=master)](https://travis-ci.org/phlegx/money-currencylayer-bank)
+[![Code Climate](http://img.shields.io/codeclimate/github/phlegx/money-currencylayer-bank.svg)](https://codeclimate.com/github/phlegx/money-currencylayer-bank)
+[![Inline docs](http://inch-ci.org/github/phlegx/money-currencylayer-bank.svg?branch=master)](http://inch-ci.org/github/phlegx/money-currencylayer-bank)
+[![License](https://img.shields.io/github/license/phlegx/money-currencylayer-bank.svg)](http://opensource.org/licenses/MIT)
+
 A gem that calculates the exchange rate using published rates from
 [currencylayer.com](https://currencylayer.com/)
 
@@ -99,10 +105,3 @@ bundle exec rake
 The MIT License
 
 Copyright (c) 2015 Phlegx Systems OG
-
----
-[![Gem Version](https://badge.fury.io/rb/money-currencylayer-bank.svg)](https://rubygems.org/gems/money-currencylayer-bank)
-[![Build Status](https://secure.travis-ci.org/phlegx/money-currencylayer-bank.svg?branch=master)](https://travis-ci.org/phlegx/money-currencylayer-bank)
-[![Code Climate](http://img.shields.io/codeclimate/github/phlegx/money-currencylayer-bank.svg)](https://codeclimate.com/github/phlegx/money-currencylayer-bank)
-[![Inline docs](http://inch-ci.org/github/phlegx/money-currencylayer-bank.svg?branch=master)](http://inch-ci.org/github/phlegx/money-currencylayer-bank)
-[![License](https://img.shields.io/github/license/phlegx/money-currencylayer-bank.svg)](http://opensource.org/licenses/MIT)

data/lib/money/bank/currencylayer_bank.rb

@@ -23,7 +23,8 @@ class Money
       CL_SOURCE = 'USD'
 
       # Use https to fetch rates from CurrencylayerBank
-      # CurrencylayerBank only allows http as connection for the free plan users.
+      # CurrencylayerBank only allows http as connection
+      # for the free plan users.
       attr_accessor :secure_connection
 
       # API must have a valid access_key
@@ -42,7 +43,8 @@ class Money
       attr_reader :ttl_in_seconds
 
       # Set the base currency for all rates. By default, USD is used.
-      # CurrencylayerBank only allows USD as base currency for the free plan users.
+      # CurrencylayerBank only allows USD as base currency
+      # for the free plan users.
       #
       # @example
       #   source = 'USD'
@@ -178,7 +180,15 @@ class Money
       # Get expire rates, first from cache and then from url
       # @return [Hash] key is country code (ISO 3166-1 alpha-3) value Float
       def exchange_rates
-        doc = JSON.parse(read_from_cache) rescue doc = JSON.parse(read_from_url) rescue doc = { 'quotes' => {}}
+        begin
+          doc = JSON.parse(read_from_cache.to_s)
+        rescue JSON::ParserError
+          begin
+            doc = JSON.parse(read_from_url)
+          rescue JSON::ParserError
+            doc = { 'quotes' => {} }
+          end
+        end
         @cl_rates = doc['quotes']
       end
 

data/test/TEST_ACCESS_KEY

@@ -0,0 +1 @@
+your access_key from https://currencylayer.com/product

data/test/currencylayer_bank_test.rb

@@ -65,10 +65,10 @@ describe Money::Bank::CurrencylayerBank do
     before do
       subject.cache = nil
       subject.access_key = TEST_ACCESS_KEY
+      stub(subject).read_from_url { File.read cache_path }
     end
 
     it 'should get from url' do
-      stub(OpenURI::OpenRead).open(url) { File.read cache_path }
       subject.update_rates
       subject.cl_rates.wont_be_empty
     end
@@ -82,19 +82,22 @@ describe Money::Bank::CurrencylayerBank do
     it "should use the non-secure http url if secure_connection isn't set" do
       subject.secure_connection = nil
       subject.access_key = TEST_ACCESS_KEY
-      subject.source_url.must_equal "#{url}?source=#{source}&access_key=#{TEST_ACCESS_KEY}"
+      subject.source_url.must_equal "#{url}?source=#{source}&"\
+                                    "access_key=#{TEST_ACCESS_KEY}"
     end
 
     it 'should use the non-secure http url if secure_connection is false' do
       subject.secure_connection = false
       subject.access_key = TEST_ACCESS_KEY
-      subject.source_url.must_equal "#{url}?source=#{source}&access_key=#{TEST_ACCESS_KEY}"
+      subject.source_url.must_equal "#{url}?source=#{source}&"\
+                                    "access_key=#{TEST_ACCESS_KEY}"
     end
 
     it 'should use the secure https url if secure_connection is set to true' do
       subject.secure_connection = true
       subject.access_key = TEST_ACCESS_KEY
-      subject.source_url.must_equal "#{secure_url}?source=#{source}&access_key=#{TEST_ACCESS_KEY}"
+      subject.source_url.must_equal "#{secure_url}?source=#{source}&"\
+                                    "access_key=#{TEST_ACCESS_KEY}"
       subject.source_url.must_include 'https://'
     end
   end
@@ -103,10 +106,10 @@ describe Money::Bank::CurrencylayerBank do
     before do
       subject.cache = "space_dir#{rand(999_999_999)}/out_space_file.json"
       subject.access_key = TEST_ACCESS_KEY
+      stub(subject).read_from_url { File.read cache_path }
     end
 
     it 'should get from url' do
-      stub(OpenURI::OpenRead).open(url) { File.read cache_path }
       subject.update_rates
       subject.cl_rates.wont_be_empty
     end
@@ -149,6 +152,7 @@ describe Money::Bank::CurrencylayerBank do
     before do
       subject.access_key = TEST_ACCESS_KEY
       subject.cache = cache_path
+      stub(subject).read_from_url { File.read cache_path }
       subject.update_rates
     end
 
@@ -211,7 +215,7 @@ describe Money::Bank::CurrencylayerBank do
     before do
       subject.access_key = TEST_ACCESS_KEY
       subject.cache = temp_cache_path
-      stub(OpenURI::OpenRead).open(url) { File.read cache_path }
+      stub(subject).read_from_url { File.read cache_path }
       subject.save_rates
     end
 

data/test/test_helper.rb

@@ -6,7 +6,7 @@ require 'monetize'
 require 'timecop'
 require 'pry'
 
-TEST_ACCESS_KEY_PATH = File.join(File.dirname(__FILE__), '..', 'TEST_ACCESS_KEY')
+TEST_ACCESS_KEY_PATH = File.join(File.dirname(__FILE__), 'TEST_ACCESS_KEY')
 TEST_ACCESS_KEY = ENV['TEST_ACCESS_KEY'] || File.read(TEST_ACCESS_KEY_PATH)
 
 if TEST_ACCESS_KEY.nil? || TEST_ACCESS_KEY.empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: money-currencylayer-bank
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Egon Zemmer
@@ -176,6 +176,7 @@ files:
 - LICENSE
 - README.md
 - lib/money/bank/currencylayer_bank.rb
+- test/TEST_ACCESS_KEY
 - test/currencylayer_bank_test.rb
 - test/live.json
 - test/test_helper.rb