carbolic 0.1.1 → 0.1.2

data/lib/carbolic.rb

@@ -2,13 +2,42 @@
 
 # file: carbolic.rb
 
-require 'builder'
+require 'rexle-builder'
+require 'rexle'
+
+class Items
+
+  attr_reader :names
+  
+  def initialize()
+    @names = []
+  end
+
+  def trace(name)
+    @names << name
+  end
+end
+
 
 class Carbolic
 
   def initialize(obj)
     carbolic(obj)
   end
+  
+  def self.log(log="this_daily.log")
+    $carbolic_log = Logger.new(log, 'daily')
+    $carbolic_log2 = File.open('trace.txt','w')
+
+    items = Items.new
+    yield items
+    a = items.names
+    c = "def initialize() \
+      Carbolic.new(self) if #{a.inspect}.include? self.class.to_s end
+      def self.empty?() end"
+    Object.class_eval c
+  end
+
 
   private
 
@@ -24,9 +53,12 @@ class Carbolic
 
     h = Hash[*a.flatten(1)]
     File.open("class_#{h[:class]}.xml",'w'){|f| f.write store(a)}    
-
+    
+    
     obj.instance_eval(){
 
+      require 'rexle-builder'
+    
       def x_inspect(x)
         if x.respond_to? :to_s
           (x.inspect.length < 150 ? x.inspect : x.inspect[0..145] + '...')
@@ -35,21 +67,74 @@ class Carbolic
         end
       end
 
-      def log_method(a=[], vars=[], args=[]) 
-        label_vars = vars.map{|x| "%s: %s" % [x,x_inspect(self.instance_variable_get(x))]}
+      def log_method(a=[], vars=[], raw_args=[])
+        instance_vars = vars.map{|x| [x,x_inspect(self.instance_variable_get(x))]}
+        label_vars = instance_vars.map{|x| "%s: %s" % x}
         line = "%s, in, %s, " % [self.class, (a + label_vars).flatten.join(', ')]
-        basic_args = args.map do |x| 
-          x.class.to_s[/Float|Fixnum|String|Array/] ? ("%s: %s" % [x.class, x_inspect(x)]) : nil
-        end
-        basic_args.compact!
+    
+        ffsa_args = raw_args.select {|x| x.class.to_s[/Float|Fixnum|String|Array|TrueClass|FalseClass/] }            
+        args = ffsa_args.map{|x| [x.class.to_s, x_inspect(x)]}
+        basic_args = args.map {|x| "%s: %s" % x}
+
         $carbolic_log.debug line << basic_args.join(', ')
+        $carbolic_log2.write ",['call','',{},"
+        $carbolic_log2.write info_in(self.class, a, instance_vars, args)
+        #$carbolic_log2.add Rexle.new()
+        $carbolic_log2.write ", ['calls', '', {}"
         r = yield
+        $carbolic_log2.write "],"
         label_vars = vars.map{|x| "%s: %s, " % [x,x_inspect(self.instance_variable_get(x))]}
         line = "%s, out, %s, " % [self.class, ([a.first] + label_vars).flatten.join(', ')]
-        line << "%s: %s" % [r.class, x_inspect(r)] if r.class.to_s[/Float|Fixnum|String|Array/] 
+        rval = r.class.to_s[/Float|Fixnum|String|Array|TrueClass|FalseClass/] ? [r.class.to_s, x_inspect(r)] : nil
+        line << "%s: %s" % rval if rval
         $carbolic_log.debug line
+        
+        $carbolic_log2.write info_out(self.class, a.first, instance_vars, rval)
+        $carbolic_log2.write "]"
+        
         r
       end
+    
+      def info_in(class_name, origins=[], instance_vars=[], args=[])
+
+        xml = RexleBuilder.new
+        a = xml.in do
+          xml.class_name class_name.to_s
+          xml.origins do
+            origins.each do |x|
+              xml.origin x
+            end
+          end
+          xml.instance_vars do
+            instance_vars.each do |x|
+              xml.send x[0].to_s.sub('@',''), x[1].to_s.gsub('"','')
+            end
+          end
+          xml.args do
+            args.each do |x|
+              xml.send x[0].downcase.sub(/:"/,''), x[1].to_s.gsub('"','')
+            end 
+          end
+        end
+
+        a
+      end
+
+      def info_out(class_name, origin, instance_vars=[], r)
+        xml = RexleBuilder.new
+        a = xml.out do
+          xml.class_name class_name.to_s
+          xml.origin origin
+          xml.instance_vars do
+            instance_vars.each do |x|
+              xml.send x[0].to_s.sub('@',''), x[1].to_s.gsub('"','')
+            end
+          end
+          xml.send r[0].downcase.sub(':',''), r[1].to_s.gsub('"','') if r
+        end
+
+        a
+      end  
     }
     
     methodx = []    
@@ -66,15 +151,13 @@ class Carbolic
     end
     obj.instance_eval(methodx.join("\n"))
 
-  end
+  end  
 
   def store(a)
 
     a.map!{|label, value| [label, value.is_a?(Array) ? value.sort.join(', ') : value.to_s]}
 
-    xml = Builder::XmlMarkup.new( :target => buffer='', :indent => 2 )
-    xml.instruct! :xml, :version => "1.0", :encoding => "UTF-8"
-
+    xml = RexleBuilder.new
     xml.class_info do
       xml.summary do
         a.each {|label, val| xml.send(label.to_s + 'x', val) }
@@ -82,7 +165,7 @@ class Carbolic
       xml.records
     end
 
-    buffer.gsub('x>','>')  
+    Rexle.new(xml.to_a).xml pretty: true
   end
 
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: carbolic
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  prerelease: 
+  version: 0.1.2
 platform: ruby
-authors: []
-
+authors: 
+- James Robertson
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-06-20 00:00:00 +01:00
+date: 2011-09-14 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -33,21 +34,21 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: carbolic