textutils 0.9.6 → 0.9.7

data/lib/textutils/reader/fixture_reader.rb

@@ -13,16 +13,15 @@ class FixtureReader
   include LogUtils::Logging
 
 
-  def self.from_zip( zip_file, name )
+  def self.from_zip( zip_file, entry_path )
+    entry = zip_file.find_entry( entry_path )
 
-    ## fix: check if name ends in .txt ?? if not add .txt
-    ##  change name to path ?? e.g. make it required to pass in full entry path??
-    ### fix -fix -fix => change name to path
+    ## todo/fix: add force encoding to utf-8 ??
+    ##  check!!!
+    ##  clean/prepprocess lines
+    ##  e.g. CR/LF (/r/n) to LF (e.g. /n)
+    text = entry.get_input_stream().read()
 
-    path = name.end_with?('.txt') ? name : "#{name}.txt"
-
-    ## get text content from zip
-    text = zip_file.read( path )
     self.from_string( text )
   end
 

data/lib/textutils/reader/values_reader.rb

@@ -10,30 +10,16 @@ class ValuesReader
   include TextUtils::ValueHelper # e.g. includes find_grade, find_key_n_title
 
 
-  def self.from_zip( zip_file, name, more_attribs={} )
-    ## fix: check if name ends in .txt ?? if not add .txt
-    ##  change name to path ?? e.g. make it required to pass in full entry path??
-    ### fix -fix -fix => change name to path
-
-    path = name.end_with?('.txt') ? name : "#{name}.txt"
-
-    ## fix: move out of from_zip
-    # 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 = path.index( '!/')
-    if pos.nil?
-      real_path = path   # 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
-      real_path = path[ (pos+2)..-1 ]
-    end
-
+  def self.from_zip( zip_file, entry_path, more_attribs={} )
     ## get text content from zip
-    text = zip_file.read( real_path )
+
+    entry = zip_file.find_entry( entry_path )
+
+    ## todo/fix: add force encoding to utf-8 ??
+    ##  check!!!
+    ##  clean/prepprocess lines
+    ##  e.g. CR/LF (/r/n) to LF (e.g. /n)
+    text = entry.get_input_stream().read()
 
     self.from_string( text, more_attribs )
   end

data/lib/textutils/version.rb

@@ -3,7 +3,7 @@ module TextUtils
 
   MAJOR = 0 ## todo: namespace inside version or something - why? why not??
   MINOR = 9
-  PATCH = 6
+  PATCH = 7
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textutils
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &79637680 !ruby/object:Gem::Requirement
+  requirement: &69523480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79637680
+  version_requirements: *69523480
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &79637460 !ruby/object:Gem::Requirement
+  requirement: &69523230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79637460
+  version_requirements: *69523230
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &79635290 !ruby/object:Gem::Requirement
+  requirement: &69522980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79635290
+  version_requirements: *69522980
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &79634910 !ruby/object:Gem::Requirement
+  requirement: &69522750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79634910
+  version_requirements: *69522750
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &79634540 !ruby/object:Gem::Requirement
+  requirement: &69520650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *79634540
+  version_requirements: *69520650
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &79634160 !ruby/object:Gem::Requirement
+  requirement: &69520320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *79634160
+  version_requirements: *69520320
 description: textutils - Text Filters, Helpers, Readers and More
 email: ruby-talk@ruby-lang.org
 executables: []