google_currency 1.0.3 → 1.1.0

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+Google Currency 1.1.0
+=====================
+
+Features
+--------
+ - Deprecated #get_google_rate, use #get_rate (thanks RMU Alumni)
+
+Bugfixes
+---------
+ - Fixed an issue when rates over 1000 did not parse correctly (thanks Brandon
+   Anderson)
+
 Google Currency 1.0.3
 =====================
 

data/lib/money/bank/google_currency.rb

@@ -5,6 +5,10 @@ require 'json'
 class Money
   module Bank
     class GoogleCurrency < Money::Bank::VariableExchange
+
+      SERVICE_HOST = "www.google.com"
+      SERVICE_PATH = "/ig/calculator"
+
       # @return [Hash] Stores the currently known rates.
       attr_reader :rates
 
@@ -58,14 +62,13 @@ class Money
       #   @bank.get_rate(:USD, :EUR)  #=> 0.776337241
       def get_rate(from, to)
         @mutex.synchronize{
-          @rates[rate_key_for(from, to)] ||= get_google_rate(from, to)
+          @rates[rate_key_for(from, to)] ||= fetch_rate(from, to)
         }
       end
 
       ##
       # Returns the requested rate after querying Google.
       #
-      #
       # @param [String, Symbol, Currency] from Currency to convert from
       # @param [String, Symbol, Currency] to Currency to convert to
       #
@@ -74,20 +77,60 @@ class Money
       # @example
       #   @bank = GoogleCurrency.new         #=> <Money::Bank::GoogleCurrency...>
       #   @bank.get_google_rate(:USD, :EUR)  #=> 0.776337241
+      #
+      # @deprecated
       def get_google_rate(from, to)
-        from = Currency.wrap(from)
-        to   = Currency.wrap(to)
+        warn "#get_google_rate is deprecated, please use #get_rate"
+        fetch_rate(from, to)
+      end
+
+      private
 
-        data = URI.parse("http://www.google.com/ig/calculator?hl=en&q=1#{from.iso_code}%3D%3F#{to.iso_code}").read
+      ##
+      # Queries for the requested rate and returns it.
+      #
+      # @param [String, Symbol, Currency] from Currency to convert from
+      # @param [String, Symbol, Currency] to Currency to convert to
+      #
+      # @return [Float] The requested rate.
+      def fetch_rate(from, to)
+        from, to = Currency.wrap(from), Currency.wrap(to)
+
+        data = build_uri(from, to).read
+        data = fix_response_json_data(data)
+
+        error = data['error']
+        raise UnknownRate unless error == '' || error == '0'
+        BigDecimal(data['rhs'].gsub(/[^\d\.]/, ''))
+      end
+
+      ##
+      # Build a URI for the given arguments.
+      #
+      # @param [Currency] from The currency to convert from.
+      # @param [Currency] to The currency to convert to.
+      #
+      # @return [URI::HTTP]
+      def build_uri(from, to)
+        uri = URI::HTTP.build(
+          :host  => SERVICE_HOST,
+          :path  => SERVICE_PATH,
+          :query => "hl=en&q=1#{from.iso_code}%3D%3F#{to.iso_code}"
+        )
+      end
+
+      ##
+      # Takes the invalid JSON returned by Google and fixes it.
+      #
+      # @param [String] data The JSON string to fix.
+      #
+      # @return [Hash]
+      def fix_response_json_data(data)
         data.gsub!(/lhs:/, '"lhs":')
         data.gsub!(/rhs:/, '"rhs":')
         data.gsub!(/error:/, '"error":')
         data.gsub!(/icc:/, '"icc":')
-        data = JSON.parse(data)
-
-        error = data['error']
-        raise UnknownRate unless error == '' || error == '0'
-        BigDecimal(data['rhs'].split(' ')[0])
+        JSON.parse(data)
       end
     end
   end

metadata

@@ -1,95 +1,74 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: google_currency
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 3
-  version: 1.0.3
+version: !ruby/object:Gem::Version
+  version: 1.1.0
+  prerelease: !!null 
 platform: ruby
-authors: 
+authors:
 - Shane Emmons
 - Donald Ball
-autorequire: 
+autorequire: !!null 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-15 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-02-08 00:00:00.000000000 -05:00
+default_executable: !!null 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &10381764 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *10381764
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &10381476 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 8
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.8
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *10381476
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &10381176 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: money
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *10381176
+- !ruby/object:Gem::Dependency
+  name: money
+  requirement: &10380900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 5
-        version: "3.5"
+      - !ruby/object:Gem::Version
+        version: '3.5'
   type: :runtime
-  version_requirements: *id004
-description: GoogleCurrency extends Money::Bank::Base and gives you access to the current Google Currency exchange rates.
-email: 
+  prerelease: false
+  version_requirements: *10380900
+description: GoogleCurrency extends Money::Bank::Base and gives you access to the
+  current Google Currency exchange rates.
+email:
 - semmons99+RubyMoney@gmail.com
 - donald.ball@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
 - CHANGELOG.md
-files: 
+files:
 - lib/money/bank/google_currency.rb
 - LICENSE
 - README.md
@@ -97,36 +76,28 @@ files:
 has_rdoc: true
 homepage: http://rubymoney.github.com/google_currency
 licenses: []
-
-post_install_message: 
-rdoc_options: 
+post_install_message: !!null 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.7
-requirements: 
+requirements:
 - json
-rubyforge_project: 
-rubygems_version: 1.3.7
-signing_key: 
+rubyforge_project: !!null 
+rubygems_version: 1.5.0
+signing_key: !!null 
 specification_version: 3
 summary: Access the Google Currency exchange rate data.
 test_files: []
-