trace-util-adv 0.3.0 → 0.3.1

data/Rakefile

@@ -14,6 +14,8 @@ begin
     gem.authors = ["Kristian Mandrup"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.files.exclude 'test', 'log_files'    
+    gem.add_dependency 'require-magic'
+    
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new      

data/TODO.txt

@@ -1,7 +1,11 @@
 TODO:
 ----
+
+=====
+0.4.0
+=====
 - Clean up Appenders, Templates and Targets
-- Convenience Appenders
+- Convenience Appenders?
   - LogFile
   - HtmlFile
   - XmlFile
@@ -13,12 +17,11 @@ TODO:
     - File
     - String
     - Stream (STDOUT, STDERR)    
-    - Stack
-    
-  - Add listener to Target?
-  
-  - Simplify with Listener model?
+    - Stack (of Strings and/or Events?)
 
+  - Simplify with Listener model?    
+  - Add listeners to Target and/or Appender?
+  
 ---
 Add time to context for before- and after handle calls. Enable tracing time output 
 Allow for comparing time it takes to complete method and act upon it!
@@ -34,24 +37,7 @@ Introduce new rule outcomes
  :include_yield - set temp outcome to include and then yield, allowing other rule to exclude
  :exclude_yield - set temp outcome to exclude and then yield, allowing other rule to include
 
-Refactor MsgContextRule 
------------------------
-- see message_filters.rb
-- BaseFilter should extend this.
-
-Refactor design
-- Modularize even more!
-
-Test String appender
-- log string to file
-
-Test library in general
-- functions as expected?
-- easy to use?
 - create RSpec tests?
 
-
-
-
 ExtJS:
 http://www.extjswithrails.com/2008/03/fitting-ext-js-into-rails-architecture.html

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/filters/include.rb

@@ -1,4 +1,5 @@
 require 'filters/filter'
 rfolders = Require.rfolder('filters', {:folders => ['simple', 'composite', 'list', 'msg_context', 'executor'], :root_files => :after, :exclude => 'include'})
 
+puts rfolders.inspect
 

data/lib/filters/simple/instance_var_filter.rb

@@ -5,23 +5,25 @@ module Tracing
         
     def initialize(options)
       super(options)    
-      # puts "create inst.var filter: #{options.inspect}"  
+      puts "create inst.var filter: #{options.inspect}"  
       @rules = options[:var_rules] || options[:vars_filter] || {}
       @var_name = options[:var_name]
+      @on_class = options[:class] || false
     end
 
     def allow_action(msg, context)
       puts "InstanceVarFilter.allow_action"
-      obj = context[:self]
-      puts "var_name: #{var_name}"
-      if var_name.kind_of?(Symbol) || var_name.kind_of?(String)
-        value = obj.instance_variable_get("@#{var_name}")      
-        puts "value: #{value}"
-        return name_allow_action(value)
-      else
-        puts "return default :yield"
-        :yield
-      end            
+      # obj = context[:self]
+      # obj = obj.class if @on_class      
+      # puts "var_name: #{var_name}"
+      # if var_name.kind_of?(Symbol) || var_name.kind_of?(String)
+      #   value = obj.instance_variable_get("@#{var_name}")      
+      #   puts "value: #{value}"
+      #   return name_allow_action(value)
+      # else
+      #   puts "return default :yield"
+      #   :yield
+      # end            
     end    
     
   end  

data/lib/templates/base_template.rb

@@ -1,5 +1,3 @@
-require 'templates/trace_output_handler'
-
 module Tracing 
   class BaseTemplate
     include Tracing::OutputHandler

data/lib/trace_calls/trace_calls.rb

@@ -1,5 +1,3 @@
-require 'trace_ext'
-
 module Tracing
   module TraceCalls
     

data/lib/trace_calls/trace_ext.rb

@@ -1,14 +1,6 @@
-require 'extensions/include'
-require 'appenders/include'
-require "templates/include"
-require 'output_handler/output_handler'
-require 'action_handler/action_handler'
-require 'filters/filter_use'
-require "duration"
-
 module Tracing
   module TraceExt
-    include Tracing::Filter::Exec
+    Tracing::Filter::Executor
 
     class << self
       attr_accessor :configuration

data/test/filters/simple/test_instancevar_filter.rb

@@ -10,6 +10,16 @@ InstanceVar_filter = {
   }
 }
 
+InstanceVar_filter2 = {
+  :name => 'check template path',
+  :var_name => 'template_path',
+  :var_rules => {
+    :include => [/taglib/], 
+    :exclude => [/rapid/],
+    :default => :exclude         
+  }
+}
+
 class Obj
   attr_accessor :template_path
   
@@ -20,30 +30,32 @@ end
 
 class TestInstanceVarFilter < Test::Unit::TestCase
 
-  def test_varfilter_hash_to_class
-    var_filter = InstanceVar_filter
-    result = var_filter.filter_class
-    assert_equal Tracing::InstanceVarFilter, result, "Should result in var filter"    
-  end
-
-  def test_varfilter_hash_to_class
-    var_filter = InstanceVar_filter
-    result = var_filter.create_filter
-    assert_equal Tracing::InstanceVarFilter, result.class, "Should result in var filter"    
-  end
-  
-  
-  def test_varfilter_from_hash
-    var_filter = InstanceVar_filter
-    config = {:filters => var_filter}    
-    result = config.filters
-    assert_equal Tracing::InstanceVarFilter, result.class, "Should result in var filter"    
-  end
+  # def test_varfilter_hash_to_class
+  #   var_filter = InstanceVar_filter
+  #   result = var_filter.filter_class
+  #   assert_equal Tracing::InstanceVarFilter, result, "Should result in var filter"    
+  # end
+  # 
+  # def test_varfilter_hash_to_class
+  #   var_filter = InstanceVar_filter
+  #   result = var_filter.create_filter
+  #   assert_equal Tracing::InstanceVarFilter, result.class, "Should result in var filter"    
+  # end
+  # 
+  # 
+  # def test_varfilter_from_hash
+  #   var_filter = InstanceVar_filter
+  #   config = {:filters => var_filter}    
+  #   result = config.filters
+  #   assert_equal Tracing::InstanceVarFilter, result.class, "Should result in var filter"    
+  # end
 
-  # see allow_action in InstanceVarFilter, refactor :yield, :include .. as return values!?
-  def test_varfilter__class_and_varmatch
-    var_filter = InstanceVar_filter
-    context = {:class_name => "Hobo::Dryml", :vars => {"template_path" => "a/taglib/x"}, :self => Obj.new("a/taglib/x") }.context
+  def test_varfilter__class_and_varmatch_2
+    var_filter = InstanceVar_filter2
+    obj = Obj.new("taglib")
+    
+    puts obj.inspect
+    context = {:class_name => "Hobo::Dryml", :vars => ["template_path"], :self => obj }.context
   
     options = {:filters => var_filter}    
     exec = Tracing::Filter::Executor.new(options)       
@@ -52,27 +64,40 @@ class TestInstanceVarFilter < Test::Unit::TestCase
     assert_equal true, result, "Filter should allow passage"    
   end
 
-  def test_varfilter__varnot_match
+
+  # see allow_action in InstanceVarFilter, refactor :yield, :include .. as return values!?
+  def test_varfilter__class_and_varmatch
     var_filter = InstanceVar_filter
+    context = {:class_name => "Hobo::Dryml", :vars => ["template_path"], :self => Obj.new("a/taglib/x") }.context
   
-    context = {:class_name => 'Blip::Blap', :vars => {"template_path" => "a/taglib/x"}, :self => Obj.new("taglib/x") }.context    
-    
-    puts "Context:" + context.inspect
-    
     options = {:filters => var_filter}    
     exec = Tracing::Filter::Executor.new(options)       
     result = exec.filters_allow?('msg', context)
-    assert_equal false, result, "Filter should NOT allow passage"    
-  end
-  
-  def test_varfilter__varexcluded
-    var_filter = InstanceVar_filter
-    context = {:class_name => 'Blip::Blap', :vars => {"template_path" => "a/taglib/x"}, :self => Obj.new("a/rapid_x") }.context  
-    
-    options = {:filters => var_filter}    
-    exec = Tracing::Filter::Executor.new(options)       
-    result = exec.filters_allow?('msg', context)
-    assert_equal false, result, "Filter should NOT allow passage"    
+
+    assert_equal true, result, "Filter should allow passage"    
   end
+
+  # def test_varfilter__varnot_match
+  #   var_filter = InstanceVar_filter
+  # 
+  #   context = {:class_name => 'Blip::Blap', :vars => ["template_path" => "a/taglib/x"], :self => Obj.new("taglib/x") }.context    
+  #   
+  #   puts "Context:" + context.inspect
+  #   
+  #   options = {:filters => var_filter}    
+  #   exec = Tracing::Filter::Executor.new(options)       
+  #   result = exec.filters_allow?('msg', context)
+  #   assert_equal false, result, "Filter should NOT allow passage"    
+  # end
+  # 
+  # def test_varfilter__varexcluded
+  #   var_filter = InstanceVar_filter
+  #   context = {:class_name => 'Blip::Blap', :vars => ["template_path" => "a/taglib/x"], :self => Obj.new("a/rapid_x") }.context  
+  #   
+  #   options = {:filters => var_filter}    
+  #   exec = Tracing::Filter::Executor.new(options)       
+  #   result = exec.filters_allow?('msg', context)
+  #   assert_equal false, result, "Filter should NOT allow passage"    
+  # end
               
 end

data/trace-util-adv.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{trace-util-adv}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2009-11-21}
+  s.date = %q{2009-11-22}
   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}
@@ -133,6 +133,7 @@ Gem::Specification.new do |s|
      "test/filters/simple/test_instancevar_filter.rb",
      "test/filters/simple/test_method_filter.rb",
      "test/filters/simple/test_module_filter.rb",
+     "test/listeners/test_listeners.rb",
      "test/samples/include.rb",
      "test/samples/sample_classes.rb",
      "test/samples/sample_composite_filters.rb",
@@ -159,11 +160,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_runtime_dependency(%q<require-magic>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<require-magic>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<require-magic>, [">= 0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: trace-util-adv
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-21 00:00:00 +01:00
+date: 2009-11-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.9
     version: 
+- !ruby/object:Gem::Dependency 
+  name: require-magic
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: |-
   
         Configure tracing using context sensitive filters, appenders, output templates in a completely non-intrusive fashion. 
@@ -171,6 +181,7 @@ test_files:
 - test/filters/simple/test_instancevar_filter.rb
 - test/filters/simple/test_method_filter.rb
 - test/filters/simple/test_module_filter.rb
+- test/listeners/test_listeners.rb
 - test/samples/include.rb
 - test/samples/sample_classes.rb
 - test/samples/sample_composite_filters.rb