loganb-scribble-client 0.0.3 → 0.0.4

data/History.txt

@@ -1,3 +1,7 @@
+== 0.0.4 2009-05-28
+
+* Contexts are now isolated into their own namespaces rather than overlap each other
+
 == 0.0.3 2009-05-28
 
 * Fixed an issue were SyslogClient barfs if no one is listening on the other end

data/lib/scribble-client.rb

@@ -6,5 +6,5 @@ Dir["#{File.dirname(__FILE__)}/scribble-client/**/*.rb"].sort.each { |lib|
 }
 
 module ScribbleClient
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/scribble-client/scribbler.rb

@@ -12,7 +12,7 @@ class Scribbler
       sequence_num = 0
       {
         :thuid => UUID.random_create.to_s,
-        :thseq => lambda { |ctx,evt|
+        :thseq => lambda { |evt|
           sequence_num += 1
         }
       }
@@ -35,15 +35,15 @@ class Scribbler
   def event(hash)
     result = {}
     #Merge data from the system-wide contexts
-    (self.class.process_context.apply_context result)
-    (self.class.thread_context.apply_context  result)
+    result[:procCtx] = self.class.process_context.apply_context
+    result[:thdCtx]  = self.class.thread_context.apply_context
 
     #Merge the contexts on this instance
-    @contexts.keys.reverse_each { |k|
-      ctx = @contexts[k]
-      ctx.apply_context result
+    @contexts.each_pair { |cname,ctx|
+      @contexts.delete(cname) if(ctx.empty?) #Automatically clears out useless contexts
+      result[cname] = ctx.apply_context
     }
-    (result.merge! hash)
+    result[:evt] = hash
     
     #21 == local5 facility, 6 == info priority
     @syslogger.syslog(21,6,result.to_json)
@@ -54,7 +54,7 @@ class Scribbler
   # If a block is supplied, the context is created for the duration of the block
   # and removed afterwards (in this case the method returns the result of the block).  
   #
-  def context(name = :default,&block)
+  def context(name = :def,&block)
     ctx = @contexts[name]
     if(ctx.nil?)
       delete_when_finished = true
@@ -81,7 +81,7 @@ class Scribbler
   def initialize(target,context = nil)
     @syslogger = SyslogClient.new(target)
     
-    @contexts = SequencedHash.new
+    @contexts = {}
     self.context.add(context) if context
   end
   
@@ -110,14 +110,18 @@ class Scribbler
       add(@init_proc.call) if(@init_proc)
     end
     
-    def apply_context(target_hash)
+    def apply_context()
+      ret = {}
       @contexts.each_pair { |k,v| 
-        unless (target_hash.key? k)
-          target_hash[k] = (v.is_a? Proc) ? (v.call target_hash,self) : v 
-        end
+        ret[k] = (v.is_a? Proc) ? (v.call self) : v 
       }
+      ret.empty? ? nil : ret
+    end
+    
+    def empty?
+      @contexts.empty?
     end
   end
-  
+    
   self.process_context
 end

data/scribble-client.gemspec

@@ -1,8 +1,8 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{scribble-client}
-  s.version = "0.0.3"
+  s.name = %q{loganb-scribble-client}
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Logan Bowers"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: loganb-scribble-client
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Logan Bowers
@@ -89,8 +89,10 @@ files:
 - script/generate
 - test/test_helper.rb
 - test/test_scribble_client.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://www.example.com/
+licenses: []
+
 post_install_message: PostInstall.txt
 rdoc_options: 
 - --main
@@ -112,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: scribble-client
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: FIX (describe your package)