yquotes 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8838912fb8a6fbb4b2bb4763747ff10ed0b3064
-  data.tar.gz: 74a817327c6e1a4ef4da6eaf569448dbf31ff263
+  metadata.gz: 9b08f86c5ff3fee6eee461f42329c84d35493c66
+  data.tar.gz: a7e15f17170b6fe991613dd67c31f659d3e4be9e
 SHA512:
-  metadata.gz: b955472d0f609237043ac7d3a9c70b76f1d2270c12686ec36151b2f1f114b12d5b14c4f52dcffdaf1e6fa0ff88cac665f3bee3aab0caefe45d1fca674219709f
-  data.tar.gz: c7f2a6f267546409eceae72332fd898e3365356a0c82621be4e5677f65962221c8a25042ce8dcdf10dbfee1cdee40a14d585a00a77617eab84f9ad0d5ef5e726
+  metadata.gz: fe8b9bd2d89823dc2a88f122f478e799e82510b752bc745a54fc2fcb95943eb1ffea4219c9ea737eb56c85ce70796cb379ffd391976f1b1feea4d415a3322632
+  data.tar.gz: 2697dcda93eb2c7f43798c72865b794239a3b8db3480541692d29d38a4cd1ead669b9864317e4891aacb4e006597ff6ed9d76085dac53e3bebba2ac5b8d09c39

data/README.md

@@ -16,10 +16,12 @@ gem 'yquotes'
 
 And then execute:
 
+	$ bundle config build.nokogiri --use-system-libraries
     $ bundle
 
 Or install it yourself as:
 
+	$ gem install nokogiri -- --use-system-libraries
     $ gem install yquotes
 
 ## Usage

data/lib/yquotes/version.rb

@@ -1,3 +1,3 @@
 module YQuotes
-  VERSION = "0.1.5"
+  VERSION = "0.1.7"
 end

data/lib/yquotes/yahoo.rb

@@ -1,18 +1,39 @@
 require 'open-uri'
 require 'csv'
 require 'date'
+require 'nokogiri'
 
 
 module YQuotes
 
-	QUOTE_ENDPOINT="https://ichart.finance.yahoo.com/table.csv?"
-	
+	COOKIE_URL = 'https://finance.yahoo.com/quote/AAPL/history?p=AAPL'
+	CRUMB_PATTERN = /\"CrumbStore\":{\"crumb\":\"(?<crumb>[^"]+)/
+	QUOTE_ENDPOINT = "https://query1.finance.yahoo.com/v7/finance/download/%{symbol}?"
+
 	class Yahoo
 
+		# Get cookie and crumb
+		def initialize
+
+			# get cookie
+			page = open(COOKIE_URL)
+			@cookie = page.meta['set-cookie'].split('; ', 2).first
+
+			# get crumb
+			scripts = Nokogiri::HTML(page).css('script')
+			scripts.each do |s|
+				if s.text.include? 'CrumbStore'
+					pattern = s.text.match(CRUMB_PATTERN) 
+					@crumb = pattern['crumb']
+					break
+				end
+			end
+		end
+
 		# fetch_csv: fetch historical quotes in csv format
 		def fetch_csv(ticker, start_date=nil, end_date=nil, period='d')
-			url = QUOTE_ENDPOINT + build_params(ticker, start_date, end_date, period)
-			connection = open(url)
+			url = build_url(ticker, start_date, end_date, period)
+			connection = open(url, 'Cookie' => @cookie)
 			data = CSV.parse(connection.read, :converters => :numeric)
 			raise "Yahoo.fetch_csv unable to fetch data" unless data.is_a? Array
 			return data
@@ -22,43 +43,38 @@ module YQuotes
 		alias_method :get_data, :fetch_csv
 
 		private
+		
 		# build_params: build parameters for get query
-		def build_params(ticker, start_date=nil, end_date=nil, period='d')
+		def build_url(ticker, start_date=nil, end_date=nil, period='d')
+
+			url = QUOTE_ENDPOINT
+			url = url %{:symbol => URI.escape(ticker).upcase}
 
 			params = {
-				:s => URI.escape(ticker)
+				:crumb => URI.escape(@crumb),
+				:events => 'history',
+				:interval => '1d'
 			}
 
 			# sanitize date
-			start_date = get_date(start_date)
-			end_date = get_date(end_date)
-
-			if start_date
-				params[:a] = start_date.month - 1
-				params[:b] = start_date.day
-				params[:c] = start_date.year
-			end
-
-			if end_date
-				params[:d] = end_date.month - 1
-				params[:e] = end_date.day
-				params[:f] = end_date.year
-			end
+			params[:period1] = get_date(start_date).to_i unless start_date.nil?
+			params[:period2] = get_date(end_date).to_i unless end_date.nil?
 
-			params[:g] = period if period == "d" or period == "m" or period == "y"
+			params[:interval] = "1d" if period == "d"
+			params[:interval] = "1mo" if period == "m"
 			
-			"#{params.map  { |k,v|  "#{k}=#{v}" }.join("&")}"
+			url + "#{params.map  { |k,v|  "#{k}=#{v}" }.join("&")}"
 		end
 
 		# get_date: get date from String
 		def get_date(d)
-			return nil unless d
-			return d if d.is_a? Date
+			return nil if d.nil?
+			return d.to_time if d.is_a? Date
 
 			if d.is_a? String
 
 				begin
-					dt = Date.parse(d)
+					dt = Date.parse(d).to_time
 				rescue Exception => e
 					raise "invalid param #{d} - date should be in yyyy-mm-dd format"
 				end

data/yquotes.gemspec

@@ -25,4 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
 
   spec.add_dependency "daru", "~> 0.1.5"
+  spec.add_dependency "nokogiri", "~> 1.7.2"
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yquotes
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - P Choudhary
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.5
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.2
 description: 
 email:
 - pankaj17n@outlook.com
@@ -106,7 +120,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: Get historical quotes from Yahoo Finance