indy 0.1.4 → 0.1.5

data/History.txt

@@ -1,3 +1,11 @@
+=== 0.1.5 / 2011-01-21
+
+* Searching with time scopes (#after, #within, #before) are much faster
+* Dates used in time scopes are limited to 1901 - 2038
+    * The Windows platform limits dates further to 1969 - 2038
+* Explicit format string for time forces the old (slower) time scoping code
+    * However, this removes the harsh limits on date values
+
 === 0.1.4 / 2011-01-19
 
 * Add support for Ruby 1.8.5

data/indy.gemspec

@@ -62,9 +62,12 @@ Gem::Specification.new do |s|
 
   }
 
-  s.rubygems_version   = "1.3.7"
-  s.files            = `git ls-files`.split("\n")
-  s.extra_rdoc_files = ["README.md", "History.txt"]
-  s.rdoc_options     = ["--charset=UTF-8"]
-  s.require_path     = "lib"
+  #  exclusions          = [File.join("performance", "large.log")]
+  #  s.files             = `git ls-files`.split("\n") - exclusions
+
+  s.rubygems_version  = "1.3.7"
+  s.files             = `git ls-files`.split("\n")
+  s.extra_rdoc_files  = ["README.md", "History.txt"]
+  s.rdoc_options      = ["--charset=UTF-8"]
+  s.require_path      = "lib"
 end

data/lib/indy/indy.rb

@@ -1,9 +1,10 @@
-require 'ostruct'
 require 'active_support/core_ext'
 
 class Indy
 
-  VERSION = "0.1.4"
+  class InvalidSource < Exception; end
+
+  VERSION = "0.1.5"
 
   #
   # hash with one key (:string, :file, or :cmd) set to the string that defines the log
@@ -21,10 +22,6 @@ class Indy
   #
   attr_accessor :time_format
 
-  FOREVER_AGO = DateTime.now - 200_000
-  FOREVER = DateTime.now + 200_000
-
-
   #
   # Initialize Indy.
   #
@@ -72,7 +69,10 @@ class Indy
     # @example
     #   Indy.search(:source => {:cmd => "cat apache.log"}, :pattern => LOG_PATTERN, :time_format => MY_TIME_FORMAT).for(:all)
     #
-    def search(params)
+    def search(params=nil)
+  
+      raise Indy::InvalidSource if params.nil?
+
       if params.respond_to?(:keys) && params[:source]
         Indy.new(params)
       else
@@ -231,7 +231,8 @@ class Indy
   #
   def within(scope_criteria)
     if scope_criteria[:time]
-      @start_time, @end_time = scope_criteria[:time]
+      @start_time, @end_time = scope_criteria[:time].collect {|str| parse_date(str) }
+
       @inclusive = scope_criteria[:inclusive] || false
     end
 
@@ -254,6 +255,8 @@ class Indy
   #
   def source=(param)
 
+    raise Indy::InvalidSource if param.nil?
+
     cmd = param[:cmd] rescue nil
     @source[:cmd] = param[:cmd] if cmd
 
@@ -261,6 +264,8 @@ class Indy
       File.exist?(param) ? @source[:file] = param : @source[:string] = param
     end
 
+    raise Indy::InvalidSource unless @source.values.reject {|value| value.kind_of? String }.empty?
+
   end
 
   #
@@ -293,6 +298,7 @@ class Indy
   #
   def _search(&block)
 
+    line_matched = nil
     time_search = use_time_criteria?
 
     source_io = open_source
@@ -300,6 +306,8 @@ class Indy
 
       hash = parse_line(line)
 
+      hash ? (line_matched = true) : next
+      
       if time_search
         set_time(hash)
         next unless inside_time_window?(hash)
@@ -307,11 +315,12 @@ class Indy
         hash[:_time] = nil if hash
       end
 
-      next unless hash
       block_given? ? block.call(hash) : nil
 
     end
 
+    warn "No matching lines found in source: #{source_io.class}" unless line_matched
+
     source_io.close if @source[:file] || @source[:cmd]
 
     results.compact
@@ -375,8 +384,8 @@ class Indy
   def use_time_criteria?
     if @start_time || @end_time
       # ensure both boundaries are set
-      @start_time = @start_time || FOREVER_AGO
-      @end_time = @end_time || FOREVER
+      @start_time = @start_time || forever_ago
+      @end_time = @end_time || forever
     end
 
     return (@time_field && @start_time && @end_time)
@@ -416,16 +425,26 @@ class Indy
   #
   def parse_date(param)
     return nil unless @time_field
+    return param if param.kind_of? Time or param.kind_of? DateTime
 
     time_string = param[@time_field] ? param[@time_field] : param
 
-    begin
-      # Attempt the appropriate parse method
-      @time_format ? DateTime.strptime(time_string, @time_format) : DateTime.parse(time_string)
-    rescue
-      # If appropriate, fall back to simple parse method
-      DateTime.parse(time_string) if @time_format rescue nil
+    if @time_format
+      begin
+        # Attempt the appropriate parse method
+        DateTime.strptime(time_string, @time_format)
+      rescue
+        # If appropriate, fall back to simple parse method
+        DateTime.parse(time_string) rescue nil
+      end
+    else
+      begin
+        Time.parse(time_string)
+      rescue Exception => e
+        raise "Failed to create time object. The error was: #{e.message}"
+      end
     end
+
   end
 
   #
@@ -469,4 +488,24 @@ class Indy
     Struct::Line.new( *params )
   end
 
+  #
+  # Return a time or datetime object way in the future
+  #
+  def forever
+    @time_format ? DateTime.new(4712) : Time.at(0x7FFFFFFF)
+  end
+
+  #
+  # Return a time or datetime object way in the past
+  #
+  def forever_ago
+    begin
+      @time_format ? DateTime.new(-4712) : Time.at(-0x7FFFFFFF)
+    rescue
+      # Windows Ruby Time can't handle dates prior to 1969
+      @time_format ? DateTime.new(-4712) : Time.at(0)
+    end
+  end
+
+
 end