padrino-core 0.14.0 → 0.14.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40709f499ebbaa2e4cd92c62e2142eac2f9c2ab9
-  data.tar.gz: ff33963d9f849f0bd9676be85e58083c3b932f41
+  metadata.gz: 1b80477905af0fe0e47cc92b6640b1201ed1eb20
+  data.tar.gz: e26a1c08a6d15e86bcf3b6b971c35f31807c5f03
 SHA512:
-  metadata.gz: 057ae19651da64cc6b475f705bbe28f0990d38011883458f7caeec8ed1d2f34e66654e0f8d3da9e1e979757c493b57eaa1c7a21c78f5e20303040c9f8213e968
-  data.tar.gz: 0d2fdf09929e900e98a25a39dbfbfaa7cadf831c10b8a4ac7bc2d26c80ae840fb645d6b6a16abee3f764e1bafd60738bd354508a35830efd72746476b08536f3
+  metadata.gz: 48cdb4f628d9a552648ed7db7a161883c5f93958d10bcc3320c4e5486dab794d5db4db763dd11bd445dfb7deea1aa8e8c55db51d0c3e61ed3f6d0187f5972bda
+  data.tar.gz: 7a277cf330b2857c674fb099c39833bc1485402857487d14564f1584b20b0b82f1798c4a95bda165776e332b6087f892c7ab23abe3f004b1861caf8efad814c6

data/lib/padrino-core/logger.rb

@@ -313,8 +313,13 @@ module Padrino
     end
 
     def self.logger=(logger)
-      logger.extend(Padrino::Logger::Extensions)
-
+      unless logger.class.ancestors.include?(Padrino::Logger::Extensions)
+        warn <<-EOT
+WARNING! `Padrino.logger = new_logger` no longer extends it with #colorize! and other features.
+          To do it with a custom logger you have to manually `new_logger.extend(Padrino::Logger::Extensions)`
+          before passing to `Padrino.logger = new_logger`.
+        EOT
+      end
       @_logger = logger
     end
 
@@ -325,37 +330,37 @@ module Padrino
     #   A {Padrino::Logger} instance
     #
     def self.setup!
-      self.logger = begin
-        config_level = (PADRINO_LOG_LEVEL || Padrino.env || :test).to_sym # need this for PADRINO_LOG_LEVEL
-        config = Config[config_level]
+      config_level = (PADRINO_LOG_LEVEL || Padrino.env || :test).to_sym # need this for PADRINO_LOG_LEVEL
+      config = Config[config_level]
 
-        unless config
-          warn("No logging configuration for :#{config_level} found, falling back to :production")
-          config = Config[:production]
-        end
+      unless config
+        warn("No logging configuration for :#{config_level} found, falling back to :production")
+        config = Config[:production]
+      end
 
-        stream = case config[:stream]
-          when :to_file
-            if filename = config[:log_path]
-              filename = Padrino.root(filename) unless Pathname.new(filename).absolute?
-              if File.directory?(filename)
-                filename = File.join(filename, "#{Padrino.env}.log")
-              else
-                FileUtils.mkdir_p(File.dirname(filename))
-              end
-              File.new(filename, 'a+')
+      stream = case config[:stream]
+        when :to_file
+          if filename = config[:log_path]
+            filename = Padrino.root(filename) unless Pathname.new(filename).absolute?
+            if File.directory?(filename)
+              filename = File.join(filename, "#{Padrino.env}.log")
             else
-              FileUtils.mkdir_p(Padrino.root('log')) unless File.exist?(Padrino.root('log'))
-              File.new(Padrino.root('log', "#{Padrino.env}.log"), 'a+')
+              FileUtils.mkdir_p(File.dirname(filename))
             end
-          when :null   then StringIO.new
-          when :stdout then $stdout
-          when :stderr then $stderr
-          else config[:stream] # return itself, probabilly is a custom stream.
-        end
-
-        Padrino::Logger.new(config.merge(:stream => stream))
+            File.new(filename, 'a+')
+          else
+            FileUtils.mkdir_p(Padrino.root('log')) unless File.exist?(Padrino.root('log'))
+            File.new(Padrino.root('log', "#{Padrino.env}.log"), 'a+')
+          end
+        when :null   then StringIO.new
+        when :stdout then $stdout
+        when :stderr then $stderr
+        else config[:stream] # return itself, probabilly is a custom stream.
       end
+
+      new_logger = Padrino::Logger.new(config.merge(:stream => stream))
+      new_logger.extend(Padrino::Logger::Extensions)
+      self.logger = new_logger
     end
 
     ##

data/lib/padrino-core/version.rb

@@ -6,7 +6,7 @@
 #
 module Padrino
   # The version constant for the current version of Padrino.
-  VERSION = '0.14.0' unless defined?(Padrino::VERSION)
+  VERSION = '0.14.0.1' unless defined?(Padrino::VERSION)
 
   #
   # The current Padrino version.

data/test/test_logger.rb

@@ -196,7 +196,9 @@ describe "alternate logger" do
   before do
     @save_logger = Padrino.logger
     @log = StringIO.new
-    Padrino.logger = FancyLogger.new(@log)
+    new_logger = FancyLogger.new(@log)
+    new_logger.extend(Padrino::Logger::Extensions)
+    capture_io { Padrino.logger = new_logger }
   end
 
   after do
@@ -223,11 +225,34 @@ describe "alternate logger" do
   end
 end
 
+describe "binary logger" do
+  before do
+    @save_logger = Padrino.logger
+    @log = StringIO.new
+    new_logger = Logger.new(@log)
+    new_logger.formatter = proc do |_, _, _, message|
+      "#{message.size}"
+    end
+    capture_io { Padrino.logger = new_logger }
+  end
+
+  after do
+    Padrino.logger = @save_logger
+  end
+
+  it 'should not convert parameters to strings before formatting' do
+    logger.info({:a => 2})
+    assert_equal "1", @log.string
+  end
+end
+
 describe "alternate logger: stdlib logger" do
   before do
     @log = StringIO.new
     @save_logger = Padrino.logger
-    Padrino.logger = Logger.new(@log)
+    new_logger = Logger.new(@log)
+    new_logger.extend(Padrino::Logger::Extensions)
+    capture_io { Padrino.logger = new_logger }
   end
 
   after do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-core
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.0.1
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-support
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.14.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.14.0.1
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement