yquotes 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67d9675aba1a9ce8ec83dca51d4f25b7b87ee71b
-  data.tar.gz: d5abc1ef64776f4a6897fa15084f20dd34118232
+  metadata.gz: f0ff917e8a8aac81d7a0cda637da8e8501c71c76
+  data.tar.gz: 1f20150900e8382b0c9e9800615d81b5db7729b5
 SHA512:
-  metadata.gz: 02d3d692fc7f0b83043e710061ee9c704c9573215d4afefbcb716e51c59393b702c49a3f0f1e9db1d2a893fef6633ed1cad08afd20f8885ce4594ab5fc88d8d0
-  data.tar.gz: dafcc751f246f2d7d64e51274a2442a86f96d9ca59c6f5e29a222bbfbabce84df49bd3065de0794bd6f2cb919266c1c64209eeb39e4f8c3944f93fbadee314bd
+  metadata.gz: 044d0ecf6eff1d86b792c12cfb718a823a57eb138f71b69f6dd5a36875b6b262b0a33a7f963f75ab9e1fc2388fdc9b2ba8e4a8f2fa346f2fc02f1654408abc50
+  data.tar.gz: 4173e954a531ce60e70004dcfcdaa9d1671b117d5f26408f224452bb47c68e17623c60648ad9da021132d55e152c03ecef8eb84213f578bcfd0d404893acb192

data/lib/yquotes/version.rb

@@ -1,3 +1,3 @@
 module YQuotes
-  VERSION = "1.1.0"
+  VERSION = '1.2.0'.freeze
 end

data/lib/yquotes/yahoo.rb

@@ -3,100 +3,93 @@ require 'csv'
 require 'date'
 require 'nokogiri'
 
-
 module YQuotes
-
-	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
-			fetch_credentials
-		end
-
-		# fetch_csv: fetch historical quotes in csv format
-		def fetch_csv(ticker, start_date=nil, end_date=nil, period='d')
-			connection = nil
-
-			# retry 3-times in case it sends unauthorized
-			3.times do |i|
-				begin
-					url = build_url(ticker, start_date, end_date, period)
-					connection = open(url, 'Cookie' => @cookie)
-					break
-				rescue OpenURI::HTTPError => e
-					fetch_credentials
-				end
-			end
-
-			data = CSV.parse(connection.read, :converters => :numeric)
-
-			raise "Yahoo.fetch_csv unable to fetch data" unless data.is_a? Array
-			return data
-		end
-
-		alias_method :get_csv, :fetch_csv
-		alias_method :get_data, :fetch_csv
-
-		private
-
-		def fetch_credentials
-			# 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
-
-		# build_params: build parameters for get query
-		def build_url(ticker, start_date=nil, end_date=nil, period='d')
-
-			url = QUOTE_ENDPOINT
-			url = url %{:symbol => URI.escape(ticker.upcase)}
-
-			params = {
-				:crumb => URI.escape(@crumb),
-				:events => 'history',
-				:interval => '1d'
-			}
-
-			# sanitize date
-			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[:interval] = "1d" if period == "d"
-			params[:interval] = "1mo" if period == "m"
-			params[:interval] = "1wk" if period == "w"
-			
-			url + "#{params.map  { |k,v|  "#{k}=#{v}" }.join("&")}"
-		end
-
-		# get_date: get date from String
-		def get_date(d)
-			return nil if d.nil?
-			return d.to_time if d.is_a? DateTime
-
-			if d.is_a? String
-
-				begin
-					dt = DateTime.parse(d).to_time
-				rescue Exception => e
-					raise "invalid param #{d} - date should be in yyyy-mm-dd format"
-				end
-			end
-		end
-
-	end
-
-end
+  COOKIE_URL = 'https://finance.yahoo.com/quote/AAPL/history?p=AAPL'.freeze
+  CRUMB_PATTERN = /\"CrumbStore\":{\"crumb\":\"(?<crumb>[^"]+)/
+  QUOTE_ENDPOINT = 'https://query1.finance.yahoo.com/v7/finance/download/%{symbol}?'.freeze
+
+  class Yahoo
+    # Get cookie and crumb
+    def initialize
+      fetch_credentials
+    end
+
+    # fetch_csv: fetch historical quotes in csv format
+    def fetch_csv(ticker, start_date = nil, end_date = nil, period = 'd')
+      connection = nil
+
+      # retry 3-times in case it sends unauthorized
+      3.times do |_i|
+        begin
+          url = build_url(ticker, start_date, end_date, period)
+          connection = open(url, 'Cookie' => @cookie)
+          break
+        rescue OpenURI::HTTPError => e
+          fetch_credentials
+        end
+      end
+
+      data = CSV.parse(connection.read, converters: :numeric)
+
+      raise 'Yahoo.fetch_csv unable to fetch data' unless data.is_a? Array
+      data
+    end
+
+    alias get_csv fetch_csv
+    alias get_data fetch_csv
+
+    private
+
+    def fetch_credentials
+      # 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|
+        next unless s.text.include? 'CrumbStore'
+        pattern = s.text.match(CRUMB_PATTERN)
+        @crumb = pattern['crumb']
+        break
+      end
+    end
+
+    # build_params: build parameters for get query
+    def build_url(ticker, start_date = nil, end_date = nil, period = 'd')
+      url = QUOTE_ENDPOINT
+      url = format(url, symbol: URI.escape(ticker.upcase))
+
+      params = {
+        crumb: URI.escape(@crumb),
+        events: 'history',
+        interval: '1d'
+      }
+
+      # sanitize date
+      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[:interval] = '1d' if period == 'd'
+      params[:interval] = '1mo' if period == 'm'
+      params[:interval] = '1wk' if period == 'w'
+
+      url + params.map { |k, v| "#{k}=#{v}" }.join('&').to_s
+    end
+
+    # get_date: get date from String
+    def get_date(d)
+      return nil if d.nil?
+      return d.to_time if d.is_a? DateTime
+
+      if d.is_a? String
+
+        begin
+          dt = DateTime.parse(d).to_time
+        rescue Exception => e
+          raise "invalid param #{d} - date should be in yyyy-mm-dd format"
+        end
+      end
+    end
+  end
+end

data/lib/yquotes.rb

@@ -1,65 +1,59 @@
 require 'csv'
 require 'daru'
 require 'tmpdir'
-require "yquotes/version"
-require "yquotes/yahoo"
+require 'yquotes/version'
+require 'yquotes/yahoo'
 
 module YQuotes
+  class Client
+    def initialize
+      @yahoo_client = Yahoo.new
+    end
 
-	class Client
+    # get_quote: returns Daru::DataFrame of the quote with volume and close
+    def get_quote(ticker, args = {})
+      if args.is_a? Hash
+        start_date = args[:start_date] if args[:start_date]
+        start_date ||= args[:s] if args[:s]
 
-		def initialize
-			@yahoo_client = Yahoo.new
-		end
+        end_date = args[:end_date] if args[:end_date]
+        end_date ||= args[:e] if args[:e]
 
-		# get_quote: returns Daru::DataFrame of the quote with volume and close
-		def get_quote(ticker, args = {})
+        period = args[:period] if args[:period]
+        period ||= args[:p] if args[:p]
+      end
 
-			if args.is_a? Hash
-				start_date = args[:start_date] if args[:start_date]
-				start_date ||= args[:s] if args[:s]
+      csv = @yahoo_client.get_csv(ticker, start_date, end_date, period)
+      create_from_csv(csv)
+    end
 
-				end_date = args[:end_date] if args[:end_date]
-				end_date ||= args[:e] if args[:e]
+    alias historical_data get_quote
+    alias historical_quote get_quote
 
-				period = args[:period] if args[:period]
-				period ||= args[:p] if args[:p]
-			end
+    private
 
-			csv = @yahoo_client.get_csv(ticker, start_date, end_date, period)
-			create_from_csv(csv)
-		end
+    def create_from_csv(data)
+      file_path = Dir.tmpdir + "/#{Time.now.to_i}"
 
-		alias_method :historical_data, :get_quote
-		alias_method :historical_quote, :get_quote
+      CSV.open(file_path, 'w') do |out|
+        data.each do |row|
+          out << row
+        end
+      end
 
-		private
+      df = nil
 
-		def create_from_csv(data)
+      df = Daru::DataFrame.from_csv(file_path, converters: :numeric)
+      File.delete(file_path) if File.exist?(file_path)
 
-			file_path = Dir.tmpdir() + "/#{Time.now.to_i}"
-
-			CSV.open(file_path, 'w') do |out|
-				data.each do |row|
-					out << row
-				end
-			end
-
-			df = nil
-
-			df = Daru::DataFrame.from_csv(file_path, :converters => :numeric)
-			File.delete(file_path) if File.exists?(file_path)
-
-			#sort from earlier to latest
-			df = df.sort ['Date']
-
-			# strip columns and create index
-			df.index = Daru::Index.new(df['Date'].to_a)
-			df.rename_vectors 'Volume' => :volume, 'Adj Close' => :adj_close, 'Open' => :open, 'Close' => :close, 'High' => :high, 'Low' => :low
-			df.delete_vector 'Date'
-			d = df.filter(:row) { |row| row[:volume] > 0}
-		end
-
-	end
+      # sort from earlier to latest
+      df = df.sort ['Date']
 
+      # strip columns and create index
+      df.index = Daru::Index.new(df['Date'].to_a)
+      df.rename_vectors 'Volume' => :volume, 'Adj Close' => :adj_close, 'Open' => :open, 'Close' => :close, 'High' => :high, 'Low' => :low
+      df.delete_vector 'Date'
+      d = df.filter(:row) { |row| row[:volume] > 0 }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yquotes
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - P Choudhary
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler