samuel 0.3.1 → 0.3.2

data/README.rdoc

@@ -58,8 +58,8 @@ Right now, there are three configuration changes you can make in either style:
 * <tt>:labels</tt> -- This is a hash with domain substrings as keys and log
   labels as values. If a request domain includes one of the domain substrings,
   the corresponding label will be used for the first part of that log entry.
-  By default this is set to <tt>{"" => "HTTP"}</tt>, so that all requests are
-  labeled with <tt>"HTTP Request"</tt>.
+  By default this is empty, so that all requests are labeled with a default of
+  <tt>"HTTP Request"</tt>.
 
 * <tt>:label</tt> -- As an alternative to the <tt>:labels</tt> hash, this is
   simply a string. If set, it takes precedence over any <tt>:labels</tt> (by

data/Rakefile

@@ -1,11 +1,19 @@
 require 'rubygems'
 require 'rake'
 
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/*_test.rb'
+  test.verbose = false
+  test.warning = true
+end
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "samuel"
-    gem.version = "0.3.1"
+    gem.version = "0.3.2"
     gem.summary = %Q{An automatic logger for HTTP requests in Ruby}
     gem.description = %Q{An automatic logger for HTTP requests in Ruby, supporting the Net::HTTP and HTTPClient client libraries.}
     gem.email = "chris@kampers.net"
@@ -17,18 +25,12 @@ begin
     gem.add_development_dependency "httpclient"
     gem.add_development_dependency "fakeweb"
   end
+
+  task :test => :check_dependencies
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = false
-  test.warning = true
-end
-
 begin
   require 'rcov/rcovtask'
   Rcov::RcovTask.new do |test|
@@ -45,8 +47,6 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
-
 task :default => :test
 
 begin

data/lib/samuel.rb

@@ -13,7 +13,7 @@ require "samuel/log_entries/net_http"
 module Samuel
   extend self
 
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 
   attr_writer :logger, :config
 
@@ -43,7 +43,7 @@ module Samuel
 
   def reset_config
     Thread.current[:__samuel_config] = nil
-    @config = {:label => nil, :labels => {"" => "HTTP"}, :filtered_params => []}
+    @config = {:label => nil, :labels => {}, :filtered_params => []}
   end
 end
 

data/samuel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{samuel}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Kampmeier"]
-  s.date = %q{2010-01-02}
+  s.date = %q{2010-01-12}
   s.description = %q{An automatic logger for HTTP requests in Ruby, supporting the Net::HTTP and HTTPClient client libraries.}
   s.email = %q{chris@kampers.net}
   s.extra_rdoc_files = [

data/test/loader_test.rb

@@ -26,8 +26,8 @@ class LoaderTest < Test::Unit::TestCase
       end
 
       should "not load HTTPClient" do
-        output = capture_output "puts defined?(HTTPClient)"
-        assert_equal "nil", output.strip
+        output = capture_output "puts 'good' unless defined?(HTTPClient)"
+        assert_equal "good", output.strip
       end
     end
 
@@ -40,8 +40,8 @@ class LoaderTest < Test::Unit::TestCase
       end
 
       should "not load HTTPClient" do
-        output = capture_output "puts defined?(HTTPClient)"
-        assert_match "nil", output.strip
+        output = capture_output "puts 'good' unless defined?(HTTPClient)"
+        assert_match "good", output.strip
       end
     end
 
@@ -54,10 +54,10 @@ class LoaderTest < Test::Unit::TestCase
       end
 
       should "not load Net::HTTP" do
-        output = capture_output "puts defined?(Net::HTTP)"
-        assert_match "nil", output.strip
+        output = capture_output "puts 'good' unless defined?(Net::HTTP)"
+        assert_match "good", output.strip
       end
     end
   end
 
-end
+end

data/test/net_http_test.rb

@@ -123,8 +123,7 @@ class RequestTest < Test::Unit::TestCase
       end
 
       should_log_including "Example request"
-      should_have_config_afterwards_including :labels => {"" => "HTTP"},
-                                              :label  => nil
+      should_have_config_afterwards_including :labels => {}, :label => nil
     end
 
     context "inside a configuration block with :filter_params" do
@@ -158,8 +157,7 @@ class RequestTest < Test::Unit::TestCase
       end
 
       should_log_including "Example request"
-      should_have_config_afterwards_including :labels => {"" => "HTTP"},
-                                              :label  => "Example"
+      should_have_config_afterwards_including :labels => {}, :label => "Example"
     end
 
     context "with a global config including :label => 'Example' but inside config block that changes it to 'Example 2'" do
@@ -170,8 +168,7 @@ class RequestTest < Test::Unit::TestCase
       end
 
       should_log_including "Example 2 request"
-      should_have_config_afterwards_including :labels => {"" => "HTTP"},
-                                              :label  => "Example"
+      should_have_config_afterwards_including :labels => {}, :label => "Example"
     end
 
     context "inside a config block of :label => 'Example 2' nested inside a config block of :label => 'Example'" do
@@ -185,8 +182,7 @@ class RequestTest < Test::Unit::TestCase
       end
 
       should_log_including "Example 2 request"
-      should_have_config_afterwards_including :labels => {"" => "HTTP"},
-                                              :label => nil
+      should_have_config_afterwards_including :labels => {}, :label => nil
     end
 
     context "wth a global config including :labels => {'example.com' => 'Example'} but inside a config block of :label => 'Example 3' nested inside a config block of :label => 'Example 2'" do

data/test/samuel_test.rb

@@ -35,7 +35,7 @@ class SamuelTest < Test::Unit::TestCase
     should "reset the config to default vaules" do
       Samuel.config = {:foo => "bar"}
       Samuel.reset_config
-      assert_equal({:label => nil, :labels => {"" => "HTTP"}, :filtered_params => []}, Samuel.config)
+      assert_equal({:label => nil, :labels => {}, :filtered_params => []}, Samuel.config)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: samuel
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Chris Kampmeier
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-02 00:00:00 -08:00
+date: 2010-01-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency