apache_log_parser 1.0.0 → 1.1.0

data/README.rdoc

@@ -17,6 +17,7 @@ From there, you would use it as follows:
     parsed[:hour]       #=> 14
     parsed[:zone]       #=> "-0800"
     parsed[:method]     #=> "GET"
+    parsed[:http_ver]   #=> "1.1"
     parsed[:resource]   #=> "/some/page.php"
     parsed[:status]     #=> 200
     parsed[:size]       #=> "7047"

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/apache_log_parser.gemspec

@@ -1,49 +1,42 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{apache_log_parser}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["watsonian"]
-  s.date = %q{2010-01-27}
+  s.date = %q{2011-05-08}
   s.description = %q{Library to easily parse standard Apache log files.}
   s.email = %q{watsonian@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "apache_log_parser.gemspec",
-     "lib/apache_log_parser.rb",
-     "spec/apache_log_parser_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "apache_log_parser.gemspec",
+    "lib/apache_log_parser.rb",
+    "spec/apache_log_parser_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/watsonian/apache_log_parser}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Library to easily parse standard Apache log files.}
-  s.test_files = [
-    "spec/apache_log_parser_spec.rb",
-     "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])

data/lib/apache_log_parser.rb

@@ -6,7 +6,7 @@ class ApacheLogParser
   
   private
     def self.parse_line(line)
-      m = line.match(/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}).*?(([0-9]{1,2})\/(.*?)\/([0-9]{4})):(([0-9]{2}):[0-9]{2}:[0-9]{2})\s*(.*?)\]\s*"([\w]*)\s(.*?)\s.*?"\s([0-9]{3})\s(.*?)\s*"(.*?)"\s*"(.*?)"/)
+      m = line.match(/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}).*?(([0-9]{1,2})\/(.*?)\/([0-9]{4})):(([0-9]{2}):[0-9]{2}:[0-9]{2})\s*(.*?)\]\s*"([\w]*)\s(.*?)\sHTTP\/(.*?)"\s([0-9]{3})\s(.*?)\s*"(.*?)"\s*"(.*?)"/)
       if m
       {:ip         => m[1],
        :date       => m[2],
@@ -18,10 +18,11 @@ class ApacheLogParser
        :zone       => m[8],
        :method     => m[9],
        :resource   => m[10],
-       :status     => m[11].to_i,
-       :size       => m[12],
-       :referer    => m[13],
-       :user_agent => m[14]}
+       :http_ver   => m[11],
+       :status     => m[12].to_i,
+       :size       => m[13],
+       :referer    => m[14],
+       :user_agent => m[15]}
       else
         {}
       end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: apache_log_parser
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  hash: 19
+  prerelease: 
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - watsonian
@@ -9,19 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-27 00:00:00 -08:00
+date: 2011-05-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 description: Library to easily parse standard Apache log files.
 email: watsonian@gmail.com
 executables: []
@@ -33,7 +45,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -48,29 +59,34 @@ homepage: http://github.com/watsonian/apache_log_parser
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Library to easily parse standard Apache log files.
-test_files: 
-- spec/apache_log_parser_spec.rb
-- spec/spec_helper.rb
+test_files: []
+

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC