google_currency_rails_cache 1.1.1 → 1.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NjQ0MTJiZDQxNTg3NjFkYzdhNzhhZDliYTI1MWVmMDIxYmU0NjhlYQ==
+  data.tar.gz: !binary |-
+    ODZjZDJlMDIyMDI5OWM3ZTQyZDhmOTcxYTI5OTI1MTkwNGYzMmU2MA==
+SHA512:
+  metadata.gz: !binary |-
+    NmViOTVmYzZhMmFlZmRiNWM0YjI0MzQyZTg3ZmI0ZjM4ZjI0YTY3NjNiNmIz
+    ZDc0ZGEyZmFmZGJiNGNiM2FhYjgyN2E1YTM1YjZiYzBjMGQ5MzYzMzkwZGQw
+    MDg1M2ZjMWVhOGRkM2JiYWI3MDM4NDhhNmRlZWZiYzMwOGQwYWE=
+  data.tar.gz: !binary |-
+    MDRlMzA4ODExYjc0M2ZjNTcyMDAxZmY1NDY4MTQwZDA1ODI3YmNmMzAxNWM5
+    Y2YwYjVhZGNiMjI0YjBlZmY1YzQ4NDk4YWI1YjFmNzQ1YzM4ODg4ZjdiYjc5
+    M2VkYTA2ZTIzZmU5N2FiNmYyMzBiN2U5YWQzMTQ1N2QzMzA2MGM=

data/google_currency_rails_cache.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "google_currency_rails_cache"
-  s.version     = "1.1.1"
+  s.version     = "1.2"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Shane Emmons", "Alex Kremer"]
   s.email       = ["semmons99@gmail.com", "alex@flextrip.com"]

data/lib/money/bank/google_currency_rails_cache.rb

@@ -7,7 +7,7 @@ class Money
     class GoogleCurrencyRailsCache < Money::Bank::VariableExchange
 
       SERVICE_HOST = "www.google.com"
-      SERVICE_PATH = "/ig/calculator"
+      SERVICE_PATH = "/finance/converter"
 
       ##
       # Clears all rates stored in @rates
@@ -85,12 +85,7 @@ class Money
         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'
-        add_to_stored_rates(rate_key_for(from, to))
-        decode_rate data['rhs']
+        extract_rate(data)
       end
 
       ##
@@ -104,74 +99,20 @@ class Money
         uri = URI::HTTP.build(
           :host  => SERVICE_HOST,
           :path  => SERVICE_PATH,
-          :query => "hl=en&q=1#{from.iso_code}%3D%3F#{to.iso_code}"
+          :query => "a=1&from=#{from.iso_code}&to=#{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.gsub!(Regexp.new("(\\\\x..|\\\\240)"), '')
-
-        MultiJson.decode(data)
-      end
-
-      ##
-      # Takes the 'rhs' response from Google and decodes it.
-      #
-      # @param [String] rhs The google rate string to decode.
-      #
-      # @return [BigDecimal]
-      def decode_rate(rhs)
-        if complex_rate?(rhs)
-          decode_complex_rate(rhs)
+      def extract_rate(data)
+        case data
+        when /<span class=bld>(\d+\.?\d*) [A-Z]{3}<\/span>/
+          BigDecimal($1)
+        when /Could not convert\./
+          raise UnknownRate
         else
-          decode_basic_rate(rhs)
+          raise GoogleCurrencyFetchError
         end
       end
-
-      ##
-      # Takes the 'rhs' response from Google and decides if it's a complex rate
-      #
-      # @param [String] rhs The google rate string to check.
-      #
-      # @return [Boolean]
-      def complex_rate?(rhs)
-        rhs.match(/10x3csupx3e(-?\d+)x3c\/supx3e/)
-      end
-
-      ##
-      # Takes a complex 'rhs' response from Google and converts it to a numeric
-      # rate.
-      #
-      # @param [String] rhs The complex google rate string to convert.
-      #
-      # @return [BigDecimal]
-      def decode_complex_rate(rhs)
-        rate  = BigDecimal(rhs.match(/\d[\d\s]*\.?\d*/)[0])
-        power = rhs.match(/10x3csupx3e(-?\d+)x3c\/supx3e/)
-
-        rate * 10**power[1].to_i
-      end
-
-      ##
-      # Takes a basic 'rhs' response from Google and converts it to a numeric
-      # rate.
-      #
-      # @param [String] rhs The basic google rate string to convert.
-      #
-      # @return [BigDecimal]
-      def decode_basic_rate(rhs)
-        BigDecimal(rhs.gsub(/[^\d\.]/, ''))
-      end
       
       ##
       # Removes the specified rate from the global list of stored rates

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google_currency_rails_cache
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: '1.2'
 platform: ruby
 authors:
 - Shane Emmons
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-30 00:00:00.000000000 Z
+date: 2013-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -31,7 +28,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -39,7 +35,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -47,7 +42,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,7 +49,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -63,7 +56,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -71,7 +63,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -79,7 +70,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -87,7 +77,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -95,7 +84,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -103,7 +91,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,7 +98,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -119,7 +105,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -127,7 +112,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -135,7 +119,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -163,27 +146,25 @@ files:
 - google_currency_rails_cache.gemspec
 homepage: http://github.com/flextrip/google_currency_rails_cache
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Access the Google Currency exchange rate data.
 test_files: []
-has_rdoc: