money-open-exchange-rates 0.1.7 → 0.2.0

data/README.markdown

@@ -1,11 +1,11 @@
 # Money Open Exchange Rates
 
 A gem that calculates the exchange rate using published rates from
-[open-exchange-rates](http://josscrowcroft.github.com/open-exchange-rates/)
+[open-exchange-rates](https://openexchangerates.org/)
 
 ## Usage
 
-```ruby
+~~~ ruby
 require 'money/bank/open_exchange_rates_bank'
 moe = Money::Bank::OpenExchangeRatesBank.new
 moe.cache = 'path/to/file/cache'
@@ -18,12 +18,12 @@ moe.update_rates
 moe.ttl_in_seconds = 86400
 
 Money.default_bank = moe
-```
+~~~
 
 You can also provide a Proc as a cache to provide your own caching mechanism
 perhaps with Redis or just a thread safe `Hash` (global). For example:
 
-```ruby
+~~~ ruby
 moe.cache = Proc.new do |v|
   key = 'money:exchange_rates'
   if v
@@ -32,17 +32,17 @@ moe.cache = Proc.new do |v|
     Thread.current[key]
   end
 end
-```
+~~~
 
 ## Tests
 
 As of the end of August 2012 all requests to the Open Exchange Rates API must
-have a valid app_id. You can place your own key on a file named TEST_APP_ID and
-then run:
+have a valid app_id. You can place your own key on a file or environment
+variable named TEST_APP_ID and then run:
 
-```
+~~~
 bundle exec rake
-```
+~~~
 
 ## Refs
 
@@ -53,13 +53,17 @@ bundle exec rake
 
 ## Contributors
 
-* [Wayne See](https://github.com/weynsee)
-* [Julien Boyer](https://github.com/chatgris)
-* [Kevin Ball](https://github.com/kball)
-* [Michael Morris](https://github.com/mtcmorris)
-
+Wayne See (8)
+Kevin Ball (3)
+Paul Robinson (2)
+Michael Morris (2)
+Dmitry Dedov (2)
+chatgris (2)
+Sam Lown (1)
+Fabio Cantoni (1)
 
 ## License
+
 The MIT License
 
-Copyright © 2012 Laurent Arnoud <laurent@spkdev.net>
+Copyright © 2014 Laurent Arnoud <laurent@spkdev.net>

data/lib/money/bank/open_exchange_rates_bank.rb

@@ -40,24 +40,9 @@ class Money
         raise InvalidCache
       end
 
-      def exchange(cents, from_currency, to_currency)
-        exchange_with(Money.new(cents, from_currency), to_currency)
-      end
-
-      def exchange_with(from, to_currency)
-        return from if same_currency?(from.currency, to_currency)
-        rate = get_rate(from.currency, to_currency)
-        Money.new(((Money::Currency.wrap(to_currency).subunit_to_unit.to_f / from.currency.subunit_to_unit.to_f) * from.cents * rate).round, to_currency)
-      end
-
-      def get_rate(from_currency, to_currency)
+      def get_rate(from_currency, to_currency, opts = {})
         expire_rates
-        super(from_currency, to_currency) || begin
-          from_base_rate = super("USD", from_currency)
-          to_base_rate = super("USD", to_currency)
-          raise(Money::Bank::UnknownRateFormat, "No conversion rate known for '#{from_currency}' -> '#{to_currency}'") if from_base_rate.nil? || to_base_rate.nil?
-          to_base_rate.to_f / from_base_rate.to_f
-        end
+        super
       end
 
       def expire_rates

data/test/open_exchange_rates_bank_test.rb

@@ -3,6 +3,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
 
 describe Money::Bank::OpenExchangeRatesBank do
+  subject { Money::Bank::OpenExchangeRatesBank.new }
 
   before do
     @cache_path = File.expand_path(File.join(File.dirname(__FILE__), 'latest.json'))
@@ -10,62 +11,38 @@ describe Money::Bank::OpenExchangeRatesBank do
 
   describe 'exchange' do
     before do
-      @bank = Money::Bank::OpenExchangeRatesBank.new
-      @bank.app_id = TEST_APP_ID
+      subject.app_id = TEST_APP_ID
       @temp_cache_path = File.expand_path(File.join(File.dirname(__FILE__), 'tmp.json'))
-      @bank.cache = @temp_cache_path
+      subject.cache = @temp_cache_path
       stub(OpenURI::OpenRead).open(Money::Bank::OpenExchangeRatesBank::OER_URL) { File.read @cache_path }
-      @bank.save_rates
+      subject.save_rates
     end
 
     it "should be able to exchange a money to its own currency even without rates" do
       money = Money.new(0, "USD")
-      @bank.exchange_with(money, "USD").must_equal money
+      subject.exchange_with(money, "USD").must_equal money
     end
 
     it "should raise if it can't find an exchange rate" do
       money = Money.new(0, "USD")
-      assert_raises(Money::Bank::UnknownRateFormat){ @bank.exchange_with(money, "AUD") }
+      proc { subject.exchange_with(money, "AUD") }.must_raise Money::Bank::UnknownRate
     end
   end
 
   describe 'update_rates' do
     before do
-      @bank = Money::Bank::OpenExchangeRatesBank.new
-      @bank.app_id = TEST_APP_ID
-      @bank.cache = @cache_path
-      @bank.update_rates
+      subject.app_id = TEST_APP_ID
+      subject.cache = @cache_path
+      subject.update_rates
     end
 
     it "should update itself with exchange rates from OpenExchangeRates" do
-      @bank.oer_rates.keys.each do |currency|
+      subject.oer_rates.keys.each do |currency|
         next unless Money::Currency.find(currency)
-        @bank.get_rate("USD", currency).must_be :>, 0
+        subject.get_rate("USD", currency).must_be :>, 0
       end
     end
 
-    it "should return the correct oer rates using oer" do
-      @bank.oer_rates.keys.each do |currency|
-        next unless Money::Currency.find(currency)
-        subunit = Money::Currency.wrap(currency).subunit_to_unit
-        @bank.exchange(100, "USD", currency).cents.
-          must_equal((@bank.oer_rates[currency].to_f * subunit).round)
-      end
-    end
-
-    it "should return the correct oer rates using exchange_with" do
-      @bank.oer_rates.keys.each do |currency|
-        next unless Money::Currency.find(currency)
-        subunit = Money::Currency.wrap(currency).subunit_to_unit
-        @bank.exchange_with(Money.new(100, "USD"), currency).cents.
-          must_equal((@bank.oer_rates[currency].to_f * subunit).round)
-
-        @bank.exchange_with(1.to_money("USD"), currency).cents.
-          must_equal((@bank.oer_rates[currency].to_f * subunit).round)
-      end
-      @bank.exchange_with(5000.to_money('JPY'), 'USD').cents.must_equal 6441
-    end
-
     it "should not return 0 with integer rate" do
       wtf = {
         :priority => 1,
@@ -78,8 +55,9 @@ describe Money::Bank::OpenExchangeRatesBank do
         :delimiter => ","
       }
       Money::Currency.register(wtf)
-      @bank.add_rate("USD", "WTF", 2)
-      @bank.exchange_with(5000.to_money('WTF'), 'USD').cents.wont_equal 0
+      subject.add_rate("USD", "WTF", 2)
+      subject.add_rate("WTF", "USD", 2)
+      subject.exchange_with(5000.to_money('WTF'), 'USD').cents.wont_equal 0
     end
 
     # in response to #4
@@ -95,23 +73,23 @@ describe Money::Bank::OpenExchangeRatesBank do
         :delimiter => ","
       }
       Money::Currency.register(btc)
-      @bank.add_rate("USD", "BTC", 1 / 13.7603)
-      @bank.add_rate("BTC", "USD", 13.7603)
-      @bank.exchange(100, "BTC", "USD").cents.must_equal 138
+      rate = 13.7603
+      subject.add_rate("USD", "BTC", 1 / 13.7603)
+      subject.add_rate("BTC", "USD", rate)
+      subject.exchange_with(100.to_money("BTC"), 'USD').cents.must_equal 137603
     end
   end
 
   describe 'App ID' do
 
     before do
-      @bank = Money::Bank::OpenExchangeRatesBank.new
       @temp_cache_path = File.expand_path(File.join(File.dirname(__FILE__), 'tmp.json'))
-      @bank.cache = @temp_cache_path
+      subject.cache = @temp_cache_path
       stub(OpenURI::OpenRead).open(Money::Bank::OpenExchangeRatesBank::OER_URL) { File.read @cache_path }
     end
 
     it 'should raise an error if no App ID is set' do
-      proc {@bank.save_rates}.must_raise Money::Bank::NoAppId
+      proc { subject.save_rates }.must_raise Money::Bank::NoAppId
     end
 
     #TODO: As App IDs are compulsory soon, need to add more tests handle
@@ -121,84 +99,80 @@ describe Money::Bank::OpenExchangeRatesBank do
 
   describe 'no cache' do
     before do
-      @bank = Money::Bank::OpenExchangeRatesBank.new
-      @bank.cache = nil
-      @bank.app_id = TEST_APP_ID
+      subject.cache = nil
+      subject.app_id = TEST_APP_ID
     end
 
     it 'should get from url' do
       stub(OpenURI::OpenRead).open(Money::Bank::OpenExchangeRatesBank::OER_URL) { File.read @cache_path }
-      @bank.update_rates
-      @bank.oer_rates.wont_be_empty
+      subject.update_rates
+      subject.oer_rates.wont_be_empty
     end
 
     it 'should raise an error if invalid path is given to save_rates' do
-      proc { @bank.save_rates }.must_raise Money::Bank::InvalidCache
+      proc { subject.save_rates }.must_raise Money::Bank::InvalidCache
     end
   end
 
   describe 'no valid file for cache' do
     before do
-      @bank = Money::Bank::OpenExchangeRatesBank.new
-      @bank.cache = "space_dir#{rand(999999999)}/out_space_file.json"
-      @bank.app_id = TEST_APP_ID
+      subject.cache = "space_dir#{rand(999999999)}/out_space_file.json"
+      subject.app_id = TEST_APP_ID
     end
 
     it 'should get from url' do
       stub(OpenURI::OpenRead).open(Money::Bank::OpenExchangeRatesBank::OER_URL) { File.read @cache_path }
-      @bank.update_rates
-      @bank.oer_rates.wont_be_empty
+      subject.update_rates
+      subject.oer_rates.wont_be_empty
     end
 
     it 'should raise an error if invalid path is given to save_rates' do
-      proc { @bank.save_rates }.must_raise Money::Bank::InvalidCache
+      proc { subject.save_rates }.must_raise Money::Bank::InvalidCache
     end
   end
 
   describe 'using proc for cache' do
     before :each do
       $global_rates = nil
-      @bank = Money::Bank::OpenExchangeRatesBank.new
-      @bank.cache = Proc.new {|v|
+      subject.cache = Proc.new {|v|
         if v
           $global_rates = v
         else
           $global_rates
         end
       }
-      @bank.app_id = TEST_APP_ID
+      subject.app_id = TEST_APP_ID
     end
 
     it 'should get from url normally' do
-      stub(@bank).source_url() { @cache_path }
-      @bank.update_rates
-      @bank.oer_rates.wont_be_empty
+      stub(subject).source_url() { @cache_path }
+      subject.update_rates
+      subject.oer_rates.wont_be_empty
     end
 
     it 'should save from url and get from cache' do
-      stub(@bank).source_url { @cache_path }
-      @bank.save_rates
+      stub(subject).source_url { @cache_path }
+      subject.save_rates
       $global_rates.wont_be_empty
-      dont_allow(@bank).source_url
-      @bank.update_rates
-      @bank.oer_rates.wont_be_empty
+      dont_allow(subject).source_url
+      subject.update_rates
+      subject.oer_rates.wont_be_empty
     end
 
   end
 
   describe 'save rates' do
     before do
-      @bank = Money::Bank::OpenExchangeRatesBank.new
-      @bank.app_id = TEST_APP_ID
+      subject.app_id = TEST_APP_ID
       @temp_cache_path = File.expand_path(File.join(File.dirname(__FILE__), 'tmp.json'))
-      @bank.cache = @temp_cache_path
+      subject.cache = @temp_cache_path
       stub(OpenURI::OpenRead).open(Money::Bank::OpenExchangeRatesBank::OER_URL) { File.read @cache_path }
-      @bank.save_rates
+      subject.save_rates
     end
 
     it 'should allow update after save' do
       begin
-        @bank.update_rates
+        subject.update_rates
       rescue
         assert false, "Should allow updating after saving"
       end
@@ -206,22 +180,22 @@ 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(@bank).read_from_url {""}
-      @bank.save_rates
+      stub(subject).read_from_url {""}
+      subject.save_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(@bank).read_from_url { %Q({"error": "An error"}) }
-      @bank.save_rates
+      stub(subject).read_from_url { %Q({"error": "An error"}) }
+      subject.save_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(@bank).read_from_url { %Q({invalid_json: "An error"}) }
-      @bank.save_rates
+      stub(subject).read_from_url { %Q({invalid_json: "An error"}) }
+      subject.save_rates
       File.open(@temp_cache_path).read.size.must_equal initial_size
     end
 
@@ -230,55 +204,14 @@ describe Money::Bank::OpenExchangeRatesBank do
     end
   end
 
-  describe 'get rate' do
-    subject { Money::Bank::OpenExchangeRatesBank.new }
-    LVL_TO_LTL =  5
-    USD_TO_RUB = 50
-    USD_TO_EUR = 1.3
-
-    before do
-      # some kind of stubbing base class
-      Money::Bank::VariableExchange.class_eval do
-        def get_rate(from, to)
-          if from == 'LVL' && to == 'LTL'
-            LVL_TO_LTL
-          elsif from == 'USD' && to == 'RUB'
-            USD_TO_RUB
-          elsif from == 'USD' && to == 'EUR'
-            USD_TO_EUR
-          else
-            nil
-          end
-        end
-      end
-    end
-
-    it 'returns rate if Money::Bank::VariableExchange#get_rate returns rate' do
-      subject.get_rate('LVL','LTL').must_equal LVL_TO_LTL
-    end
-
-    describe 'calculate cross rate using "USD" rate value if no data was returned by Money::Bank::VariableExchange#get_rate' do
-
-      it 'returns cross rate if "USD" rates for provided currencies exist' do
-        eur_to_rub_cross_rate = USD_TO_RUB / USD_TO_EUR
-        subject.get_rate('EUR', 'RUB').must_equal eur_to_rub_cross_rate
-      end
-
-      it 'raises Money::Bank::UnknownRateFormat if no cross rates found' do
-        ->{ subject.get_rate('ZAR', 'ZMK') }.must_raise Money::Bank::UnknownRateFormat
-      end
-    end
-  end
-
   describe '#expire_rates' do
     before do
-      @bank = Money::Bank::OpenExchangeRatesBank.new
-      @bank.app_id = TEST_APP_ID
-      @bank.ttl_in_seconds = 1000
+      subject.app_id = TEST_APP_ID
+      subject.ttl_in_seconds = 1000
       @usd_eur_rate = 0.655
-      @bank.add_rate('USD', 'EUR', @usd_eur_rate)
+      subject.add_rate('USD', 'EUR', @usd_eur_rate)
       @temp_cache_path = File.expand_path(File.join(File.dirname(__FILE__), 'tmp.json'))
-      @bank.cache = @temp_cache_path
+      subject.cache = @temp_cache_path
       stub(OpenURI::OpenRead).open(Money::Bank::OpenExchangeRatesBank::OER_URL) { File.read @cache_path }
     end
 
@@ -293,23 +226,23 @@ describe Money::Bank::OpenExchangeRatesBank do
       end
 
       it 'should update the rates' do
-        @bank.update_rates
-        @bank.get_rate('USD', 'EUR').wont_equal @usd_eur_rate
+        subject.update_rates
+        subject.get_rate('USD', 'EUR').wont_equal @usd_eur_rate
       end
 
       it 'updates the next expiration time' do
         exp_time = Time.now + 1000
 
-        @bank.expire_rates
-        @bank.rates_expiration.must_equal exp_time
+        subject.expire_rates
+        subject.rates_expiration.must_equal exp_time
       end
     end
 
     describe 'when the ttl has not expired' do
       it 'not should update the rates' do
-        exp_time = @bank.rates_expiration
-        @bank.expire_rates
-        @bank.rates_expiration.must_equal exp_time
+        exp_time = subject.rates_expiration
+        subject.expire_rates
+        subject.rates_expiration.must_equal exp_time
       end
     end
   end

data/test/test_helper.rb

@@ -2,10 +2,9 @@
 require 'minitest/autorun'
 require 'rr'
 require 'money/bank/open_exchange_rates_bank'
-require 'monetize/core_extensions'
+require 'monetize'
 require 'timecop'
 require 'pry'
-Money.silence_core_extensions_deprecations = true
 
 TEST_APP_ID_PATH = File.join(File.dirname(__FILE__), '..', 'TEST_APP_ID')
 TEST_APP_ID = ENV['TEST_APP_ID'] || File.read(TEST_APP_ID_PATH)

metadata

@@ -1,112 +1,142 @@
 --- !ruby/object:Gem::Specification
 name: money-open-exchange-rates
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Laurent Arnoud
-- Sam Lown
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: 6.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: 6.2.1
+- !ruby/object:Gem::Dependency
+  name: monetize
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.7'
 description: A gem that calculates the exchange rate using published rates from open-exchange-rates.
@@ -117,36 +147,37 @@ extensions: []
 extra_rdoc_files:
 - README.markdown
 files:
-- Gemfile
 - LICENSE
 - README.markdown
+- Gemfile
 - lib/money/bank/open_exchange_rates_bank.rb
-- test/latest.json
 - test/open_exchange_rates_bank_test.rb
+- test/latest.json
 - test/test_helper.rb
 homepage: http://github.com/spk/money-open-exchange-rates
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A gem that calculates the exchange rate using published rates from open-exchange-rates.
 test_files:
 - test/open_exchange_rates_bank_test.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 47727fe9bad23633da19274d859b19a6178fac03
-  data.tar.gz: 2ca0a29fd3ac60268bfe16f6bc5ce5245602b5fa
-SHA512:
-  metadata.gz: 1858044994a092557f0f9db8107ed5e6b537efe1d6d95ee8654f0df7734c83805ea906bedda731ce2729a1dbf6b7b3c5d9846292581d2671da1db6f3a8a52a68
-  data.tar.gz: 893d31e26b8cf61e5242df6253486f7205bd5ba4af50f04e88ad1bec88243747d9705a95fb1bb3df7aab68d1990835816363d72b78daecf67467c19aca751852