apache_log_report 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77ddb670e22eb7d75ebd658beecb96a452b9c65ace149f2a8376921271063d84
-  data.tar.gz: 33f6690db108ac0c4d9f8619f90add9ec5f9ac4d5414b38127413ea618b8e46f
+  metadata.gz: 0cfcc34ca8741250adff411009618f4a359c4c59606a911a924416650fa352e7
+  data.tar.gz: 4f366f09084266e0112f597aac8be998ff47df8ef50d8fd01b1c26361dc889b9
 SHA512:
-  metadata.gz: f8074e3498f0b8f5e8769f5fccade340cb85f7bfa8dc5393197d216b1f22329bd14484c0ab45e5dcfa11f5dd26f007dbd44fa666273e1e50a14cbfdfa5c835ba
-  data.tar.gz: fda701c90b667b09d6a385ab23da6a10725624256cb92eb9521f53b119bf461a1a147db6fb6cb1b191dfcf874b920852fdb13c5f125f38f788657e8b9c8a6c9e
+  metadata.gz: ddee7b7b3fd56327c3409f0a6de2778b83a0e67d743d300f00259ba314159d1cb62315f388fc0136052895903c7e6df47e08ba59b036db23f0722fc99e5f7b6d
+  data.tar.gz: 0e857dbb34cd66057a401016afcd457c19c995c7aff66a87d4db230569b67a091c19d5f3446377f1a7ee8f8cda3b70ea0b8b4753bd7aea3beadc07810cf2d54b

data/lib/apache_log_report.rb

@@ -18,11 +18,11 @@ module ApacheLogReport
         args[:limit] = n
       end
 
-      opts.on("-bDATE", "--from-date=DATE", DateTime, "Consider entries after or on DATE") do |n|
+      opts.on("-bDATE", "--begin=DATE", DateTime, "Consider entries after or on DATE") do |n|
         args[:from_date] = n
       end
 
-      opts.on("-eDATE", "--to-date=DATE", DateTime, "Consider entries before or on DATE") do |n|
+      opts.on("-eDATE", "--end=DATE", DateTime, "Consider entries before or on DATE") do |n|
         args[:to_date] = n
       end
 
@@ -186,18 +186,29 @@ module ApacheLogReport
       "true"
     ].compact.join " and "
 
+    # in alternative to sum(size)
+    human_readable_size = <<-EOS
+    CASE 
+    WHEN sum(size) < 1024 THEN sum(size) || ' B' 
+    WHEN sum(size) >=  1024 AND sum(size) < (1024 * 1024) THEN ROUND((CAST(sum(size) AS REAL) / 1024),2) || ' KB' 
+    WHEN sum(size) >= (1024 * 1024)  AND sum(size) < (1024 * 1024 * 1024) THEN ROUND((CAST(sum(size) AS REAL) / (1024 * 1024)),2) || ' MB' 
+    WHEN sum(size) >= (1024 * 1024 * 1024) AND sum(size) < (1024 * 1024 * 1024 *1024) THEN ROUND((CAST(sum(size) AS REAL) / (1024 * 1024 * 1024)),2) || ' GB' 
+    WHEN sum(size) >= (1024 * 1024 * 1024 * 1024) THEN ROUND((CAST(sum(size) AS REAL) / (1024 * 1024 * 1024 * 1024)),2) || ' TB' 
+END AS size
+    EOS
+
     @total_hits = db.execute "SELECT count(datetime) from LogLine where #{@filter}"
     @total_unique_visitors = db.execute "SELECT count(distinct(unique_visitor)) from LogLine where #{@filter}"
-    @total_size = db.execute "SELECT sum(size) from LogLine where #{@filter}"
+    @total_size = db.execute "SELECT #{human_readable_size} from LogLine where #{@filter}"
     @total_days = (Date.parse(@last_day[0][0]) - Date.parse(@first_day[0][0])).to_i
 
-    @daily_distribution = db.execute "SELECT date(datetime), count(datetime), count(distinct(unique_visitor)), sum(size) from LogLine  where #{@filter} group by date(datetime)"
+    @daily_distribution = db.execute "SELECT date(datetime), count(datetime), count(distinct(unique_visitor)), #{human_readable_size} from LogLine  where #{@filter} group by date(datetime)"
 
-    @time_distribution = db.execute "SELECT strftime('%H', datetime), count(datetime), count(distinct(unique_visitor)), sum(size) from LogLine  where #{@filter} group by strftime('%H', datetime)"
+    @time_distribution = db.execute "SELECT strftime('%H', datetime), count(datetime), count(distinct(unique_visitor)), #{human_readable_size} from LogLine  where #{@filter} group by strftime('%H', datetime)"
 
-    @most_requested_pages = db.execute "SELECT path, count(path), count(distinct(unique_visitor)), sum(size) from LogLine where extension == '.html' and #{@filter} group by path order by count(path) desc limit #{options[:limit]}"
+    @most_requested_pages = db.execute "SELECT path, count(path), count(distinct(unique_visitor)), #{human_readable_size} from LogLine where extension == '.html' and #{@filter} group by path order by count(path) desc limit #{options[:limit]}"
 
-    @most_requested_resources = db.execute "SELECT path, count(path), count(distinct(unique_visitor)), sum(size) from LogLine  where #{@filter} group by path order by count(path) desc limit #{options[:limit]}"
+    @most_requested_resources = db.execute "SELECT path, count(path), count(distinct(unique_visitor)), #{human_readable_size} from LogLine  where #{@filter} group by path order by count(path) desc limit #{options[:limit]}"
 
     @missed_pages = db.execute "SELECT path, count(path), count(distinct(unique_visitor)) from LogLine where status == '404' and extension == '.html' and #{@filter} group by path order by count(path) desc limit #{options[:limit]}"
 
@@ -219,13 +230,13 @@ module ApacheLogReport
       [x[0], x[1].map { |y| y[1] }].flatten
     }
 
-    @browsers = db.execute "SELECT browser, count(browser), count(distinct(unique_visitor)), sum(size) from LogLine where #{@filter} group by browser order by count(browser) desc"
+    @browsers = db.execute "SELECT browser, count(browser), count(distinct(unique_visitor)), #{human_readable_size} from LogLine where #{@filter} group by browser order by count(browser) desc"
 
-    @platforms = db.execute "SELECT platform, count(platform), count(distinct(unique_visitor)), sum(size) from LogLine where #{@filter} group by platform order by count(platform) desc"
+    @platforms = db.execute "SELECT platform, count(platform), count(distinct(unique_visitor)), #{human_readable_size} from LogLine where #{@filter} group by platform order by count(platform) desc"
 
-    @ips =  db.execute "SELECT ip, count(ip), count(distinct(unique_visitor)), sum(size) from LogLine where #{@filter} group by ip order by count(ip) desc limit #{options[:limit]}"
+    @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)), sum(size) from LogLine where #{@filter} group by referer order by count(referer) 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]}"
   end
 
 
@@ -263,7 +274,7 @@ module ApacheLogReport
 
 | Hits                | #{"%10d" % @total_hits[0][0]} |
 | Unique Visitors     | #{"%10d" % @total_unique_visitors[0][0] } |
-| Tx                  | #{"%10d" % @total_size[0][0] } |
+| Tx                  | #{"%10s" % @total_size[0][0]} |
 | Days                | #{"%10d" % @total_days[0][0] } |
 
 * Daily Distribution

data/lib/apache_log_report/version.rb

@@ -1,3 +1,3 @@
 module ApacheLogReport
-  VERSION = "0.9.8"
+  VERSION = "0.9.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apache_log_report
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Adolfo Villafiorita