ytterb 0.2.152.223223 → 0.2.154.000903

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4de92e40383cd2fc47c6dd00857bc62ea366000e
-  data.tar.gz: cf77d498119558b2cb956adde78d8e0a5541a7d4
+  metadata.gz: 9d578badfc1091885c94aba70d1b629e33f7e5cb
+  data.tar.gz: 795be1dc6adc612d9c850c17d7246359ffbf002e
 SHA512:
-  metadata.gz: 850e40a9c4b39e5147bd9c985c29203818b2590d207c8cfa3de1ce363b905eb237f52503dcceb8b78259e5db9937255c7c711e0097ed18bbd2bd4d133105b298
-  data.tar.gz: 61ca6fd0035c30f4e9ab1b54574527422b19e19c70782d4d7237887770da122fb25ad0dbc7a391d8e9b3a3f7e0e73f38de8ef75f6f2353038f371e6fc4441511
+  metadata.gz: 62932e40ab5dc287dd10a521e6bd2315b3b944fe1479c68c26af61fea210f951b516f4477c7e89dea2761c691928f66bd5b6372f983c32818bcfebc726a4524d
+  data.tar.gz: e10472592351bca656d6cf3f9666b2b0546c01dcd48a6ac261567fdc71726759c2ee6f1d936241b3891e328b40f0f26dca9ed28215ae832377307ae6452a519e

data/lib/ytterb/.cache/local_settings/settings/.yaml

@@ -0,0 +1,4 @@
+---
+:sync_from: '2013-06-02'
+:sync_increment: 120
+:api_calls_per_hour: 1900

data/lib/ytterb/stock_symbol/cache_builder.rb

@@ -10,7 +10,6 @@ module Ytterb
     class CacheBuilder
 
       def initialize
-        @yql = Yql::Client.new
         @sml = MarketLoader.new      
         @local_settings = Util::Settings.new
 
@@ -26,57 +25,33 @@ module Ytterb
       def build_stock_sync_queue
         @stock_sync_queue = Queue.new
         @sml.stock_symbols.shuffle.each do |stock|
-          @stock_sync_queue << stock.symbol
+          @stock_sync_queue << stock
         end
       end
 
       def stock_processor_run
+        initial_queue_size = @stock_sync_queue.length
+        prev_done = 0
+        puts "Initial queue size is #{initial_queue_size}"
         while true
           begin
             curr = @stock_sync_queue.pop(true) rescue nil
             break unless curr # queue is empty
             sleep(3600.0/@local_settings[:api_calls_per_hour])
-            puts "#{@stock_sync_queue.length} symbols in the queue"
-            puts "Processing Symbol: #{curr}"
-            curr_file = @local_settings.get_symbol_store_file(curr)
-            curr_stock_info = Util::DataPersistHelper.load(curr_file) rescue nil
-            curr_stock_info ||= {}
-            curr_stock_info[:sync_to] ||= @local_settings[:sync_from]
-            date_start = Date.parse(curr_stock_info[:sync_to])
-            if (date_start < Date.today)
-              date_end = date_start + @local_settings[:sync_increment]
-              date_end = Date.today if date_end > Date.today
-              result = @yql.get_symbol_historical(curr,date_start.to_s, date_end.to_s)
-              max_end_date = Date.parse(curr_stock_info[:sync_to])
-              symbol_updated = false
-              if result and result.has_key?("quote") and result["quote"].kind_of?(Array)
-                # TODO: need to pull all this logic into the yql client
-                # TODO: this needs some tests!
-                result["quote"].each do |item|
-                  if item["Date"]
-                    curr_stock_info[:data]||={}
-                    curr_stock_info[:data][item["Date"]] = item
-                    if Date.parse(item["Date"]) > max_end_date
-                      max_end_date = Date.parse(item["Date"])
-                      curr_stock_info[:sync_to] = max_end_date.to_s
-                      symbol_updated = true
-                    end
-                  end
-                end
-                @stock_sync_queue << curr if symbol_updated
-                puts curr_stock_info[:sync_to]
-                Util::DataPersistHelper.save(curr_file,curr_stock_info)
-              else
-                puts "Debug result: #{result}"
-              end
+            curr.fetch_history
+            curr_done = (initial_queue_size - @stock_sync_queue.length) * 100 / initial_queue_size
+            if curr_done > prev_done
+              puts "#{curr_done} %"
+              prev_done = curr_done
+            else
+              print "#{curr.symbol}."
             end
           rescue StandardError => e
-            puts "error in stock processor run: #{e.message} : #{e.backtrace.join(" | ")}"
+            puts "#{e.message} : #{e.backtrace.join("|")}"
           end
         end
       end
 
-
     end # CacheBuilder
   end 
 end

data/lib/ytterb/stock_symbol/stock.rb

@@ -1,5 +1,8 @@
 require 'csv'
 
+require_relative '../util'
+require_relative '../yql'
+
 module Ytterb
   module StockSymbol
     class Stock
@@ -12,10 +15,15 @@ module Ytterb
           val.gsub!(/\^/,"-") if sym_k == :symbol
           @options[sym_k] = val
         end
+        # not interested in variable data which was captured in the stock list
+        @options.reject! {|k,v| [:lastsale, :marketcap, :adr_tso].include?(k) }
+        load
       end
 
-      def attributes
-        return @options.keys
+      def self.builder_from_csv(stock_symbol_file, exchange)
+        CSV.foreach(stock_symbol_file, :headers => true) do |obj|
+          yield Stock.new(obj.to_hash.merge("Exchange" => exchange))
+        end
       end
 
       def method_missing(meth, *args, &block)
@@ -31,12 +39,40 @@ module Ytterb
         @options.to_s
       end
       
-      def self.builder_from_csv(stock_symbol_file, exchange)
-        CSV.foreach(stock_symbol_file, :headers => true) do |obj|
-          yield Stock.new(obj.to_hash.merge("Exchange" => exchange))
+      ## load/save operations
+      def self.get_settings
+        @settings ||= Util::Settings.new
+      end
+      
+      def load
+        symbol_history_file = self.class.get_settings.get_symbol_store_file(self.symbol)
+        @history = Util::DataPersistHelper.load(curr_file) rescue nil
+      end
+      
+      def save
+        return unless @history
+        symbol_history_file = self.class.get_settings.get_symbol_store_file(self.symbol)
+        Util::DataPersistHelper.save(symbol_history_file,@history)
+      end
+            
+      # history via yql operation
+      def self.get_yql_client
+        @yql_client ||= Yql::Client.new
+      end
+      
+      def fetch_history(start_date = nil, end_date = nil)
+        start_date ||= self.class.get_settings[:sync_from]
+        @history||={}
+        @history["items"]||={}
+        start_date = @history[:max_sync_date] if @history and @history[:max_sync_date]
+        @history[:max_sync_date] = Date.parse(Time.at(0).to_s).to_s
+        
+        self.class.get_yql_client.get_symbol_historical(@options[:symbol], start_date, end_date).each do |line|
+          @history["items"][line["Date"]] = line
+          @history[:max_sync_date] = line["Date"] if Date.parse(line["Date"]) > Date.parse(@history[:max_sync_date])
         end
+        save
       end
-
     end
   end
 end # Ytterb

data/lib/ytterb/yql/client.rb

@@ -1,14 +1,15 @@
 require 'rest-client'
 require 'cgi'
-require 'json'
 require 'date'
 
+require_relative 'exceptions'
+require_relative 'response'
+
 module Ytterb
   module Yql
     class Client
       def initialize
         @endpoint = "http://query.yahooapis.com/v1/public/yql"
-        puts "YQL Client is using endpoint @ #{@endpoint}"
       end
 
       def get_yql_endpoint
@@ -17,22 +18,18 @@ module Ytterb
 
       def run_select_query(query)
         RestClient.get("#{get_yql_endpoint}?q=#{CGI::escape(query)}&format=json&env=store://datatables.org/alltableswithkeys") do |response, request, result|
-          raise "Failed performing YQLQuery\n Request: #{request.inspect}\n Response #{response.inspect}" unless response.code == 200
-          return JSON.parse(response)
+          raise ClientYqlError, "Failed performing YQLQuery\n Request: #{request.inspect}\n Response #{response.inspect}" unless response.code == 200
+          return Response.new(response).lines
         end
       end
 
-      def get_symbol_current(my_symbol)
-        run_select_query("select * from yahoo.finance.quotes where symbol in (\"#{my_symbol}\")")["query"]["results"]
-      end
-
       def get_symbol_historical(my_symbol, start_date = nil, end_date = nil)
         requested_end = Date.parse(end_date) if end_date
         requested_end = Date.today unless requested_end
 
         requested_start = Date.parse(start_date) if start_date
         requested_start = requested_end - 30 unless requested_start
-        run_select_query("select * from yahoo.finance.historicaldata where symbol in (\"#{my_symbol}\") and startDate='#{requested_start}' and endDate='#{requested_end}'")["query"]["results"]
+        run_select_query("select * from yahoo.finance.historicaldata where symbol in (\"#{my_symbol}\") and startDate='#{requested_start}' and endDate='#{requested_end}'")
       end
 
     end

data/lib/ytterb/yql/exceptions.rb

@@ -0,0 +1,6 @@
+module Ytterb
+  module Yql
+    class InvalidYqlResponse < StandardError; end
+    class ClientYqlError < StandardError; end
+  end
+end

data/lib/ytterb/yql/response.rb

@@ -0,0 +1,49 @@
+require 'json'
+
+require_relative 'exceptions'
+
+module Ytterb
+  module Yql
+    class Response
+      def initialize(raw)
+        begin
+          @response = JSON.parse(raw)
+        rescue
+          raise InvalidYqlResponse, "failed parsing yql response"
+        end
+        build_response_lines
+      end
+      
+      def validate_response_line(line)
+        raise InvalidYqlResponse, "response line needs to be a hash. found a #{line.class}" unless line.kind_of?(Hash)
+        line.select! do |k,v|
+          ["Symbol", "Date", "Open", "High", "Low", "Close", "Volume", "Adj_Close"].include?(k)
+        end
+        line
+      end
+      
+      def build_response_lines
+        @response_lines = []
+        return unless @response.has_key?("query")
+        return unless @response["query"].has_key?("count")
+        return unless @response["query"]["count"].to_i > 0
+        return unless @response["query"].has_key?("results")
+        return unless @response["query"]["results"].has_key?("quote")
+        if @response["query"]["results"]["quote"].kind_of?(Hash)
+          @response_lines << validate_response_line(@response["query"]["results"]["quote"])
+        elsif @response["query"]["results"]["quote"].kind_of?(Array)
+          @response["query"]["results"]["quote"].each do |line|
+            @response_lines << validate_response_line(line)
+          end
+        else
+          raise InvalidYqlResponse, "response/query/results/quote needs to be an Array or a Hash. Found a #{@response["query"]["results"]["quote"].class}"
+        end
+      end
+      
+      def lines
+        @response_lines
+      end
+      
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ytterb
 version: !ruby/object:Gem::Version
-  version: 0.2.152.223223
+  version: 0.2.154.000903
 platform: ruby
 authors:
 - thext
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-02 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,6 +97,7 @@ files:
 - lib/ytterb/.cache/cached_symbol_data/.keepme
 - lib/ytterb/.cache/cached_symbol_data/clean.sh
 - lib/ytterb/.cache/local_settings/settings.yaml
+- lib/ytterb/.cache/local_settings/settings/.yaml
 - lib/ytterb/.cache/raw_symbol_data/companylist_amex.csv
 - lib/ytterb/.cache/raw_symbol_data/companylist_nasdaq.csv
 - lib/ytterb/.cache/raw_symbol_data/companylist_nyse.csv
@@ -113,6 +114,8 @@ files:
 - lib/ytterb/yql.rb
 - lib/ytterb/yql/_req.rb
 - lib/ytterb/yql/client.rb
+- lib/ytterb/yql/exceptions.rb
+- lib/ytterb/yql/response.rb
 - spec/spec_helper.rb
 - spec/ytterb_spec.rb
 - ytterb.gemspec