universal-access-log-parser 1.0.0 → 1.0.1

data/Gemfile

@@ -9,5 +9,6 @@ group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
+  gem "ruby-prof", "~> 0.10.8"
 end
 

data/Gemfile.lock

@@ -18,6 +18,7 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
     ruby-ip (0.9.0)
+    ruby-prof (0.10.8)
 
 PLATFORMS
   ruby
@@ -28,3 +29,4 @@ DEPENDENCIES
   rcov
   rspec (~> 2.3.0)
   ruby-ip
+  ruby-prof (~> 0.10.8)

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/universal-access-log-parser.rb

@@ -392,7 +392,11 @@ class UniversalAccessLogParser
 	end
 
 	def parse(line)
-		matched, *strings = @regexp.match(line).to_a
+		begin
+			matched, *strings = @regexp.match(line).to_a
+		rescue ArgumentError => e
+			raise ParsingError.new("parser regexp error: #{e}", self, line)
+		end
 
 		raise ParsingError.new('parser regexp did not match log line', self, line) if strings.empty?
 

data/spec/bin/benchmark

@@ -0,0 +1,26 @@
+#!/usr/bin/ruby
+require 'unprof'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
+require 'universal-access-log-parser'
+
+$lines = 0
+
+def progress
+	puts $lines
+end
+
+UniversalAccessLogParser.new do
+        apache_combined
+        string :handling, :process => lambda{|s| s.to_sym}
+        string :current_status, :nil_on => '-'
+        string :initial_status, :nil_on => '-'
+        integer :cache_hits
+        float :cache_ttl, :nil_on => '-'
+        integer :cache_age
+        float :response_time
+end.parse_file(File.join(File.dirname(__FILE__), '..', 'data', 'varnishncsa-short.log')).each! do
+	$lines += 1
+	progress if $lines % 10 == 0
+end
+

data/universal-access-log-parser.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "universal-access-log-parser"
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2011-10-05"
+  s.date = "2011-10-18"
   s.description = "Meta parser that allows you to define new parser with ruby DSL to match access log file format you are willing to parse or use one of the predefined parsers like Apache common, IIS and more"
   s.email = "jpastuszek@gmail.com"
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/common_parsers.rb",
     "lib/universal-access-log-parser.rb",
+    "spec/bin/benchmark",
     "spec/common_parsers_spec.rb",
     "spec/data/apache_access.log",
     "spec/data/bad1.log",
@@ -53,12 +54,14 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<ruby-prof>, ["~> 0.10.8"])
     else
       s.add_dependency(%q<ruby-ip>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<ruby-prof>, ["~> 0.10.8"])
     end
   else
     s.add_dependency(%q<ruby-ip>, [">= 0"])
@@ -66,6 +69,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<ruby-prof>, ["~> 0.10.8"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: universal-access-log-parser
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Jakub Pastuszek
@@ -15,10 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-05 00:00:00 Z
+date: 2011-10-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: ruby-ip
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -27,12 +29,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id001
-  name: ruby-ip
-  prerelease: false
   type: :runtime
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: rspec
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -43,12 +45,12 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  version_requirements: *id002
-  name: rspec
-  prerelease: false
   type: :development
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: bundler
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -59,12 +61,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id003
-  name: bundler
-  prerelease: false
   type: :development
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: jeweler
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -75,12 +77,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  version_requirements: *id004
-  name: jeweler
-  prerelease: false
   type: :development
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: rcov
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -89,10 +91,24 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id005
-  name: rcov
+  type: :development
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: ruby-prof
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 39
+        segments: 
+        - 0
+        - 10
+        - 8
+        version: 0.10.8
   type: :development
+  requirement: *id006
 description: Meta parser that allows you to define new parser with ruby DSL to match access log file format you are willing to parse or use one of the predefined parsers like Apache common, IIS and more
 email: jpastuszek@gmail.com
 executables: []
@@ -113,6 +129,7 @@ files:
 - VERSION
 - lib/common_parsers.rb
 - lib/universal-access-log-parser.rb
+- spec/bin/benchmark
 - spec/common_parsers_spec.rb
 - spec/data/apache_access.log
 - spec/data/bad1.log