textutils 0.6.2 → 0.6.3

data/lib/textutils/reader/hash_reader.rb

@@ -12,13 +12,28 @@ class HashReaderV2
   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
-    path          = "#{include_path}/#{name}.yml"
+    path          = "#{include_path}/#{name_real_path}.yml"
     reader        = HashReader.new( path )
 
     logger.info "parsing data '#{name}' (#{path})..."

data/lib/textutils/reader/values_reader.rb

@@ -11,14 +11,29 @@ class ValuesReaderV2
     @name          = name
     @include_path  = include_path
     @more_attribs  = more_attribs
+    
+    # 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
   attr_reader :more_attribs
 
   def each_line
-    path          = "#{include_path}/#{name}.txt"
+    path          = "#{include_path}/#{name_real_path}.txt"
     reader        = ValuesReader.new( path, more_attribs )
 
     logger.info "parsing data '#{name}' (#{path})..."

data/lib/textutils/version.rb

@@ -1,6 +1,6 @@
 
 module TextUtils
 
-  VERSION = '0.6.2'
+  VERSION = '0.6.3'
 
 end   # module TextUtils

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textutils
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &77968240 !ruby/object:Gem::Requirement
+  requirement: &77627020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *77968240
+  version_requirements: *77627020
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &77968020 !ruby/object:Gem::Requirement
+  requirement: &77626800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *77968020
+  version_requirements: *77626800
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &77967800 !ruby/object:Gem::Requirement
+  requirement: &77626580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *77967800
+  version_requirements: *77626580
 description: textutils - Text Filters, Helpers, Readers and More
 email: webslideshow@googlegroups.com
 executables: []