textutils 0.9.5 → 0.9.6

data/Rakefile

@@ -21,6 +21,7 @@ Hoe.spec 'textutils' do
     ['props'],
     ['logutils'],
     ### 3rd party gems
+    ['rubyzip'],   ## todo/check: make optional -why? why not??
     ['activesupport']
   ]
 

data/lib/textutils.rb

@@ -12,6 +12,9 @@ require 'erb'
 
 # 3rd party gems / libs
 
+require 'zip'
+
+
 # fix: remove version from activerecord in deps
 require 'active_support/all'   # String.starts_with?, Object.blank?, etc.
 

data/lib/textutils/reader/fixture_reader.rb

@@ -6,28 +6,55 @@
 
 ##
 #  use ManifestReader ?? why? why not?  - reuse in manifest gem (or manman e.g. manifest manger) ??
-#    
+#
 
 class FixtureReader
 
   include LogUtils::Logging
 
-  def initialize( path )
-    @path = path
-  
+
+  def self.from_zip( zip_file, name )
+
+    ## 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"
+
+    ## get text content from zip
+    text = zip_file.read( path )
+    self.from_string( text )
+  end
+
+  def self.from_file( path )
+    ## note: assume/enfore utf-8 encoding (with or without BOM - byte order mark)
+    ## - see textutils/utils.rb
+    text = File.read_utf8( path )
+    self.from_string( text )
+  end
+
+  def self.from_string( text )
+    FixtureReader.new( { text: text } )
+  end
+
+
+  def initialize( arg )
+
+    if arg.is_a?( String )  ## old style (deprecated) - pass in filepath as string
+      path = arg
+      logger.info "FixtureReader.new - deprecated API - use FixtureReader.from_file() instead"
+      text = File.read_utf8( path )
+    else   ## assume it's a hash
+      opts = arg
+      text = opts[:text]
+    end
+
     @ary = []
 
     ## nb: assume/enfore utf-8 encoding (with or without BOM - byte order mark)
     ## - see textutils/utils.rb
-    text = File.read_utf8( @path )
   
-    if @path.ends_with?( '.yml' ) || @path.ends_with?( '.yaml' )
-      ### fix/todo: remove later on!!! - do not use!!
-      puts "deprecated api - FixtureReader w/ yaml format - will get removed; please use new plain text manifest format"
-      @ary = old_deprecated_yaml_reader( text )
-    else
-      @ary = plain_text_reader( text )
-    end
+    @ary = plain_text_reader( text )
 
     logger.debug "fixture setup:"
     logger.debug @ary.to_json
@@ -75,30 +102,6 @@ class FixtureReader
   end # method plain_text_reader
 
 
-  def old_deprecated_yaml_reader( text )
-    hash = YAML.load( text )
-    
-    ### build up array for fixtures from hash
-    ary = []
-    
-    hash.each do |key_wild, value_wild|
-      key   = key_wild.to_s.strip
-      
-      logger.debug "yaml key:#{key_wild.class.name} >>#{key}<<, value:#{value_wild.class.name} >>#{value_wild}<<"
-    
-      if value_wild.kind_of?( String ) # assume single fixture name
-        ary << value_wild
-      elsif value_wild.kind_of?( Array ) # assume array of fixture names as strings
-        ary = ary + value_wild
-      else
-        logger.error "unknow fixture type in setup (yaml key:#{key_wild.class.name} >>#{key}<<, value:#{value_wild.class.name} >>#{value_wild}<<); skipping"
-      end
-    end
-    ary  # return fixture ary
-  end
-
-
-
   def each
     @ary.each do |fixture|
       yield( fixture )

data/lib/textutils/reader/values_reader.rb

@@ -6,24 +6,73 @@
 class ValuesReader
 
   include LogUtils::Logging
-  
+
   include TextUtils::ValueHelper # e.g. includes find_grade, find_key_n_title
 
 
-  def initialize( path, more_attribs={} )
+  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
+
+    ## get text content from zip
+    text = zip_file.read( real_path )
+
+    self.from_string( text, more_attribs )
+  end
+
+  def self.from_file( path, more_attribs={} )
+    ## note: assume/enfore utf-8 encoding (with or without BOM - byte order mark)
+    ## - see textutils/utils.rb
+    text = File.read_utf8( path )
+
+    self.from_string( text, more_attribs )
+  end
+
+  def self.from_string( text, more_attribs={} )
+    ValuesReader.new( {text: text}, more_attribs )
+  end
+
+
+  def initialize( arg, more_attribs={} )
     @more_attribs = more_attribs
     
-    ### workaround/hack
-    #  if path includes newline assume it's a string buffer not a file name
-    #  fix: use  from_file an from_string etc. for  ctor
-    #   check  what is the best convention (follow  ???)
-
-    if path =~ /\n/m
-      @path = 'stringio'   # what name to use ???
-      @data = path.dup   # make a duplicate ?? why? why not?
-    else
-      @path = path
-      @data = File.read_utf8( @path )
+    ### todo/fix: rename @data to @text !!!!
+
+    if arg.is_a?( String )  ## old style (deprecated) - pass in filepath as string
+      path = arg
+
+      ### workaround/hack
+      #  if path includes newline assume it's a string buffer not a file name
+      #  fix: use  from_file an from_string etc. for  ctor
+      #   check  what is the best convention (follow  ???)
+      if path =~ /\n/m
+        logger.info "ValuesReader.new - deprecated API - use ValuesReader.from_string() instead"
+        @data = path.dup   # make a duplicate ?? why? why not?
+      else
+        logger.info "ValuesReader.new - deprecated API - use ValuesReader.from_file() instead"
+        @data = File.read_utf8( @path )
+      end
+    else   ## assume it's a hash
+      opts = arg
+      @data = opts[:text]
     end
   end
 

data/lib/textutils/version.rb

@@ -1,11 +1,9 @@
 
 module TextUtils
 
-  VERSION = '0.9.5'
-
   MAJOR = 0 ## todo: namespace inside version or something - why? why not??
   MINOR = 9
-  PATCH = 5
+  PATCH = 6
   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.5
+  version: 0.9.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &80774090 !ruby/object:Gem::Requirement
+  requirement: &79637680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80774090
+  version_requirements: *79637680
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &80773630 !ruby/object:Gem::Requirement
+  requirement: &79637460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80773630
+  version_requirements: *79637460
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: &79635290 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *79635290
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &80773320 !ruby/object:Gem::Requirement
+  requirement: &79634910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80773320
+  version_requirements: *79634910
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &80772810 !ruby/object:Gem::Requirement
+  requirement: &79634540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *80772810
+  version_requirements: *79634540
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &80772360 !ruby/object:Gem::Requirement
+  requirement: &79634160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +76,7 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *80772360
+  version_requirements: *79634160
 description: textutils - Text Filters, Helpers, Readers and More
 email: ruby-talk@ruby-lang.org
 executables: []