textutils 0.3.0 → 0.4.0

data/Rakefile

@@ -18,7 +18,7 @@ Hoe.spec 'textutils' do
   self.history_file = 'History.markdown'
 
   self.extra_deps = [
-    ['logutils', '~> 0.2.0']
+    ['logutils', '>= 0.3.0']
   ]
 
   self.licenses = ['Public Domain']

data/lib/textutils/reader/code_reader.rb

@@ -2,22 +2,19 @@
 
 class CodeReader
 
-  def initialize( logger=nil, path )
-    if logger.nil?
-      @logger = Logger.new(STDOUT)
-      @logger.level = Logger::INFO
-    else
-      @logger = logger
-    end
+  def logger
+    @logger ||= LogUtils[ self ]
+  end
 
-    @path  = path
+  def initialize( path )
+    @path   = path
 
     ## nb: assume/enfore utf-8 encoding (with or without BOM - byte order mark)
     ## - see worlddb/utils.rb
     
     @code  = File.read_utf8( @path )
   end
-  
+
   def eval( klass )
     klass.class_eval( @code )
 
@@ -29,6 +26,4 @@ class CodeReader
     # end
   end
 
-  attr_reader :logger
-
 end # class CodeReader

data/lib/textutils/reader/hash_reader.rb

@@ -3,14 +3,11 @@
 
 class HashReader
 
-  def initialize( logger=nil, path )
-    if logger.nil?
-      @logger = Logger.new(STDOUT)
-      @logger.level = Logger::INFO
-    else
-      @logger = logger
-    end
-    
+  def logger
+    @logger ||= LogUtils[ self ]
+  end
+
+  def initialize( path )
     @path = path
 
     ## nb: assume/enfore utf-8 encoding (with or without BOM - byte order mark)
@@ -34,7 +31,7 @@ class HashReader
     ## nb: yaml does NOT support tabs see why here -> yaml.org/faq.html
     
     text = text.gsub( "\t" ) do |_|
-      puts "*** warn: hash reader - found tab (\t) replacing w/ two spaces; yaml forbids tabs; see yaml.org/faq.html"
+      logger.warn "hash reader - found tab (\t) replacing w/ two spaces; yaml forbids tabs; see yaml.org/faq.html"
       '  '  # replace w/ two spaces
     end
 
@@ -44,7 +41,7 @@ class HashReader
     ##   no: no
 
     text = text.gsub( /^([ ]*)(ON|On|on|NO|No|no|N|n|Y|y)[ ]*:/ ) do |value|
-      puts "*** warn: hash reader - found implicit bool (#{$1}#{$2}) for key; adding quotes to turn into string; see yaml.org/refcard.html"
+      logger.warn "hash reader - found implicit bool (#{$1}#{$2}) for key; adding quotes to turn into string; see yaml.org/refcard.html"
       # nb: preserve leading spaces for structure - might be significant
       "#{$1}'#{$2}':"  # add quotes to turn it into a string (not bool e.g. true|false)
     end
@@ -54,16 +51,13 @@ class HashReader
     ##  key: nb,nn,no,se   => nb,nn,'no',se  -- avoid!!
 
     text = text.gsub( /:[ ]+(ON|On|on|NO|No|no|N|n|Y|y)[ ]*($| #.*$)/ ) do |value|
-      puts "*** warn: hash reader - found implicit bool (#{$1}) for value; adding quotes to turn into string; see yaml.org/refcard.html"
+      logger.warn "hash reader - found implicit bool (#{$1}) for value; adding quotes to turn into string; see yaml.org/refcard.html"
       ": '#{$1}'"  # add quotes to turn it into a string (not bool e.g. true|false)
     end
 
     
     @hash = YAML.load( text )
   end
-
-  attr_reader :logger
-  
   
   ###
   # nb: returns all values as strings
@@ -77,7 +71,7 @@ class HashReader
       key   = key_wild.to_s.strip
       value = value_wild.to_s.strip
       
-      puts "yaml key:#{key_wild.class.name} >>#{key}<<, value:#{value_wild.class.name} >>#{value}<<"
+      logger.debug "yaml key:#{key_wild.class.name} >>#{key}<<, value:#{value_wild.class.name} >>#{value}<<"
     
       yield( key, value )
     end
@@ -100,7 +94,7 @@ class HashReader
         value = value_wild
       end
       
-      puts "yaml key:#{key_wild.class.name} >>#{key}<<, value:#{value_wild.class.name} >>#{value}<<"
+      logger.debug "yaml key:#{key_wild.class.name} >>#{key}<<, value:#{value_wild.class.name} >>#{value}<<"
     
       yield( key, value )
     end

data/lib/textutils/reader/line_reader.rb

@@ -6,18 +6,13 @@
 
 class StringLineReader
 
-  def initialize( logger=nil, data )
-    if logger.nil?
-      @logger = Logger.new(STDOUT)
-      @logger.level = Logger::INFO
-    else
-      @logger = logger
-    end
-    
-    @data = data
+  def logger
+    @logger ||= LogUtils[ self ]
   end
 
-  attr_reader :logger
+  def initialize( data )
+    @data = data
+  end
 
 
   def each_line
@@ -47,14 +42,11 @@ end
 
 class LineReader
 
-  def initialize( logger=nil, path )
-    if logger.nil?
-      @logger = Logger.new(STDOUT)
-      @logger.level = Logger::INFO
-    else
-      @logger = logger
-    end
-    
+  def logger
+    @logger ||= LogUtils[ self ]
+  end
+
+  def initialize( path )
     @path = path
 
     ## nb: assume/enfore utf-8 encoding (with or without BOM - byte order mark)
@@ -62,9 +54,6 @@ class LineReader
     @data = File.read_utf8( @path )
   end
 
-  attr_reader :logger
-
-
   def each_line
     @data.each_line do |line|
   

data/lib/textutils/reader/values_reader.rb

@@ -2,15 +2,11 @@
 
 class ValuesReader
 
-  def initialize( logger, path, more_values={} )
-    ## todo: check - can we make logger=nil a default arg too?
-    if logger.nil?
-      @logger = Logger.new(STDOUT)
-      @logger.level = Logger::INFO
-    else
-      @logger = logger
-    end
-    
+  def logger
+    @logger ||= LogUtils[ self ]
+  end
+
+  def initialize( path, more_values={} )
     @path = path
 
     @more_values = more_values
@@ -18,8 +14,6 @@ class ValuesReader
     @data = File.read_utf8( @path )
   end
 
-  attr_reader :logger
-  
   def each_line
    
     @data.each_line do |line|
@@ -47,7 +41,7 @@ class ValuesReader
       
       line = line.strip
 
-      puts "line: >>#{line}<<"
+      logger.debug "line: >>#{line}<<"
 
       values = line.split(',')
       
@@ -60,14 +54,14 @@ class ValuesReader
       
       values = values.select do |value|
         if value =~ /^#/  ## start with # treat it as a comment column; e.g. remove it
-          puts "   removing column with value >>#{value}<<"
+          logger.debug "   removing column with value >>#{value}<<"
           false
         else
           true
         end
       end
       
-      puts "  values: >>#{values.join('<< >>')}<<"
+      logger.debug "  values: >>#{values.join('<< >>')}<<"
       
       
       ### todo/fix: allow check - do NOT allow mixed use of with key and w/o key
@@ -103,7 +97,7 @@ class ValuesReader
       if key_col == '<auto>'
         ## autogenerate key from first title
         key_col = title_to_key( titles[0] )
-        puts "   autogen key >#{key_col}< from title >#{titles[0]}<"
+        logger.debug "   autogen key >#{key_col}< from title >#{titles[0]}<"
       end
       
       attribs[ :key ] = key_col
@@ -171,5 +165,4 @@ class ValuesReader
       key
   end # method title_to_key
 
-  
 end # class ValuesReader

data/lib/textutils/version.rb

@@ -1,7 +1,7 @@
 
 module TextUtils
 
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 
 end   # module TextUtils
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: textutils
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-20 00:00:00 Z
+date: 2013-02-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: logutils
@@ -23,14 +23,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 19
         segments: 
         - 0
-        - 2
+        - 3
         - 0
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency