indy 0.1.4 → 0.1.5

data/performance/profile_spec.rb

@@ -23,8 +23,28 @@ describe "Search Performance" do
         @indy.like(:message => 'filesystem')
       end
 
-      it "should profile code using #time()" do
-        @indy.after(:time => "12-29-2010 12:11:33").for(:all)
+      it "should profile code using #after()" do
+        @indy.after(:time => "29-12-2010 12:11:32").for(:all)
+      end
+
+    end
+
+  end
+
+  context "with a 10000 line log file" do
+
+    large_file = "#{File.dirname(__FILE__)}/large.log"
+    before(:all) do
+      @indy = Indy.new(
+        :source => large_file,
+        :pattern => [/^\[([^\|]+)\|([^\]]+)\] (.*)$/,:severity, :time, :message],
+        :time_format => '%d-%m-%Y %H:%M:%S')
+    end
+
+    profile :file => STDOUT, :printer => :flat, :min_percent => 1  do
+
+      it "should profile code using #after() and an explicit @time_format" do
+        @indy.after(:time => "29-12-2010 12:11:32").for(:all)
       end
 
     end

data/spec/indy_spec.rb

@@ -82,6 +82,18 @@ describe Indy do
       Indy.search(:cmd => "ls").source.should_not be_nil
     end
 
+    it "the instance should raise an exception when passed an invalid source: Fixnum" do
+      lambda{ Indy.search(9) }.should raise_error Indy::InvalidSource
+    end
+
+    it "the instance should raise an exception when passed an invalid source: nil" do
+      lambda{ Indy.search(nil) }.should raise_error Indy::InvalidSource
+    end
+
+    it "the instance should raise an exception when the arity is incorrect" do
+      lambda{ Indy.search( ) }.should raise_error Indy::InvalidSource
+    end
+
     context "for a String" do
 
       let(:log_file) { "#{File.dirname(__FILE__)}/data.log" }
@@ -151,7 +163,7 @@ describe Indy do
   context "bad data" do
 
     before(:each) do
-      log = "2000-09-07 14:07:41 INFO  MyApp - Entering APPLICATION.\n \n2000-09-07 14:07:41 INFO  MyApp  Entering APPLICATION.\n2000-09-07 14:07:41 INFO  MyApp - Entering APPLICATION.\n\n"
+      log = "2000-09-07 14:07:41 INFO  MyApp - Entering APPLICATION.\n \n2000-09-07 14:07:41 INFO  MyApp - Entering APPLICATION.\n bad \n2000-09-07 14:07:41 INFO  MyApp - Entering APPLICATION.\n\n"
       @indy = Indy.search(log)
     end
 
@@ -164,7 +176,7 @@ describe Indy do
   context "instance" do
 
     before(:each) do
-      log = "2000-09-07 14:07:41 INFO MyApp - Entering APPLICATION.\n2000-09-07 14:07:41 INFO MyApp Entering APPLICATION.\n2000-09-07 14:07:41 INFO MyApp - Entering APPLICATION."
+      log = "2000-09-07 14:07:41 INFO MyApp - Entering APPLICATION.\n2000-09-07 14:07:41 INFO MyApp - Entering APPLICATION.\n2000-09-07 14:07:41 INFO MyApp - Entering APPLICATION."
       @indy = Indy.search(log)
     end
 

data/spec/time_spec.rb

@@ -10,7 +10,7 @@ describe Indy do
 
     it "should parse a standard date" do
       line_hash = {:time => "2000-09-07 14:07:41", :message => "Entering APPLICATION"}
-      @indy.send(:parse_date, line_hash).class.should == DateTime
+      @indy.send(:parse_date, line_hash).class.should == Time
     end
 
     it "should parse dates when log includes non-conforming data" do
@@ -118,8 +118,7 @@ describe Indy do
     end
 
     it "using around should find the correct entries" do
-      puts @indy.around(:time => '2000-09-07 14:11:00', :span => 2).inspect
-      @indy.for(:all).count.should == 3
+      @indy.around(:time => '2000-09-07 14:11:00', :span => 2).for(:all).count.should == 2
     end
 
     it "using after and inclusive should find the correct entries" do
@@ -140,7 +139,7 @@ describe Indy do
         ].join("\n") )
     end
 
-    it "should find the correct entries" do
+    it "should find the correct entries (Bug: https://github.com/burtlo/Indy/issues#issue/3)" do
       @indy.after(:time => '2000-09-07 14:07:42').for(:all).length.should == 3
       @indy.before(:time => '2000-09-07 14:07:43').for(:all).length.should == 2
     end
@@ -156,7 +155,7 @@ describe Indy do
 
     it "should parse a non-standard date" do
       line_hash = {:time => "2000/09/07", :message => "Entering APPLICATION"}
-      @indy.send(:parse_date, line_hash).class.should == DateTime
+      @indy.send(:parse_date, line_hash).class.should == Time
     end
 
   end
@@ -168,9 +167,11 @@ describe Indy do
       @indy = Indy.new(:time_format => '%m-%d-%Y', :source => "1-13-2002 message\n1-14-2002 another message\n1-15-2002 another message", :pattern => [pattern, :time, :message])
     end
 
-    it "should parse a US style date when given a time format" do
+    it "should parse a US style date when given a time format by using DateTime" do
       line_hash = {:time => '1-13-2002', :message => 'message'}
-      @indy.send(:parse_date, line_hash).class.should == DateTime
+      time = @indy.send(:parse_date, line_hash)
+      time.class.should == DateTime
+      time.day.should == 13
     end
 
     it "should accept standard time format searches even while using an explicit log time format" do
@@ -187,24 +188,21 @@ describe Indy do
         "2000-09-07 14:08:41 INFO  MyApp - Exiting APPLICATION.",
         "2000-09-07 14:10:55 INFO  MyApp - Exiting APPLICATION."].join("\n")
       @search_result = Indy.search(log_string).for(:application => 'MyApp')
-      @time_search_result = Indy.search(log_string).before(:time => "2100-09-07").for(:application => 'MyApp')
+      @time_search_result = Indy.search(log_string).before(:time => "2020-09-07").for(:application => 'MyApp')
     end
 
     it "should not exist as an attribute when unless performing a time search" do
       @search_result.first._time.class.should == NilClass
-      @time_search_result.first._time.class.should == DateTime
+      @time_search_result.first._time.class.should == Time
     end
 
     it "should be accurate" do
-      @time_search_result.first._time.to_s.should == "2000-09-07T14:07:41+00:00"
+      @time_search_result.first._time.to_s.should == "Thu Sep 07 14:07:41 -0700 2000"
     end
 
     it "should allow for time range calculations" do
-      time_span = @time_search_result.last._time - @time_search_result.first._time
-      hours,minutes,seconds,frac = Date.day_fraction_to_time( time_span )
-      hours.should == 0
-      minutes.should == 3
-      seconds.should == 14
+      seconds = @time_search_result.last._time - @time_search_result.first._time
+      seconds.should == 194
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: indy
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Franklin Webber
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 -08:00
+date: 2011-01-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -221,7 +221,7 @@ has_rdoc: true
 homepage: http://github.com/burtlo/Indy
 licenses: 
 - MIT
-post_install_message: "\n    [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>]\n\n    Thank you for installing Indy 0.1.4 / 2011-01-19.\n\n    Changes:\n      \n  * Add support for Ruby 1.8.5\n  \n\n    [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>]\n\n  "
+post_install_message: "\n    [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>]\n\n    Thank you for installing Indy 0.1.5 / 2011-01-21.\n\n    Changes:\n      \n  * Searching with time scopes (#after, #within, #before) are much faster\n  * Dates used in time scopes are limited to 1901 - 2038\n      * The Windows platform limits dates further to 1969 - 2038\n  * Explicit format string for time forces the old (slower) time scoping code\n      * However, this removes the harsh limits on date values\n  \n\n    [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>] [<>]\n\n  "
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
@@ -249,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Log Search Library