yahoo_finanza 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76d722ed1eb7c00680153fcbddf312a115a1d62f
-  data.tar.gz: e62c6d0cdfb36c7ea8fbf602ed61124ca16fbeb4
+  metadata.gz: 2bf5897a7c1dab870202deb24deff1f11ccf4f95
+  data.tar.gz: e9d1bec7671281e049b3eec56e9e06cbf060d67a
 SHA512:
-  metadata.gz: fea0930a1d2e68265dd8e666261e95af5aeed6ee3dd01a1eb5c3fbb12e015758696de4217bed3a9cc4ccff902e919f09162191bc12952836c33f966cb9947527
-  data.tar.gz: 51ad5f30d582b14e5a1cd2d06e51a2b66a3d01e3430c54e65b8940038ec4af999fd5444ebfe3f761740017f4590b8981fd6103b7829e43324402345da9110332
+  metadata.gz: e72882fc69bec34b9d0bc566e28296afc789bcb23f15918eb398f2f220fb6490c1b5238bc5e548d97a9eb87e785c86ce44e8c09dce3691084968028fe06dfd70
+  data.tar.gz: 5c4bbe495075825ea6cd03f1d57a5978ec86da5679311b0e153a730515b7eb5d46027ca0dbe032035b57861209533faf522e661b943579497c8dd711e7debe52

data/lib/yahoo_finanza.rb

@@ -1,7 +1,7 @@
 require 'yahoo_finanza/version'
-require 'yahoo_finanza/client'
 require 'yahoo_finanza/constants'
-require 'yahoo_finanza/worker'
+require 'yahoo_finanza/workers'
+require 'yahoo_finanza/client'
 
 module YahooFinanza
 end

data/lib/yahoo_finanza/client.rb

@@ -1,54 +1,31 @@
-require 'yahoo_finanza/parser'
-require 'yahoo_finanza/finance_utils'
-
-require 'yql'
-require 'json'
-require 'ostruct'
-require 'mechanize'
+require 'yahoo_finanza/workers'
 
 module YahooFinanza
   class Client
-    include YahooFinanza::FinanceUtils
-    include YahooFinanza::Parser
-
-    attr_reader :yql, :mecha_yahoo
+    def quote symbol
+      YahooFinanza::SingleQuoteWorker.new(symbol).run
+    end
 
-    def initialize
-      @yql = Yql::Client.new
-      @yql.format = 'json'
+    def quotes symbols
+      clean_quotes(YahooFinanza::MultiQuoteWorker.new(symbols).run)
     end
 
-    def quotes(symbols)
-      return [] if symbols.empty?
-      query = Yql::QueryBuilder.new 'yahoo.finance.quotes'
-      query.conditions = "symbol in (\"#{symbols.join('\", \"')}\")"
-      @yql.query = query
-      response = @yql.get
-      yahoofy(response.show)
+    def quotes_history symbol, options
+      YahooFinanza::HistoricQuoteWorker.new(symbol, options).run
     end
 
-    def quote(symbol)
-      return [] if symbol == ''
-      query = Yql::QueryBuilder.new 'yahoo.finance.quotes'
-      query.conditions = "symbol in (\"#{symbol}\")"
-      @yql.query = query
-      response = @yql.get
-      single_yahoofy(response.show)
+    def search_symbols key
+      YahooFinanza::SymbolSearchWorker.new(key).run
     end
 
-    def historical_quotes(symbol, options = {})
-      return [] if symbol == ''
-      query = Yql::QueryBuilder.new 'yahoo.finance.historicaldata'
-      query.conditions = {
-        symbol: symbol, startDate: options[:start_date],
-        endDate: options[:end_date] }
-      @yql.query = query
-      response = @yql.get
-      historical_yahoofy(response.show)
+    def popular_stock_quotes
+      popular_symbols = YahooFinanza::ActiveStockWorker.new.get_active_stocks
+      YahooFinanza::MultiQuoteWorker.new(popular_symbols).run
     end
 
-    def popular_quotes
-      quotes(active_symbols)
+    private
+    def clean_quotes quotes
+      quotes.reject { |quote| quote.ask }
     end
   end
 end

data/lib/yahoo_finanza/parser.rb

@@ -1,5 +1,7 @@
 require 'json'
 require 'ostruct'
+require 'pry'
+require 'uri'
 
 module YahooFinanza
   module Parser
@@ -9,12 +11,16 @@ module YahooFinanza
       json['ResultSet']['Result'].map { |quote| quote['symbol'] }
     end
 
+    def hash_to_query(hash)
+      URI.encode(hash.map{|k,v| "#{k}=#{v}"}.join("&"))
+    end
+
     def yahoofy(payload)
       jsons = JSON.parse(payload)['query']['results']['quote']
       if jsons.class == Hash && jsons['Name']
-        [OpenStruct.new(jsons)]
+        OpenStruct.new(viperize_hash(jsons))
       elsif jsons.class == Array
-        jsons.map { |symbol| OpenStruct.new(symbol) }
+        jsons.map { |symbol| OpenStruct.new(viperize_hash(symbol)) }
       else
         []
       end
@@ -22,15 +28,29 @@ module YahooFinanza
 
     def single_yahoofy(payload)
       jsons = JSON.parse(payload)['query']['results']['quote']
-      result = OpenStruct.new(jsons)
-      return [] unless result.Name
+      result = OpenStruct.new(viperize_hash(jsons))
+      return '' unless result.name
       result
     end
 
     def historical_yahoofy(payload)
       jsons = JSON.parse(payload)['query']['results']
       return [] unless jsons
-      jsons['quote'].map { |symbol| OpenStruct.new(symbol) }
+      jsons['quote'].map { |symbol| OpenStruct.new(viperize_hash(symbol)) }
+    end
+
+    def viperize(symbol)
+      word = symbol.to_s.dup
+      word.gsub!(/::/, '/')
+      word.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+      word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+      word.tr!("-", "_")
+      word.downcase!
+      word.to_sym
+    end
+
+    def viperize_hash hash
+      hash.map { |key, value| { viperize(key.to_s) => value } }.reduce(:merge)
     end
   end
 end

data/lib/yahoo_finanza/version.rb

@@ -1,4 +1,4 @@
 # Yahoo Finanza Version
 module YahooFinanza
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

data/lib/yahoo_finanza/workers.rb

@@ -0,0 +1,97 @@
+require 'yahoo_finanza/parser'
+
+require 'rest-client'
+require 'mechanize'
+require 'yql'
+
+module YahooFinanza
+
+  class BaseWorker
+    attr_accessor :yql
+    include YahooFinanza::Parser
+    include YahooFinanza::Constants
+
+    def invalid_symbol? symbol
+      symbol == '' || !((nyse + nasdaq + amex + sp_500).include? symbol)
+    end
+  end
+
+  class ActiveStockWorker
+    attr_accessor :browser
+
+    def initialize
+      @browser = Mechanize.new
+    end
+
+    def get_active_stocks
+      nasdaq = @browser.get(YahooFinanza::Constants.active_nnm_url).search(".linkb")[0..24]
+      nyse = @browser.get(YahooFinanza::Constants.active_nyse_url).search(".linkb")[0..24]
+      (nasdaq + nyse).map do |stock|
+        stock.text.match(/\(.*?\)/)[0].gsub!("(", "").gsub!(")", "")
+      end
+    end
+  end
+
+  class SymbolSearchWorker < BaseWorker
+    def initialize(key)
+      @key = key
+    end
+
+    def run
+      params = { callback: "YAHOO.Finance.SymbolSuggest.ssCallback", query: @key }
+      response = RestClient.get("#{YahooFinanza::Constants.search_url}" + "#{hash_to_query(params)}")
+      parse(response)
+    end
+  end
+
+  class MultiQuoteWorker < BaseWorker
+    def initialize(symbols)
+      @yql = Yql::Client.new(format: 'json')
+      @symbols = symbols
+    end
+
+    def run
+      return [] if @symbols.empty?
+      query = Yql::QueryBuilder.new 'yahoo.finance.quotes'
+      query.conditions = "symbol in (\"#{@symbols.join('\", \"')}\")"
+      @yql.query = query
+      response = @yql.get
+      yahoofy(response.show)
+    end
+  end
+
+  class SingleQuoteWorker < BaseWorker
+    def initialize(symbol)
+      @yql = Yql::Client.new(format: 'json')
+      @symbol = symbol
+    end
+
+    def run
+      return '' if invalid_symbol? @symbol
+      query = Yql::QueryBuilder.new 'yahoo.finance.quotes'
+      query.conditions = "symbol in (\"#{@symbol}\")"
+      @yql.query = query
+      response = @yql.get
+      single_yahoofy(response.show)
+    end
+  end
+
+  class HistoricQuoteWorker < BaseWorker
+    def initialize(symbol, opts)
+      @yql = Yql::Client.new(format: 'json')
+      @symbol = symbol
+      @opts = opts
+    end
+
+    def run
+      return [] if (invalid_symbol? @symbol) || @opts.empty?
+      @query = Yql::QueryBuilder.new('yahoo.finance.historicaldata')
+      @query.conditions = {
+        symbol: @symbol, startDate: @opts[:start_date],
+        endDate: @opts[:end_date] }
+      @yql.query = @query
+      response = @yql.get
+      historical_yahoofy(response.show)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yahoo_finanza
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Eric D. Santos
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yql
@@ -119,12 +119,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/yahoo_finanza.rb
-- lib/yahoo_finanza/finance_utils.rb
 - lib/yahoo_finanza/version.rb
 - lib/yahoo_finanza/parser.rb
 - lib/yahoo_finanza/client.rb
 - lib/yahoo_finanza/constants.rb
-- lib/yahoo_finanza/worker.rb
+- lib/yahoo_finanza/workers.rb
 homepage: https://github.com/cometaworks/yahoo_finanza
 licenses:
 - MIT

data/lib/yahoo_finanza/finance_utils.rb

@@ -1,47 +0,0 @@
-require 'ostruct'
-require 'csv'
-require 'open-uri'
-require 'uri'
-
-require 'yahoo_finanza/parser'
-
-module YahooFinanza
-  class MarketDoesntExistError < Exception; end
-
-  module FinanceUtils
-    def self.included(base)
-      base.extend(self)
-    end
-
-    def symbols_by_market(market)
-      if [:nyse, :nasdaq, :amex].include? market.to_sym
-        YahooFinanza::Constants.send(market.to_sym)
-      else
-        raise YahooFinanza::MarketDoesntExistError
-      end
-    end
-
-    def sp_symbols
-      YahooFinanza::Constants.sp_500
-    end
-
-    def all_symbols
-      symbols_by_market('nyse').concat(symbols_by_market('nasdaq'))
-    end
-
-    def search_symbols(key = '')
-      params = { callback: "YAHOO.Finance.SymbolSuggest.ssCallback", query: key }
-      response = RestClient.get("#{YahooFinanza::Constants.search_url}" +
-                                "#{hash_to_query(params)}")
-      YahooFinanza::Parser.parse(response)
-    end
-
-    def active_symbols
-      YahooFinanza::Worker.new.get_active_stocks
-    end
-
-    def hash_to_query(hash)
-      URI.encode(hash.map{|k,v| "#{k}=#{v}"}.join("&"))
-    end
-  end
-end

data/lib/yahoo_finanza/worker.rb

@@ -1,20 +0,0 @@
-require 'mechanize'
-require 'rest-client'
-
-module YahooFinanza
-  class Worker
-    attr_accessor :browser
-
-    def initialize
-      @browser = Mechanize.new
-    end
-
-    def get_active_stocks 
-      nasdaq = @browser.get(YahooFinanza::Constants.active_nnm_url).search(".linkb")[0..24]
-      nyse = @browser.get(YahooFinanza::Constants.active_nyse_url).search(".linkb")[0..24]
-      (nasdaq + nyse).map do |stock|
-        stock.text.match(/\(.*?\)/)[0].gsub!("(", "").gsub!(")", "")
-      end
-    end
-  end
-end