textutils 0.8.2 → 0.8.3

data/lib/textutils/reader/values_reader.rb

@@ -43,7 +43,7 @@ class ValuesReaderV2
     end
 
     ## fix: move Prop table to props gem - why? why not??
-    WorldDb::Models::Prop.create_from_fixture!( name, path )
+    WorldDb::Model::Prop.create_from_fixture!( name, path )
   end
 
 end # class ValuesReaderV2
@@ -59,7 +59,7 @@ class ValuesReader
 
   def initialize( path, 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
@@ -89,6 +89,16 @@ class ValuesReader
     blank_counter  = 0    # count of number of blank lines (note: 1+ blank lines clear multi-line record)
     values         = []
 
+    # keep track of last header
+    #  e.g. lines like
+    # ___________________________________
+    # - Brauerei Schwechat (Brau Union)
+    #
+    #  laster_header will be 'Brauerei Schwechat (Brau Union)'
+    #  gets passed along as an attribue e.g. more_attribs[:header]='Brauerei Schwechat (Brau Union)'
+    last_header  = nil
+
+
     @data.each_line do |line|
 
       ## allow alternative comment lines
@@ -126,8 +136,20 @@ class ValuesReader
       line = line.strip
 
 
-      if line =~ /^-\s/   # check for group headers  e.g.  - St. James Brewery
-        logger.info "  skip group header #{line} for now (fix/add soon)"
+      if line =~ /^-\s+/   # check for group headers  e.g.  - St. James Brewery
+        if values.length > 0  # check if we already processed a record? if yes; yield last record (before reset)
+          attribs, more_values = find_key_n_title( values )
+          attribs = attribs.merge( @more_attribs )  # e.g. merge country_id and other defaults if present
+          attribs[:header] = last_header   unless last_header.nil?   # add optional header attrib
+          yield( attribs, more_values )
+          values         = []
+        end
+        inside_record  = false
+        blank_counter  = 0
+
+        # update last_header
+        last_header = line.gsub( /^-\s/, '' )  # cut-off leading marker and space
+        logger.info "  update group header >#{last_header}<"
         next
       elsif line =~ /^\[([a-z][a-z]+)\]/
       ### check for multiline record
@@ -137,10 +159,10 @@ class ValuesReader
         if values.length > 0  # check if we already processed a record? if yes; yield last record (before reset)
           attribs, more_values = find_key_n_title( values )
           attribs = attribs.merge( @more_attribs )  # e.g. merge country_id and other defaults if present
+          attribs[:header] = last_header   unless last_header.nil?   # add optional header attrib
           yield( attribs, more_values )
           values         = []
         end
-
         inside_record  = true
         blank_counter  = 0
 
@@ -160,6 +182,7 @@ class ValuesReader
           if values.length > 0
             attribs, more_values = find_key_n_title( values )
             attribs = attribs.merge( @more_attribs )  # e.g. merge country_id and other defaults if present
+            attribs[:header] = last_header   unless last_header.nil?   # add optional header attrib
             yield( attribs, more_values )
             values         = []
           end
@@ -175,6 +198,7 @@ class ValuesReader
     if values.length > 0
       attribs, more_values = find_key_n_title( values )
       attribs = attribs.merge( @more_attribs )  # e.g. merge country_id and other defaults if present
+      attribs[:header] = last_header   unless last_header.nil?   # add optional header attrib
       yield( attribs, more_values )
     end
 

data/lib/textutils/version.rb

@@ -1,7 +1,7 @@
 
 module TextUtils
 
-  VERSION = '0.8.2'
+  VERSION = '0.8.3'
 
 end   # module TextUtils
 

data/test/test_values_reader.rb

@@ -10,6 +10,63 @@ require 'helper'
 
 class TestValuesReader < MiniTest::Unit::TestCase
 
+  def test_header
+    txt =<<EOS
+
+Wieselburger Gold,      5.0%, 11.8°
+____________________________________________
+- Zwettler Brauerei|Privatbrauerei Zwettl
+
+Zwettler Original,     5.1 %,  11.9°
+Zwettler Export Lager, 5.0 %,  11.8°
+
+______________________________________
+- Brauerei Schwechat (Brau Union)
+
+Schwechater,             5.0%, 11.5°, 41.0 kcal/100ml
+Schwechater Zwickl,      5.4%, 12.5°, 45.0 kcal/100ml
+
+EOS
+
+    reader = ValuesReader.new( txt )
+
+    i = 0
+    reader.each_line do |attribs, values|
+      i += 1
+
+      puts "attribs:"
+      pp attribs
+      puts "values:"
+      pp values
+
+      if i == 1
+        assert_equal attribs[:header],    nil
+        assert_equal attribs[:key],      'wieselburgergold'
+        assert_equal attribs[:title],    'Wieselburger Gold'
+      elsif i == 2
+        assert_equal attribs[:header],   'Zwettler Brauerei|Privatbrauerei Zwettl'
+        assert_equal attribs[:key],      'zwettleroriginal'
+        assert_equal attribs[:title],    'Zwettler Original'
+      elsif i == 3
+        assert_equal attribs[:header],   'Zwettler Brauerei|Privatbrauerei Zwettl'
+        assert_equal attribs[:key],      'zwettlerexportlager'
+        assert_equal attribs[:title],    'Zwettler Export Lager'
+      elsif i == 4
+        assert_equal attribs[:header],   'Brauerei Schwechat (Brau Union)'
+        assert_equal attribs[:key],      'schwechater'
+        assert_equal attribs[:title],    'Schwechater'
+      elsif i == 5
+        assert_equal attribs[:header],   'Brauerei Schwechat (Brau Union)'
+        assert_equal attribs[:key],      'schwechaterzwickl'
+        assert_equal attribs[:title],    'Schwechater Zwickl'
+      else
+        assert false   # should not get here
+      end
+    end
+
+  end # test_header
+
+
   def test_escape_comma
     # note: double espace comma e.g. \\, becomes literal \,
     txt =<<EOS
@@ -52,7 +109,7 @@ EOS
         assert_equal values[0],  '1845'
         assert_equal values[1],  'The Griffin Brewery // Chiswick Lane South // London, W4 2QB'
       else
-        assert_equal true, false   # should not get here
+        assert false   # should not get here
       end
     end
   end # test_escape_comma
@@ -150,7 +207,7 @@ EOS
         assert_equal values[1],  'www.egger-bier.at'
         assert_equal values[2],  '3105 Unterradlberg // Tiroler Straße 18'
       else
-        assert_equal true, false   # should not get here
+        assert false   # should not get here
       end
     end
   end # test_mixed
@@ -212,7 +269,7 @@ EOS
         assert_equal values[2],  '3910 Zwettl // Syrnauer Straße 22-25'
         assert_equal values[3],  'brands: Zwettler'
       else
-        assert_equal true, false   # should not get here
+        assert false   # should not get here
       end
     end
   end  # test_multi_line_records
@@ -247,7 +304,7 @@ EOS
       elsif i == 2
       elsif i == 3
       else
-        assert_equal true, false   # should not get here
+        assert  false   # should not get here
       end
     end
   end  #  test_classic_csv_records
@@ -302,7 +359,7 @@ EOS
         assert_equal values[1], '11.8°'
         assert_equal values[-1], 'bio'
       else
-        assert_equal true, false   # should not get here
+        assert false   # should not get here
       end
     end
   end # test_autogen_keys

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textutils
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &20656452 !ruby/object:Gem::Requirement
+  requirement: &21298812 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *20656452
+  version_requirements: *21298812
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &20655864 !ruby/object:Gem::Requirement
+  requirement: &21298416 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *20655864
+  version_requirements: *21298416
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &20655132 !ruby/object:Gem::Requirement
+  requirement: &21297996 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '3.7'
   type: :development
   prerelease: false
-  version_requirements: *20655132
+  version_requirements: *21297996
 description: textutils - Text Filters, Helpers, Readers and More
 email: ruby-talk@ruby-lang.org
 executables: []