lamian 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c25553f88b3b5fc9b4a29a6e851f099e3c8384d
-  data.tar.gz: 033dbf2949a2b4a495311756fed3c4acbefceac3
+  metadata.gz: af55048dfae57a8cb4c142cc91a3e184a840df54
+  data.tar.gz: 259f504ea8d043659adfa66a736974e6f1c0d344
 SHA512:
-  metadata.gz: 037040f26b0fda2927d85b2351b7b944b7fa4b404fee7e4a9792bfaf039cffa44380d37e0297f98446fbbb000a9894c657a19ae161d87b6ea04ef54506f7df2b
-  data.tar.gz: 6155210a40ccbfb2764186d1fb36b2d96d73dcb9f09082ef95b75212fc8b79a71ca55f514a931039adcee36e587305ad188a10aef99345e300cd6657b9303ba0
+  metadata.gz: 605dcc50b3472cd341dd9ea3f8aceae8a0c180679f19bf86189d1c02783d61eba98ef6ce7096cf25851de11bbfb5137633e3cd544793bf5999d388dafc73e949
+  data.tar.gz: a5b1b27b04d6bcb2a184c8a4acb4e1dec2f2f99f650fb605ca5e7c49e57ad408c23fc9cda35dbdd013d24d780021520bc056b734549ae65ab2ffecb14246fa90

data/lib/lamian.rb

@@ -25,20 +25,12 @@ module Lamian
       Lamian::Logger.current
     end
 
-    def start(&block)
-      logger.start(&block)
+    def run
+      logger.run { yield }
     end
 
-    def reset
-      logger.reset
-    end
-
-    def dump(*args, &block)
-      logger.dump(*args, &block)
-    end
-
-    def stop
-      logger.stop
+    def dump
+      logger.dump
     end
   end
 end

data/lib/lamian/config.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'logger'
 
 module Lamian

data/lib/lamian/engine.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rails'
 require 'exception_notification'
 require 'exception_notification/rails'

data/lib/lamian/logger.rb

@@ -8,60 +8,50 @@ module Lamian
       Thread.current[:__lamian_logger] ||= new
     end
 
-    def initialize(running = false)
-      self.running = running
+    def initialize
       self.level = 0
-      reset
+      self.logdevs = []
+      self.formatter = Lamian.config.formatter
     end
 
-    def start
-      if block_given?
-        run_with_separate_logdev { yield }
-      else
-        reset
-        self.running = true
-      end
+    def run
+      push_logdev(StringIO.new)
+      yield
+    ensure
+      pop_logdev
     end
 
-    def reset
-      self.logdev = StringIO.new
+    def add(*args, &block)
+      each_logdev { super(*args, &block) }
     end
 
     def dump(format: nil)
-      result = block_given? ? run_with_separate_logdev { yield } : logdev.string.dup
-      format ? prepare_output(format, result) : result
+      result = logdevs[-1].string.dup
+      formatter ? apply_format(format, result) : result
     end
 
-    def stop
-      self.running = false
-      dump
-    end
+    private
 
-    def add(*)
-      return unless running?
-      self.formatter = Lamian.config.formatter
-      super
-    end
+    attr_accessor :level, :logdevs, :formatter
 
-    private
+    def apply_format(_format, result)
+      result.gsub!(/\[\d{1,2}m/)
+      result
+    end
 
-    def prepare_output(_format, text)
-      text.gsub!(/\[\d{1,2}m/, '')
-      text
+    def push_logdev(logdev)
+      logdevs << logdev
     end
 
-    attr_accessor :running, :logdev, :level, :formatter
-    alias running? running
+    def pop_logdev
+      logdevs.pop
+    end
 
-    def run_with_separate_logdev
-      old_logdev = logdev
-      old_running = running?
-      start
-      yield
-      stop
-    ensure
-      self.logdev = old_logdev
-      self.running = old_running
+    def each_logdev
+      logdevs.each do |logdev|
+        @logdev = logdev
+        yield
+      end
     end
   end
 end

data/lib/lamian/middleware.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Lamian
   class Middleware
     def initialize(app)
@@ -5,9 +6,7 @@ module Lamian
     end
 
     def call(env)
-      result = []
-      Lamian.start { result = app.call(env) }
-      result
+      Lamian.run { app.call(env) }
     end
 
     private

data/lib/lamian/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Lamian
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lamian
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - JelF
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-21 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 description: Add logs to your error messages, using exception_notifier or smth like
   it
 email:
@@ -149,4 +163,3 @@ signing_key:
 specification_version: 4
 summary: Add logs to your error messages
 test_files: []
-has_rdoc: