google_currency 2.2.0 → 2.3.0

data/AUTHORS

@@ -1,7 +1,9 @@
 andersonbrandon
 Donald Ball
+Daniel Doubrovkine
 James Chen
 Jérémy Lecour
 Lars Pind
 Shane Emmons
 sowenjub
+yinquanteo

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+master
+======
+
+- fix incorrect parsing of complex rates
+
 Google Currency 2.2.0
 =====================
 

data/google_currency.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "google_currency"
-  s.version     = "2.2.0"
+  s.version     = "2.3.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Shane Emmons"]
   s.email       = ["semmons99@gmail.com"]
@@ -13,11 +13,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec", ">= 2.0.0"
   s.add_development_dependency "yard", ">= 0.5.8"
   s.add_development_dependency "json", ">= 1.4.0"
-  s.add_development_dependency "yajl-ruby", ">= 1.0.0"
   s.add_development_dependency "ffi"
 
-  s.add_dependency "money", "~> 5.1.0"
-  s.add_dependency "multi_json", ">= 1.0.0"
+  s.add_dependency "money", "~> 5.1.1"
+  s.add_dependency "multi_json"
 
   s.files =  Dir.glob("{lib,spec}/**/*")
   s.files += %w(LICENSE README.md CHANGELOG.md AUTHORS)

data/lib/money/bank/google_currency.rb

@@ -8,6 +8,7 @@ class Money
 
       SERVICE_HOST = "www.google.com"
       SERVICE_PATH = "/ig/calculator"
+      EXPONENT_REGEXP = /10(x3c)?sup(x3e)?(?<exponent>-?\d+)(x3c)?\/sup(x3e)?/
 
       # @return [Hash] Stores the currently known rates.
       attr_reader :rates
@@ -107,6 +108,8 @@ class Money
       #
       # @return [Hash]
       def fix_response_json_data(data)
+        data = data.force_encoding("ISO-8859-1").encode("UTF-8")
+
         data.gsub!(/lhs:/, '"lhs":')
         data.gsub!(/rhs:/, '"rhs":')
         data.gsub!(/error:/, '"error":')
@@ -137,7 +140,7 @@ class Money
       #
       # @return [Boolean]
       def complex_rate?(rhs)
-        rhs.match(/10x3csupx3e(-?\d+)x3c\/supx3e/)
+        rhs.match(EXPONENT_REGEXP)
       end
 
       ##
@@ -149,9 +152,9 @@ class Money
       # @return [BigDecimal]
       def decode_complex_rate(rhs)
         rate  = BigDecimal(rhs.match(/\d[\d\s]*\.?\d*/)[0])
-        power = rhs.match(/10x3csupx3e(-?\d+)x3c\/supx3e/)
+        power = rhs.match(EXPONENT_REGEXP)
 
-        rate * 10**power[1].to_i
+        rate * BigDecimal("1E#{power[:exponent]}")
       end
 
       ##

data/spec/google_currency_with_json_spec.rb

@@ -32,12 +32,22 @@ describe "GoogleCurrency" do
       @bank.rates.should include('USD_TO_EUR')
     end
 
-    it "should handle complex rates" do
-      uri = double('uri')
-      @bank.stub(:build_uri){|from,to| uri }
-      uri.stub(:read) { %q({lhs: "1 Vietnamese dong",rhs: "4.8 \x26#215; 10\x3csup\x3e-5\x3c/sup\x3e U.S. dollars",error: "",icc: true}) }
+    context "handles" do
+      before :each do
+        @uri = double('uri')
+        @bank.stub(:build_uri){ |from,to| @uri }
+      end
 
-      @bank.get_rate('VND', 'USD').should == BigDecimal("0.48215105E1")
+      it "Vietnamese Dong" do
+        # rhs decodes (after html entity decoding) to "4.8 x 10<sup>-5</sup> U.S. dollars"
+        @uri.stub(:read) { %q({lhs: "1 Vietnamese dong",rhs: "4.8 \x26#215; 10\x3csup\x3e-5\x3c/sup\x3e U.S. dollars",error: "",icc: true}) }
+        @bank.get_rate('VND', 'USD').should == BigDecimal("4.8E-5")
+      end
+
+      it "Indonesian Rupiah" do
+        @uri.stub(:read) { "{lhs: \"1 U.S. dollar\",rhs: \"10\xA0000 Indonesian rupiahs\",error: \"\",icc: true}" }
+        @bank.get_rate('IDR', 'USD').should == BigDecimal("0.1E5")
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google_currency
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -59,22 +59,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
-- !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.1.1
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +98,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +106,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 description: GoogleCurrency extends Money::Bank::Base and gives you access to the
   current Google Currency exchange rates.
 email:
@@ -133,7 +117,6 @@ extra_rdoc_files: []
 files:
 - lib/money/bank/google_currency.rb
 - spec/google_currency_with_json_spec.rb
-- spec/google_currency_with_yajl_spec.rb
 - spec/spec_helper.rb
 - LICENSE
 - README.md

data/spec/google_currency_with_yajl_spec.rb

@@ -1,60 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-require 'money'
-require 'money/bank/google_currency'
-
-require 'yajl'
-MultiJson.engine = :yajl
-
-describe "GoogleCurrency" do
-  before :each do
-    @bank = Money::Bank::GoogleCurrency.new
-  end
-
-  describe "#get_rate" do
-    it "should use #fetch_rate when rate is unknown" do
-      @bank.should_receive(:fetch_rate).once
-      @bank.get_rate('USD', 'USD')
-    end
-
-    it "should not use #fetch_rate when rate is known" do
-      @bank.get_rate('USD', 'USD')
-      @bank.should_not_receive(:fetch_rate)
-      @bank.get_rate('USD', 'USD')
-    end
-
-    it "should return the correct rate" do
-      @bank.get_rate('USD', 'USD').should == 1.0
-    end
-
-    it "should store the rate for faster retreival" do
-      @bank.get_rate('USD', 'EUR')
-      @bank.rates.should include('USD_TO_EUR')
-    end
-
-    it "should handle complex rates" do
-      uri = double('uri')
-      @bank.stub(:build_uri){|from,to| uri }
-      uri.stub(:read) { %q({lhs: "1 Vietnamese dong",rhs: "4.8 \x26#215; 10\x3csup\x3e-5\x3c/sup\x3e U.S. dollars",error: "",icc: true}) }
-      @bank.get_rate('VND', 'USD').should == BigDecimal("0.48215105E1")
-    end
-  end
-
-  describe "#flush_rates" do
-    it "should empty @rates" do
-      @bank.get_rate('USD', 'EUR')
-      @bank.flush_rates
-      @bank.rates.should == {}
-    end
-  end
-
-  describe "#flush_rate" do
-    it "should remove a specific rate from @rates" do
-      @bank.get_rate('USD', 'EUR')
-      @bank.get_rate('USD', 'JPY')
-      @bank.flush_rate('USD', 'EUR')
-      @bank.rates.should include('USD_TO_JPY')
-      @bank.rates.should_not include('USD_TO_EUR')
-    end
-  end
-end