tee_logger 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fac48b2aa959b362ac7fa364c0a343a2f1588616
-  data.tar.gz: d14d1e2b0458879b5ddcbd11ae59a9514d29c2e5
+  metadata.gz: 7a6bbfeaad4ce3cc439f815a4d72468ea056dd47
+  data.tar.gz: 9a559bcaa02d344745ba5ec2d0f3f2fc397dde92
 SHA512:
-  metadata.gz: 61e4ff27817c8717f338f38a01500c08041a32dbb0243d40c1dc2211be28b4f8638f38b692c9cd3d9ee0747129b1b8b2d59950b1522afebf24b887e0c042fe40
-  data.tar.gz: fda1d7ffb55beeecc1bca0241005a40d59adabdc92e1116dcc3939465e1f8959d89ab8ea695dfcde102c53183bcda096ba97d0806ddf3ab0f63df1614fcdce16
+  metadata.gz: d8e217bda8ad154e33bb6e819e1b563c1b0d15026be829651b2b8c66bd13d3d50ada1581c50e8bf4629df76b606df4ebe59347bd161ca23090ee6082403cca17
+  data.tar.gz: 64a1db311741ce7907741c68fa7016fc8391c864fdfb295f5c70b7f73a586ff29d4707e012040323e6e0a9bfd2e2263196c3ed486f4d48901c598ee5a7cbf3a3

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v3.0.1
+- refactoring for [issue #9](https://github.com/k-ta-yamada/tee_logger/issues/9)
+
 # v3.0.0
 - [issue #4](https://github.com/k-ta-yamada/tee_logger/issues/4)
   logging method's parametrer disabling_target change to enabling_targe

data/README.md

@@ -4,7 +4,7 @@
 [![Test Coverage](https://codeclimate.com/github/k-ta-yamada/tee_logger/badges/coverage.svg)](https://codeclimate.com/github/k-ta-yamada/tee_logger/coverage)
 
 > Sorry. In from version 2 to version 3, changed usage.
-> see also [CHANGELOG.md](/CHANGELOG.md#v300).
+> see also [CHANGELOG.md](https://github.com/k-ta-yamada/tee_logger/blob/master/CHANGELOG.md).
 
 - [Rubygems.org](https://rubygems.org/gems/tee_logger)
 - [GitHub](https://github.com/k-ta-yamada/tee_logger)

data/lib/tee_logger.rb

@@ -20,25 +20,21 @@ module TeeLogger
   class TeeLogger
     class << self
       # @!macro [attach] logging_methods
-      #   @!method $1(progname = nil, disabling_target = nil, &block)
+      #   @!method $1(progname = nil, *options, &block)
       #   logging $1 level message.
       #   @param progname see also Logger
-      #   @param disabling_target (Symbol) valid values => [:console, :logfile]
+      #   @param options [Array]
+      #   @option options [Fixnum] indent_level
+      #   @option options [Symbol] enabling_target
+      #                            valid values => [:console, :logfile]
       #   @param &block see also Logger
       #   @return true
       #   @see Logger
       def define_logging_methods(name)
         define_method(name) do |progname = nil, *options, &block|
-          opts = parse_to_hash_from(options)
-
-          disabling_target = reverse_target(opts[:enabling_target])
-          progname, block  = indentation(progname, block, opts[:indent_level])
-
-          if disabling_target.nil?
-            logging(name, progname, &block)
-          else
-            disable(disabling_target) { logging(name, progname, &block) }
-          end
+          logdev_name, indent_level = extract_options(options).values
+          progname, block = indentation(progname, block, indent_level)
+          logging(name, progname, logdev_name, &block)
         end
       end
       private :define_logging_methods
@@ -124,9 +120,13 @@ module TeeLogger
 
     private
 
-    def logging(name, progname, &block)
-      @console.send(name, progname, &block)
-      @logfile.send(name, progname, &block)
+    def logging(name, progname, logdev_name = nil, &block)
+      if logdev_name
+        disable(logdev_name) { logging(name, progname, &block) }
+      else
+        @console.send(name, progname, &block)
+        @logfile.send(name, progname, &block)
+      end
     end
   end
 end

data/lib/tee_logger/utils.rb

@@ -2,32 +2,29 @@
 module TeeLogger
   # util
   module Utils
+    # LOGDEV_NAMES not incuded error
     class IncorrectNameError < StandardError; end
-
+    #
+    class IncorrectOptionError < StandardError; end
+    # using private method #parse_to_hash
+    ParsedOption = Struct.new(:logdev_name, :indent_level)
     # defined log devices names
-    LOGDEVS = %i(console logfile)
+    LOGDEV_NAMES = [:console, :logfile]
+    # defined reverse names
+    LOGDEV_REVERSE = { console: :logfile, logfile: :console }
 
     private
 
-    def parse_to_hash_from(options)
-      result = { enabling_target: nil, indent_level: 0 }
-      options.each_with_object(result) do |val, obj|
-        if val.is_a?(Symbol)
-          correct_name?(val)
-          obj[:enabling_target] = LOGDEVS.include?(val) ? val : nil
-        elsif val.is_a?(Fixnum)
-          obj[:indent_level] = val
+    def extract_options(options)
+      options.each_with_object(ParsedOption.new(nil, 0)) do |val, obj|
+        case val
+        when Symbol then obj.logdev_name = name_reverse(val)
+        when Fixnum then obj.indent_level = val
+        else incorrect_option_error(val)
         end
       end
     end
 
-    def reverse_target(logdev_name)
-      case logdev_name
-      when :console then :logfile
-      when :logfile then :console
-      end
-    end
-
     def indentation(progname, block, indent_level)
       if block.nil?
         progname = "#{' ' * indent_level}#{formatting(progname)}"
@@ -39,22 +36,30 @@ module TeeLogger
     end
 
     def formatting(val)
-      if val.is_a?(Symbol)
-        ":#{val}"
-      elsif val.nil?
-        'nil'
-      else
-        val
+      case val
+      when Symbol then ":#{val}"
+      when nil    then 'nil'
+      else val
       end
     end
 
-    def correct_name?(logdev_name)
-      if LOGDEVS.include?(logdev_name)
-        true
-      else
-        fail IncorrectNameError,
-             "logdev_name=[:#{logdev_name}]:logdev_name is :console or :logfile"
-      end
+    def name_reverse(val)
+      correct_name?(val)
+      LOGDEV_REVERSE[val]
+    end
+
+    def correct_name?(name)
+      LOGDEV_NAMES.include?(name) ? true : incorrect_name_error(name)
+    end
+
+    def incorrect_name_error(name)
+      fail IncorrectNameError,
+           "logdev_name is :console or :logfile. logdev_name=[:#{name}]"
+    end
+
+    def incorrect_option_error(val)
+      fail IncorrectOptionError,
+           "option params is Symbol or Fixnum. class=[#{val.class}]"
     end
 
     def logdev_instance(logdev_name)

data/lib/tee_logger/version.rb

@@ -1,5 +1,5 @@
 # namespace
 module TeeLogger
   # version number
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tee_logger
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - k-ta-yamada
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler