From owner-svn-ports-all@FreeBSD.ORG Wed Sep 26 20:54:56 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 49627106566C; Wed, 26 Sep 2012 20:54:56 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3285B8FC08; Wed, 26 Sep 2012 20:54:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8QKsu7Y090913; Wed, 26 Sep 2012 20:54:56 GMT (envelope-from madpilot@svn.freebsd.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8QKstw7090910; Wed, 26 Sep 2012 20:54:55 GMT (envelope-from madpilot@svn.freebsd.org) Message-Id: <201209262054.q8QKstw7090910@svn.freebsd.org> From: Guido Falsi Date: Wed, 26 Sep 2012 20:54:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r304929 - in head/finance/p5-Finance-Quote: . files X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Sep 2012 20:54:56 -0000 Author: madpilot Date: Wed Sep 26 20:54:55 2012 New Revision: 304929 URL: http://svn.freebsd.org/changeset/ports/304929 Log: - Fix getting currency quotes from new yahoo API using upstream patch - Bump PORTREVISION PR: ports/171207 Submitted by: Guido Falsi Obtained from: Upstream project repository Approved by: maintainer timeout Approved by: crees, tabthorpe (mentors, implicit) Modified: head/finance/p5-Finance-Quote/Makefile (contents, props changed) head/finance/p5-Finance-Quote/files/patch-lib-Finance-Quote.pm (contents, props changed) Modified: head/finance/p5-Finance-Quote/Makefile ============================================================================== --- head/finance/p5-Finance-Quote/Makefile Wed Sep 26 20:51:56 2012 (r304928) +++ head/finance/p5-Finance-Quote/Makefile Wed Sep 26 20:54:55 2012 (r304929) @@ -1,13 +1,9 @@ -# New ports collection makefile for: Finance::Quote -# Date created: 26 Dec 2000 -# Whom: Sergey Skvortsov -# +# Created by: Sergey Skvortsov # $FreeBSD$ -# PORTNAME= Finance-Quote PORTVERSION= 1.17 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= finance perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- Modified: head/finance/p5-Finance-Quote/files/patch-lib-Finance-Quote.pm ============================================================================== --- head/finance/p5-Finance-Quote/files/patch-lib-Finance-Quote.pm Wed Sep 26 20:51:56 2012 (r304928) +++ head/finance/p5-Finance-Quote/files/patch-lib-Finance-Quote.pm Wed Sep 26 20:54:55 2012 (r304929) @@ -1,13 +1,149 @@ -http://github.com/pfenwick/finance-quote/commit/7de984bea80e9c5e00504ededba6897183bb8c45 - ---- lib/Finance/Quote.pm.orig 2009-10-06 01:39:57.000000000 +0800 -+++ lib/Finance/Quote.pm 2010-02-13 18:25:22.000000000 +0800 -@@ -167,7 +167,7 @@ - if (!@reqmodules or $reqmodules[0] eq "-defaults") { - shift(@reqmodules) if (@reqmodules); - # Default modules -- @modules = qw/AEX AIAHK ASEGR ASX BMONesbittBurns Bourso Cdnfundlibrary -+ @modules = qw/AEX AIAHK ASEGR ASX BMONesbittBurns BSERO Bourso Cdnfundlibrary - Currencies Deka DWS FTPortfolios Fidelity FinanceCanada Fool HU - GoldMoney HEX - IndiaMutual LeRevenu ManInvestments Morningstar NZX Platinum SEB +--- lib/Finance/Quote.pm.orig 2012-08-31 15:38:42.023832749 +0200 ++++ lib/Finance/Quote.pm 2012-08-31 15:42:45.299834285 +0200 +@@ -35,7 +35,6 @@ + use Carp; + use Finance::Quote::UserAgent; + use HTTP::Request::Common; +-use HTML::TreeBuilder; + use Encode; + use Data::Dumper; + +@@ -43,7 +42,14 @@ + $VERSION $TIMEOUT %MODULES %METHODS $AUTOLOAD + $YAHOO_CURRENCY_URL $USE_EXPERIMENTAL_UA/; + +-$YAHOO_CURRENCY_URL = "http://uk.finance.yahoo.com/q?s="; ++# Call on the Yahoo API: ++# - "f=l1" should return a single value - the "Last Trade (Price Only)" ++# - "s=" the value of s should be "=X" ++# where and are currencies ++# Excample: http://finance.yahoo.com/d/quotes.csv?f=l1&s=AUDGBP=X ++# Documentation can be found here: ++# http://code.google.com/p/yahoo-finance-managed/wiki/csvQuotesDownload ++$YAHOO_CURRENCY_URL = "http://finance.yahoo.com/d/quotes.csv?e=.csv&f=l1&s="; + + @ISA = qw/Exporter/; + @EXPORT = (); +@@ -240,26 +246,13 @@ + + my $ua = $this->user_agent; + +- my $data = $ua->request(GET "${YAHOO_CURRENCY_URL}$from$to%3DX")->content; +- # The web page returns utf8 content which gives a warning when parsing $data +- # in HTML::Parser +- my $tb = HTML::TreeBuilder->new_from_content(decode_utf8($data)); +- +- # Find the
with the data +- my $div = $tb->look_down('id','yfi_quote_summary_data'); +- # Make sure there's a
to parse. +- return undef unless $div; +- +- # The first should contain the quote +- my $rate_element=$div->look_down('_tag','b'); +- # Make sure there's a to parse. +- return undef unless $rate_element; +- +- my $exchange_rate=$rate_element->as_text; +- +- $exchange_rate =~ s/,// ; # solve a bug when conversion rate +- # involves thousands. yahoo inserts +- # a comma when thousands occur ++ # The response should be a single value (the exchange rate) ++ my $data = $ua->request(GET "${YAHOO_CURRENCY_URL}${from}${to}=X")->content; ++ my $exchange_rate = $data; ++ ++ $exchange_rate =~ s/,// ; # solve a bug when conversion rate ++ # involves thousands. yahoo inserts ++ # a comma when thousands occur + + { + local $^W = 0; # Avoid undef warnings. +@@ -268,6 +261,18 @@ + # we may have extra cruft, or no amount. + return undef unless ($exchange_rate+0); + } ++ ++if ( $exchange_rate < 0.001 ) { ++ # exchange_rate is too little. we'll get more accuracy by using ++ # the inverse rate and inverse it ++ my $inverse_rate = $this->currency( $to, $from ); ++ { ++ local $^W = 0; ++ return undef unless ( $exchange_rate + 0 ); ++ } ++ $exchange_rate = int( 100000000 / $inverse_rate + .5 ) / 100000000; ++} ++ + return ($exchange_rate * $amount); + } + +@@ -770,6 +775,60 @@ + return $retTime; + } + ++ ++# If $str ends with a B like "20B" or "1.6B" then expand it as billions like ++# "20000000000" or "1600000000". ++# ++# This is done with string manipulations so floating-point rounding doesn't ++# produce spurious digits for values like "1.6" which aren't exactly ++# representable in binary. ++# ++# Is "B" for billions the only abbreviation from Yahoo? ++# Could extend and rename this if there's also millions or thousands. ++# ++# For reference, if the value was just for use within perl then simply ++# substituting to exponential "1.5e9" might work. But expanding to full ++# digits seems a better idea as the value is likely to be printed directly ++# as a string. ++sub B_to_billions { ++ ++ my ($self,$str) = @_; ++ ### B_to_billions(): $str ++ if ($str =~ s/B$//i) { ++ $str = $self->decimal_shiftup ($str, 9); ++ } ++ return $str; ++} ++ ++# $str is a number like "123" or "123.45" ++# return it with the decimal point moved $shift places to the right ++# must have $shift>=1 ++# eg. decimal_shiftup("123",3) -> "123000" ++# decimal_shiftup("123.45",1) -> "1234.5" ++# decimal_shiftup("0.25",1) -> "2.5" ++# ++sub decimal_shiftup { ++ my ($self, $str, $shift) = @_; ++ ++ # delete decimal point and set $after to count of chars after decimal. ++ # Leading "0" as in "0.25" is deleted too giving "25" so as not to end up ++ # with something that might look like leading 0 for octal. ++ my $after = ($str =~ s/(?:^0)?\.(.*)/$1/ ? length($1) : 0); ++ ++ $shift -= $after; ++ # now $str is an integer and $shift is relative to the end of $str ++ ++ if ($shift >= 0) { ++ # moving right, eg. "1234" becomes "12334000" ++ return $str . ('0' x $shift); # extra zeros appended ++ } else { ++ # negative means left, eg. "12345" becomes "12.345" ++ # no need to prepend zeros since demanding initial $shift>=1 ++ substr ($str, $shift,0, '.'); # new '.' at shifted spot from end ++ return $str; ++ } ++} ++ + # Dummy destroy function to avoid AUTOLOAD catching it. + sub DESTROY { return; } + +@@ -803,7 +862,7 @@ + This module gets stock quotes from various internet sources, including + Yahoo! Finance, Fidelity Investments, and the Australian Stock Exchange. + There are two methods of using this module -- a functional interface +-that is depreciated, and an object-orientated method that provides ++that is deprecated, and an object-orientated method that provides + greater flexibility and stability. + + With the exception of straight currency exchange rates, all information