ystock 0.3.1 → 0.3.2

data/lib/ystock.rb

@@ -9,6 +9,7 @@
 require 'cgi'
 require 'json'
 require 'net/http'
+require 'httparty'
 module Ystock
     def ensure_unique(name)
         begin
@@ -17,52 +18,6 @@ module Ystock
     end
     
 	@@service_uri = "http://download.finance.yahoo.com/d/quotes.csv"
-	
-	# => Ystock::Google
-	class Google
-		@@google_service = "http://finance.google.com/finance/info"
-		# => Ystock::Google.find(["aapl", "goog"])
-		def self.find(args)
-			last_stock = args.last
-			stock_string = ""
-			args.each do |stock|
-				if last_stock == stock
-					stock_string += stock
-				else
-					stock_string += stock + ","
-				end
-			end
-			# => Send Request to get quote then format
-			format(send_request(stock_string))
-		end
-		
-		def self.get_quote(arg)
-			# => One stock
-			format(send_request(arg))
-		end
-		
-		def self.format(results)
-			output = Hash.new
-			results.each do |result|
-				output[result["t"].to_sym] = {
-					:symbol => result["t"],
-					:market => result["e"],
-					:price => result["l"],
-		            :change => result["c"]
-				} 
-			end
-			return output
-		end
-		
-		def self.send_request(args)
-			url = @@google_service + "?client=ig&q="
-			url += args
-			resp = Net::HTTP.get_response(URI.parse(url))
-			data = resp.body.gsub("//", "")
-			# => Result = Hash
-			result = JSON.parse(data)
-		end
-	end
      
     # Ystock.find(['stock', 'stock'])
 	def self.find(args)
@@ -94,12 +49,14 @@ module Ystock
 		output = Hash.new
 		results.each_line("\n") do |row|
 			stockdata = row.split(",")
-			unless !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]}
+			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
@@ -113,8 +70,15 @@ module Ystock
         end
         return response.body
      end
+
+	def self.version
+		return Gem::VERSION
+	end
+	
+	def self.test
+		return "Test is working 2"
+	end
     
 end
-class ActiveRecord::Base
-  include Ystock
-end
+
+require 'ystock/google'

data/lib/ystock/google.rb

@@ -0,0 +1,53 @@
+# => 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
+					stock_string += "?stock=" + stock
+				else
+					stock_string += "&stock=" + stock
+				end
+			end
+			puts stock_string
+			# => Send Request to get quote then format
+			format(send_request(stock_string))
+		end
+	
+		def self.get_quote(arg)
+			arg = "?stock=" + arg	
+			# => One stock
+			format(send_request(arg))
+		end
+	
+		def self.format(results)
+			output = Hash.new
+		
+			results.each do |item|
+				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["exchange"]["data"]
+					}
+				end
+			end
+			
+			return output
+		
+		end
+	
+		def self.send_request(args)
+			url = @@google_service + args
+			puts url
+			return HTTParty.get(url)
+		end
+	end
+end

data/ystock.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ystock}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Greg Winn"]
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = %q{Get stock information from Yahoo Finance and Google}
   s.email = %q{greg@winn.ws}
   s.extra_rdoc_files = ["README.markdown", "lib/ystock.rb"]
-  s.files = ["Manifest", "README.markdown", "Rakefile", "init.rb", "lib/ystock.rb", "ystock.gemspec"]
+  s.files = ["README.markdown", "lib/ystock.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"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ystock
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -19,11 +19,9 @@ extra_rdoc_files:
 - README.markdown
 - lib/ystock.rb
 files:
-- Manifest
 - README.markdown
-- Rakefile
-- init.rb
 - lib/ystock.rb
+- lib/ystock/google.rb
 - ystock.gemspec
 homepage: http://github.com/gregwinn/ystock
 licenses: []

data/Manifest

@@ -1,6 +0,0 @@
-Manifest
-README.rdoc
-Rakefile
-init.rb
-lib/ystock.rb
-ystock.gemspec

data/Rakefile

@@ -1,15 +0,0 @@
-# Rakefile
-require 'rubygems'
-require 'rake'
-require 'echoe'
-Echoe.new('ystock', '0.2.4') do |p|
-  p.description    = "Get stock information from Yahoo Finance"
-  p.url            = "http://github.com/gregwinn/ystock"
-  p.author         = "Greg Winn"
-  p.email          = "greg@winn.ws"
-  p.ignore_pattern = ["tmp/*", "script/*"]
-  p.development_dependencies = []
-end
-
-Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }
-

data/init.rb

@@ -1 +0,0 @@
-require 'ystock'