money-open-exchange-rates 0.0.4 → 0.0.5

data/lib/money/bank/open_exchange_rates_bank.rb

@@ -25,7 +25,9 @@ class Money
 
       def save_rates
         raise InvalidCache unless cache
-        open(cache, 'w').write(open(OER_URL).read)
+        open(cache, 'w') do |f|
+          f.write(open(OER_URL).read)
+        end
       rescue Errno::ENOENT
         raise InvalidCache
       end
@@ -39,7 +41,7 @@ class Money
         unless rate
           from_base_rate = get_rate("USD", from.currency)
           to_base_rate = get_rate("USD", to_currency)
-          rate = to_base_rate / from_base_rate
+          rate = to_base_rate.to_f / from_base_rate.to_f
         end
         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

data/test/open_exchange_rates_bank_test.rb

@@ -24,7 +24,7 @@ describe Money::Bank::OpenExchangeRatesBank 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
+        @bank.exchange(100, "USD", currency).cents.must_equal((@bank.oer_rates[currency].to_f * subunit).round)
       end
     end
 
@@ -33,12 +33,28 @@ describe Money::Bank::OpenExchangeRatesBank 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
+        @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
+      Money::Currency::TABLE[:wtf] = {
+        :priority => 1,
+        :iso_code => "WTF",
+        :name => "WTF",
+        :symbol => "WTF",
+        :subunit => "Cent",
+        :subunit_to_unit => 1000,
+        :separator => ".",
+        :delimiter => ","
+      }
+      Money::Currency::STRINGIFIED_KEYS << 'wtf'
+      @bank.add_rate("USD", "WTF", 2)
+      @bank.exchange_with(5000.to_money('WTF'), 'USD').cents.wont_equal 0
+    end
+
     # in response to #4
     it "should exchange btc" do
       Money::Currency::TABLE[:btc] = {
@@ -51,6 +67,7 @@ describe Money::Bank::OpenExchangeRatesBank do
         :separator => ".",
         :delimiter => ","
       }
+      Money::Currency::STRINGIFIED_KEYS << '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
@@ -94,4 +111,27 @@ describe Money::Bank::OpenExchangeRatesBank do
     end
   end
 
+  describe 'save rates' do
+    include RR::Adapters::TestUnit
+
+    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
+      stub(OpenURI::OpenRead).open(Money::Bank::OpenExchangeRatesBank::OER_URL) { File.read @cache_path }
+      @bank.save_rates
+    end
+
+    it 'should allow update after save' do
+      begin
+        @bank.update_rates
+      rescue
+        assert false, "Should allow updating after saving"
+      end
+    end
+
+    after do
+      File.delete @temp_cache_path
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: money-open-exchange-rates
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-11 00:00:00.000000000 Z
+date: 2012-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &20494700 !ruby/object:Gem::Requirement
+  requirement: &13990160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.3
   type: :runtime
   prerelease: false
-  version_requirements: *20494700
+  version_requirements: *13990160
 - !ruby/object:Gem::Dependency
   name: money
-  requirement: &20492640 !ruby/object:Gem::Requirement
+  requirement: &13989400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *20492640
+  version_requirements: *13989400
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &20491460 !ruby/object:Gem::Requirement
+  requirement: &13988080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *20491460
+  version_requirements: *13988080
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &20490720 !ruby/object:Gem::Requirement
+  requirement: &13987380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 1.0.4
   type: :development
   prerelease: false
-  version_requirements: *20490720
+  version_requirements: *13987380
 description: A gem that calculates the exchange rate using published rates from open-exchange-rates.
   Compatible with the money gem.
 email: laurent@spkdev.net
@@ -90,10 +90,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.11
 signing_key: 
 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
-has_rdoc: