apache_log-parser 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d58c4fdaad1564bc136957c9c523f1033018c7b3
-  data.tar.gz: ebe791bfd38e8197305e6facb1bebab6a910084e
+  metadata.gz: d7b3cf2d958865b1b7ed59532445be7468c0c4ea
+  data.tar.gz: eef9f4f04a09fc17ba7db8b075b7da6d59c4df0c
 SHA512:
-  metadata.gz: 5daa56c8008103401cca6e2aad85278fec7f846425b18c9b7b1e1140e60069a454a83b7d90ea70393bc6a5dd1e0ccccf5007761d839f7c42630d9d7f9f5ac7a5
-  data.tar.gz: ee9130d6a7cc7a20f5f773e6bf68202e08625fd637f5d763724cb548061f82b7e4ce5c73f8a447cc48b62cd519c7eb6e12fa1006e278313c8a46bc8f09a79172
+  metadata.gz: 1641a79197ca5cbf216dd02e5f81ce935bd3c2a3098093220bb5b63b01580d32b19304505c25c62b5167348636650380bbccf2aab272d27fa5c1438f383551bb
+  data.tar.gz: ba877b92b6dd6e1254be3bd788f62b7b38d207fb4123b4bac630d1e4ed916bb0909dffd52c5989ad93f792aa9ac6516fbe6704941c77421872b6b63417fe58ec

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.1.0
+  - 2.0.0
+  - 1.9.3

data/README.md

@@ -1,5 +1,5 @@
 # ApacheLog::Parser
-
+[![Build Status](https://travis-ci.org/takady/apache_log-parser.svg?branch=master)](https://travis-ci.org/takady/apache_log-parser) [![Code Climate](https://codeclimate.com/github/takady/apache_log-parser/badges/gpa.svg)](https://codeclimate.com/github/takady/apache_log-parser)  
 Gem to parse apache log including common, combined and customized format.
 
 ## Installation
@@ -28,17 +28,17 @@ common_log[:datetime]       #=> datetime
 common_log[:request]        #=> request
 
 # combined format
-common_log = ApacheLog::Parser.parse(log_line, 'combined')
-common_log[:referer]        #=> referer
-common_log[:user_agent]     #=> user_agent
+combined_log = ApacheLog::Parser.parse(log_line, 'combined')
+combined_log[:referer]        #=> referer
+combined_log[:user_agent]     #=> user_agent
 
 # custom format(additional fields after 'combined')
-# custom format: LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" \"%v\" \"%{cookie}n\" %D"
-common_log = ApacheLog::Parser.parse(log_line, 'combined', %w(vhost usertrack request_duration))
-common_log[:user_agent]        #=> user_agent
-common_log[:vhost]             #=> vhost
-common_log[:usertrack]         #=> usertrack
-common_log[:request_duration]  #=> request_duration
+# e.g. "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" \"%v\" \"%{cookie}n\" %D"
+custom_log = ApacheLog::Parser.parse(log_line, 'combined', %w(vhost usertrack request_duration))
+custom_log[:user_agent]        #=> user_agent
+custom_log[:vhost]             #=> vhost
+custom_log[:usertrack]         #=> usertrack
+custom_log[:request_duration]  #=> request_duration
 ```
 
 The format parameter must be 'common' or 'combined'.

data/lib/apache_log/parser.rb

@@ -5,7 +5,6 @@ module ApacheLog
   module Parser
 
     def self.parse(line, format, additional_fields=[])
-
       common_fields   = %w(remote_host identity_check user datetime request status size)
       combined_fields = common_fields + %w(referer user_agent)
 
@@ -28,27 +27,31 @@ module ApacheLog
         raise "format error\n no such format: <#{format}> \n"
       end
 
-      match = pattern.match(line)
-      raise "parse error\n at line: <#{line}> \n" if match.nil?
+      matched = pattern.match(line)
+      raise "parse error\n at line: <#{line}> \n" if matched.nil?
+
+      generate_hash(fields, matched.to_a)
+    end
 
-      columns = match.to_a
+    private
+      def self.generate_hash(keys, values)
+        hash = {}
 
-      parsed_hash = {}
-      fields.each.with_index do |val, idx|
-        val = val.to_sym
-        if val == :datetime
-          parsed_hash[val] = to_datetime(columns[idx+1])
-        elsif val == :request
-          parsed_hash[val] = parse_request(columns[idx+1])
-        else
-          parsed_hash[val] = columns[idx+1]
+        keys.each.with_index do |key, idx|
+          key = key.to_sym
+          case key
+          when :datetime
+            hash[key] = to_datetime(values[idx+1])
+          when :request
+            hash[key] = parse_request(values[idx+1])
+          else
+            hash[key] = values[idx+1]
+          end
         end
-      end
 
-      parsed_hash
-    end
+        hash
+      end
 
-    private
       def self.to_datetime(str)
         DateTime.strptime( str, '%d/%b/%Y:%T %z')
       end

data/lib/apache_log/parser/version.rb

@@ -1,5 +1,5 @@
 module ApacheLog
   module Parser
-    VERSION = "2.0.1"
+    VERSION = "2.0.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apache_log-parser
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Yuichi Takada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-10 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md