trace-util-adv 0.2.4 → 0.3.0

data/test/samples/sample_composite_filters.rb

@@ -33,18 +33,21 @@ Module_composite_filter_A = {
 # for specific instance_vars, match on values (after .to_s on var)  
 Var_composite_filter_A = {
   :name => 'template_path',
-  :vars => [{
-    :name => 'template_path', :type => :string,
-    :var_rules => {
-      :include => [/.*\/taglib\/.*/], 
-      :exclude => [/.*\/rapid_.*/]         
-    } 
-    },
-    {
-      :name => 'template_path', 
+  :vars => [
+      {
+      :name => 'template_path', :type => :string,
       :var_rules => {
-        :exclude => [/.*\/rapid_.*/],         
-        :default => :include
+        :include => [/.*\/taglib\/.*/], 
+        :exclude => [/.*\/rapid_.*/]         
       } 
-    }]
+      },
+      {
+        :name => 'template_path', 
+        :var_rules => {
+          :exclude => [/.*\/rapid_.*/],         
+          :default => :include
+        } 
+      }
+    ],
+    :default => :yield    
 }

data/test/targets/test_create_targets.rb

@@ -0,0 +1,21 @@
+
+
+# def test_create_xml_tracer
+#   xml_tracer = {:type => :xml, :to_file => 'log_files/xml/traced.xml'}.template
+#   assert_equal Tracing::XmlTemplate, xml_tracer.class, "Should create instance of XmlTemplate"
+# end
+# 
+# def test_create_html_tracer
+#   html_tracer = {:type => :html, :default_path => 'log_files/html'}.template
+#   assert_equal Tracing::HtmlTemplate, html_tracer.class, "Should create instance of HtmlTemplate"
+# end
+# 
+# def test_create_log_tracer
+#   log_tracer = {:type => :log, :default_path => 'log_files'}.template
+#   assert_equal Tracing::LogTemplate, log_tracer.class, "Should create instance of LogTemplate"
+# end
+# 
+# def test_create_log_tracer
+#   stream_tracer = {:type => :stream, :stream => :STDOUT}.template
+#   assert_equal Tracing::StreamTemplate, log_tracer.class, "Should create instance of StreamTemplate"
+# end

data/test/templates/include.rb

@@ -0,0 +1,4 @@
+require "trace-util-adv"
+Require.base_path = File.dirname(__FILE__)
+Require.folder "../samples"
+require "test/unit"

data/test/templates/test_create_templates.rb

@@ -0,0 +1,23 @@
+require "include"
+
+
+class TestCreateTemplates < Test::Unit::TestCase
+
+  def test_tracer
+    rule = {:template => :html}
+    result = rule.template
+    assert_equal result.class, Tracing::HtmlTemplate, "Should result in HtmlTemplate"    
+
+    rule = {:template => :xml}
+    result = rule.template
+    assert_equal result.class, Tracing::XmlTemplate, "Should result in XmlTemplate"    
+
+    rule = {:template => :string}
+    result = rule.template
+    assert_equal result.class, Tracing::StringTemplate, "Should result in StringTemplate"    
+  end
+
+end
+
+
+

data/test/templates/test_exec_templates.rb

@@ -0,0 +1,6 @@
+require "include"
+
+class TestExecuteTemplates < Test::Unit::TestCase
+
+
+end

data/test/trace_calls/include.rb

@@ -0,0 +1,4 @@
+require "trace-util-adv"
+Require.base_path = File.dirname(__FILE__)
+Require.folder "../samples"
+require "test/unit"

data/test/trace_calls/test_configure_.rb

@@ -1,8 +1,4 @@
-require 'extensions/core_extensions'
-require 'filters/base_filters'
-require 'rules/hash_rule_extensions'
-require "test/unit"
-
+require "include"
 
 class TestTraceCallsConfigure < Test::Unit::TestCase
   
@@ -14,28 +10,35 @@ class TestTraceCallsConfigure < Test::Unit::TestCase
     
     @ah1_filter_1 = {:x_class_filter => "Dryml"}
     @ah1_filter_1 = {:i_class_filter => "Template"}
+    
+    @ah_filters = [@ah1_filter_1, @ah1_filter_2]
+    
+    @ah1_app_1 = :xml
+    @ah1_app2 = :html
+    
+    @appenders = [@ah1_app_1, @ah1_app2]
   end
 
 
   def test_register_action_handler_from_hash
     # Action handler
-    ah1 = {:filters => [@ah1_filter_1, @ah1_filter_2], :appenders => [ah1_app_1, ah1_app2]}     
+    ah1 = {:filters => @ah_filters, :appenders => @appenders}.action_handlers
     action_handlers = ah1
     # Trace configuration
-    configuration = Tracing::Configuration.new {:action_handlers => action_handlers, :filters => @filters, :final_yield_action => :exclude}
+    configuration = Tracing::Configuration.new :action_handlers => action_handlers, :filters => @filters, :final_yield_action => :exclude
     # configure
     TraceCalls.configure(configuration)
   end
 
   def test_register_action_handler_from_hash
     # Action handlers
-    ah1 = {:filters => [ah1_filter_1, ah1_filter_2], }     
+    ah1 = {:filters => @filters}.action_handlers     
     app_1 = :xml
     # Trace configuration
-    configuration = Tracing::Configuration.new {:appenders => app_1, :filters => filters, :final_yield_action => :exclude}
+    configuration = Tracing::Configuration.new :appenders => app_1, :filters => @ah_filters, :final_yield_action => :exclude
 
     # configure
-    TraceCalls.configure(configuration)
+    Tracing::TraceExt.configure(configuration)
 
   end
 
@@ -49,8 +52,8 @@ class TestTraceCallsConfigure < Test::Unit::TestCase
 
   def test_register_multiple_action_handler_from_hash
     # Action handlers
-    ah1 = {:filters => [ah1_filter_1, ah1_filter_2], :appenders => [ah1_app_1, ah1_app2]}
-    ah2 = {:filters => [ah2_filter_1, ah2_filter_2], :appenders => [ah2_app_1, ah2_app2]}
+    ah1 = {:filters => @ah_filters, :appenders => @appenders}
+    ah2 = {:filters => @ah_filters, :appenders => @appenders}
 
     action_handlers = [ah1, ah2]
 
@@ -60,10 +63,10 @@ class TestTraceCallsConfigure < Test::Unit::TestCase
     filters = [im_filter_1, xym_class_1]
 
     # Trace configuration
-    configuration = Tracing::Configuration.new {:action_handlers => action_handlers, :filters => filters, :final_yield_action => :exclude}
+    configuration = Tracing::Configuration.new :action_handlers => action_handlers, :filters => @ah_filters, :final_yield_action => :exclude
 
     # configure
-    TraceCalls.configure(configuration)
+    Tracing::TraceExt.configure(configuration)
   end
 
 end

data/test/trace_calls/tracing/test_html_tracing.rb

@@ -1,12 +1,11 @@
-require "trace_util_adv"
-require "samples/include"
+require "../include"
 
 class TestHtmlTracing < Test::Unit::TestCase
             
   def test_html_tracing    
     classes_to_trace = [ 'My']            
     Tracing::HtmlAppender.default_path = 'log_files/html'        
-    Tracing::TraceCalls.configure(:type => :html, :to_file => 'traced_dryml.html', :filters => Method_filter_hello)                
+    Tracing::TraceExt.configure(:type => :html, :to_file => 'traced_dryml.html', :filters => Method_filter_hello)                
     my = Me::My.new
     my.hello
     my.hi_there

data/test/trace_calls/tracing/test_logger_tracing.rb

@@ -1,12 +1,13 @@
-require "trace_util_adv"
-require "samples/include"
+require "../include"
   
 class TestLoggerTracing < Test::Unit::TestCase
             
   def test_logger_tracing    
     classes_to_trace = [ 'My']            
-    Tracing::LoggerAppender.default_path = 'log_files'        
-    Tracing::TraceCalls.configure(:type => :log, :filters => Method_filter_hello)                
+    # Should be for LogFileAppender
+    # Tracing::LoggerAppender.default_path = 'log_files'        
+
+    Tracing::TraceExt.configure(:type => :log, :filters => Method_filter_hello)                
     my = Me::My.new
     my.hello
     my.hi_there

data/test/trace_calls/tracing/test_stream_tracing.rb

@@ -1,11 +1,10 @@
-require "trace_util_adv"
-require "samples/include"
+require "../include"
   
 class TestStreamTracing < Test::Unit::TestCase
             
   def test_stream_tracing    
     classes_to_trace = [ 'My']            
-    Tracing::TraceCalls.configure(:type => :stream, :filters => Method_filter_hello)                
+    Tracing::TraceExt.configure(:type => :stream, :filters => Method_filter_hello)                
     my = Me::My.new
     my.hello
     my.hi_there

data/test/trace_calls/tracing/test_teamplate_log_tracing.rb

@@ -1,12 +1,11 @@
-require "trace_util_adv"
-require "samples/include"
+require "../include"
   
 class TestDrymlTemplateLogTracing < Test::Unit::TestCase
             
   def test_dryml_template_tracing    
     classes_to_trace = [ 'My']            
     Tracing::TemplateLogAppender.default_path = 'log_files/templates'        
-    Tracing::TraceCalls.configure(:type => :template_log, :filters => Method_filter_dryml)                
+    Tracing::TraceExt.configure(:type => :template_log, :filters => Method_filter_dryml)                
     my = Me::My.new
     my.hello
     my.hi_there

data/test/trace_calls/tracing/test_xml_tracing.rb

@@ -1,12 +1,11 @@
-require "trace_util_adv"
-require "samples/include"
+require "../include"
   
 class TestXmlTracing < Test::Unit::TestCase
             
   def test_xml_tracing    
     classes_to_trace = [ 'My']            
     Tracing::XmlAppender.default_path = 'log_files/xml'        
-    Tracing::TraceCalls.configure(:type => :xml, :to_file => 'traced_dryml.html', :filters => Method_filter_hello)                
+    Tracing::TraceExt.configure(:type => :xml, :to_file => 'traced_dryml.html', :filters => Method_filter_hello)                
     my = Me::My.new
     my.hello
     my.hi_there

data/trace-util-adv.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{trace-util-adv}
-  s.version = "0.2.4"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2009-11-15}
+  s.date = %q{2009-11-21}
   s.description = %q{
       Configure tracing using context sensitive filters, appenders, output templates in a completely non-intrusive fashion. 
       Tracing can even be applied runtime as a response when certain conditions occur}
@@ -63,6 +63,7 @@ Gem::Specification.new do |s|
      "lib/filters/list/README-NOTE.txt",
      "lib/filters/list/list_instance_var_filter.rb",
      "lib/filters/msg_context/message_context_filters.rb",
+     "lib/filters/name_filter.rb",
      "lib/filters/simple/argument_filter.rb",
      "lib/filters/simple/class_filter.rb",
      "lib/filters/simple/instance_var_filter.rb",
@@ -102,15 +103,18 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/spec_helper.rb",
      "spec/trace-util-adv_spec.rb",
+     "test/action_handler/include.rb",
      "test/action_handler/test_action_handler.rb",
      "test/action_handler/test_create_action_handler.rb",
+     "test/appenders/include.rb",
      "test/appenders/test_appender_filters.rb",
-     "test/appenders/test_appender_tracers.rb",
+     "test/appenders/test_appender_templates.rb",
      "test/appenders/test_create_appender.rb",
      "test/appenders/test_html_appender.rb",
      "test/appenders/test_stream_appender.rb",
      "test/appenders/test_template_log_appender.rb",
      "test/appenders/test_xml_appender.rb",
+     "test/extensions/include.rb",
      "test/extensions/test_filters_creation.rb",
      "test/extensions/test_hash_extensions.rb",
      "test/extensions/test_hash_filter_extensions.rb",
@@ -122,6 +126,7 @@ Gem::Specification.new do |s|
      "test/filters/composite/test_composite_module_filter.rb",
      "test/filters/composite/test_composite_var_filter.rb",
      "test/filters/executor/test_filter_exec.rb",
+     "test/filters/include.rb",
      "test/filters/msg_context/test_custom_filters.rb",
      "test/filters/simple/test_base_filter.rb",
      "test/filters/simple/test_class_filter.rb",
@@ -135,14 +140,17 @@ Gem::Specification.new do |s|
      "test/sandbox/matcher.rb",
      "test/sandbox/sandbox.rb",
      "test/sandbox/test_xml_gen.rb",
+     "test/targets/test_create_targets.rb",
+     "test/templates/include.rb",
+     "test/templates/test_create_templates.rb",
+     "test/templates/test_exec_templates.rb",
+     "test/trace_calls/include.rb",
      "test/trace_calls/test_configure_.rb",
      "test/trace_calls/tracing/test_html_tracing.rb",
      "test/trace_calls/tracing/test_logger_tracing.rb",
      "test/trace_calls/tracing/test_stream_tracing.rb",
      "test/trace_calls/tracing/test_teamplate_log_tracing.rb",
-     "test/trace_calls/tracing/test_xml_tracing.rb",
-     "test/tracers/test_create_tracers.rb",
-     "test/tracers/test_exec_tracers.rb"
+     "test/trace_calls/tracing/test_xml_tracing.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: trace-util-adv
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-15 00:00:00 +01:00
+date: 2009-11-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,6 +79,7 @@ files:
 - lib/filters/list/README-NOTE.txt
 - lib/filters/list/list_instance_var_filter.rb
 - lib/filters/msg_context/message_context_filters.rb
+- lib/filters/name_filter.rb
 - lib/filters/simple/argument_filter.rb
 - lib/filters/simple/class_filter.rb
 - lib/filters/simple/instance_var_filter.rb
@@ -140,15 +141,18 @@ summary: adds advancing tracing capability to your ruby code
 test_files: 
 - spec/spec_helper.rb
 - spec/trace-util-adv_spec.rb
+- test/action_handler/include.rb
 - test/action_handler/test_action_handler.rb
 - test/action_handler/test_create_action_handler.rb
+- test/appenders/include.rb
 - test/appenders/test_appender_filters.rb
-- test/appenders/test_appender_tracers.rb
+- test/appenders/test_appender_templates.rb
 - test/appenders/test_create_appender.rb
 - test/appenders/test_html_appender.rb
 - test/appenders/test_stream_appender.rb
 - test/appenders/test_template_log_appender.rb
 - test/appenders/test_xml_appender.rb
+- test/extensions/include.rb
 - test/extensions/test_filters_creation.rb
 - test/extensions/test_hash_extensions.rb
 - test/extensions/test_hash_filter_extensions.rb
@@ -160,6 +164,7 @@ test_files:
 - test/filters/composite/test_composite_module_filter.rb
 - test/filters/composite/test_composite_var_filter.rb
 - test/filters/executor/test_filter_exec.rb
+- test/filters/include.rb
 - test/filters/msg_context/test_custom_filters.rb
 - test/filters/simple/test_base_filter.rb
 - test/filters/simple/test_class_filter.rb
@@ -173,11 +178,14 @@ test_files:
 - test/sandbox/matcher.rb
 - test/sandbox/sandbox.rb
 - test/sandbox/test_xml_gen.rb
+- test/targets/test_create_targets.rb
+- test/templates/include.rb
+- test/templates/test_create_templates.rb
+- test/templates/test_exec_templates.rb
+- test/trace_calls/include.rb
 - test/trace_calls/test_configure_.rb
 - test/trace_calls/tracing/test_html_tracing.rb
 - test/trace_calls/tracing/test_logger_tracing.rb
 - test/trace_calls/tracing/test_stream_tracing.rb
 - test/trace_calls/tracing/test_teamplate_log_tracing.rb
 - test/trace_calls/tracing/test_xml_tracing.rb
-- test/tracers/test_create_tracers.rb
-- test/tracers/test_exec_tracers.rb

data/test/appenders/test_appender_tracers.rb

@@ -1,56 +0,0 @@
-require 'extensions/core_extensions'
-require 'filters/base_filters'
-require 'rules/hash_rule_extensions'
-require "test/unit"
-
-
-class TestAppenderTracers < Test::Unit::TestCase
-
-  def setup
-    # Trace filters
-    im_filter_1 = {:i_method_filter => "a,b"}
-    xym_class_1 = {:xy_class_filter => "C,D"}
-    @filters = [im_filter_1, xym_class_1]
-
-    @app_filter_1 = {:x_class_filter => "Dryml"}
-    @app_filter_2 = {:i_class_filter => "Template"}
-
-    @xml_tracer = {:type => :xml, :to_file => 'log_files/xml/traced.xml'}.tracer
-    @html_tracer = {:type => :html, :default_path => 'log_files/html/'}.tracer
-    @log_tracer = {:type => :log}.tracer
-    @stream_tracer = {:type => :stream}.tracer
-  end  
-  
-
-  def test_appender_register_tracer
-    # Trace configuration
-    appender_1 = {:tracer => @xml_tracer}.appender
-    assert_equal Tracing::XmlAppender, appender_1.class, "Should create instance of XmlAppender"
-
-    appender_2 = {:tracer => @html_tracer}.appender
-    assert_equal Tracing::HtmlAppender, appender_2.class, "Should create instance of HtmlAppender"
-
-    appender_3 = {:tracer => @log_tracer}.appender
-    assert_equal Tracing::HtmlAppender, appender_3.class, "Should create instance of LogAppender"
-
-    appender_4 = {:tracer => @stream_tracer}.appender
-    assert_equal Tracing::StreamAppender, appender_4.class, "Should create instance of Streamppender"
-  end
-
-
-  def test_appender_register_tracer_and_filters
-    # Trace configuration
-    appender_1 = {:tracer => @xml_tracer, :filters => @app_filter_1}.appender
-    assert_equal Tracing::XmlAppender, appender_1.class, "Should create instance of XmlAppender"
-
-    appender_2 = {:tracer => @html_tracer, :filters => @app_filter_1}.appender
-    assert_equal Tracing::HtmlAppender, appender_2.class, "Should create instance of HtmlAppender"
-
-    appender_3 = {:tracer => @log_tracer, :filters => @app_filter_1}.appender
-    assert_equal Tracing::HtmlAppender, appender_3.class, "Should create instance of LogAppender"
-
-    appender_4 = {:tracer => @stream_tracer, :filters => @app_filter_1}.appender
-    assert_equal Tracing::StreamAppender, appender_4.class, "Should create instance of Streamppender"
-  end
-
-end