money-open-exchange-rates 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 437aaa9ee1ba378244b8d8e2826df7b2c62030245cad2c0842c4985917d49c7f
-  data.tar.gz: df74b76387cc6bbb7850e9b8aabf200c45aa4c15c3a0b76a0acc991eb6dd448b
+  metadata.gz: 2ccf18d87ab1263df713ece79feed894fa64b59112b5f64a51416c01f558f5e0
+  data.tar.gz: abde5b9fe07e938bd8121ce423acd9d4e3a744ce811a4b455580ff86f75f3329
 SHA512:
-  metadata.gz: da4cc8071242bf6a520167453e12dfa8a07cedbf7b088cf39c8e0561515a3669049bc0eab0729657045d3fd4580f62722dcc57e962351fbf14c5a87584184112
-  data.tar.gz: 286222c2ad6c009ae563bcafa813bec513614b96a77d09da457ee8e7d91022667daf50af34b3b3f517acbe0679aeb5be6a338955ad760d728b636d06ce572084
+  metadata.gz: 9c8fe6c2357a1fa560f327c9cbdf38293cdcf0e46db2aa08f9c65a289f24a668eae9cf4f3d4f47786d42dcf6cbc0e6fe46fb7d6f18f251245036be1939c0fcaf
+  data.tar.gz: 11085f010f58fbf3cc7e7c256a5532574ac29ae4dd388861d8f0090a21b35c7b26a6775b4398d3a0a1ea20020e80c1ff2d1dcb56218b0dd54822c682df4505ae

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'coveralls', require: false

data/History.md

@@ -1,4 +1,14 @@
 
+v1.2.2 / 2018-03-31
+===================
+
+  * Warn secure_connection= is deprecated
+  * More simple code on calc_pair_rate_using_base
+  * Increase code coverage on source_url
+  * Fix parse error specs on refresh_rates
+  * Use Coveralls for coverage
+  * Add tests for rates_timestamp issue
+
 v1.2.1 / 2018-03-31
 ===================
 

data/README.md

@@ -194,5 +194,5 @@ Copyright © 2011-2018 Laurent Arnoud <laurent@spkdev.net>
 [![Version](https://img.shields.io/gem/v/money-open-exchange-rates.svg)](https://rubygems.org/gems/money-open-exchange-rates)
 [![Documentation](https://img.shields.io/badge/doc-rubydoc-blue.svg)](http://www.rubydoc.info/gems/money-open-exchange-rates)
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](http://opensource.org/licenses/MIT "MIT")
-[![Code Climate](https://img.shields.io/codeclimate/github/spk/money-open-exchange-rates.svg)](https://codeclimate.com/github/spk/money-open-exchange-rates)
+[![Coverage Status](https://img.shields.io/coveralls/github/spk/money-open-exchange-rates.svg)](https://coveralls.io/github/spk/money-open-exchange-rates?branch=master)
 [![Inline docs](https://inch-ci.org/github/spk/money-open-exchange-rates.svg?branch=master)](http://inch-ci.org/github/spk/money-open-exchange-rates)

data/lib/money/bank/open_exchange_rates_bank.rb

@@ -33,7 +33,8 @@ class Money
 
       # @deprecated secure_connection is deprecated and has no effect
       def secure_connection=(*)
-        'secure_connection is deprecated and has no effect'
+        warn 'secure_connection is deprecated and has no effect'
+        nil
       end
 
       # As of the end of August 2012 all requests to the Open Exchange Rates
@@ -292,12 +293,19 @@ class Money
         result if valid_rates?(result)
       end
 
+      # Read API
+      #
+      # @return [String]
+      def json_response
+        open(source_url).read
+      end
+
       # Read from url
       #
       # @return [String] JSON content
       def read_from_url
         raise NoAppId if app_id.nil? || app_id.empty?
-        @json_response = open(source_url).read
+        @json_response = json_response
         save_cache if cache
         @json_response
       end
@@ -361,12 +369,11 @@ class Money
       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 = BigDecimal(to_base_rate.to_s) / from_base_rate
-          add_rate(from_currency, to_currency, rate)
-          return rate
-        end
-        nil
+        return unless to_base_rate
+        return unless from_base_rate
+        rate = BigDecimal(to_base_rate.to_s) / from_base_rate
+        add_rate(from_currency, to_currency, rate)
+        rate
       end
     end
   end

data/lib/open_exchange_rates_bank/version.rb

@@ -2,5 +2,5 @@
 
 # Module for version constant
 module OpenExchangeRatesBank
-  VERSION = '1.2.1'.freeze
+  VERSION = '1.2.2'.freeze
 end

data/test/open_exchange_rates_bank_test.rb

@@ -7,6 +7,9 @@ describe Money::Bank::OpenExchangeRatesBank do
   let(:oer_historical_url) do
     Money::Bank::OpenExchangeRatesBank::OER_HISTORICAL_URL
   end
+  let(:default_source) do
+    Money::Bank::OpenExchangeRatesBank::OE_SOURCE
+  end
 
   let(:temp_cache_path) do
     data_file('tmp.json')
@@ -67,6 +70,12 @@ describe Money::Bank::OpenExchangeRatesBank do
         subject.exchange_with(money, 'TJS').must_equal Money.new(250, 'TJS')
       end
 
+      it "should raise if it can't find an currency" do
+        money = Money.new(0, 'USD')
+        proc { subject.exchange_with(money, 'PLP') }
+          .must_raise Money::Currency::UnknownCurrency
+      end
+
       it "should raise if it can't find an exchange rate" do
         money = Money.new(0, 'USD')
         proc { subject.exchange_with(money, 'SSP') }
@@ -134,10 +143,6 @@ describe Money::Bank::OpenExchangeRatesBank do
     it 'should raise an error if no App ID is set' do
       proc { subject.update_rates }.must_raise Money::Bank::NoAppId
     end
-
-    # TODO: As App IDs are compulsory soon, need to add more tests handle
-    # app_id-specific errors from
-    # https://openexchangerates.org/documentation#errors
   end
 
   describe 'no cache' do
@@ -185,6 +190,15 @@ describe Money::Bank::OpenExchangeRatesBank do
         subject.source_url.must_include '/api/latest.json'
       end
     end
+
+    describe 'secure_connection=' do
+      it 'do nothing' do
+        _out, err = capture_io do
+          subject.secure_connection = false
+        end
+        err.must_include 'deprecated'
+      end
+    end
   end
 
   describe 'no valid file for cache' do
@@ -226,8 +240,9 @@ describe Money::Bank::OpenExchangeRatesBank do
 
   describe '#refresh_rates' do
     before do
-      add_to_webmock(subject)
+      subject.app_id = TEST_APP_ID
       subject.cache = temp_cache_path
+      stub(subject).json_response { File.read(oer_latest_path) }
       subject.update_rates
     end
 
@@ -245,21 +260,21 @@ describe Money::Bank::OpenExchangeRatesBank do
 
     it 'should not break an existing file if save fails to read' do
       initial_size = File.read(temp_cache_path).size
-      stub(subject).read_from_url { '' }
+      stub(subject).json_response { '' }
       subject.refresh_rates
       File.open(temp_cache_path).read.size.must_equal initial_size
     end
 
     it 'should not break an existing file if save returns json without rates' do
       initial_size = File.read(temp_cache_path).size
-      stub(subject).read_from_url { '{"error": "An error"}' }
+      stub(subject).json_response { '{"error": "An error"}' }
       subject.refresh_rates
       File.open(temp_cache_path).read.size.must_equal initial_size
     end
 
     it 'should not break an existing file if save returns a invalid json' do
       initial_size = File.read(temp_cache_path).size
-      stub(subject).read_from_url { '{invalid_json: "An error"}' }
+      stub(subject).json_response { '{invalid_json: "An error"}' }
       subject.refresh_rates
       File.open(temp_cache_path).read.size.must_equal initial_size
     end
@@ -270,6 +285,10 @@ describe Money::Bank::OpenExchangeRatesBank do
       add_to_webmock(subject)
     end
 
+    it 'should be now when not updated from api' do
+      subject.rates_timestamp.must_be :>, Time.at(1_414_008_044)
+    end
+
     it 'should be set on update_rates' do
       subject.update_rates
       subject.rates_timestamp.must_equal Time.at(1_414_008_044)
@@ -375,13 +394,17 @@ describe Money::Bank::OpenExchangeRatesBank do
 
   describe 'source currency' do
     it 'should be changed when a known currency is given' do
-      subject.source = 'EUR'
-      subject.source.must_equal 'EUR'
+      source = 'EUR'
+      subject.source = source
+      subject.source.must_equal source
+      subject.source_url.must_include "base=#{source}"
     end
 
     it 'should use USD when given unknown currency' do
-      subject.source = 'invalid'
-      subject.source.must_equal 'USD'
+      source = 'invalid'
+      subject.source = source
+      subject.source.must_equal default_source
+      subject.source_url.wont_include "base=#{default_source}"
     end
   end
 

data/test/test_helper.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'coveralls'
+Coveralls.wear!
+
 require 'minitest/autorun'
 require 'rr'
 require 'webmock/minitest'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: money-open-exchange-rates
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Laurent Arnoud