teelogger 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 374fbb37a9d2c70a80c83f6c52ec70501fef456a
-  data.tar.gz: 43ff68bc53641a1805f21e76916ec5241b0e5549
+  metadata.gz: 33bd79b4386cd699bb1293011cd5982edee2458d
+  data.tar.gz: 28df88866d33f0678d4ee964c68e8ffbd603d9c0
 SHA512:
-  metadata.gz: 704c17de207b1a44bb1886ea9291c27c77c67b8e38140dcca144f21009705dae5e58c50a8ce056e877195320be3413985915d2d96651a7e691042846126ad0b8
-  data.tar.gz: 0797bc600ca9c252c61ec27289cc61103143ab7df846760b025f0039f5222d98aa0fd13db267fd6042053fc614bcad71e7e2bb005e97ea50f8a198d5f663bd2e
+  metadata.gz: 8e8ba78dcc4e630caa5c735f2a00552224289171af9bcf6db61aad02a7023a336db52279d040f608ccbca4edb150be736f4bbd4c5e20d7106bd30142ba813c26
+  data.tar.gz: 4f0b65a534c59edbc76a14d925c274d1733c5ce84ea88bd5415b22361e438795ace05a1f8625dcf27268138095093e65c04aad722864223a59e01f1812673b68

data/.travis.yml

@@ -12,9 +12,6 @@ rvm:
   - 2.1.0
   - 2.2.2
   - jruby
-matrix:
-  allow_failures:
-    rvm: 2.2.2
 env:
   CODECLIMATE_REPO_TOKEN=e37a93224a40c36fd6a24465c063e7627661921a868a2d1321ad2937d7889de6
 notifications:

data/features/issues.feature

@@ -0,0 +1,11 @@
+@issues
+Feature: Issues
+  As a user of the teelogger gem
+  When I file an issue 
+  I expect a regression test from it
+
+  @issue_7
+  Scenario: Complex data causes exception in filter
+    Given I create a TeeLogger for regression testing issues
+    And I log complex data
+    Then I expect there not to be an exception

data/features/step_definitions/formatter_steps.rb

@@ -17,7 +17,7 @@ Given(/^I call it with parameters "([^"]*)", "([^"]*)", "([^"]*)" and "([^"]*)"$
   # machines.
   zone = ENV["TZ"]
   ENV["TZ"] = "UTC"
-  t = Time.parse(time)
+  t = Time.parse(time).localtime
   ENV["TZ"] = zone
 
   result = formatter.call(severity, t, progname, message)

data/features/step_definitions/issue_steps.rb

@@ -0,0 +1,36 @@
+io = nil
+logger = nil
+error = nil
+
+Given(/^I create a TeeLogger for regression testing issues$/) do
+  io = StringIO.new
+  logger = TeeLogger::TeeLogger.new io
+  assert [TeeLogger::DEFAULT_FLUSH_INTERVAL] == logger.flush_interval, "Flush interval is not default: #{logger.flush_interval}"
+end
+
+Given(/^I log complex data$/) do
+  # Reduced data from issue #7
+  data = {
+    "status" => 200,
+    "result" => {
+      "id" => 123,
+      "caps" => [
+        {
+          "first" => [42],
+          "second" => ["some string"],
+        },
+      ],
+    },
+  }
+
+  begin
+    logger.error(data)
+    error = nil
+  rescue StandardError => err
+    error = err
+  end
+end
+
+Then(/^I expect there not to be an exception$/) do
+  assert error.nil?, "Expected no error, but got: #{error}"
+end

data/features/support/env.rb

@@ -1,10 +1,11 @@
 require "codeclimate-test-reporter"
 CodeClimate::TestReporter.start
 
-begin
-  require 'test/unit/assertions'
-rescue LoadError
-  require 'minitest/assertions'
+# Simple assert function
+def assert(condition, message = "Unknown reason")
+  if not condition
+    raise message
+  end
 end
 
 require "teelogger"

data/lib/teelogger.rb

@@ -226,7 +226,6 @@ public
     end
 
     def method_missing(meth, *args, &block)
-      puts "MISSING #{meth}"
       dispatch(meth, *args, &block)
     end
 

data/lib/teelogger/filter.rb

@@ -20,6 +20,10 @@ module TeeLogger
       /salt[a-z\-_]*/,
     ]
 
+    ##
+    # Word to use in place of original values
+    REDACTED_WORD = "[REDACTED]"
+
     ##
     # Filter words
     def filter_words

data/lib/teelogger/filters/assignment.rb

@@ -31,7 +31,7 @@ module TeeLogger
         args.each do |arg|
           @matches.each do |match|
             # Modify the matching arguments in place
-            arg.gsub!(match, '\1[REDACTED]')
+            arg.gsub!(match, "\1#{::TeeLogger::Filter::REDACTED_WORD}")
           end
         end
 

data/lib/teelogger/filters/cli.rb

@@ -35,7 +35,7 @@ module TeeLogger
         # Otherwise, if the first argument matches, we'll redact the second.
         @matches.each do |word|
           if word.match(args[0])
-            args[1] = '[REDACTED]'
+            args[1] = ::TeeLogger::Filter::REDACTED_WORD
           end
         end
         return args

data/lib/teelogger/filters/recursive.rb

@@ -20,35 +20,42 @@ module TeeLogger
         # For each argument, recurse processing. Note that due to the window
         # size of one, args is only an element long - but let's write this out
         # properly.
+        processed_args = []
+
         args.each do |arg|
-          # Since we're matching enumerabls, the argument must respond to .each
-          arg.each do |expanded|
-            # The expanded variable can be a single item or a list of items.
-            # If expanded is itself an Enumarable, the first item is a key, the remainder
-            # values. We need to recursively process the values.
-            if expanded.is_a? Enumerable
-              # If the key matches any of the filter words, we'll just skip
-              # the value entirely.
-              key = expanded[0]
+          # So we have an Enumerable, but we don't know whether it's Array-like
+          # or Hash-like. We'll check whether it responds to ".keys", and then
+          # treat it as a Hash.
+          processed = nil
+          if arg.respond_to? :keys
+            processed = {}
+            # Looks like a Hash, treat it like a Hash
+            arg.each do |key, value|
+
+              # If the key is a match, we'll just redact the entire value.
               redacted = false
               run_data[:words].each do |word|
                 if word.match(key.to_s)
-                  arg[key] = '[REDACTED]'
-                  redacted = true
-                  break
+                   processed[key] = ::TeeLogger::Filter::REDACTED_WORD
+                   redacted = true
+                   break
                 end
               end
 
+              # Otherwise, pass it through
               if not redacted
-                arg[key] = run_data[:filters].apply_filters_internal(run_data, *expanded[1..-1])
+                processed[key] = run_data[:filters].apply_filters_internal(run_data, value)[0]
               end
-            else
-              arg = run_data[:filters].apply_filters_internal(run_data, expanded)
             end
+          else
+            # Treat it like an Array
+            processed = run_data[:filters].apply_filters_internal(run_data, *arg)
           end
+
+          processed_args << processed
         end
 
-        return args
+        return processed_args
       end
     end # class Recursive
   end # module Filter

data/lib/teelogger/version.rb

@@ -6,5 +6,5 @@
 # All rights reserved.
 #
 module TeeLogger
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/teelogger.gemspec

@@ -19,9 +19,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "cucumber"
-  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "rake", "~> 0"
+  spec.add_development_dependency "cucumber", "~> 0"
 
   spec.add_dependency "tai64", "~> 0.0"
   spec.add_dependency "require_all", "~> 1.3"

metadata

@@ -1,97 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: teelogger
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Jens Finkhaeuser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tai64
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 description: Mini wrapper around Ruby Logger for logging to multiple destinations.
@@ -101,17 +87,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - features/filter.feature
 - features/formatter.feature
+- features/issues.feature
 - features/logger.feature
 - features/step_definitions/filter_steps.rb
 - features/step_definitions/formatter_steps.rb
+- features/step_definitions/issue_steps.rb
 - features/step_definitions/logger_steps.rb
 - features/support/env.rb
 - lib/teelogger.rb
@@ -134,25 +122,27 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Mini wrapper around Ruby Logger for logging to multiple destinations.
 test_files:
 - features/filter.feature
 - features/formatter.feature
+- features/issues.feature
 - features/logger.feature
 - features/step_definitions/filter_steps.rb
 - features/step_definitions/formatter_steps.rb
+- features/step_definitions/issue_steps.rb
 - features/step_definitions/logger_steps.rb
 - features/support/env.rb