ystock 0.3.8 → 0.4.0

data/README.markdown

@@ -1,93 +1,96 @@
 # Ystock
-
-Get stock information from Yahoo Finance and Google (in beta)
+This gem provides you with the latest market data avalable, pulling from both Google and Yahoo Finance.
 
 ## Install
 Add the following to your Gemfile
 ```ruby
-gem "ystock", "~> 0.3.4"
+gem "ystock", "~> 0.4.0"
 ```
 
 ### Dependancies 
 Please note 'httparty' is required to run this gem.
 
-
-Then run bundle install
+## Bundle
+```
+bundle install
+```
 
 ----
 
-# Basic Usage
+# Google Usage
 
-## Single stock
-After you have installed the gem and included it into your Gemfile you can now start to use ystock.
+This uses the Google Finance API to request the latest market information (up to 15 min delay). The Google Fincance API tends to return better and more usful information on the stock requested.
 
-1. In a controller you can do the following:
+### Single Stock
 ```ruby
-class SomeController < ApplicationController
-   def index
-      @stock = Ystock.get_stock('appl')
-   end
-end
+Ystock::Google.get_quote("appl")
 ```
 
-2. In your view you may display the results:
-
-```html+ruby
-<p>The price of Apple stock is: $<%=@stock[:AAPL][:price]%></p>
+### Multiple Stocks
+```ruby
+Ystock::Google.find(["aapl", "f", "ggog"])
 ```
 
 #### Available data
 ```
-<%=@stock[:AAPL][:price]%>
-<%=@stock[:AAPL][:change]%>
-<%=@stock[:AAPL][:volume]%>
-```
-
-## Usage many stocks
-After you have installed the gem and included it into your Gemfile you can now start to use ystock.
-
-1. In a controller you can do the following:
-```ruby
-class SomeController < ApplicationController
-   def index
-      @stocks = Ystock.find(["aapl", "goog"])
-   end
-end
-```
-
-2. In your view you may display the results:
-
-```ruby
-@stocks.each do |sym, values|
-     # sym -> AAPL
-     # values[:price], values[:change], values[:volume] 
-     puts values[:price]
-end
+symbol
+pretty_symbol
+symbol_lookup_url
+company
+exchange
+exchange_timezone
+exchange_utc_offset
+exchange_closing
+divisor
+currency
+last
+high
+low
+volume
+avg_volume
+market_cap
+open
+y_close
+change
+perc_change
+delay
+trade_timestamp
+trade_date_utc
+trade_time_utc
+current_date_utc
+current_time_utc
+symbol_url
+chart_url
+disclaimer_url
+ecn_url
+isld_last
+isld_trade_date_utc
+isld_trade_time_utc
+brut_last
+brut_trade_date_utc
+brut_trade_time_utc
+daylight_savings
 ```
 
 ----
 
-# Google Stock (Beta)
-I have added Google finance to this gem due to the number of stocks not supported by Yahoo.
-
-## Usage for multiple stocks
+# Yahoo Usage
 
-```
-@stocks = Ystock::Google.find(["aapl","goog"])
-
-<%=@stocks[:AAPL][:price]%>
-<%=@stocks[:AAPL][:change]%>
-<%=@stocks[:AAPL][:volume]%>
-<%=@stocks[:AAPL][:market]%>
+### Single Stock
+```ruby
+Ystock::Yahoo.get_quote("appl")
 ```
 
+### Multiple Stocks
 ```ruby
-@stocks.each do |sym, value|
-     puts value[:price]
-end
+Ystock::Yahoo.find(["aapl", "f", "ggog"])
 ```
 
-#### Sample response
+#### Available data
 ```
-{:AAPL=>{:symbol=>"AAPL", :market=>"Nasdaq", :price=>"598.90", :change=>"-5.53", :volume=>"15285309"}, :GOOG=>{:symbol=>"GOOG", :market=>"Nasdaq", :price=>"570.48", :change=>"-0.71", :volume=>"2310094"}}
+price
+change
+volume
+symbol
 ```
+

data/lib/ystock/google.rb

@@ -1,67 +1,44 @@
-# => Ystock::Google
 module Ystock
 	class Google
-		#@@google_service = "http://finance.google.com/finance/info"
 		@@google_service = "http://www.google.com/ig/api"
-		# => Ystock::Google.find(["aapl", "goog"])
 		def self.find(args)
-			first_stock = args.first
 			stock_string = ""
 			args.each do |stock|
-				if first_stock == stock
+				if args.first == stock
 					stock_string += "?stock=" + stock
 				else
 					stock_string += "&stock=" + stock
 				end
 			end
-			# => Send Request to get quote then format
 			format(send_request(stock_string), true)
 		end
 	
 		def self.get_quote(arg)
-			arg = "?stock=" + arg	
-			# => One stock
+			arg = "?stock=" + arg
 			format(send_request(arg), false)
 		end
 	
 		def self.format(results, is_many)
-			output = Hash.new
+			output = Array.new
 		
 			results.each do |item|
+
 				if is_many
+					
 					item[1]["finance"].each do |stock|
-						output[stock["symbol"]["data"].to_sym] = {
-							:symbol => stock["symbol"]["data"],
-							:market => stock["exchange"]["data"],
-							:price => stock["last"]["data"],
-				            :change => stock["change"]["data"],
-							:volume => stock["volume"]["data"],
-							:company => stock["company"]["data"],
-							:high => stock["high"]["data"],
-							:low => stock["low"]["data"],
-							:avg_volume => stock["avg_volume"]["data"],
-							:market_cap => stock["market_cap"]["data"],
-							:perc_change => stock["perc_change"]["data"],
-							:y_close => stock["y_close"]["data"],
-							:open => stock["open"]["data"]
-						}
+						stock_data = Hash.new
+						stock.each do |key, val|
+							stock_data[:"#{key}"] = (!val["data"].nil?) ? val["data"] : val
+						end
+						output << [stock_data]
 					end
+					
 				else
-					output = {
-						:symbol => item[1]["finance"]["symbol"]["data"],
-						:market => item[1]["finance"]["exchange"]["data"],
-						:price => item[1]["finance"]["last"]["data"],
-			            :change => item[1]["finance"]["change"]["data"],
-						:volume => item[1]["finance"]["volume"]["data"],
-						:company => item[1]["finance"]["company"]["data"],
-						:high => item[1]["finance"]["high"]["data"],
-						:low => item[1]["finance"]["low"]["data"],
-						:avg_volume => item[1]["finance"]["avg_volume"]["data"],
-						:market_cap => item[1]["finance"]["market_cap"]["data"],
-						:perc_change => item[1]["finance"]["perc_change"]["data"],
-						:y_close => item[1]["finance"]["y_close"]["data"],
-						:open => item[1]["finance"]["open"]["data"]
-					}
+					stock_data = Hash.new
+					item[1]["finance"].each do |key, val|
+						stock_data[:"#{key}"] = (!val["data"].nil?) ? val["data"] : val
+					end
+					output = [stock_data]
 				end
 			end
 			

data/lib/ystock/yahoo.rb

@@ -0,0 +1,65 @@
+module Ystock
+	class Yahoo
+	    @@service_uri = "http://download.finance.yahoo.com/d/quotes.csv"
+	   
+		def self.find(args)
+			stock_string = ""
+			last_stock = args.last.to_s
+	        args.each do |stock|
+				if last_stock == stock.to_sym
+					stock_string += stock.to_s
+				else
+					stock_string += stock.to_s + ","
+				end
+	        end
+			format(send_request(stock_string))
+		end
+	    
+	    def self.get_quote(stock)
+	        stock_data = Hash.new
+	        s = send_request(stock)
+	        a = s.chomp.split(",") 
+	        return [{:symbol => stock,
+	                :price => a[0],
+	                :change => a[1],
+	                :volume => a[2]
+	                }]
+	    end
+		
+		def self.format(results)
+			output = Array.new
+			results.each_line("\n") do |row|
+				stockdata = row.split(",")
+				if !stockdata.nil?
+					if !stockdata[3].nil?
+						stockdata[3] = stockdata[3].gsub("\r\n", "").gsub('"', '')
+
+						output << [{:symbol => stockdata[3],
+			         		:price => stockdata[0],
+			         		:change => stockdata[1],
+			         		:volume => stockdata[2]}]
+
+					end
+				end
+			end
+	        return output
+		end
+
+	    def self.send_request(args)
+	        completed_path = @@service_uri + "?f=l1c1v1s&s=" + args
+	        uri = URI.parse(completed_path)
+	        response = Net::HTTP.start(uri.host, uri.port) do |http|
+	            http.get completed_path
+	        end
+	        return response.body
+	     end
+
+		def self.version
+			return Gem::VERSION
+		end
+		
+		def self.test
+			return "Test is working 2"
+		end
+	end
+end

data/lib/ystock.rb

@@ -10,75 +10,6 @@ require 'cgi'
 require 'json'
 require 'net/http'
 require 'httparty'
-module Ystock
-    def ensure_unique(name)
-        begin
-            self[name] = yield
-        end while self.class.exists?(name => self[name])
-    end
-    
-	@@service_uri = "http://download.finance.yahoo.com/d/quotes.csv"
-     
-    # Ystock.find(['stock', 'stock'])
-	def self.find(args)
-		stock_string = ""
-		last_stock = args.last.to_s
-        args.each do |stock|
-			if last_stock == stock.to_s
-				stock_string += stock.to_s
-			else
-				stock_string += stock.to_s + ","
-			end
-        end
-		format(send_request(stock_string))
-	end
-    
-    def self.get_stock(stock)
-        output = Hash.new
-        s = send_request(stock)
-        a = s.chomp.split(",")
-        output[stock.to_sym] = {:symbol => stock,
-                :price => a[0],
-                :change => a[1],
-                :volume => a[2]
-                }
-        return output
-    end
-	
-	def self.format(results)
-		output = Hash.new
-		results.each_line("\n") do |row|
-			stockdata = row.split(",")
-			if !stockdata.nil?
-				if !stockdata[3].nil?
-					stockdata[3] = stockdata[3].gsub("\r\n", "").gsub('"', '')
-					output[stockdata[3].to_sym] = {:symbol => stockdata[3],
-		         		:price => stockdata[0],
-		         		:change => stockdata[1],
-		         		:volume => stockdata[2]}
-				end
-			end
-		end
-        return output
-	end
-
-    def self.send_request(args)
-        completed_path = @@service_uri + "?f=l1c1v1s&s=" + args
-        uri = URI.parse(completed_path)
-        response = Net::HTTP.start(uri.host, uri.port) do |http|
-            http.get completed_path
-        end
-        return response.body
-     end
-
-	def self.version
-		return Gem::VERSION
-	end
-	
-	def self.test
-		return "Test is working 2"
-	end
-    
-end
 
+require 'ystock/yahoo'
 require 'ystock/google'

data/ystock.gemspec

@@ -1,29 +1,18 @@
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
   s.name = %q{ystock}
-  s.version = "0.3.8"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Greg Winn"]
   s.date = %q{2012-06-09}
-  s.description = %q{Get stock information from Yahoo Finance and Google}
+  s.description = %q{Grab stock information from Yahoo Finance and Google}
   s.email = %q{greg@winn.ws}
   s.extra_rdoc_files = ["README.markdown", "lib/ystock.rb"]
-  s.files = ["README.markdown", "lib/ystock.rb", "lib/ystock/google.rb", "ystock.gemspec"]
+  s.files = ["README.markdown", "lib/ystock.rb","lib/ystock/yahoo.rb", "lib/ystock/google.rb", "ystock.gemspec"]
   s.homepage = %q{http://github.com/gregwinn/ystock}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Ystock", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{ystock}
   s.rubygems_version = %q{1.5.0}
-  s.summary = %q{Get stock information from Yahoo Finance and Google}
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
+  s.summary = %q{Grab stock information from Yahoo Finance and Google}
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ystock
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ bindir: bin
 cert_chain: []
 date: 2012-06-09 00:00:00.000000000 Z
 dependencies: []
-description: Get stock information from Yahoo Finance and Google
+description: Grab stock information from Yahoo Finance and Google
 email: greg@winn.ws
 executables: []
 extensions: []
@@ -21,6 +21,7 @@ extra_rdoc_files:
 files:
 - README.markdown
 - lib/ystock.rb
+- lib/ystock/yahoo.rb
 - lib/ystock/google.rb
 - ystock.gemspec
 homepage: http://github.com/gregwinn/ystock
@@ -52,5 +53,5 @@ rubyforge_project: ystock
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Get stock information from Yahoo Finance and Google
+summary: Grab stock information from Yahoo Finance and Google
 test_files: []