google_currency 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b57390ef56dd1b049e7b5d9fd8a3ed893791779
-  data.tar.gz: 38469aad714942d2fb16afa1b933a2d31e6940b0
+  metadata.gz: c8965d9cb15aaf014c5b9ae2a70f163f43743cf3
+  data.tar.gz: 5fe6ef5793cd5b9defd1654ceb4003fedd97a18f
 SHA512:
-  metadata.gz: 8207d9c3712b4e58da9080e9dcf1b1bf43620d615205435ebd36b2895824f99a155a52b3889bafa4729ee275d7e9c17d96728f65110ceeccc88de0188d805cf1
-  data.tar.gz: ed516c931481812b71dad0290ef1a657742eb743c2ff46699ec210a4c644e9dd3e23c4b8aba96a702269d6a893a5382139264b6af3e48c2dca66efc40e98c183
+  metadata.gz: 22c338a754cdd998b7bbcf3d70b26182942ef7d4fc311fb6c68aed93aca4d20e02909dfadc44483f506a98049a19841c83c76c77eca5ac79a75a0a7f98e61216
+  data.tar.gz: 6ed9ef16e15b44aac44a08225358cd23f004781c66ac42d1378cc79f75d0a2b937c2ced08f658e9a6365c269b4732934bad1cd23b2a37c2a2976160342707d0b

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+3.4.0
+=====
+
+- Add captcha response detection
+- Use finance.google.com for reliability across different regions
+
 3.3.0
 =====
 

data/README.md

@@ -9,25 +9,29 @@ and gives you access to the current Google Currency exchange rates.
 Usage
 -----
 
-    require 'money'
-    require 'money/bank/google_currency'
+```ruby
 
-    # (optional)
-    # set the seconds after than the current rates are automatically expired
-    # by default, they never expire
-    Money::Bank::GoogleCurrency.ttl_in_seconds = 86400
+require 'money'
+require 'money/bank/google_currency'
 
-    # set default bank to instance of GoogleCurrency
-    Money.default_bank = Money::Bank::GoogleCurrency.new
+# (optional)
+# set the seconds after than the current rates are automatically expired
+# by default, they never expire
+Money::Bank::GoogleCurrency.ttl_in_seconds = 86400
 
-    # create a new money object, and use the standard #exchange_to method
-    money = Money.new(1_00, "USD") # amount is in cents
-    money.exchange_to(:EUR)
+# set default bank to instance of GoogleCurrency
+Money.default_bank = Money::Bank::GoogleCurrency.new
 
-    # or install and use the 'monetize' gem
-    require 'monetize'
-    money = 1.to_money(:USD)
-    money.exchange_to(:EUR)
+# create a new money object, and use the standard #exchange_to method
+money = Money.new(1_00, "USD") # amount is in cents
+money.exchange_to(:EUR)
+
+# or install and use the 'monetize' gem
+require 'monetize'
+money = 1.to_money(:USD)
+money.exchange_to(:EUR)
+
+```
 
 An `UnknownRate` will be thrown if `#exchange_to` is called with a `Currency`
 that `Money` knows, but Google does not.
@@ -35,6 +39,8 @@ that `Money` knows, but Google does not.
 An `UnknownCurrency` will be thrown if `#exchange_to` is called with a
 `Currency` that `Money` does not know.
 
+A `GoogleCurrencyCaptchaError` will be thrown if the Google Finance Converter API page responds with a Captcha instead of a rate (#52).
+
 A `GoogleCurrencyFetchError` will be thrown if there is an unknown issue with the Google Finance Converter API.
 
 Caveats
@@ -55,6 +61,9 @@ Consequently, this means that small exchange rates will be imprecise.
 For example, if the IDR to USD exchange rate were 0.00007761, Google will report it as 0.0001.
 This means 100000 IDR would exchange to 10 USD instead of 7.76 USD.
 
+To accommodate for this, the reverse rate will be obtained if the rate is small
+(below 0.1) and the reciprocal of this reverse rate is used.
+
 Copyright
 ---------
 

data/google_currency.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "google_currency"
-  s.version     = "3.3.0"
+  s.version     = "3.4.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Shane Emmons"]
   s.email       = ["semmons99@gmail.com"]

data/lib/money/bank/google_currency.rb

@@ -8,11 +8,15 @@ class Money
     # from Google Finance Calculator
     class GoogleCurrencyFetchError < Error
     end
+    # Raised when there is a captcha form request in extracting exchange rates
+    # from Google Finance Calculator
+    class GoogleCurrencyCaptchaError < Error
+    end
 
     class GoogleCurrency < Money::Bank::VariableExchange
 
 
-      SERVICE_HOST = "www.google.com"
+      SERVICE_HOST = "finance.google.com"
       SERVICE_PATH = "/finance/converter"
 
 
@@ -164,6 +168,8 @@ class Money
           BigDecimal($1)
         when /Could not convert\./
           raise UnknownRate
+        when /captcha-form/
+          raise GoogleCurrencyCaptchaError
         else
           raise GoogleCurrencyFetchError
         end

data/spec/google_currency_with_json_spec.rb

@@ -73,6 +73,13 @@ describe "GoogleCurrency" do
           @bank.get_rate('VND', 'USD')
         }.to raise_error(Money::Bank::GoogleCurrencyFetchError)
       end
+
+      it "should raise GoogleCurrencyCaptchaError when the page sends a Captcha form" do
+        allow(@uri).to receive(:read) { load_rate_http_response("captcha") }
+        expect {
+          @bank.get_rate('VND', 'USD')
+        }.to raise_error(Money::Bank::GoogleCurrencyCaptchaError)
+      end
     end
   end
 

data/spec/rates/captcha.html

@@ -0,0 +1,87 @@
+<!DOCTYPE html><html><head><script>(function(){(function(){function e(a){this.t={};this.tick=function(a,c,b){var d=void 0!=b?b:(new Date).getTime();this.t[a]=[d,c];if(void 0==b)try{window.console.timeStamp("CSI/"+a)}catch(h){}};this.tick("start",null,a)}var a,d;window.performance&&(d=(a=window.performance.timing)&&a.responseStart);var f=0<d?new e(d):new e;window.jstiming={Timer:e,load:f};if(a){var c=a.navigationStart;0<c&&d>=c&&(window.jstiming.srt=d-c)}if(a){var b=window.jstiming.load;0<c&&d>=c&&(b.tick("_wtsrt",void 0,c),b.tick("wtsrt_","_wtsrt",
+d),b.tick("tbsd_","wtsrt_"))}try{a=null,window.chrome&&window.chrome.csi&&(a=Math.floor(window.chrome.csi().pageT),b&&0<c&&(b.tick("_tbnd",void 0,window.chrome.csi().startE),b.tick("tbnd_","_tbnd",c))),null==a&&window.gtbExternal&&(a=window.gtbExternal.pageT()),null==a&&window.external&&(a=window.external.pageT,b&&0<c&&(b.tick("_tbnd",void 0,window.external.startE),b.tick("tbnd_","_tbnd",c))),a&&(window.jstiming.pt=a)}catch(g){}})();}).call(this);
+</script><title> - Google Finance Search</title><meta name="Description" content="Get real-time stock quotes &amp; charts, financial news, currency conversions, or track your portfolio with Google Finance."><meta name="robots" content="noindex"><meta http-equiv="X-UA-Compatible" content="IE=10"><link rel="stylesheet" type="text/css" href="/finance/f/finance_us-1489929081.css"><link rel="stylesheet" type="text/css" href="/_/scs/finance-static/_/ss/k=finance.a.x7heix82rby5.L.X.O/d=0/rs=AGHGApGGyMTYIG0S-XdTFFcL0gvZpAxOZg"><link rel="icon" type="image/vnd.microsoft.icon" href="/finance/favicon.ico"><style>#gbar,#guser{font-size:13px;padding-right:8px;padding-top:4px !important;}#gbar{padding-left:8px;height:22px}#guser{padding-bottom:7px !important;text-align:right}.gbh,.gbd{border-top:1px solid #c9d7f1;font-size:1px}.gbh{height:0;position:absolute;top:24px;width:100%}@media all{.gb1{height:22px;margin-right:.5em;vertical-align:top}#gbar{float:left}}a.gb1,a.gb4{text-decoration:underline !important}a.gb1,a.gb4{color:#00c !important}.gbi .gb4{color:#dd8e27 !important}.gbf .gb4{color:#900 !important}
+</style><script></script><script async="" defer="" src="//www.google.com/insights/consumersurveys/async_survey?site=xusttduenzseze54mcajwbd6sq"></script><script>
+      function _rpt() {}
+      function _tck() {}
+    </script><script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-40765809-1', {
+      'allowLinker': true,
+      'cookiePath': '/finance'
+    });
+    ga('send', 'pageview');
+    </script></head><body><div class=fjfe-bodywrapper><div id=fjfe-real-body class=g-doc><input type="text" name="hist_state" id="hist_state" style="display:none;"><iframe id="hist_frame" name="hist_frame" class=invfr tabindex="-1"></iframe><iframe src="/_/scs/finance-static/_/js/k=finance.a.en_US.9R147Dhnn8c.O/m=b/rt=h/d=0/rs=AGHGApGszSEHbMoXAq0_ObWO6zwfX-urUw" class=invfr tabindex="-1"></iframe><div id=gbar><nobr><a class=gb1 href="https://www.google.com/webhp?tab=ew">Search</a> <a class=gb1 href="http://www.google.com/imghp?hl=en&tab=ei">Images</a> <a class=gb1 href="http://maps.google.com/maps?hl=en&tab=el">Maps</a> <a class=gb1 href="https://play.google.com/?hl=en&tab=e8">Play</a> <a class=gb1 href="http://www.youtube.com/?tab=e1">YouTube</a> <a class=gb1 href="http://news.google.com/nwshp?hl=en&tab=en">News</a> <a class=gb1 href="https://mail.google.com/mail/?tab=em">Gmail</a> <a class=gb1 href="https://drive.google.com/?tab=eo">Drive</a> <a class=gb1 style="text-decoration:none" href="https://www.google.com/intl/en/options/"><u>More</u> &raquo;</a></nobr></div><div id=guser width=100%><nobr><span id=gbn class=gbi></span><span id=gbf class=gbf></span><span id=gbe></span><a  href="http://www.google.com/support/finance?hl=en" class=gb4>Help</a> | <a target=_top id=gb_70 href="https://accounts.google.com/ServiceLogin?service=finance&passive=1209600&continue=http://www.google.com/finance/captcha&followup=http://www.google.com/finance/captcha" class=gb4>Sign in</a></nobr></div><div class=gbh style=left:0></div><div class=gbh style=right:0></div><div id=fjfe-click-wrapper><script>
+(function() {
+  var l = window.location;
+  var q = l.search ? l.search.substr(1) : '';
+  var h = l.hash ? l.hash.substr(1) : '';
+  var p = '/finance';
+  var ss = 'stockscreener';
+  var conn = window.history && window.history.pushState ? '/' : '#';
+  if (l.pathname == p + '/' + ss) {
+    if (h) l.href = p + conn + ss + '?' + q + '&' + h;
+  } else if (l.pathname != p && h) {
+    l.href = p + l.hash;
+  }
+  if (h) {
+document.getElementById('fjfe-click-wrapper').style.display = 'none';
+  }
+})();
+</script><div id=gf-head class="g-section g-tpl-75-25 g-split"><div class="g-unit g-first"><div class=fjfe-logo><a href="/finance/?ei=J3BzWOCmPNWQswH67ou4Dw"><img src="/finance/f/logo_material-4224265490.png" alt="Google Finance"></a></div><div id=gf-search class=fjfe-search><form method="get" action="/finance" autocomplete="off"><input class=fjfe-searchbox-input name=q type=text tabindex=1 value=""></input><span class=fjfe-searchbox-button-wrapper><span class=fjfe-searchbox-button-wrapper2><input class=fjfe-searchbox-button type=submit tabindex=2 value="Get quotes"></input></span></span><input type=hidden name="ei" value="J3BzWOCmPNWQswH67ou4Dw"></input></form></div></div><div class="g-unit fjfe-promo"><div id="ad2-target" class="id-ad2-target"></div></div></div><div class=elastic><div id=app class="g-section g-tpl-left-11p4em"><div class="g-unit g-first"><div id=gf-nav><div class=fjfe-nav-nav><ul class=fjfe-nav id=navmenu><li class=fjfe-nav-item><a href="/finance?ei=J3BzWOCmPNWQswH67ou4Dw"><div>Markets</div></a><li class=fjfe-nav-item><a href="/finance/market_news?ei=J3BzWOCmPNWQswH67ou4Dw"><div>News</div></a><li class=fjfe-nav-item><a href="/finance/portfolio?action=view&amp;ei=J3BzWOCmPNWQswH67ou4Dw"><div>Portfolios</div></a><li class=fjfe-nav-item><a href="/finance/stockscreener?ei=J3BzWOCmPNWQswH67ou4Dw"><div>Stock screener</div></a><li class=fjfe-nav-item><a href="/finance/domestic_trends?ei=J3BzWOCmPNWQswH67ou4Dw"><div>Google Domestic Trends</div></a></ul></div><div class="fjfe-recentquotes fjfe-recentquotes-noquote"><h4>Recent Quotes <span class="fjfe-recentquotes-duration">(<a href="//www.google.com/history/optout?hl=en">30 days</a>)</span></h4><div class=fjfe-recentquotes-noquote-notification>You have no recent quotes</div><div class=fjfe-recentquotes-quotes><div class="fjfe-toggle fjfe-toggle-button"><span class=fjfe-chg-toggle>chg</span> | <span class=fjfe-perc-toggle>%</span></div><div class=fjfe-table-div><table class=fjfe-recentquotes-table id=rq width=100%></table></div></div></div></div></div><div class=g-unit id=gf-viewc><div class=fjfe-content>
+<form id="captcha-form" action="/finance/captcha" method="get">
+<input type=hidden name=ctoken value="AIPim9iQSVMWeMs67Od2GF12I55XhMuifTl6_yyQgq7nJcGjohgibhsURlPuFcOGcNuKIjDYl2OlkiTY8y0xQgqpW57uZ7LClA">
+<table cellspacing="0" cellpadding="5" border="0">
+<tbody>
+<tr>
+<td>To continue your request, type the numbers you see
+in the picture below:
+</td>
+</tr>
+<tr>
+<td>
+<img src="/finance/captcha?ctoken=AIPim9iQSVMWeMs67Od2GF12I55XhMuifTl6_yyQgq7nJcGjohgibhsURlPuFcOGcNuKIjDYl2OlkiTY8y0xQgqpW57uZ7LClA&ei=J3BzWOCmPNWQswH67ou4Dw" width=200 height=70 />
+</td>
+</tr>
+<tr>
+<td align="left">
+<input type=text title="Type the numbers you see"
+               size=30 name="canswer" id="canswer" value="">
+</td>
+</tr>
+<tr>
+<td align="left">
+<input value="OK" name="button" type="submit" id="submit_captcha">
+&nbsp; &nbsp;
+<input value="Cancel" name="button" type="submit" id="cancel">
+</td>
+</tr>
+</tbody>
+</table>
+</form>
+</div></div></div></div></div><div id=gf-foot><div id=fjfe-edition-links class=fjfe-footer-links>Google Finance Beta available in: <a href="http://www.google.com.hk/finance?ei=J3BzWOCmPNWQswH67ou4Dw" class="fjfe-edition-link">Hong Kong</a> - <a href="http://www.google.ca/finance?ei=J3BzWOCmPNWQswH67ou4Dw" class="fjfe-edition-link">Canada</a> - <a href="http://www.google.com/finance?ei=J3BzWOCmPNWQswH67ou4Dw" class="fjfe-edition-link">U.S.</a> - <a href="http://www.google.com.hk/finance?hl=zh-CN&ei=J3BzWOCmPNWQswH67ou4Dw" class="fjfe-edition-link">China</a> - <a href="http://www.google.co.uk/finance?ei=J3BzWOCmPNWQswH67ou4Dw" class="fjfe-edition-link">U.K.</a></div><p class=fjfe-footer-disclaimer>Information is provided "as is" and solely for informational purposes, not for trading purposes or advice, and may be delayed.<br>To see all exchange delays, please <a href="http://www.google.com/intl/en/googlefinance/disclaimer/?ei=J3BzWOCmPNWQswH67ou4Dw" class="fjfe-secondary-link fjfe-no-sticky-params"> see disclaimer</a>.</p><div class=fjfe-footer-links>&copy;2017 Google - <a href="http://www.google.com?hl=en&ei=J3BzWOCmPNWQswH67ou4Dw">Google Home</a> - <a href="http://googlefinanceblog.blogspot.com?ei=J3BzWOCmPNWQswH67ou4Dw">Blog</a> - <a href="http://support.google.com/finance?hl=en&ei=J3BzWOCmPNWQswH67ou4Dw">Help</a> - <a href="http://support.google.com/finance?ctx=report&hl=en&ei=J3BzWOCmPNWQswH67ou4Dw">Report a Problem</a> - <a href="http://www.google.com/intl/en/policies/privacy/?ei=J3BzWOCmPNWQswH67ou4Dw">Privacy Policy</a> - <a href="http://www.google.com/intl/en/policies/terms/?ei=J3BzWOCmPNWQswH67ou4Dw">Terms of Service</a></div></div><script>var _cleardot = 'data:image\/gif;base64,R0lGODlhAQABAIAAAP\/\/\/\/\/\/\/yH5BAEKAAEALAAAAAABAAEAAAICTAEAOw\x3d\x3d';
+    var google = google || {};
+    google.finance = google.finance || {};
+    google.finance.gce = false ;</script><script src="/finance/f/sfe-opt-1767485581.js"></script><script>
+      _regOnLoad = function(f) {
+        if (document.readyState == 'complete') {
+          f && f();
+        } else {
+          // Window.attachEvent() for IE8 and below compatability.
+          var addEventFunction = window.attachEvent ||
+              window.addEventListener || function(ignored, f) { f(); };
+          var event = window.attachEvent ? 'onload' : 'load';
+          f && addEventFunction(event, f);
+        }
+      };
+    
+      google.finance.renderRecentQuotes = function() {};
+    </script>
+<script>
+google.finance.common.listenToForm('captcha-form');
+</script>
+</div></div><script>var googlefinance = {i: ["f.b.id","",null,0,"",0,null,["f.b.cf","9R147Dhnn8c.en_US.",0],[],1,[],"J3BzWOCmPNWQswH67ou4Dw","www.google.com","xcenueYTtfa1Z01KurF2Be31bD4:1483960360021",1]}; GF_domReady = 1;</script></body></html>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google_currency
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -84,6 +84,7 @@ files:
 - lib/money/bank/google_currency.rb
 - lib/money/rates_store/rate_removal_support.rb
 - spec/google_currency_with_json_spec.rb
+- spec/rates/captcha.html
 - spec/rates/error.html
 - spec/rates/sgd_to_usd.html
 - spec/rates/vnd_to_usd.html
@@ -108,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Access the Google Currency exchange rate data.