ntail 1.3.1 → 1.3.2

data/.document

@@ -1,5 +1,5 @@
 lib/**/*.rb
 bin/*
-- 
+-
 features/**/*.feature
 LICENSE.txt

data/Gemfile.lock

@@ -19,7 +19,7 @@ GEM
     json (1.6.6)
     multi_json (1.3.2)
     polyglot (0.3.3)
-    rainbow (1.1.3)
+    rainbow (2.0.0)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)

data/README.md

@@ -1,7 +1,7 @@
 ntail
 =====
 
-A `tail(1)`-like utility for nginx log files that supports parsing, filtering and formatting of individual 
+A `tail(1)`-like utility for nginx log files that supports parsing, filtering and formatting of individual
 log lines (in nginx's so-called ["combined" log format](http://wiki.nginx.org/NginxHttpLogModule#log_format)).
 
 <a name="intro"/>
@@ -126,7 +126,7 @@ Advanced Examples
 
 TODO
 ----
-    
+
 * implement a native `"-f"` option for ntail, similar to that of `tail(1)`, using e.g. flori's [file-tail gem](https://github.com/flori/file-tail)
 * implement a `"-i"` option ("ignore exceptions"/"continue processing"), if handling a single line raises an exception
 * or indeed a reverse `"-r"` option ("re-raise exception"), to immediately stop processing and raising the exception for investigation

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.3.2

data/lib/ntail/body_bytes_sent.rb

@@ -1,14 +1,14 @@
 module NginxTail
   module BodyBytesSent
-    
+
     def self.included(base) # :nodoc:
       base.class_eval do
 
         # this ensures the below module methods actually make sense...
         raise "Class #{base.name} should implement instance method 'body_bytes_sent'" unless base.instance_methods.map(&:to_s).include? 'body_bytes_sent'
-        
+
       end
     end
-        
+
   end
 end

data/lib/ntail/http_method.rb

@@ -1,15 +1,15 @@
 module NginxTail
   module HttpMethod
-    
+
     #
     # http://www.ietf.org/rfc/rfc2616.txt - "section 5.1.1 Method"
-    # 
-    # OPTIONS GET HEAD POST PUT DELETE TRACE CONNECT 
     #
-    
+    # OPTIONS GET HEAD POST PUT DELETE TRACE CONNECT
+    #
+
     def self.included(base) # :nodoc:
       base.class_eval do
-        
+
         def self.to_http_method_s(http_method)
           (http_method ||= "").upcase!  # will be nil if $request == "-" (ie. "dodgy" HTTP requests)
           case http_method
@@ -22,13 +22,13 @@ module NginxTail
 
         # this ensures the below module methods actually make sense...
         raise "Class #{base.name} should implement instance method 'http_method'" unless base.instance_methods.map(&:to_s).include? 'http_method'
-        
+
       end
     end
-    
+
     def to_http_method_s
       self.class.to_http_method_s(self.http_method)
     end
-    
+
   end
 end

data/lib/ntail/http_referer.rb

@@ -20,12 +20,12 @@ module NginxTail
         def self.reset_internal_referers()
           while !@@internal_referers.empty? ; @@internal_referers.pop ; end
         end
-        
+
         # mainly (solely?) for testing purposes...
         def self.internal_referers()
           @@internal_referers.dup
         end
-        
+
         def self.add_internal_referer(internal_referer)
           raise "Cannot add unkown HTTP referer" if self.unknown_referer? internal_referer
           (@@internal_referers << internal_referer).uniq!
@@ -34,11 +34,11 @@ module NginxTail
         def self.unknown_referer?(http_referer)
           http_referer == UNKNOWN_REFERER
         end
-        
+
         def self.internal_referer?(http_referer)
           !self.unknown_referer?(http_referer) && !@@internal_referers.detect { |referer| referer.match(http_referer) }.nil?
         end
-        
+
         def self.external_referer?(http_referer)
           !self.unknown_referer?(http_referer) && !self.internal_referer?(http_referer)
         end
@@ -64,15 +64,15 @@ module NginxTail
     def unknown_referer?
       self.class.unknown_referer?(self.http_referer)
     end
-    
+
     def internal_referer?
       self.class.internal_referer?(self.http_referer)
     end
-    
+
     def external_referer?
       self.class.external_referer?(self.http_referer)
     end
-    
+
     def to_referer_s
       self.class.to_referer_s(self.http_referer)
     end

data/lib/ntail/http_user_agent.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'user-agent'
 
 class Agent
-  
+
   def search_bot?
     false
   end
@@ -14,7 +14,7 @@ class SearchBot < Agent
   def search_bot?
     true
   end
-  
+
   #
   # Feedfetcher-Google; (+http://www.google.com/feedfetcher.html; feed-id=17168503030479467473)
   # Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)
@@ -52,8 +52,8 @@ class SearchBot < Agent
 
   def self.search_bot?(http_user_agent)
     !KNOWN_SEARCH_BOTS.detect { |bot| bot.match(http_user_agent) }.nil?
-  end 
-  
+  end
+
   attr_accessor :name
   attr_accessor :os
 
@@ -80,7 +80,7 @@ class SearchBot < Agent
       else super(string)
     end
   end
-  
+
   def self.os_for_user_agent string
     case string
       when    GOOGLE_BOT then :"google.com"
@@ -98,18 +98,18 @@ class SearchBot < Agent
       else super(string)
     end
   end
-  
+
 end
 
 module NginxTail
   module HttpUserAgent
-    
+
     def self.included(base) # :nodoc:
       base.class_eval do
 
         def self.search_bot?(http_user_agent)
           SearchBot.search_bot?(http_user_agent)
-        end 
+        end
 
         def self.to_agent(http_user_agent)
           if self.search_bot? http_user_agent
@@ -126,22 +126,22 @@ module NginxTail
 
         # this ensures the below module methods actually make sense...
         raise "Class #{base.name} should implement instance method 'http_user_agent'" unless base.instance_methods.map(&:to_s).include? 'http_user_agent'
-        
+
       end
     end
-    
+
     def search_bot?
       self.class.search_bot?(self.http_user_agent)
     end
-    
+
     def to_agent
       self.class.to_agent(self.http_user_agent)
     end
-    
+
     def to_agent_s
       self.class.to_agent_s(self.http_user_agent)
     end
-    
+
   end
 end
 

data/lib/ntail/http_version.rb

@@ -1,6 +1,6 @@
 module NginxTail
   module HttpVersion
-    
+
     def self.included(base) # :nodoc:
       base.class_eval do
 
@@ -25,13 +25,13 @@ module NginxTail
 
         # this ensures the below module methods actually make sense...
         raise "Class #{base.name} should implement instance method 'http_version'" unless base.instance_methods.map(&:to_s).include? 'http_version'
-        
+
       end
     end
 
     def to_http_version_s(which = :full)
       self.class.to_http_version_s(self.http_version, which)
     end
-    
+
   end
 end

data/lib/ntail/known_ip_addresses.rb

@@ -9,19 +9,19 @@ module NginxTail
 
     def self.included(base) # :nodoc:
       base.class_eval do
-    
+
         @@known_ip_addresses = []
 
         # mainly (solely?) for testing purposes...
         def self.known_ip_addresses()
           @@known_ip_addresses.dup
         end
-        
+
         # mainly (solely?) for testing purposes...
         def self.reset_known_ip_addresses()
           while !@@known_ip_addresses.empty? ; @@known_ip_addresses.pop ; end
         end
-        
+
         def self.add_known_ip_address(known_ip_address)
           (@@known_ip_addresses << known_ip_address).uniq!
         end
@@ -32,13 +32,13 @@ module NginxTail
 
         # this ensures the below module methods actually make sense...
         raise "Class #{base.name} should implement instance method 'remote_addr'" unless base.instance_methods.map(&:to_s).include? 'remote_addr'
-        
+
       end
     end
-    
+
     def known_ip_address?
       self.class.known_ip_address?(self.remote_addr)
     end
-    
+
   end
 end

data/lib/ntail/local_ip_addresses.rb

@@ -1,6 +1,6 @@
 module NginxTail
   module LocalIpAddresses
-    
+
     #
     # local IP addresses, for filtering and formatting purposes
     #
@@ -11,17 +11,17 @@ module NginxTail
       base.class_eval do
 
         @@local_ip_addresses = []
-        
+
         # mainly (solely?) for testing purposes...
         def self.local_ip_addresses()
           @@local_ip_addresses.dup
         end
-        
+
         # mainly (solely?) for testing purposes...
         def self.reset_local_ip_addresses()
           while !@@local_ip_addresses.empty? ; @@local_ip_addresses.pop ; end
         end
-        
+
         def self.add_local_ip_address(local_ip_address)
           (@@local_ip_addresses << local_ip_address).uniq!
         end
@@ -32,13 +32,13 @@ module NginxTail
 
         # this ensures the below module methods actually make sense...
         raise "Class #{base.name} should implement instance method 'remote_addr'" unless base.instance_methods.map(&:to_s).include? 'remote_addr'
-        
+
       end
     end
-    
+
     def local_ip_address?
       self.class.local_ip_address?(self.remote_addr)
     end
-    
+
   end
 end

data/lib/ntail/log_line.rb

@@ -3,6 +3,8 @@ require 'net/http'
 require 'rubygems'
 require 'rainbow'
 
+require 'rainbow/ext/string'
+
 module NginxTail
   class LogLine
 

data/lib/ntail/proxy_addresses.rb

@@ -1,14 +1,14 @@
 module NginxTail
   module ProxyAddresses
-    
+
     def self.included(base) # :nodoc:
       base.class_eval do
 
         # this ensures the below module methods actually make sense...
         raise "Class #{base.name} should implement instance method 'proxy_addresses'" unless base.instance_methods.map(&:to_s).include? 'proxy_addresses'
-        
+
       end
     end
-        
+
   end
 end

data/lib/ntail/remote_addr.rb

@@ -24,7 +24,7 @@ module NginxTail
           end
           record ? record[5] : 'N/A'
         end
-      
+
         def self.to_city_s(remote_addr)
           record = if defined? GeoIP # ie. if the optional GeoIP gem is installed
             if File.exists?('/usr/share/GeoIP/GeoIPCity.dat') # ie. if the GeoIP city database is installed
@@ -33,7 +33,7 @@ module NginxTail
           end
           record ? record[7] : 'N/A'
         end
-        
+
         # this ensures the below module methods actually make sense...
         raise "Class #{base.name} should implement instance method 'remote_addr'" unless base.instance_methods.map(&:to_s).include? 'remote_addr'
 
@@ -51,6 +51,6 @@ module NginxTail
     def to_city_s()
       self.class.to_city_s(self.remote_addr)
     end
-    
+
   end
 end

data/lib/ntail/remote_user.rb

@@ -18,12 +18,12 @@ module NginxTail
         def self.reset_authenticated_users
           while !@@authenticated_users.empty? ; @@authenticated_users.pop ; end
         end
-        
+
         # mainly (solely?) for testing purposes...
         def self.authenticated_users
           @@authenticated_users.dup
         end
-        
+
         def self.add_authenticated_user(authenticated_user)
           raise "Cannot add unkown remote user" if self.unknown_remote_user? authenticated_user
           (@@authenticated_users << authenticated_user).uniq!
@@ -36,7 +36,7 @@ module NginxTail
         def self.remote_user?(remote_user)
           !self.unknown_remote_user?(remote_user)
         end
-        
+
         def self.authenticated_user?(remote_user)
           self.remote_user?(remote_user) && @@authenticated_users.include?(remote_user)
         end
@@ -54,7 +54,7 @@ module NginxTail
     def remote_user?
       self.class.remote_user?(self.remote_user)
     end
-    
+
     def authenticated_user?
       self.class.authenticated_user?(self.remote_user)
     end

data/lib/ntail/request.rb

@@ -1,8 +1,8 @@
 module NginxTail
   module Request
-    
+
     UNKNOWN_REQUEST = "-".freeze # the 'default' nginx value for $request variable
-    
+
     def self.included(base) # :nodoc:
       base.class_eval do
 
@@ -12,7 +12,7 @@ module NginxTail
 
         # this ensures the below module methods actually make sense...
         raise "Class #{base.name} should implement instance method 'request'" unless base.instance_methods.map(&:to_s).include? 'request'
-        
+
       end
     end
 
@@ -28,6 +28,6 @@ module NginxTail
         "%s %s" % [self.to_http_method_s, self.to_uri_s]
       end
     end
-        
+
   end
 end

data/lib/ntail/status.rb

@@ -1,8 +1,8 @@
 module NginxTail
   module Status
-    
+
     NGINX_MAGIC_STATUS = '499'   # ex-standard HTTP response code specific to nginx, in addition to http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
-    
+
     def self.included(base) # :nodoc:
       base.class_eval do
 
@@ -11,25 +11,25 @@ module NginxTail
           # (status.to_s != NGINX_MAGIC_STATUS) and Net::HTTPResponse::CODE_TO_OBJ[status.to_s] <= Net::HTTPInformation
           (status.to_s != NGINX_MAGIC_STATUS) and Net::HTTPResponse::CODE_CLASS_TO_OBJ[(status.to_i / 100).to_s] == Net::HTTPInformation
         end
-        
+
         # Successful 2xx
         def self.success_status?(status)
           # (status.to_s != NGINX_MAGIC_STATUS) and Net::HTTPResponse::CODE_TO_OBJ[status.to_s] <= Net::HTTPSuccess
           (status.to_s != NGINX_MAGIC_STATUS) and Net::HTTPResponse::CODE_CLASS_TO_OBJ[(status.to_i / 100).to_s] == Net::HTTPSuccess
         end
-        
+
         # Redirection 3xx
         def self.redirect_status?(status)
           # (status.to_s != NGINX_MAGIC_STATUS) and Net::HTTPResponse::CODE_TO_OBJ[status.to_s] <= Net::HTTPRedirection
           (status.to_s != NGINX_MAGIC_STATUS) and Net::HTTPResponse::CODE_CLASS_TO_OBJ[(status.to_i / 100).to_s] == Net::HTTPRedirection
         end
-        
+
         # Client Error 4xx
         def self.client_error_status?(status)
           # (status.to_s != NGINX_MAGIC_STATUS) and Net::HTTPResponse::CODE_TO_OBJ[status.to_s] <= Net::HTTPClientError
           (status.to_s != NGINX_MAGIC_STATUS) and Net::HTTPResponse::CODE_CLASS_TO_OBJ[(status.to_i / 100).to_s] == Net::HTTPClientError
         end
-        
+
         # Internal Server Error 5xx
         def self.server_error_status?(status)
           # (status.to_s != NGINX_MAGIC_STATUS) and Net::HTTPResponse::CODE_TO_OBJ[status.to_s] <= Net::HTTPServerError
@@ -38,7 +38,7 @@ module NginxTail
 
         # this ensures the below module methods actually make sense...
         raise "Class #{base.name} should implement instance method 'status'" unless base.instance_methods.map(&:to_s).include? 'status'
-        
+
       end
     end
 
@@ -61,7 +61,7 @@ module NginxTail
     def server_error_status?
       self.class.server_error_status?(self.status)
     end
-        
+
   end
 end
 

data/lib/ntail/time_local.rb

@@ -2,7 +2,7 @@ require 'date'
 
 module NginxTail
   module TimeLocal
-    
+
     def self.included(base) # :nodoc:
       base.class_eval do
 
@@ -15,17 +15,17 @@ module NginxTail
         def self.to_date(time_local)
           DateTime.strptime(time_local, '%d/%b/%Y:%T %z')
         end
-        
+
         def self.to_date_s(time_local, format = "%Y-%m-%d %X")
           self.to_date(time_local).strftime(format)
         end
 
         # this ensures the below module methods actually make sense...
         raise "Class #{base.name} should implement instance method 'time_local'" unless base.instance_methods.map(&:to_s).include? 'time_local'
-        
+
       end
     end
-    
+
     def to_date
       self.class.to_date(self.time_local)
     end
@@ -33,6 +33,6 @@ module NginxTail
     def to_date_s
       self.class.to_date_s(self.time_local)
     end
-    
+
   end
 end

data/lib/ntail/uri.rb

@@ -1,6 +1,6 @@
 module NginxTail
   module Uri
-    
+
     def self.included(base) # :nodoc:
       base.class_eval do
 
@@ -90,10 +90,10 @@ module NginxTail
 
         # this ensures the below module methods actually make sense...
         raise "Class #{base.name} should implement instance method 'uri'" unless base.instance_methods.map(&:to_s).include? 'uri'
-        
+
       end
     end
-    
+
     def to_uri_s
       self.class.to_uri_s(self.uri)
     end
@@ -105,6 +105,6 @@ module NginxTail
     def static_uri?
       self.class.static_uri?(self.uri)
     end
-    
+
   end
 end

data/ntail.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ntail"
-  s.version = "1.3.1"
+  s.version = "1.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Vandenberk"]
-  s.date = "2014-01-06"
+  s.date = "2014-03-14"
   s.description = "A tail(1)-like utility for nginx log files. It supports parsing, filtering and formatting individual log lines."
   s.email = "pvandenberk@mac.com"
   s.executables = ["ntail"]

data/spec/application_spec.rb

@@ -13,7 +13,7 @@ describe NginxTail::Application do
   it "has a default 'exit' value of 0" do
     NginxTail::Application.new.exit.should eq(0)
   end
-  
+
   it "has a default 'running' value of true" do
     NginxTail::Application.new.running.should eq(true)
   end
@@ -39,5 +39,5 @@ describe NginxTail::Application do
   it "has a 'pattern' that can be set via options" do
     NginxTail::Application.new(['--apache']).pattern.should eq(:apache)
   end
-  
+
 end

data/test/helper.rb

@@ -20,26 +20,26 @@ class Test::Unit::TestCase
   def random_ip_address
     ((1..4).map { Kernel.rand(256) }).join('.')
   end
-  
+
   def local_ip_address
     # http://en.wikipedia.org/wiki/IP_address#IPv4_private_addresses
     (['192', '168'] + (1..2).map { Kernel.rand(256) }).join('.')
   end
 
-  # 
+  #
   # http://wiki.nginx.org/NginxHttpLogModule#log_format
   #
   # There is a predefined log format called "combined":
-  # 
+  #
   # log_format combined '$remote_addr - $remote_user [$time_local] '
   #                     '"$request" $status $body_bytes_sent '
   #                     '"$http_referer" "$http_user_agent"';
-  # 
+  #
 
   LOG_FORMAT_COMBINED = '%s - %s [%s] ' \
                         '"%s" %d %d ' \
                         '"%s" "%s"'
-                        
+
   DEFAULT_VALUES = {
     :remote_addr => '72.46.130.42',
     :remote_user => '-',
@@ -54,9 +54,9 @@ class Test::Unit::TestCase
     :http_user_agent => 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US) AppleWebKit/534.10 (KHTML, like Gecko) Chrome/8.0.552.224 Safari/534.10',
     :proxy_addresses => nil
   }
-  
+
   REQUEST_FORMAT = '%s %s %s'
-  
+
   def random_raw_line(options = {})
     options = DEFAULT_VALUES.merge options
     options[:request] ||= REQUEST_FORMAT % [
@@ -76,19 +76,19 @@ class Test::Unit::TestCase
       # TODO implement support for :proxy_addresses
     ]
   end
-  
+
   def random_log_line(options = {})
     NginxTail::LogLine.new(random_raw_line(options))
   end
-  
+
   def bad_request_raw_line
     # a "bad request", resulting in a 400 status, is logged by nginx as follows:
     # 121.8.101.138 - - [28/Dec/2010:23:50:58 +0000] "-" 400 0 "-" "-"
     '121.8.101.138 - - [28/Dec/2010:23:50:58 +0000] "-" 400 0 "-" "-"'
   end
-  
+
   def bad_request_log_line
     NginxTail::LogLine.new(bad_request_raw_line)
   end
-  
+
 end

data/test/ntail/test_formatting.rb

@@ -3,70 +3,70 @@ require 'helper'
 class TestFormatting < Test::Unit::TestCase
 
   context "NginxTail::Formatting" do
-    
+
     should "correctly format remote_addr using the %a taken" do
       remote_addr = random_ip_address
       log_line = random_log_line(:remote_addr => remote_addr)
       NginxTail::LogLine.format = "%a"
       assert_equal "%15s" % remote_addr, log_line.to_s(:color => false)
     end
-     
+
     should "correctly format remote_user using the %u taken" do
       remote_user = 'me_myself_and_i'
       log_line = random_log_line(:remote_user => remote_user)
       NginxTail::LogLine.format = "%u"
       assert_equal remote_user, log_line.to_s(:color => false)
     end
-     
+
     should "correctly format time_local using the %t taken" do
       time_local = '25/Feb/2011:07:53:29 +0000'
       log_line = random_log_line(:time_local => time_local)
       NginxTail::LogLine.format = "%t"
       assert_equal '2011-02-25 07:53:29', log_line.to_s(:color => false)
     end
-     
+
     should "correctly format request using the %r taken" do
       request = 'GET / HTTP/1.1'
       log_line = random_log_line(:request => request)
       NginxTail::LogLine.format = "%r"
       assert_equal 'GET /', log_line.to_s(:color => false)
     end
-     
+
     should "correctly format status using the %s taken" do
       status = '200'
       log_line = random_log_line(:status => status)
       NginxTail::LogLine.format = "%s"
       assert_equal status, log_line.to_s(:color => false)
     end
-     
+
     should "correctly format body_bytes_sent using the %b taken" do
       body_bytes_sent = '31415'
       log_line = random_log_line(:body_bytes_sent => body_bytes_sent)
       NginxTail::LogLine.format = "%b"
       assert_equal body_bytes_sent, log_line.to_s(:color => false)
     end
-     
+
     should "correctly format http_referer using the %R taken" do
       http_referer = 'http://www.google.com/search?q=ntail'
       log_line = random_log_line(:http_referer => http_referer)
       NginxTail::LogLine.format = "%R"
       assert_equal 'www.google.com', log_line.to_s(:color => false)
     end
-     
+
     should "correctly format http_user_agent using the %U taken" do
       http_user_agent = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_4; en-US) AppleWebKit/534.13 (KHTML, like Gecko) Chrome/9.0.597.102 Safari/534.13'
       log_line = random_log_line(:http_user_agent => http_user_agent)
       NginxTail::LogLine.format = "%U"
       assert_equal '(Chrome, OS X 10.6)', log_line.to_s(:color => false)
     end
-     
+
 #     should "correctly format proxy_addresses using the %p taken" do
 #       proxy_addresses = '"127.0.0.1"'
 #       log_line = random_log_line(:proxy_addresses => proxy_addresses)
 #       NginxTail::LogLine.format = "%p"
 #       assert_equal proxy_addresses, log_line.to_s(:color => false)
 #     end
-     
+
   end
 
 end

data/test/ntail/test_http_method.rb

@@ -3,48 +3,48 @@ require 'helper'
 class TestHttpMethod < Test::Unit::TestCase
 
   context "ntail" do
-    
+
     context "(with Sickill::Rainbow enabled)" do
-      
+
       setup do
         Sickill::Rainbow.enabled = true
       end
-    
+
       should "color-code the HTTP method" do
-        
+
         # read-only methods are never color-coded...
         log_line = random_log_line(:http_method => 'GET')
         assert_equal "GET", log_line.to_http_method_s
-        
-        # methods that change state are ALWAYS color-coded if Rainbow is enabled... 
+
+        # methods that change state are ALWAYS color-coded if Rainbow is enabled...
         log_line = random_log_line(:http_method => 'POST')
         assert_not_equal "POST", log_line.to_http_method_s
         assert_equal "POST".inverse, log_line.to_http_method_s
-        
+
       end
-      
+
     end
-    
+
     context "(with Sickill::Rainbow disabled)" do
 
       setup do
         Sickill::Rainbow.enabled = false
       end
-    
+
       should "NOT color-code the HTTP method" do
-        
+
         # read-only methods are never color-coded...
         log_line = random_log_line(:http_method => 'GET')
         assert_equal "GET", log_line.to_http_method_s
-        
+
         # methods that change state are NOT color-coded if Rainbow is disabled...
         log_line = random_log_line(:http_method => 'POST')
         assert_equal "POST", log_line.to_http_method_s
-        
+
       end
-      
+
     end
-    
+
   end
 
-end
+end

data/test/ntail/test_http_referer.rb

@@ -3,17 +3,17 @@ require 'helper'
 class TestHttpReferer < Test::Unit::TestCase
 
   context "ntail" do
-    
+
     setup do
       @http_referer = "http://example.com/index.html"
       @log_line = random_log_line(:http_referer => @http_referer)
     end
-    
+
     teardown do
       # undo any changes the test may have made
       NginxTail::LogLine.reset_internal_referers
     end
-    
+
     should "have empty list of internal referers without configuration" do
       assert NginxTail::LogLine.internal_referers.empty?
     end
@@ -52,13 +52,13 @@ class TestHttpReferer < Test::Unit::TestCase
       assert @log_line.external_referer?
 
       NginxTail::LogLine.add_internal_referer(/http:\/\/example\.com/)
-      
+
       assert NginxTail::LogLine.internal_referer?(@http_referer)
       assert !NginxTail::LogLine.external_referer?(@http_referer)
       assert @log_line.internal_referer?
       assert !@log_line.external_referer?
     end
-    
+
     should "parse and format the unknownHTTP referer" do
       http_referer = NginxTail::HttpReferer::UNKNOWN_REFERER
       assert_equal http_referer, NginxTail::LogLine.to_referer_s(http_referer)
@@ -69,9 +69,9 @@ class TestHttpReferer < Test::Unit::TestCase
       to_referer_s = NginxTail::LogLine.to_referer_s(@http_referer)
       assert_equal "example.com", to_referer_s
       # parsed from a raw log line
-      assert_equal "example.com", @log_line.to_referer_s    
+      assert_equal "example.com", @log_line.to_referer_s
     end
-    
+
   end
 
 end

data/test/ntail/test_http_user_agent.rb

@@ -3,7 +3,7 @@ require 'helper'
 class TestHttpUserAgent < Test::Unit::TestCase
 
   context "ntail" do
-    
+
     should "correctly identify search bot user agent" do
       search_bot_user_agent = "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)"
       # directly via the helper function
@@ -23,7 +23,7 @@ class TestHttpUserAgent < Test::Unit::TestCase
       assert !log_line.search_bot?
       assert !log_line.to_agent.search_bot?
     end
-        
+
   end
 
 end

data/test/ntail/test_http_version.rb

@@ -3,7 +3,7 @@ require 'helper'
 class TestHttpVersion < Test::Unit::TestCase
 
   context "ntail" do
-    
+
     should "correctly identify the HTTP version of the request" do
       http_version = "HTTP/1.0"
       # directly via the helper function

data/test/ntail/test_known_ip_addresses.rb

@@ -15,7 +15,7 @@ class TestKnownIpAddresses < Test::Unit::TestCase
     NginxTail::LogLine.add_known_ip_address(first_ip_address = random_ip_address)
     assert_equal 1, NginxTail::LogLine.known_ip_addresses.size
     assert NginxTail::LogLine.known_ip_addresses.include?(first_ip_address)
-    
+
     NginxTail::LogLine.add_known_ip_address(second_ip_address = random_ip_address)
     assert_equal 2, NginxTail::LogLine.known_ip_addresses.size
     assert NginxTail::LogLine.known_ip_addresses.include?(second_ip_address)
@@ -24,20 +24,20 @@ class TestKnownIpAddresses < Test::Unit::TestCase
   should "avoid duplicates in list of known IP addresses" do
     NginxTail::LogLine.add_known_ip_address(known_ip_address = random_ip_address)
     assert_equal 1, NginxTail::LogLine.known_ip_addresses.size
-    
+
     NginxTail::LogLine.add_known_ip_address(known_ip_address)
     assert_equal 1, NginxTail::LogLine.known_ip_addresses.size
   end
-  
+
   should "recognize a known IP address after configuration" do
     remote_address = random_ip_address
     log_line = random_log_line(:remote_addr => remote_address)
-    
+
     assert !NginxTail::LogLine.known_ip_address?(remote_address)
     assert !log_line.known_ip_address?
-    
+
     NginxTail::LogLine.add_known_ip_address(remote_address)
-    
+
     assert NginxTail::LogLine.known_ip_address?(remote_address)
     assert log_line.known_ip_address?
   end

data/test/ntail/test_local_ip_addresses.rb

@@ -15,7 +15,7 @@ class TestLocalIpAddresses < Test::Unit::TestCase
     NginxTail::LogLine.add_local_ip_address(first_ip_address = local_ip_address)
     assert_equal 1, NginxTail::LogLine.local_ip_addresses.size
     assert NginxTail::LogLine.local_ip_addresses.include?(first_ip_address)
-    
+
     NginxTail::LogLine.add_local_ip_address(second_ip_address = local_ip_address)
     assert_equal 2, NginxTail::LogLine.local_ip_addresses.size
     assert NginxTail::LogLine.local_ip_addresses.include?(second_ip_address)
@@ -24,20 +24,20 @@ class TestLocalIpAddresses < Test::Unit::TestCase
   should "avoid duplicates in list of known IP addresses" do
     NginxTail::LogLine.add_local_ip_address(local_ip_address = local_ip_address)
     assert_equal 1, NginxTail::LogLine.local_ip_addresses.size
-    
+
     NginxTail::LogLine.add_local_ip_address(local_ip_address)
     assert_equal 1, NginxTail::LogLine.local_ip_addresses.size
   end
-  
+
   should "recognize a known IP address after configuration" do
     remote_address = local_ip_address
     log_line = random_log_line(:remote_addr => remote_address)
-    
+
     assert !NginxTail::LogLine.local_ip_address?(remote_address)
     assert !log_line.local_ip_address?
-    
+
     NginxTail::LogLine.add_local_ip_address(remote_address)
-    
+
     assert NginxTail::LogLine.local_ip_address?(remote_address)
     assert log_line.local_ip_address?
   end

data/test/ntail/test_log_line.rb

@@ -3,28 +3,28 @@ require 'helper'
 class TestLogLine < Test::Unit::TestCase
 
   context "NginxTail::LogLine" do
-    
+
     should "initialize itself correctly from a parsable log line" do
       raw_line = random_raw_line
       log_line = NginxTail::LogLine.new(raw_line)
       assert_equal raw_line, log_line.raw_line
       assert log_line.parsable
     end
-    
+
     should "initialize itself correctly from a non-parsable log line" do
       raw_line = "foo bar blegga"
       log_line = NginxTail::LogLine.new(raw_line)
       assert_equal raw_line, log_line.raw_line
       assert !log_line.parsable
     end
-    
+
     should "implement non-abbreviated alias for $remote_addr" do
       remote_addr = random_ip_address
       log_line = random_log_line(:remote_addr => remote_addr)
       assert_equal remote_addr, log_line.remote_addr
       assert_equal remote_addr, log_line.remote_address
     end
-    
+
     should "implement a getter method for each (sub-)component" do
       (NginxTail::LogLine::COMPONENTS + NginxTail::LogLine::SUBCOMPONENTS).each do |component|
         getter_method = component.to_s
@@ -38,7 +38,7 @@ class TestLogLine < Test::Unit::TestCase
         assert !NginxTail::LogLine.instance_methods.map(&:to_s).include?(setter_method), "setter '#{setter_method}' should NOT exist"
       end
     end
-    
+
     should "include an extension module for each (sub-)component" do
       (NginxTail::LogLine::COMPONENTS + NginxTail::LogLine::SUBCOMPONENTS).each do |component|
         ntail_module = NginxTail::Inflections.component_to_ntail_module(component)
@@ -46,7 +46,7 @@ class TestLogLine < Test::Unit::TestCase
         assert NginxTail::LogLine.included_modules.include?(ntail_module), "module '#{ntail_module.name}' should be included"
       end
     end
-      
+
   end
 
 end

data/test/ntail/test_remote_addr.rb

@@ -3,7 +3,7 @@ require 'helper'
 class TestRemoteAddr < Test::Unit::TestCase
 
   context "ntail" do
-    
+
     setup do
       @remote_addr = "192.0.32.10"
       @log_line = random_log_line(:remote_addr => @remote_addr)
@@ -36,7 +36,7 @@ class TestRemoteAddr < Test::Unit::TestCase
       # parsed from a raw log line
       assert ["www.example.com", "192.0.32.10"].include? @log_line.to_host_s
     end
-    
+
     should "convert the request's remote address into a country string" do
       return unless File.exists?('/usr/share/GeoIP/GeoIP.dat')
       # directly via the helper function
@@ -45,7 +45,7 @@ class TestRemoteAddr < Test::Unit::TestCase
       # parsed from a raw log line
       assert_equal "United States", @log_line.to_country_s
     end
-    
+
     should "convert the request's remote address into a city string" do
       return unless File.exists?('/usr/share/GeoIP/GeoIPCity.dat')
       # directly via the helper function
@@ -54,7 +54,7 @@ class TestRemoteAddr < Test::Unit::TestCase
       # parsed from a raw log line
       assert_equal "Marina Del Rey", @log_line.to_city_s
     end
-    
+
   end
 
 end

data/test/ntail/test_remote_user.rb

@@ -10,18 +10,18 @@ class TestRemoteUser < Test::Unit::TestCase
   should "have empty list of authenticated users without configuration" do
     assert NginxTail::LogLine.authenticated_users.empty?
   end
-  
+
   should "correctly identify the default/unknown remote user" do
     unknown_remote_user = NginxTail::RemoteUser::UNKNOWN_REMOTE_USER
     log_line = random_log_line(:remote_user => unknown_remote_user)
-    
+
     assert NginxTail::LogLine.unknown_remote_user?(unknown_remote_user)
     assert !NginxTail::LogLine.remote_user?(unknown_remote_user)
     assert !NginxTail::LogLine.authenticated_user?(unknown_remote_user)
-    
+
     assert log_line.unknown_remote_user?
   end
-  
+
   should "not allow the default/unknown remote user to be added" do
     assert_raise RuntimeError do
       NginxTail::LogLine.add_authenticated_user(NginxTail::RemoteUser::UNKNOWN_REMOTE_USER)
@@ -32,7 +32,7 @@ class TestRemoteUser < Test::Unit::TestCase
     NginxTail::LogLine.add_authenticated_user(first_remote_user = "john_doe")
     assert_equal 1, NginxTail::LogLine.authenticated_users.size
     assert NginxTail::LogLine.authenticated_users.include?(first_remote_user)
-    
+
     NginxTail::LogLine.add_authenticated_user(second_referer = "jane_doe")
     assert_equal 2, NginxTail::LogLine.authenticated_users.size
     assert NginxTail::LogLine.authenticated_users.include?(second_referer)
@@ -41,7 +41,7 @@ class TestRemoteUser < Test::Unit::TestCase
   should "avoid duplicates in list of authenticated users" do
     NginxTail::LogLine.add_authenticated_user(authenticated_user = "john_doe")
     assert_equal 1, NginxTail::LogLine.authenticated_users.size
-    
+
     NginxTail::LogLine.add_authenticated_user(authenticated_user)
     assert_equal 1, NginxTail::LogLine.authenticated_users.size
   end
@@ -54,7 +54,7 @@ class TestRemoteUser < Test::Unit::TestCase
     assert !NginxTail::LogLine.authenticated_user?(remote_user)
     assert log_line.remote_user?
     assert !log_line.authenticated_user?
-    
+
     NginxTail::LogLine.add_authenticated_user(remote_user)
     assert NginxTail::LogLine.remote_user?(remote_user)
     assert NginxTail::LogLine.authenticated_user?(remote_user)

data/test/ntail/test_request.rb

@@ -3,24 +3,24 @@ require 'helper'
 class TestRequest < Test::Unit::TestCase
 
   context "ntail" do
-    
+
     should "do something reasonable for bad requests" do
-      
+
       log_line = bad_request_log_line
       assert_equal "-", log_line.request
-      
+
       assert_nil log_line.http_method
       assert_nil log_line.uri
       assert_nil log_line.http_version
-      
+
       assert_equal "", log_line.to_http_method_s
       assert_equal "-", log_line.to_uri_s
       assert_equal "", log_line.to_http_version_s
-      
+
       assert_equal "-", log_line.to_request_s
-      
+
     end
-     
+
   end
 
-end
+end

data/test/ntail/test_status.rb

@@ -3,7 +3,7 @@ require 'helper'
 class TestStatus < Test::Unit::TestCase
 
   context "ntail" do
-    
+
     should "correctly identify the nginx 499 status code" do
       status = NginxTail::Status::NGINX_MAGIC_STATUS # 499
       # directly via the helper function
@@ -20,7 +20,7 @@ class TestStatus < Test::Unit::TestCase
       assert !log_line.client_error_status?
       assert !log_line.server_error_status?
     end
-        
+
   end
 
-end
+end

data/test/ntail/test_time_local.rb

@@ -3,7 +3,7 @@ require 'helper'
 class TestTimeLocal < Test::Unit::TestCase
 
   context "ntail" do
-    
+
     setup do
       @time_local = "13/Apr/2010:04:45:51 +0100"
       @log_line = random_log_line(:time_local => @time_local)
@@ -22,9 +22,9 @@ class TestTimeLocal < Test::Unit::TestCase
       to_date_s = NginxTail::LogLine.to_date_s(@time_local)
       assert_equal "2010-04-13 04:45:51", to_date_s
       # parsed from a raw log line
-      assert_equal "2010-04-13 04:45:51", @log_line.to_date_s    
+      assert_equal "2010-04-13 04:45:51", @log_line.to_date_s
     end
-    
+
   end
 
-end
+end

data/test/ntail/test_uri.rb

@@ -8,14 +8,14 @@ class TestUri < Test::Unit::TestCase
       # undo any changes the test may have made
       NginxTail::LogLine.reset_automatic_files
     end
-    
+
     should "correctly identify a default automatic request" do
       # directly via the helper function
       # parsed from a raw log line
       log_line = random_log_line(:uri => '/index.html')
-      assert !log_line.automatic_uri?      
+      assert !log_line.automatic_uri?
       log_line = random_log_line(:uri => '/robots.txt')
-      assert log_line.automatic_uri?      
+      assert log_line.automatic_uri?
     end
 
     should "correctly identify a custom automatic request" do
@@ -24,9 +24,9 @@ class TestUri < Test::Unit::TestCase
       log_line = random_log_line(:uri => '/blegga.html')
       assert !log_line.automatic_uri?
       NginxTail::LogLine.add_automatic_file('blegga.html')
-      assert log_line.automatic_uri? 
+      assert log_line.automatic_uri?
     end
-        
+
   end
 
-end
+end

data/test/test_ntail.rb

@@ -5,10 +5,10 @@ class TestNtail < Test::Unit::TestCase
   should "have namespaced classes" do
     assert_equal "constant", defined? NginxTail
     assert NginxTail.is_a? Module
-    
+
     assert_equal "constant", defined? NginxTail::LogLine
     assert NginxTail::LogLine.is_a? Class
-    
+
     assert_equal "constant", defined? NginxTail::Application
     assert NginxTail::Application.is_a? Class
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ntail
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -294,7 +294,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4046669679785560715
+      hash: 1237207687887993838
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: