prepor-ologger 0.1.3 → 0.1.5

data/Readme.rdoc

@@ -16,11 +16,23 @@
   
   # Configs  
   OLogger.path = Pathname('log/ologs')
+  OLogger.on_raise = lambda { |e| send_to_email(e) }
+
+  
   
   # In objects
   def start!(character)
     ologger "Starting project", character
   end
+
+  # For raise exceptions to object log
+  class A
+    # definitions
+
+    # AFTER definition
+    include OLogger::Raiser
+  end
+
 	
 
 

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.5

data/lib/ologger/raise_patch.rb

@@ -1,20 +1,18 @@
-class StandardError
-  attr_accessor :obj
-end
-module Kernel
-  def ologger_raise(*argv)
-    if Thread.current[:ologger_raiser]
-      argv.each do |e|
-        e.obj = self if e.is_a?(StandardError)
+module OLogger
+  module Raiser
+    def self.included(base)
+      base.instance_methods.each do |m| 
+        unless m =~ /^__|instance_eval|=|`/ 
+          base.class_eval %Q{def with_ologger_#{m}(*args, &block)
+            Thread.current[:ologger_raiser] = self
+            without_ologger_#{m}(*args, &block)
+          end
+          }
+          base.send :alias_method, :"without_ologger_#{m}", m
+          base.send :alias_method, m, :"with_ologger_#{m}"
+        end
       end
-      ologger_old_raise(*argv)
-    else
-      ologger_old_raise(*argv)
     end
   end
-
-  alias_method :ologger_old_raise, :raise
-  alias_method :raise, :ologger_raise
-
 end
 

data/lib/ologger.rb

@@ -61,7 +61,7 @@ module OLogger
     
     def get_logs(log_module)
       path = OLogger.path + log_module
-      path.entries.select { |v| not_self_and_parent v }.map{ |v| v.to_s.gsub /\.log$/, '' }
+      path.entries.select { |v| not_self_and_parent v }.map{ |v| v.to_s.gsub(/\.log$/, '') }
     end
     
     def parse_log_id(log_id)
@@ -86,17 +86,29 @@ module OLogger
     
     def enable(&block)      
       buffer.flush
-      Thread.current[:ologger_raiser] = true
       begin
         yield           
       rescue StandardError => e
-        e.obj.ologger "Exception:", :objs => [e, e.backtrace]
-        on_raise.call(e) if on_raise && on_raise.is_a?(Proc)
+        Thread.current[:ologger_raiser].ologger "Exception:", :objs => [e, e.backtrace] if Thread.current[:ologger_raiser]
+        if on_raise && on_raise.is_a?(Proc)
+          on_raise.call(e) 
+        else
+          raise e
+        end
       ensure
-        Thread.current[:ologger_raiser] = false
+        Thread.current[:ologger_raiser] = nil
         buffer.write
-      end      
+      end
     end
+
+    #def exception_message(e)
+      #params = { :objs => [e, e.backtrace] }
+      #if Thread.current[:ologger_raiser]
+        #params[:ologger_module] = Thread.current[:ologger_raiser].ologger_module
+        #params[:ologger_id] = Thread.current[:ologger_raiser].ologger_id
+      #end
+      #params
+    #end
     
     def filter(controller, &block)
       enable(&block)

data/ologger.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ologger}
-  s.version = "0.1.3"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrew Rudenko"]
-  s.date = %q{2009-09-14}
+  s.date = %q{2009-09-20}
   s.default_executable = %q{ologger}
   s.description = %q{}
   s.email = %q{ceo@prepor.ru}
@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
      "lib/ologger/parser.rb",
      "lib/ologger/raise_patch.rb",
      "lib/ologger/tags",
-     "memory",
      "ologger.gemspec",
      "test/test.rb",
      "test/test_helper.rb"

data/test/test.rb

@@ -42,11 +42,20 @@ describe OLogger do
       @obj.ologger 'hi!', @ar_obj
     end
     
-    it "should raise exceptions" do
-      mock(OLogger.buffer).add(hash_including(:message => "Exception:"))
+    #it "should raise exceptions" do
+      #mock(OLogger.buffer).add(hash_including(:message => "Exception:"))
+      #OLogger.enable do
+        #Foo.find(10)
+      #end
+    #end
+
+    it "should raise exceptions on right level" do
+      OLogger.on_raise = lambda { |e| 0 }
+      mock(OLogger.buffer).add(hash_including(:message => "Exception:", :logger_module => 'test', :logger_id => 'test'))
       OLogger.enable do
-        Foo.find(10)
+        A.new.foo
       end
+
     end
 
     describe "writing" do

data/test/test_helper.rb

@@ -21,4 +21,24 @@ Artester.def :game_logger do
       t.string :bar
     end
   end
-end
+end
+
+class A
+  def foo
+    B.new.bar
+  end
+
+  def ologger_module
+    'test'
+  end
+  def ologger_id
+    'test'
+  end
+  include OLogger::Raiser
+end
+
+class B
+  def bar
+    raise 'hehe'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: prepor-ologger
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors: 
 - Andrew Rudenko
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-14 00:00:00 -07:00
+date: 2009-09-20 00:00:00 -07:00
 default_executable: ologger
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,12 +53,12 @@ files:
 - lib/ologger/parser.rb
 - lib/ologger/raise_patch.rb
 - lib/ologger/tags
-- memory
 - ologger.gemspec
 - test/test.rb
 - test/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/prepor/olog
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Object separated logs