beaver 1.2.0 → 1.3.0

data/lib/beaver/utils.rb

@@ -2,18 +2,18 @@ require 'yaml'
 require 'time'
 
 module Beaver
-  # Sundry utility methods and classes for use by Beaver
+  # Sundry utility methods for use by Beaver
   module Utils
-    LBRACE, RBRACE = '{', '}'
-    LBRACKET, RBRACKET = '[', ']'
-    QUOTE = '"'
-    ESCAPE = '\\'
-    EQUAL = '='
-    COLIN = ':'
-    TO_SPACE = ['>']
-    SPACE = ' '
-    COMMA = ','
-    LETTER_REGEX = /^[a-z]$/i
+    LBRACE, RBRACE = '{', '}' # :nodoc:
+    LBRACKET, RBRACKET = '[', ']' # :nodoc:
+    QUOTE = '"' # :nodoc:
+    ESCAPE = '\\' # :nodoc:
+    EQUAL = '=' # :nodoc:
+    COLIN = ':' # :nodoc:
+    TO_SPACE = ['>'] # :nodoc:
+    SPACE = ' ' # :nodoc:
+    COMMA = ',' # :nodoc:
+    LETTER_REGEX = /^[a-z]$/i # :nodoc:
 
     # Converts a string representation of a Hash into YAML, then into a Hash.
     # This is targeted towards the Parameters value in Rails logs. It is assumed that every key is a represented as a String in the logs.
@@ -92,6 +92,54 @@ module Beaver
       YAML.load s
     end
 
+    # Returns an array of arrays of strings with all the columns padded the same length.
+    def self.tablize(rows)
+      max_sizes = rows.inject([0]*rows.first.size) do |sizes, vals|
+        vals.map! &:to_s
+        vals.each_with_index { |val, i| sizes[i] = val.size if val.size > sizes[i] }; sizes
+      end
+      rows.map { |vals| vals.each_with_index.map { |val, i| val.ljust(max_sizes[i]) } }
+    end
+
+    # Matches tags recursively
+    def self.deep_matching_tags(matchers, tags)
+      all_tags_matched = nil
+      any_arrays_matched = false
+      for m in matchers
+        if m.is_a? Array
+          matched = deep_matching_tags m, tags
+          any_arrays_matched = true if matched
+        else
+          matched = tags.include? m
+          all_tags_matched = (matched && all_tags_matched != false) ? true : false
+        end
+      end
+      return (all_tags_matched or any_arrays_matched)
+    end
+
+    # Recursively compares to Hashes. If all of Hash A is in Hash B, they match.
+    def self.matching_hashes?(a,b)
+      intersecting_keys = a.keys & b.keys
+      if intersecting_keys.any?
+        a_values = a.values_at(*intersecting_keys)
+        b_values = b.values_at(*intersecting_keys)
+        indicies = (0..b_values.size-1)
+        indicies.all? do |i|
+          if a_values[i].is_a? String
+            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)
+            matching_hashes? a_values[i], b_values[i]
+          else
+            false
+          end
+        end
+      else
+        false
+      end
+    end
+
     # Parse a string (from a command-line arg) into a Date object
     def self.parse_date(date)
       case date
@@ -100,17 +148,5 @@ module Beaver
         else nil
       end
     end
-
-    # Normalizes Time.new across Ruby 1.8 and 1.9.
-    # Accepts the same arguments as Time.
-    class NormalizedTime < ::Time
-      if RUBY_VERSION < '1.9'
-        # Returns a new NormalizedTime object.
-        def self.new(*args)
-          args.pop if args.last.is_a? String
-          local(*args)
-        end
-      end
-    end
   end
 end

data/lib/beaver/version.rb

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

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Jordan Hollinger
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-08 00:00:00 -05:00
+date: 2012-06-24 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -32,7 +32,9 @@ files:
 - lib/beaver/beaver.rb
 - lib/beaver/request.rb
 - lib/beaver/parsers/rails.rb
+- lib/beaver/parsers/http.rb
 - lib/beaver/utils.rb
+- lib/beaver/version.rb
 - README.rdoc
 - LICENSE
 - bin/beaver