apache_log_report 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a00134ccecff45a5213565360c91ff2b87c40af4b47bcdda18327ed556dfea86
-  data.tar.gz: 6244d502e63bf9e699f2ad1f7188f17669d645125e15a7aa591815fa091f51b2
+  metadata.gz: 07ad311b79b7ad4888250d690af4857cc620b07a4fdc7206bbc40adf5b2fd00b
+  data.tar.gz: 1ed81f7bd6324af49a24ad6d8abe9add71710813c051537f254f80d9c9ac6739
 SHA512:
-  metadata.gz: 3775358b99f42896eae739abf20898588c55026a64d5bac188ac9007a73767fc59c2f608d5a45fb05765bea3f3a2cdb8ae938a07d278232334edb85ba1ce2b5b
-  data.tar.gz: 82c92ff76df83a14deb79443d8b19eb46b5b5e50e81cfb469c5eeac21e66d2b79ad91a51b1ecec6ac3aafa4dc33ebf2137d5dc1ce3ff988131f2c869b787ad35
+  metadata.gz: db323468d20cb50f870ac0dbe62cbfd42feb10e69da02d9d892dd206bcf9e5d1c3c5ad91a542f4f888bc04a9a6df3514ba186d67cc60b32e7647df6ff183e5d5
+  data.tar.gz: cf33e4665e31a6f18fc346c80b6f8b7cae8456b0c9dbf2d8c658a383b3711e754f795d08963d5c3c5109bd34360c5bc00bb17c93b15e4c551a7a9a1b5f619023

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    apache_log_report (1.1.0)
+    apache_log_report (1.1.2)
       apache_log-parser
       browser
       sqlite3

data/README.org

@@ -14,10 +14,8 @@ See the [[file:CHANGELOG.org][CHANGELOG]] file.
 
 * Todo
 
-** TODO Version information from command line and in reports
-** TODO Refactor code from one giant class to more manageable chunkes
-** TODO Move performance stats var to class (to isolate vars)
-** TODO Check total number of days (which is not working, now)
+** TODO Graphs in HTML output
+** TODO Countries
 
 * Compatibility
 

data/exe/apache_log_report

@@ -23,21 +23,28 @@ end
 @started_at = Time.now
 
 @db = ApacheLogReport::LogParser.parse @log_file
-@data = ApacheLogReport::DataCruncher.crunch @db, @options
 
-@ended_at = Time.now
-@duration = @ended_at - @started_at
-
-@data = @data.merge({
-                      command: @command,
-                      log_file: @log_file,
-                      started_at: @started_at,
-                      ended_at: @ended_at,
-                      duration: @duration
-                    })
-
-#
-# Emit Output
-#
-
-puts ApacheLogReport::Emitter.emit @data, @options
+if @options[:output_format]  == "sqlite"
+  ddb = SQLite3::Database.new('db.sqlite3')
+  b = SQLite3::Backup.new(ddb, 'main', @db, 'main')
+  b.step(-1) #=> DONE
+  b.finish
+else
+  @data = ApacheLogReport::DataCruncher.crunch @db, @options
+
+  @ended_at = Time.now
+  @duration = @ended_at - @started_at
+
+  @data = @data.merge({
+                        command: @command,
+                        log_file: @log_file,
+                        started_at: @started_at,
+                        ended_at: @ended_at,
+                        duration: @duration
+                      })
+
+  #
+  # Emit Output
+  #
+  puts ApacheLogReport::Emitter.emit @data, @options
+end

data/lib/apache_log_report/data_cruncher.rb

@@ -71,6 +71,8 @@ module ApacheLogReport
       @ips = db.execute "SELECT ip, count(ip), count(distinct(unique_visitor)), #{human_readable_size} from LogLine where #{filter} group by ip order by count(ip) desc limit #{options[:limit]}"
       @referers = db.execute "SELECT referer, count(referer), count(distinct(unique_visitor)), #{human_readable_size} from LogLine where #{filter} group by referer order by count(referer) desc limit #{options[:limit]}"
       
+      @streaks = db.execute "SELECT ip, substr(datetime, 1, 10), path from LogLine order by ip, datetime"
+
       data = {}
       self.instance_variables.each do |variable|
         var_as_symbol = variable.to_s[1..-1].to_sym

data/lib/apache_log_report/options_parser.rb

@@ -50,7 +50,7 @@ module ApacheLogReport
           args[:code_export] = n
         end
         
-        opts.on("-fFORMAT", "--format=FORMAT", String, "Output format: html, org. Defaults to org mode") do |n|
+        opts.on("-fFORMAT", "--format=FORMAT", String, "Output format: html, org, sqlite. Defaults to org mode") do |n|
           args[:output_format] = n
         end
 

data/lib/apache_log_report/templates/template.html.erb

@@ -26,9 +26,17 @@
             <th class="tx">Tx</th>
             <td class="tx"><%= data[:total_size][0][0] %></td>
           </tr>
+          <tr>
+            <th class="period">Period</th>
+            <td class="period">
+              <%= data[:first_day][0][0] %>
+              --
+              <%= data[:last_day][0][0] %>
+            </td>
+          </tr>
           <tr>
             <th class="days">Days </th>
-            <td class="days"><%= data[:total_days][0][0] %></td>
+            <td class="days"><%= data[:total_days] %></td>
           </tr>
         </table>
       </article>
@@ -56,6 +64,34 @@
         </article>
       <% end %>
 
+      <article>
+        <h2>Streaks</h2>
+
+        <table class="streaks">
+          <thead>
+            <tr>
+              <th>IP</th>
+              <th>Day</th>
+              <th>URL</th>
+            </tr>
+          </thead>
+          <tbody>
+            <% data[:streaks].group_by(&:first).each do |ip, date_urls| %>
+              <tr>
+                <td class="ip"><%= ip %></td>
+                <td class="streaks">
+                  <% date_urls.group_by(&:first).each do |date, urls| %>
+                    <% urls.each do |url| %>
+                      <b><%= url[1] %>:</b> <%= url[2] %> <br />
+                    <% end %>
+                  <% end %>
+                </td>
+              </tr>
+            <% end %>
+          </tbody>
+        </table>
+      </article>
+
       <article>
         <h2>Command Invocation and Performance</h2>
 

data/lib/apache_log_report/version.rb

@@ -1,3 +1,3 @@
 module ApacheLogReport
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apache_log_report
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Adolfo Villafiorita
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Generate a request report in OrgMode format from an Apache log file.