textutils 0.6.5 → 0.6.6

data/lib/textutils/reader/line_reader.rb

@@ -41,6 +41,49 @@ class StringLineReader
 end
 
 
+class LineReaderV2
+  include LogUtils::Logging
+
+  def initialize( name, include_path )
+    @name          = name
+    @include_path  = include_path
+    
+    # map name to name_real_path
+    #   name might include !/ for virtual path (gets cut off)
+    #   e.g. at-austria!/w-wien/beers becomse w-wien/beers
+
+    pos = @name.index( '!/')
+    if pos.nil?
+      @name_real_path = @name   # not found; real path is the same as name
+    else
+      # cut off everything until !/ e.g.
+      #   at-austria!/w-wien/beers becomes
+      #   w-wien/beers
+      @name_real_path = @name[ (pos+2)..-1 ]
+    end
+  end
+
+  attr_reader :name
+  attr_reader :name_real_path
+  attr_reader :include_path
+
+  def each_line
+    path          = "#{include_path}/#{name_real_path}.txt"
+    reader        = LineReader.new( path )
+
+    logger.info "parsing data '#{name}' (#{path})..."
+
+    reader.each_line do |line|
+      yield( line )
+    end
+
+    ## fix: move Prop table to props gem - why? why not??
+    WorldDb::Models::Prop.create_from_fixture!( name, path )
+  end
+
+end # class LineReaderV2
+
+
 class LineReader
 
   include LogUtils::Logging
@@ -55,8 +98,13 @@ class LineReader
 
   def each_line
     @data.each_line do |line|
-  
-      if line =~ /^\s*#/
+
+      # comments allow:
+      # 1) #####  (shell/ruby style)
+      # 2) --  comment here (haskel/?? style)
+      # 3) % comment here (tex/latex style)
+
+      if line =~ /^\s*#/ || line =~ /^\s*--/ || line =~ /^\s*%/
         # skip komments and do NOT copy to result (keep comments secret!)
         logger.debug 'skipping comment line'
         next
@@ -68,7 +116,14 @@ class LineReader
         next
       end
 
-      # remove leading and trailing whitespace
+      # pass 1) remove possible trailing eol comment
+      ##  e.g    -> nyc, New York   # Sample EOL Comment Here (with or without commas,,,,)
+      ## becomes -> nyc, New York
+
+      line = line.sub( /\s+#.+$/, '' )
+
+      # pass 2) remove leading and trailing whitespace
+      
       line = line.strip
  
       yield( line )

data/lib/textutils/version.rb

@@ -1,6 +1,6 @@
 
 module TextUtils
 
-  VERSION = '0.6.5'
+  VERSION = '0.6.6'
 
 end   # module TextUtils

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textutils
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000Z
+date: 2013-06-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &18184884 !ruby/object:Gem::Requirement
+  requirement: &16771836 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *18184884
+  version_requirements: *16771836
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &18183684 !ruby/object:Gem::Requirement
+  requirement: &16771092 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *18183684
+  version_requirements: *16771092
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &18183096 !ruby/object:Gem::Requirement
+  requirement: &16770396 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '3.6'
   type: :development
   prerelease: false
-  version_requirements: *18183096
+  version_requirements: *16770396
 description: textutils - Text Filters, Helpers, Readers and More
 email: webslideshow@googlegroups.com
 executables: []