rupee 0.2.8 → 0.2.9

data/lib/rupee/quote.rb

@@ -72,9 +72,9 @@ module Rupee
         case res
         when Net::HTTPSuccess
           @source.params.each do |param, regex|
-            begin
-              @results[param] = parse(regex.match(res.body)[1])
-            rescue
+            if res.body =~ regex
+              @results[param] = parse($1) 
+            else
               @results[param] = nil
             end
           end
@@ -146,11 +146,11 @@ module Rupee
     #   parse "15"  # => 15
     #   parse "abc" # => "abc"
     def parse(result)
-      begin
-        Float(result.gsub /,/, "")
-      rescue
-        result
-      end
+      return 0.0 if result =~ /N\.A\./
+
+      Float(result.gsub /,/, "")
+    rescue
+      result
     end
 
     # Scans the values provided for the number with the greatest number of

data/lib/rupee/source/google.rb

@@ -4,7 +4,7 @@ module Rupee
     GOOGLE = Source.new(:google,
       "http://www.google.com/ig/api?stock=%s",
       :price   => /<last data="([0-9.-]*)"/,
-      :change  => /<change data="([0-9.-]*)"/,
+      :change  => /<change data="\+?([0-9.-]*)"/,
       :pct_chg => /<perc_change data="([0-9.-]*)"/,
       :date    => /<trade_date_utc data="([0-9.-]*)"/,
       :time    => /<trade_date_utc data="([0-9.-]*)"/,

data/lib/rupee/source/yahoo.rb

@@ -2,17 +2,17 @@ module Rupee
   class Source
     YAHOO = Source.new(:yahoo,
       "http://finance.yahoo.com/q?s=%s",
-      :price   => /(?:<\/a> |"yfnc_tabledata1"><big><b>)<span id="yfs_l[19]0_[^>]+>([0-9,.-]{1,})/,
-      :change  => /><span id="yfs_c[16]0_.*?(?:\n[\s\w\-]*\n[\s">\(]*?)?([0-9.,-]{1,})/,
-      :pct_chg => /yfs_p[24]0_.*?(?:\n[\s\w\-]*\n[\s">\(]*?)?([0-9.,-]{1,})%\)(?:<\/span>|<\/b><\/span><\/td>)/,
+      :price   => /yfs_l84_[^>]+>([0-9,.-]+)/,
+      :change  => /yfs_c6[34]_[^>]+>(?:<img[^>]+>)\s*([0-9,.-])+/,
+      :pct_chg => /yfs_p4[34]_[^>]+>\(([0-9,.-]+)%\)/,
       :date    => /<span id="yfs_market_time">.*?, (.*?20[0-9]{1,2})/,
       :time    => /(?:"time"|"yfnc_tabledata1")><span id="yfs_t[51]0_[^>]+>(.*?)</,
       :bid     => /yfs_b00_[^>]+>([0-9,.-]{1,})/,
       :ask     => /yfs_a00_[^>]+>([0-9,.-]{1,})/,
       :open    => /Open:<\/th><td class="yfnc_tabledata1">([0-9,.-]{1,})/,
-      :high    => /yfs_h00_[^>]+>([0-9,.-]{1,})/,
-      :low     => /yfs_g00_[^>]+>([0-9,.-]{1,})/,
-      :volume  => /yfs_v00_[^>]+>([0-9,.-]{1,})/,
+      :high    => /yfs_h53_[^>]+>([0-9,.-]{1,})/,
+      :low     => /yfs_g53_[^>]+>([0-9,.-]{1,})/,
+      :volume  => /yfs_v53_[^>]+>([0-9,.-]{1,})/,
       :mkt_cap => /yfs_j10_[^>]+>([0-9,.-]{1,}[KMBT]?)/)
   end
 end

data/lib/rupee/version.rb

@@ -1,4 +1,4 @@
 module Rupee
   # The current version
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

data/spec/ruby/quote_spec.rb

@@ -32,7 +32,7 @@ describe Quote do
     [:change, :pct_chg].each do |param|
       it "should have a #{param}" do
         run_if_connected do
-          @wfc.price.should be_a_kind_of Float
+          @wfc.send(param).should be_a_kind_of Float
         end
       end
     end
@@ -58,6 +58,17 @@ describe Quote do
         @goog.price.should be_within(10).of bb_price
       end
     end
+
+    [:change, :pct_chg].each do |param|
+      it "should have around the same #{param} as Bloomberg" do
+        run_if_connected do
+          bb_result = Quote.new("GOOG").send(param)
+          bb_result.should be_a_kind_of Float
+          @goog.send(param).should be_within(10).of bb_result
+        end
+      end
+    end
+
   end
 
   describe "specifying Yahoo! Finance as the quote service" do
@@ -72,5 +83,15 @@ describe Quote do
         @yahoo.price.should be_within(1).of bb_price
       end
     end
+
+    [:change, :pct_chg].each do |param|
+      it "should have around the same #{param} as Bloomberg" do
+        run_if_connected do
+          bb_result = Quote.new("YHOO").send(param)
+          bb_result.should be_a_kind_of Float
+          @yahoo.send(param).should be_within(10).of bb_result
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rupee
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-20 00:00:00.000000000 Z
+date: 2012-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70214885187220 !ruby/object:Gem::Requirement
+  requirement: &70180983536300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70214885187220
+  version_requirements: *70180983536300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70214885201400 !ruby/object:Gem::Requirement
+  requirement: &70180983535100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70214885201400
+  version_requirements: *70180983535100
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70214885198020 !ruby/object:Gem::Requirement
+  requirement: &70180983534340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70214885198020
+  version_requirements: *70180983534340
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70214885197200 !ruby/object:Gem::Requirement
+  requirement: &70180983533620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70214885197200
+  version_requirements: *70180983533620
 - !ruby/object:Gem::Dependency
   name: autotest-fsevent
-  requirement: &70214885196560 !ruby/object:Gem::Requirement
+  requirement: &70180983532920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70214885196560
+  version_requirements: *70180983532920
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70214885195960 !ruby/object:Gem::Requirement
+  requirement: &70180983531920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70214885195960
+  version_requirements: *70180983531920
 description: ! "                      rupee aims to provide user-friendly tools for
   use in\n                      financial gems and applications.\n"
 email: