logfile_interval 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a422a1c2dd8f8e7f23f0383d0e136b092a759bb7
-  data.tar.gz: a00233a4c5d418409adebb04192f2ece523afd17
+  metadata.gz: 417b2ac31812737e3157b7f96c59d60e9923aaf7
+  data.tar.gz: 4cd82aa72b77e206073e2bbac761017efa6f849b
 SHA512:
-  metadata.gz: 10ae89ce0a1634f7cb7f3dd12c9b729cf9b3423a69d6493ec61a185681adbcc5257422c2d9ca02ed353f34d67ec76e244042f1d984dcba0a826c74370f94c9c6
-  data.tar.gz: 3795d4971b016b9b5101f387d8fd7ee4dcb9e6551631f100cc7cbb22e49444622826ee8e594102f12fd588f3136f10281379a6f382452bad38f4b6d5b608b3ba
+  metadata.gz: 69445364975c36a7b0f96b78303f7fab0b95ad4bc8cda51b9501c91e5985c4bf5c8b7beecff87b4481e4b6e7e7a4024964afdf77ed58dabcfcf51b9b2f8602db
+  data.tar.gz: f16e7acf7e9b95471775763977eb775d75d9c32482599b0d519836e9fc1f5c162ee97bb18529db28bc695a514b8a15c036172dc8900bf4745b8d19bdff4f38d8

data/README.md

@@ -22,7 +22,7 @@ require 'pp'
 require 'date'
 require 'logfile_interval'
 
-class AccessLog < LogfileInterval::LineParser::Base
+class AccessLog < LogfileInterval::ParsedLine::Base
   # Example line:
   # 74.75.19.145 - - [31/Mar/2013:06:54:12 -0700] "GET /ppa/google_chrome HTTP/1.1" 200 7855 "https://www.google.com/" "Mozilla/5.0 Chrome/25.0.1364.160"
 
@@ -84,25 +84,21 @@ for each ip, number of requests grouped by http code:
 ### Write a LineParser class
 The first step is to define a LineParser class as in the example above. The parser lists the fields that must be parsed, how a timestamp can be extracted from each line and how to aggregate values into intervals.
 ```ruby
-module LogfileInterval
-  module LineParser
-    class AccessLog < Base
-      # Example line:
-      # 74.75.19.145 - - [31/Mar/2013:06:54:12 -0700] "GET /ppa/google_chrome HTTP/1.1" 200 7855 "https://www.google.com/" "Mozilla/5.0 Chrome/25.0.1364.160"
-
-      set_regex /^([\d\.]+)\s+\S+\s+\S+\s+\[(\d\d.*\d\d)\]\s+"(?:GET|POST|PUT|HEAD|DELETE)\s+(\S+)\s+HTTP\S+"\s+(\d+)\s+(\d+)\s+"([^"]*)"\s+"([^"]+)"$/
-
-      add_column :name => 'ip',           :pos => 1, :aggregator => :count
-      add_column :name => 'timestamp',    :pos => 2, :aggregator => :timestamp
-      add_column :name => 'code',         :pos => 4, :aggregator => :count
-      add_column :name => 'code_by_ip',   :pos => 4, :aggregator => :count,     :group_by => 'ip'
-      add_column :name => 'length',       :pos => 5, :aggregator => :average,                      :conversion => :integer
-      add_column :name => 'length_by_ip', :pos => 5, :aggregator => :average,   :group_by => 'ip', :conversion => :integer
-
-      def time
-        Time.strptime(self.timestamp, '%d/%b/%Y:%H:%M:%S %z')
-      end
-    end
+class AccessLog < LogfileInterval::ParsedLine::Base
+  # Example line:
+  # 74.75.19.145 - - [31/Mar/2013:06:54:12 -0700] "GET /ppa/google_chrome HTTP/1.1" 200 7855 "https://www.google.com/" "Mozilla/5.0 Chrome/25.0.1364.160"
+
+  set_regex /^([\d\.]+)\s+\S+\s+\S+\s+\[(\d\d.*\d\d)\]\s+"(?:GET|POST|PUT|HEAD|DELETE)\s+(\S+)\s+HTTP\S+"\s+(\d+)\s+(\d+)\s+"([^"]*)"\s+"([^"]+)"$/
+
+  add_column :name => 'ip',           :pos => 1, :aggregator => :count
+  add_column :name => 'timestamp',    :pos => 2, :aggregator => :timestamp
+  add_column :name => 'code',         :pos => 4, :aggregator => :count
+  add_column :name => 'code_by_ip',   :pos => 4, :aggregator => :count,     :group_by => 'ip'
+  add_column :name => 'length',       :pos => 5, :aggregator => :average,                      :conversion => :integer
+  add_column :name => 'length_by_ip', :pos => 5, :aggregator => :average,   :group_by => 'ip', :conversion => :integer
+
+  def time
+    Time.strptime(self.timestamp, '%d/%b/%Y:%H:%M:%S %z')
   end
 end
 ```
@@ -134,7 +130,7 @@ end
 And get a parsed record for each line.
 ```ruby
 logfile = 'access.log'
-parser = LineParser::AccessLog
+parser = AccessLog
 
 log = LogfileInterval::Logfile.new(logfile, parser)
 log.each_line do |line|
@@ -142,7 +138,6 @@ log.each_line do |line|
   puts line
 end
 
-parser = LineParser::AccessLog
 log.each_parsed_line do |record|
   puts record.class # LineParser::AccessLog
   puts record.ip

data/lib/logfile_interval/aggregator/appender.rb

@@ -0,0 +1,17 @@
+module LogfileInterval
+  module Aggregator
+    class Appender < Base
+      def initialize(options = {})
+        super(options)
+        @val = {}
+      end
+
+      def add(value, group_by = nil)
+        @val[key(group_by)] ||= Set.new
+        @val[key(group_by)].add(value)
+        @size.increment(key(group_by))
+      end
+    end
+  end
+end
+

data/lib/logfile_interval/version.rb

@@ -1,3 +1,3 @@
 module LogfileInterval
-  VERSION = "2.1.3"
+  VERSION = "2.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logfile_interval
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Philippe Le Rohellec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,6 +99,7 @@ files:
 - bin/readme.rb
 - docs/design.rb
 - lib/logfile_interval.rb
+- lib/logfile_interval/aggregator/appender.rb
 - lib/logfile_interval/aggregator/average.rb
 - lib/logfile_interval/aggregator/base.rb
 - lib/logfile_interval/aggregator/count.rb
@@ -161,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Aggregate logfile data into intervals