hanami-utils 1.2.0.rc1 → 1.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86da2fce7ef69bfbd91366caa3abcc403dcacbf581fca38eb3b242f4dcbca5e7
-  data.tar.gz: 34213163f0aff44ee06516a4ceb7fdcbe96802a4b101a1bb5c45b6220c8e8736
+  metadata.gz: bf90917997534d92623b70db435517bd1f209f2225ccd749877f27dcff9037c8
+  data.tar.gz: cdb5703c3d960dda031f075039b5fe2d295611868795b1723d3433a8aaf06b51
 SHA512:
-  metadata.gz: 607969cb2bc3673ef48a15102342409b5e383433c55dc39543f51dd4436e384f56050e8d48be9defddba15d2933644d001c59ce6863bffd203f020a58b34753d
-  data.tar.gz: c9374f9627a418002d7753536025f9b3724cfea6fb18a77344ccdfcc0a8d94375cf26c687fd8d91edda8fb036b75d7dda16674785260f37a8507672d62935a9c
+  metadata.gz: 8be115da3e0bf2c9fcab0f7fd98b662afba7681dd1b3e44a9916ed4d59ca686a9176fe9856098df8d0d0fd5ea9d904837058f66ca5f66be571f25dfc4746998b
+  data.tar.gz: fa533c2d40d70758bc97bb027a886bc270f9190e09a077961e67e9d96b6f4dba3d2b6f97cd2b79a9a1a91003b3eb6cc46d6cfe2326b21e21bd95b12c53fd3f64

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Hanami::Utils
 Ruby core extentions and class utilities for Hanami
 
+## v1.2.0.rc2 - 2018-04-06
+### Added
+- [Luca Guidi] Use different colors for each `Hanami::Logger` level
+
 ## v1.2.0.rc1 - 2018-03-30
 ### Added
 - [Oana Sipos & Sean Collins & Luca Guidi] Colored logging

data/lib/hanami/interactor.rb

@@ -119,8 +119,8 @@ module Hanami
 
       # @since 0.3.5
       # @api private
-      def method_missing(m, *)
-        @payload.fetch(m) { super }
+      def method_missing(method_name, *)
+        @payload.fetch(method_name) { super }
       end
 
       # @since 0.3.5

data/lib/hanami/logger.rb

@@ -140,6 +140,17 @@ module Hanami
       "unknown" => UNKNOWN
     ].freeze
 
+    # @since 1.2.0
+    # @api private
+    def self.level(level)
+      case level
+      when DEBUG..UNKNOWN
+        level
+      else
+        LEVELS.fetch(level.to_s.downcase, DEBUG)
+      end
+    end
+
     # @since 0.5.0
     # @api private
     attr_writer :application_name
@@ -329,12 +340,7 @@ module Hanami
     # @since 0.8.0
     # @api private
     def _level(level)
-      case level
-      when DEBUG..UNKNOWN
-        level
-      else
-        LEVELS.fetch(level.to_s.downcase, DEBUG)
-      end
+      self.class.level(level)
     end
 
     # @since 1.2.0

data/lib/hanami/logger/colorizer.rb

@@ -52,18 +52,26 @@ module Hanami
 
       private
 
-      # The colors defined for the four parts of the log message
-      #
-      # These can be overridden, keeping the name keys, with acceptable values
-      # being any from Hanami::Utils::ShellColor::COLORS
+      # The colors defined for the three parts of the log message
       #
       # @since 1.2.0
+      # @api private
       COLORS = ::Hash[
         app:      :blue,
-        severity: :magenta,
         datetime: :cyan,
       ].freeze
 
+      # @since 1.2.0
+      # @api private
+      LEVELS = ::Hash[
+        Hanami::Logger::DEBUG   => :cyan,
+        Hanami::Logger::INFO    => :magenta,
+        Hanami::Logger::WARN    => :yellow,
+        Hanami::Logger::ERROR   => :red,
+        Hanami::Logger::FATAL   => :red,
+        Hanami::Logger::UNKNOWN => :blue,
+      ].freeze
+
       attr_reader :colors
 
       # @since 1.2.0
@@ -75,7 +83,8 @@ module Hanami
       # @since 1.2.0
       # @api private
       def severity(input)
-        colorize(input, color: colors.fetch(:severity, nil))
+        color = LEVELS.fetch(Hanami::Logger.level(input), :gray)
+        colorize(input, color: color)
       end
 
       # @since 1.2.0

data/lib/hanami/utils/files.rb

@@ -29,7 +29,7 @@ module Hanami
       # @since 1.1.0
       def self.write(path, *content)
         mkdir_p(path)
-        open(path, ::File::CREAT | ::File::WRONLY | ::File::TRUNC, *content)
+        open(path, ::File::CREAT | ::File::WRONLY | ::File::TRUNC, *content) # rubocop:disable Security/Open - this isn't a call to `::Kernel.open`, but to `self.open`
       end
 
       # Rewrites the contents of an existing file.

data/lib/hanami/utils/hash.rb

@@ -253,7 +253,7 @@ module Hanami
       #   hash.keys    # => [:a, :b]
       #   hash.inspect # => { :a => 23, :b => { 'c' => ["x", "y", "z"] } }
       def symbolize!
-        keys.each do |k| # rubocop:disable Performance/HashEachMethods (this breaks the build)
+        keys.each do |k|
           v = delete(k)
           self[k.to_sym] = v
         end
@@ -276,7 +276,7 @@ module Hanami
       #   hash.keys    # => [:a, :b]
       #   hash.inspect # => {:a=>23, :b=>{:c=>["x", "y", "z"]}}
       def deep_symbolize!
-        keys.each do |k| # rubocop:disable Performance/HashEachMethods (this breaks the build)
+        keys.each do |k|
           v = delete(k)
           v = self.class.new(v).deep_symbolize! if v.respond_to?(:to_hash)
 
@@ -301,7 +301,7 @@ module Hanami
       #   hash.keys    # => [:a, :b]
       #   hash.inspect # => {"a"=>23, "b"=>{"c"=>["x", "y", "z"]}}
       def stringify!
-        keys.each do |k| # rubocop:disable Performance/HashEachMethods (this breaks the build)
+        keys.each do |k|
           v = delete(k)
           v = self.class.new(v).stringify! if v.respond_to?(:to_hash)
 
@@ -490,10 +490,10 @@ module Hanami
       # @since 0.3.0
       #
       # @raise [NoMethodError] If doesn't respond to the given method
-      def method_missing(m, *args, &blk)
-        raise NoMethodError.new(%(undefined method `#{m}' for #{@hash}:#{self.class})) unless respond_to?(m)
+      def method_missing(method_name, *args, &blk)
+        raise NoMethodError.new(%(undefined method `#{method_name}' for #{@hash}:#{self.class})) unless respond_to?(method_name)
 
-        h = @hash.__send__(m, *args, &blk)
+        h = @hash.__send__(method_name, *args, &blk)
         h = self.class.new(h) if h.is_a?(::Hash)
         h
       end
@@ -502,8 +502,8 @@ module Hanami
       #
       # @api private
       # @since 0.3.0
-      def respond_to_missing?(m, include_private = false)
-        @hash.respond_to?(m, include_private)
+      def respond_to_missing?(method_name, include_private = false)
+        @hash.respond_to?(method_name, include_private)
       end
     end
     # rubocop:enable ClassLength

data/lib/hanami/utils/string.rb

@@ -160,8 +160,8 @@ module Hanami
       #
       # @since 1.1.0
       # @api private
-      def self.bind(value, binding, fn)
-        binding.instance_exec(value, &fn)
+      def self.bind(value, binding, fun)
+        binding.instance_exec(value, &fun)
       end
 
       # Return a titleized version of the string
@@ -709,10 +709,10 @@ module Hanami
       # @since 0.3.0
       #
       # @raise [NoMethodError] If doesn't respond to the given method
-      def method_missing(m, *args, &blk)
-        raise NoMethodError.new(%(undefined method `#{m}' for "#{@string}":#{self.class})) unless respond_to?(m)
+      def method_missing(method_name, *args, &blk)
+        raise NoMethodError.new(%(undefined method `#{method_name}' for "#{@string}":#{self.class})) unless respond_to?(method_name)
 
-        s = @string.__send__(m, *args, &blk)
+        s = @string.__send__(method_name, *args, &blk)
         s = self.class.new(s) if s.is_a?(::String)
         s
       end
@@ -721,8 +721,8 @@ module Hanami
       #
       # @api private
       # @since 0.3.0
-      def respond_to_missing?(m, include_private = false)
-        @string.respond_to?(m, include_private)
+      def respond_to_missing?(method_name, include_private = false)
+        @string.respond_to?(method_name, include_private)
       end
     end
   end

data/lib/hanami/utils/version.rb

@@ -3,6 +3,6 @@ module Hanami
     # Defines the version
     #
     # @since 0.1.0
-    VERSION = '1.2.0.rc1'.freeze
+    VERSION = '1.2.0.rc2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-utils
 version: !ruby/object:Gem::Version
-  version: 1.2.0.rc1
+  version: 1.2.0.rc2
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2018-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: transproc
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby core extentions and Hanami utilities