blooper 1.7 → 1.8

data/{COPYING → COPYRIGHT}

@@ -1,4 +1,4 @@
-Copyright (c) 2012 paranormal <mbsd@isgroup.com.ua>
+Copyright (c) 2012-2013 paranormal <mbsd@isgroup.com.ua>
 
 All rights reserved.
 

data/{README.rdoc → README.md}

@@ -1,32 +1,32 @@
-== Welcome to blooper
+# Welcome to blooper
 
-{Blooper}[http://www.mariowiki.com/Blooper] is squid-like creatures that are found in the ocean.
+[Blooper](http://www.mariowiki.com/Blooper) is squid-like creatures that are found in the ocean.
 It can also write squid access log into a database (I believe any sequel-support database).
 Should you write a squid access log into a data base, you won't have to catch a blooper in the ocean of errors for that.
 I have already tamed one, and you are free to use it.
 
-The idea is shamelessly stolen from {logmysqldaemon}[http://sourceforge.net/projects/logmysqldaemon/] script.
+The idea is shamelessly stolen from [logmysqldaemon](http://sourceforge.net/projects/logmysqldaemon/) script.
 
-== Installation
+# Installation
 
     gem install (pg|mysql|oracle|sqlite|etc sequel database adapter)
     gem install blooper
 
-== Squid configuration
+# Squid configuration
 
     logformat squid_log time %{%Y-%m-%d_%H:%M:%S%z}tl time_response %tr ip_source %>a squid_request_status %Ss http_status_code %03>Hs http_reply_size %<st http_request_method %rm http_request_url %ru user_name %un squid_hier_code %Sh ip_destination %<a http_content_type %mt
-    access_log daemon:{adapter:postgres,database:squid,username:squid,password:squid,host:db} squid_log
+    access_log daemon:{adapter:postgres,database:squid,username:squid,password:squid,host:db,encoding:utf8} squid_log
     logfile_daemon /usr/local/bin/blooper
 
-1. The column names are dynamic, here time is a column name, {%{%Y-%m-%d_%H:%M:%S%z}}[http://www.squid-cache.org/Versions/v3/3.2/cfgman/logformat.html] is a value that will be written into that column.
+1. The column names are dynamic, here time is a column name, [%{%Y-%m-%d_%H:%M:%S%z}](http://www.squid-cache.org/Versions/v3/3.2/cfgman/logformat.html) is a value that will be written into that column.
 
-2. The second string contains database access information, the credential depends on {adapter}[http://sequel.rubyforge.org/rdoc/files/doc/opening_databases_rdoc.html], tested only with postgres.
+2. The second string contains database access information, the credential depends on [adapter](http://sequel.rubyforge.org/rdoc/files/doc/opening_databases_rdoc.html), tested only with postgres.
 
 3. The third string is a full path to the executable ($ which blooper).
 
-== Database configuration
+# Database configuration
 
     createdb squid
-    psql squid < pg.schema
+    psql squid < sql/pg.schema
 
 Or use your own schema integration, just specify the proper format into the logformat variable in squid.conf.

data/lib/blooper.rb

@@ -25,16 +25,15 @@ module Blooper
       super('Blooper')
       self.level = $VERBOSE && Logger::DEBUG || LOGGER_LEVEL
       self.logger.formatter = formatter
-      @input = Input.new
     end
 
     def run
       @log.info('Establishing the database connection')
       DB.instance
       @log.info('A database connection has been established')
-      @input.each do |rows|
+      Input.each do |tuple|
         begin
-          rows.save
+          tuple.save
           @log.debug('Data was saved')
         rescue Sequel::DatabaseDisconnectError
           @log.warn('A database connection has been lost, reconnecting...')

data/lib/blooper/input.rb

@@ -1,14 +1,16 @@
 module Blooper
   class Input
 
-    def initialize(input = STDIN)
-      @input = input
+    attr_reader :flow
+
+    def initialize(flow = STDIN)
+      @flow = flow
     end
 
-    def each
-      @input.each do |line|
+    def self.each(*args)
+      Input.new(*args).flow.each do |line|
         line = Line.new(line)
-        yield Tuple.new(line.clean) if line.valid?
+        yield Tuple.new(line.clean) if line.valid?  rescue ArgumentError
       end
     end
 

data/lib/blooper/tuple.rb

@@ -1,18 +1,27 @@
 module Blooper
   class Tuple
 
+    SQL = {'-' => nil}
+
     def initialize(line)
       @line = line
     end
 
     def tuples
-      h = Hash[*@line.split]
-      h.merge(h) {|k,v| v.eql?('-') ? nil : v}
+      Hash[*sql]
     end
 
     def save
       DB.instance.insert(tuples)
     end
 
+    private
+
+    def sql
+      @line.split.map do |raw|
+        SQL.has_key?(raw) ? SQL[raw] : raw
+      end
+    end
+
   end
 end

data/lib/blooper/version.rb

@@ -1,3 +1,3 @@
 module Blooper
-  VERSION = "1.7" unless defined?(Blooper::VERSION)
+  VERSION = "1.8" unless defined?(Blooper::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blooper
 version: !ruby/object:Gem::Version
-  version: '1.7'
+  version: '1.8'
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,13 +26,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.38.0
   type: :runtime
@@ -40,7 +40,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.38.0
 - !ruby/object:Gem::Dependency
@@ -48,7 +48,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
@@ -56,7 +56,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: work through squid access log daemon
@@ -73,8 +73,8 @@ files:
 - lib/blooper/tuple.rb
 - lib/blooper/db.rb
 - lib/blooper/version.rb
-- COPYING
-- README.rdoc
+- COPYRIGHT
+- README.md
 homepage: https://github.com/paranormal/blooper
 licenses:
 - bsd
@@ -85,18 +85,18 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: squid's access log collector — Read more