apache_log-parser 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 059d6f42a9d78d8cfdb3b4245dc5bb7038b52e6b
-  data.tar.gz: 9843f3196f886414b7c7ee784669b0b26b367c6e
+  metadata.gz: 79f05f655abf68de378abfbc46727b3ffb63c814
+  data.tar.gz: 881391956529b0d466b71b2ead3118a9586da5b2
 SHA512:
-  metadata.gz: 0e54be8c7eee30b4d7abdc5fea023f9c88cd8917d2ff472ea74d6214bf8919f8c68a3915d8eb561de3e1d09da4300f1dd63fdd90e7a6883024f02308e42223d0
-  data.tar.gz: 577b92735e5c908b20953bfc2729777489b5f58e72517054d39674498926bf630f37559d1c595f126b4b3eba9ce467515de0f3a17c2dfe9ff3399de039873786
+  metadata.gz: 02cc9b7d20474c3b0d3049e36c7f1e8e4f6e72374457e002132cc52156bf22f3a062c18d780131aa021ab877c2779f433e119ffa269d89fcc9b0a4019b2a35df
+  data.tar.gz: e5b3c7f417621295ef82346f919d900f5ef56b54e49faede00373bb21bea80462790145b53b040627e43ce1b9abb1cfa23266a01775c583b63473395732b2978

data/lib/apache_log/parser.rb

@@ -3,25 +3,24 @@ require 'date'
 
 module ApacheLog
   class Parser
-    def initialize(format, additional_fields=[])
-      common_fields   = %w(remote_host identity_check user datetime request status size)
-      combined_fields = common_fields + %w(referer user_agent)
+    COMMON_FIELDS = %w(remote_host identity_check user datetime request status size)
+    COMBINED_FIELDS = COMMON_FIELDS + %w(referer user_agent)
 
-      common_pattern     = '(?:^|\s)((?:\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})|(?:[\w:]+?))\s+(\S+)\s+(\S+)\s+\[(\d{2}\/.*\d{4}:\d{2}:\d{2}:\d{2}\s.*)\]\s+"(.*?)"\s+(\S+)\s+(\S+)'
-      combined_pattern   = common_pattern + '\s+"(.*?[^\\\\])"\s+"(.*?[^\\\\])"'
-      additional_pattern = ''
+    COMMON_PATTERN = '(?:^|\s)((?:\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})|(?:[\w:]+?))\s+(\S+)\s+(\S+)\s+\[(\d{2}\/.*\d{4}:\d{2}:\d{2}:\d{2}\s.*)\]\s+"(.*?)"\s+(\S+)\s+(\S+)'
+    COMBINED_PATTERN = COMMON_PATTERN + '\s+"(.*?[^\\\\])"\s+"(.*?[^\\\\])"'
+    ADDITIONAL_PATTERN = '\s+"?([^"]*)"?'
 
-      additional_fields.each do
-        additional_pattern += '\s+"?([^"]*)"?'
-      end
+    def initialize(format, additional_fields=[])
+      additional_pattern = ''
+      additional_pattern << ADDITIONAL_PATTERN * additional_fields.size
 
       case format
       when 'common'
-        @fields = common_fields + additional_fields
-        @pattern = /#{common_pattern}#{additional_pattern}/
+        @fields = COMMON_FIELDS + additional_fields
+        @pattern = /#{COMMON_PATTERN}#{additional_pattern}/
       when 'combined'
-        @fields = combined_fields + additional_fields
-        @pattern = /#{combined_pattern}#{additional_pattern}/
+        @fields = COMBINED_FIELDS + additional_fields
+        @pattern = /#{COMBINED_PATTERN}#{additional_pattern}/
       else
         raise "format error\n no such format: <#{format}> \n"
       end
@@ -29,28 +28,27 @@ module ApacheLog
 
     def parse(line)
       matched = @pattern.match(line)
+
       raise "parse error\n at line: <#{line}> \n" if matched.nil?
+
       generate_hash(@fields, matched.to_a)
     end
 
     private
 
     def generate_hash(keys, values)
-      hash = {}
-
-      keys.each.with_index(1) do |key, idx|
+      keys.each.with_index(1).each_with_object({}) do |(key, i), hash|
         key = key.to_sym
+
         case key
         when :datetime
-          hash[key] = to_datetime(values[idx])
+          hash[key] = to_datetime(values[i])
         when :request
-          hash[key] = parse_request(values[idx])
+          hash[key] = parse_request(values[i])
         else
-          hash[key] = values[idx]
+          hash[key] = values[i]
         end
       end
-
-      hash
     end
 
     def to_datetime(str)
@@ -59,11 +57,8 @@ module ApacheLog
 
     def parse_request(str)
       method, path, protocol = str.split
-      {
-        method:   method,
-        path:     path,
-        protocol: protocol,
-      }
+
+      { method: method, path: path, protocol: protocol }
     end
   end
 end

data/lib/apache_log/parser/version.rb

@@ -1,5 +1,5 @@
 module ApacheLog
   class Parser
-    VERSION = "3.1.1"
+    VERSION = "3.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apache_log-parser
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Yuichi Takada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-18 00:00:00.000000000 Z
+date: 2015-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler