exchange 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a30e01a5f55d57a9201b8da420a8c3849ca73c6
-  data.tar.gz: 3fde15afd9be50c593edab5bf94f517cc55e24b2
+  metadata.gz: 91f5a8992aa043b158277a444d70b03dcc83dba6
+  data.tar.gz: 1666ddfa3deca602192b2ac49a9171f329b25d9c
 SHA512:
-  metadata.gz: ef1eafc5d5d39a7e68508285e6c2b1dfd194034fd11792106180d63265b1ad500d0c362f2c77cb35aaa510f47412704559b09c47fbcd210afee3f398d319f2f6
-  data.tar.gz: 27dce37969266711bbba84ddb2777e78b25fc3bca17092364ca0baadb787fa92843904b2020224c338d2d47c2d67907a917caf3b7bbaa0fd0cdae670c4bb60ea
+  metadata.gz: d301bbf1ef608479b9b51e5ca4eab45f1a35c62265f445c37f1c82e628aa8a884f4063fc3f6865c2afdd593c429f30fe32f2b26d629856ef36f59478d4fcba90
+  data.tar.gz: 6c51362dfbdb84d89feb15d8c4b9a34f01bf39cded31ae93ea50dfbc6930ea461d2c1f11e0b13da61a83ced54581f01ca6ef0e2e01ec02e54ccb369a1e250db6

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - rbx-19mode
+  - rbx-20mode
   - jruby-19mode
   - jruby-20mode
   

data/README.rdoc

@@ -1,6 +1,6 @@
 = exchange {<img src="https://secure.travis-ci.org/beatrichartz/exchange.png?branch=master" />}[http://travis-ci.org/beatrichartz/exchange] {<img src="https://gemnasium.com/beatrichartz/exchange.png" alt="Dependency Status" />}[https://gemnasium.com/beatrichartz/exchange] {<img src="https://codeclimate.com/github/beatrichartz/exchange.png" />}[https://codeclimate.com/github/beatrichartz/exchange]
 
-The Exchange Gem gives you easy access to currency functions directly on your Numbers. {It is tested against}[http://travis-ci.org/beatrichartz/exchange]: ruby 2.0, 1.9, ruby 1.8, ree and rubinius (1.8 and 1.9 mode). Exchange will in future versions take advantage of 2.0 features, be sure to check this page for updates!
+The Exchange Gem gives you easy access to currency functions directly on your Numbers. {It is tested against}[http://travis-ci.org/beatrichartz/exchange]: ruby 2.0, 1.9, ree and rubinius (1.9 and 2.0 mode). Exchange will in future versions take advantage of 2.1 features like refinements, be sure to check this page for updates!
 
 You can use it with just plain ruby projects, in Rails 2 and 3, Sinatra or whatever Framework you like.
 
@@ -9,7 +9,7 @@ You can use it with just plain ruby projects, in Rails 2 and 3, Sinatra or whate
 == Installation
 === Bundler / Rails
 Add it to your Gemfile  
-  gem "exchange", ">= 0.10.0"
+  gem "exchange", ">= 1.1.0"
 === Manually
 Just install it as a gem
   gem install exchange
@@ -52,7 +52,7 @@ Exchange uses BigDecimal in all its currency and conversion operations, so you w
   
 === BigDecimal? Sounds slow to me
 
-If performance combined with conversion is your concern, {head over to this benchmark}[https://github.com/beatrichartz/exchange/blob/master/benchmark/benchmark.rb]. With ruby 1.9.3, you'll get about the following results
+If performance combined with conversion is your concern, don't worry. With ruby 1.9.3, you'll get about the following results for money instantiation (e.g. 1.in(:eur))
 
   1000 operations
 
@@ -426,6 +426,6 @@ Please note that only open source APIs can be accepted as contributions to this
 
 == Copyright
 
-Copyright (c) 2012 Beat Richartz. See LICENSE.txt for
+Copyright (c) 2013 Beat Richartz. See LICENSE.txt for
 further details.
 

data/exchange.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.authors           = ["Beat Richartz"]
   s.description       = "Simple Money handling for your ruby app – ISO4217-compatible Currency instantiation, conversion, string formatting and more via an intuitive DSL: 1.in(:usd).to(:eur)"
   s.email             = "attr_accessor@gmail.com"
-  s.homepage          = "http://beatrichartz.github.com/exchange"
+  s.homepage          = "http://beatrichartz.github.io/exchange"
   s.licenses          = ["MIT"]
   s.require_paths     = ["lib"]
   s.summary           = "Simple Money handling for your ruby app"

data/lib/exchange/base.rb

@@ -3,7 +3,7 @@ module Exchange
   
   # The current version of the exchange gem
   #
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
   
   # The root installation path of the gem
   # @version 0.5

data/lib/exchange/core_extensions/float/error_safe.rb

@@ -8,8 +8,8 @@ module Exchange
     # Installs a method chain that overwrites the old error prone meth with the new one
     #
     def self.money_error_preventing_method_chain base, meth
-      base.send :alias_method, :"#{meth}with_errors", meth
-      base.send :alias_method, meth, :"#{meth}without_errors"
+      base.send :alias_method, :"#{meth}_with_errors", meth
+      base.send :alias_method, meth, :"#{meth}_without_errors"
     end
     
     # @!macro prevent_errors_with_exchange_for
@@ -18,11 +18,11 @@ module Exchange
     #   @method $1(other)
     #
     def self.prevent_errors_with_exchange_for base, meth
-      base.send(:define_method, :"#{meth}without_errors", lambda { |other|
+      base.send(:define_method, :"#{meth}_without_errors", lambda { |other|
         if other.is_a?(Exchange::Money)
           BigDecimal.new(self.to_s).send(meth, other.value).to_f
         else
-          send(:"#{meth}with_errors", other)
+          send(:"#{meth}_with_errors", other)
         end
       })
       money_error_preventing_method_chain base, meth

data/lib/exchange/iso.rb

@@ -180,19 +180,35 @@ module Exchange
       new_hsh
     end
     
-    # Interpolates a string with separators every 3 characters
-    # 
-    
     # get a precision for a specified amount and a specified currency
+    #
     # @params [Float, Integer] amount The amount to get the precision for
     # @params [Symbol] currency the currency to get the precision for
     #
     def precision_for amount, currency
       defined_minor_precision                         = definitions[currency][:minor_unit]
-      given_major_precision, given_minor_precision    = amount.to_s.match(/^-?(\d*)\.?(\d*)$/).to_a[1..2].map(&:size)
+      match                                           = amount.to_s.match(/^-?(\d*)\.?(\d*)e?(-?\d+)?$/).to_a[1..3]
+      given_major_precision, given_minor_precision    = precision_from_match *match
       
       given_major_precision + [defined_minor_precision, given_minor_precision].max
     end
     
+    # Get the precision from a match with /^-?(\d*)\.?(\d*)e?(-?\d+)?$/
+    #
+    # @params [String] major The major amount of the match as a string
+    # @params [String] minor The minor amount of the match as a string
+    # @params [String] rational The rational of the match as a string
+    # @return [Array] An array containing the major and the minor precision in this order
+    #
+    def precision_from_match major, minor, rational=nil
+      if rational
+        leftover_minor_precision = minor.eql?('0') ? 0 : minor.size
+        rational_precision       = rational.delete('-').to_i
+        [major.size, leftover_minor_precision.send(rational.start_with?('-') ? :+ : :-, rational_precision)]
+      else
+        [major, minor].map(&:size)
+      end
+    end
+    
   end
 end

data/lib/exchange/money.rb

@@ -86,7 +86,7 @@ module Exchange
     def to other, options={}
       other = ISO.assert_currency!(other)
 
-      if api_supports_currency?(other) && api_supports_currency?(currency)
+      if api_supports_currency?(currency) && api_supports_currency?(other)
         opts = { :at => time, :from => self }.merge(options)
         Money.new(api.new.convert(value, currency, other, opts), other, opts)
       elsif fallback!

data/spec/exchange/cache/base_spec.rb

@@ -6,7 +6,7 @@ describe "Exchange::Cache::Base" do
   describe "key generation" do
     before(:each) do
       time = Time.gm 2012, 03, 01, 23, 23, 23
-      Time.stub! :now => time
+      Time.stub :now => time
     end
     context "with a daily cache" do
       it "should build a timestamped key with the class given, the yearday and the year" do

data/spec/exchange/cache/memcached_spec.rb

@@ -15,7 +15,7 @@ describe "Exchange::CacheDalli::Client" do
     Exchange.configuration.reset
   end
   describe "client" do
-    let(:client) { mock('memcached') }
+    let(:client) { double('memcached') }
     before(:each) do
       Exchange::GemLoader.new('dalli').try_load
     end
@@ -28,7 +28,7 @@ describe "Exchange::CacheDalli::Client" do
     end
   end
   describe "wipe_client!" do
-    let(:client) { mock('memcached') }
+    let(:client) { double('memcached') }
     
     it "should set the client to nil" do
       Dalli::Client.should_receive(:new).with("HOST:PORT").and_return(client)
@@ -38,7 +38,7 @@ describe "Exchange::CacheDalli::Client" do
     end
   end
   describe "cached" do
-    let(:client) { mock('memcached', :get => '') }
+    let(:client) { double('memcached', :get => '') }
     before(:each) do
       Dalli::Client.should_receive(:new).with("HOST:PORT").and_return(client)
     end
@@ -69,7 +69,7 @@ describe "Exchange::CacheDalli::Client" do
       end
     end
     context "when no cached result exists" do
-      let(:client) { mock('memcached') }
+      let(:client) { double('memcached') }
       context "when returning nil" do
         before(:each) do
           subject.should_receive(:key).with('API_CLASS', {}).twice.and_return('KEY')

data/spec/exchange/cache/memory_spec.rb

@@ -15,7 +15,7 @@ describe "Exchange::Cache::Memory" do
     context "with a class" do
       before(:each) do
         @time = Time.gm(2012,10,10,12)
-        Time.stub! :now => @time
+        Time.stub :now => @time
       end
       it "should yield a valid instance variable name" do
         subject.send(:instance_variable_name, Exchange::ExternalAPI::Ecb, {}).should == '@exchange_externalapi_ecb_2012_284_2012_284'
@@ -25,7 +25,7 @@ describe "Exchange::Cache::Memory" do
   describe "clean_out_cache" do
     before(:each) do
       @time = Time.gm(2012,10,10,12)
-      Time.stub! :now => @time
+      Time.stub :now => @time
       subject.instance_variable_set '@exchange_externalapi_someapi_2011_284_2011_284_chfeur', 'Expired'
       subject.instance_variable_set '@exchange_externalapi_someapi_2010_284_2012_284_chfeur', 'Valid1'
       subject.instance_variable_set '@exchange_externalapi_ecb_2012_283_2011_283', 'Expired'

data/spec/exchange/cache/rails_spec.rb

@@ -18,7 +18,7 @@ describe "Exchange::Cache::Rails" do
     Exchange.configuration.reset
   end
   describe "client" do
-    let(:client) { mock('rails_cache') }
+    let(:client) { double('rails_cache') }
     it "should set up a client on the specified host and port for the cache" do
       ::Rails.should_receive(:cache).and_return(client)
       subject.client.should == client
@@ -29,7 +29,7 @@ describe "Exchange::Cache::Rails" do
       lambda { subject.cached('API_CLASS') }.should raise_error(Exchange::Cache::CachingWithoutBlockError)
     end
     context "when a result is returned" do
-      let(:client) { mock('rails_cache') }
+      let(:client) { double('rails_cache') }
       context "with a daily cache" do
         before(:each) do
           subject.should_receive(:key).with('API_CLASS', {}).and_return('KEY')
@@ -56,7 +56,7 @@ describe "Exchange::Cache::Rails" do
       end
     end
     context "when no result is returned" do
-      let(:client) { mock('rails_cache') }
+      let(:client) { double('rails_cache') }
       before(:each) do
         subject.should_receive(:key).with('API_CLASS', {}).at_most(3).times.and_return('KEY')
         ::Rails.should_receive(:cache).twice.and_return(client)

data/spec/exchange/cache/redis_spec.rb

@@ -17,7 +17,7 @@ describe "Exchange::Cache::Redis" do
     Exchange.configuration.reset
   end
   describe "client" do
-    let(:client) { mock('redis') }
+    let(:client) { double('redis') }
     after(:each) do
       subject.instance_variable_set "@client", nil
     end
@@ -27,7 +27,7 @@ describe "Exchange::Cache::Redis" do
     end
   end
   describe "cached" do
-    let(:client) { mock('redis', :get => nil) }
+    let(:client) { double('redis', :get => nil) }
     before(:each) do
       ::Redis.should_receive(:new).with(:host => 'HOST', :port => 'PORT').and_return(client)
     end

data/spec/exchange/core_extensions/float/error_safe_spec.rb

@@ -7,7 +7,7 @@ describe "Exchange::ErrorSafe" do
   end
   before(:each) do
     @time = Time.gm(2012,8,27)
-    Time.stub! :now => @time
+    Time.stub :now => @time
   end
   after(:all) do
     Exchange.configuration.reset

data/spec/exchange/core_extensions/numeric/conversability_spec.rb

@@ -7,7 +7,7 @@ describe "Exchange::Conversability" do
   end
   before(:each) do
     @time = Time.gm(2012,8,27)
-    Time.stub! :now => @time
+    Time.stub :now => @time
   end
   after(:all) do
     Exchange.configuration.reset

data/spec/exchange/external_api/call_spec.rb

@@ -27,7 +27,7 @@ describe "Exchange::ExternalAPI::Call" do
           @count = 0
           @uri_mock.should_receive(:open).at_most(3).times.and_return do
             @count += 1
-            @count == 3 ? mock('opened', :read => fixture('api_responses/example_json_api.json')) : raise(OpenURI::HTTPError.new('404', 'URI'))
+            @count == 3 ? double('opened', :read => fixture('api_responses/example_json_api.json')) : raise(OpenURI::HTTPError.new('404', 'URI'))
           end
           Exchange::ExternalAPI::Call.new('JSON_API') do |result|
             result.should == JSON.load(fixture('api_responses/example_json_api.json'))
@@ -62,7 +62,7 @@ describe "Exchange::ExternalAPI::Call" do
         @count = 0
         @uri_mock.should_receive(:open).at_most(3).times.and_return do
           @count += 1
-          @count == 3 ? mock('opened', :read => fixture('api_responses/example_xml_api.xml')) : raise(OpenURI::HTTPError.new('404', 'URI'))
+          @count == 3 ? double('opened', :read => fixture('api_responses/example_xml_api.xml')) : raise(OpenURI::HTTPError.new('404', 'URI'))
         end
         Exchange::ExternalAPI::Call.new('XML_API', :format => :xml) do |result|
           result.to_s.should == Nokogiri::XML.parse(fixture('api_responses/example_xml_api.xml').sub("\n", '')).to_s

data/spec/exchange/external_api/ecb_spec.rb

@@ -14,7 +14,7 @@ describe "Exchange::ExternalAPI::Ecb" do
   end
   before(:each) do
     time = Time.gm(2012,2,3)
-    Time.stub! :now => time
+    Time.stub :now => time
   end
   describe "updating rates" do
     subject { Exchange::ExternalAPI::Ecb.new }

data/spec/exchange/external_api/random_spec.rb

@@ -23,7 +23,7 @@ describe "Exchange::ExternalAPI::OpenExchangeRates" do
     end
     it "should set the timestamp from time.now" do
       time = Time.now
-      time.stub! :now => time
+      time.stub :now => time
       subject.update
       subject.timestamp.should == time.to_i
     end

data/spec/exchange/helper_spec.rb

@@ -6,7 +6,7 @@ describe "Exchange::Helper" do
   describe "assure_time" do
     before(:each) do
       time = Time.now
-      Time.stub! :now => time
+      Time.stub :now => time
     end
     context "with a time object" do
       it "should return that time object" do

data/spec/exchange/iso_spec.rb

@@ -737,6 +737,32 @@ describe "Exchange::ISO" do
         end
       end
     end
+    context "given a float with scientific notation" do
+      context "with bigger precision than the definition" do
+        it "should instantiate a big decimal with the given precision" do
+          BigDecimal.should_receive(:new).with("6.0e-05",6).and_return('INSTANCE')
+          subject.instantiate(6.0e-05, :tnd).should == 'INSTANCE'
+          BigDecimal.should_receive(:new).with("600000.0",8).and_return('INSTANCE')
+          subject.instantiate(6.0e05, :sar).should == 'INSTANCE'
+          BigDecimal.should_receive(:new).with("1.456e-08",12).and_return('INSTANCE')
+          subject.instantiate(1.456e-08, :omr).should == 'INSTANCE'
+          BigDecimal.should_receive(:new).with("145600000.0",12).and_return('INSTANCE')
+          subject.instantiate(1.456e08, :omr).should == 'INSTANCE'
+        end
+      end
+      context "with smaller precision than the definition" do
+        it "should instantiate a big decimal with the defined precision" do
+          BigDecimal.should_receive(:new).with("0.6",4).and_return('INSTANCE')
+          subject.instantiate(6.0e-01, :tnd).should == 'INSTANCE'
+          BigDecimal.should_receive(:new).with("60.0",4).and_return('INSTANCE')
+          subject.instantiate(6.0e01, :sar).should == 'INSTANCE'
+          BigDecimal.should_receive(:new).with("0.14",4).and_return('INSTANCE')
+          subject.instantiate(1.4e-01, :omr).should == 'INSTANCE'
+          BigDecimal.should_receive(:new).with("14.56",5).and_return('INSTANCE')
+          subject.instantiate(1.456e01, :omr).should == 'INSTANCE'
+        end
+      end
+    end
     context "given a big decimal" do
       let!(:bigdecimal) { BigDecimal.new("23.23") }
       it "should instantiate a big decimal according to the iso standards" do

data/spec/exchange/money_spec.rb

@@ -92,7 +92,7 @@ describe "Exchange::Money" do
     context "with a 'to' currency not provided by the given api" do
       context "but provided by a fallback api" do
         it "should use the fallback" do
-          subject.api::CURRENCIES.stub! :include? => false
+          subject.api::CURRENCIES.stub :include? => false
           mock_api("http://api.finance.xaviermedia.com/api/#{Time.now.strftime("%Y/%m/%d")}.xml", fixture('api_responses/example_xml_api.xml'), 3)
           subject.to(:chf).value.round(2).should == 36.36
           subject.to(:chf).currency.should == :chf
@@ -101,9 +101,9 @@ describe "Exchange::Money" do
       end
       context "but not provided by any fallback api" do
         it "should raise the no rate error" do
-          Exchange::ExternalAPI::OpenExchangeRates::CURRENCIES.stub! :include? => false
-          Exchange::ExternalAPI::XavierMedia::CURRENCIES.stub! :include? => false
-          Exchange::ExternalAPI::Ecb::CURRENCIES.stub! :include? => false
+          Exchange::ExternalAPI::OpenExchangeRates::CURRENCIES.stub :include? => false
+          Exchange::ExternalAPI::XavierMedia::CURRENCIES.stub :include? => false
+          Exchange::ExternalAPI::Ecb::CURRENCIES.stub :include? => false
           lambda { subject.to(:xaf) }.should raise_error Exchange::NoRateError
         end
       end

data/spec/spec_helper.rb

@@ -21,7 +21,7 @@ module HelperMethods
   end
   
   def mock_api(adress, response, count=1)
-    @uri_mock = mock('uri', :open => mock('opened_uri', :read => response))
+    @uri_mock = double('uri', :open => double('opened_uri', :read => response))
     URI.should_receive(:parse).with(adress).at_most(count).times.and_return(@uri_mock)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exchange
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Beat Richartz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -155,7 +155,7 @@ files:
 - spec/support/api_responses/example_historic_json.json
 - spec/support/api_responses/example_json_api.json
 - spec/support/api_responses/example_xml_api.xml
-homepage: http://beatrichartz.github.com/exchange
+homepage: http://beatrichartz.github.io/exchange
 licenses:
 - MIT
 metadata: {}
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Simple Money handling for your ruby app