beaver 1.4.0 → 1.4.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 59b5cde80bdb96a54a47391839e44e5df313920d
+  data.tar.gz: 5f34d0b376cf7ebe821a7d451485f92ce6854630
+SHA512:
+  metadata.gz: 975399a18858fe522da3d58ec943b3f001b138f94222a5c4a430b81d5785085da35a2e41628c1db7a07424563a9ddf88cea4f3d049b70b5f218162c92a1c2bb9
+  data.tar.gz: 76c6e06afdb6a79c89b50dcdd0ca8a9fbe380b7f38c95b5acdd6a253bbacf6886c86afcb4d2d2416e0b184635070afe1c5bb7502e27f65578a78287a1296a3f2

data/lib/beaver.rb

@@ -3,6 +3,7 @@ begin
 rescue LoadError
   $stderr.puts "Zlib not available; compressed log files will be skipped."
 end
+require 'cgi'
 
 require 'beaver/version'
 require 'beaver/utils'

data/lib/beaver/dam.rb

@@ -38,7 +38,7 @@ module Beaver
   # 
   #  :params_str    Rails HTTP  Regular expressing matching the Parameters string
   # 
-  #  :params        Rails       Hash of Symbol=>String/Regexp pairs: {:username => 'bob', :email => /@gmail\.com$/}. All must match.
+  #  :params        Rails HTTP  Hash of Symbol=>String/Regexp pairs: {:username => 'bob', :email => /@gmail\.com$/}. All must match (but *not* all must be present).
   # 
   #  :tagged        Rails       Comma-separated String or Array of Rails Tagged Logger tags. If you specify multiple tags, a request must have *all* of them.
   # 

data/lib/beaver/parsers/http.rb

@@ -7,6 +7,7 @@ module Beaver
       # The Combined Log Format as an array of symbols
       FORMAT_SYMBOLS = FORMAT.split(' ').map(&:to_sym) # :nodoc:
       FHOST, FID, FUSER, FTIME, FREQUEST, FSTATUS, FSIZE, FREFERER, FUA = FORMAT_SYMBOLS # :nodoc:
+      REGEX_TIME_FIX = /([0-9]{4}):([0-9]{2})/
 
       # Regex matchers keyed by opening quotes, etc.
       MATCHERS = {'[' => /^\[([^\]]+)\] ?/, '"' => /^"([^"]+)" ?/} # :nodoc:
@@ -37,6 +38,18 @@ module Beaver
         @path
       end
 
+      # Parses and returns the request parameters as a Hash
+      def parse_params
+        params_str.empty? ? BLANK_HASH : CGI::parse(params_str).inject({}) do |hash, (param, value)|
+          hash[param] = if value.is_a?(Array) and value.size == 1 and param !~ /\[\d*\]$/
+            value[0]
+          else
+            value
+          end
+          hash
+        end
+      end
+
       # Returns the url query string
       def params_str
         parse_request! if @params_str.nil?
@@ -86,7 +99,7 @@ module Beaver
 
       # Parses and returns the time at which the request was made
       def parse_time
-        time_str = @request[FTIME].gsub(/([0-9]{4}):([0-9]{2})/, "#{$1} #{$2}")
+        time_str = @request[FTIME].sub(REGEX_TIME_FIX) { "#{$1} #{$2}" }
         Time.parse(time_str) rescue nil
       end
 

data/lib/beaver/parsers/rails.rb

@@ -47,11 +47,6 @@ module Beaver
         @ms ||= REGEX_MS.match(@data) ? $1.to_i : 0
       end
 
-      # Returns the request parameters as a Hash (this is more expensive than Request#params_str)
-      def params
-        @params ||= params_str.empty? ? BLANK_HASH : Utils.str_to_hash(params_str)
-      end
-
       # Returns the tags string associated with the request (e.g. "[tag1] [tag2] ")
       def tags_str
         @tags_str ||= REGEX_TAGS.match(@data) ? $1 : nil
@@ -89,6 +84,11 @@ module Beaver
         REGEX_COMPLETED.match(@data) ? $1.to_i : 0
       end
 
+      # Parses and returns the request parameters as a Hash
+      def parse_params
+        params_str.empty? ? BLANK_HASH : Utils.str_to_hash(params_str)
+      end
+
       # Parses and returns the request parameters as a String
       def parse_params_str
         REGEX_PARAMS_STR.match(@data) ? $1 : BLANK_STR

data/lib/beaver/request.rb

@@ -56,6 +56,11 @@ module Beaver
       @status ||= parse_status
     end
 
+    # Returns the request parameters as a Hash (this is more expensive than Request#params_str)
+    def params
+      @params ||= parse_params
+    end
+
     # Returns the request parameters as a String
     def params_str
       @params_str ||= parse_params_str

data/lib/beaver/utils.rb

@@ -127,6 +127,8 @@ module Beaver
         indicies.all? do |i|
           if a_values[i].is_a? String
             a_values[i] == b_values[i]
+          elsif a_values[i].is_a? Array
+            a_values[i] == b_values[i]
           elsif a_values[i].is_a?(Regexp) and b_values[i].is_a?(String)
             a_values[i] =~ b_values[i]
           elsif a_values[i].is_a?(Hash) and b_values[i].is_a?(Hash)

data/lib/beaver/version.rb

@@ -1,4 +1,4 @@
 module Beaver
-  MAJOR_VERSION, MINOR_VERSION, TINY_VERSION, PRE_VERSION = 1, 4, 0, nil # :nodoc:
+  MAJOR_VERSION, MINOR_VERSION, TINY_VERSION, PRE_VERSION = 1, 4, 1, nil # :nodoc:
   VERSION = [MAJOR_VERSION, MINOR_VERSION, TINY_VERSION, PRE_VERSION].compact.join '.' # :nodoc:
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaver
 version: !ruby/object:Gem::Version
-  version: 1.4.0
-  prerelease: 
+  version: 1.4.1
 platform: ruby
 authors:
 - Jordan Hollinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-12 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies: []
 description: A simple DSL and command-line tool for discovering what people are up
   to in your Rails app
@@ -21,37 +20,36 @@ extra_rdoc_files: []
 files:
 - lib/beaver.rb
 - lib/beaver/dam.rb
-- lib/beaver/beaver.rb
-- lib/beaver/request.rb
 - lib/beaver/parsers/rails.rb
 - lib/beaver/parsers/http.rb
-- lib/beaver/utils.rb
+- lib/beaver/beaver.rb
+- lib/beaver/request.rb
 - lib/beaver/version.rb
+- lib/beaver/utils.rb
 - README.rdoc
 - LICENSE
 - bin/beaver
 homepage: http://github.com/jhollinger/beaver
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rails log parser
 test_files: []