textutils 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5ec47749fc531cb8ffbc71fc152c2a31e53e637
-  data.tar.gz: eb485b1f3e40c1a8653f3a5d19e17a0d30b3079c
+  metadata.gz: 3e40ccfbcb833b42ca09205ad659db438c5205c2
+  data.tar.gz: 2025fd82b7f254c303bc900e59441b571a9cf543
 SHA512:
-  metadata.gz: 574f8628d2bebd407b0ee4846be97833d840cc734dcccb137d8eb64cdc5b2498a70888e15b22a6f118501dbc8bf1cbf72ed1d01ab0f02d0f186b6bbcf3251d68
-  data.tar.gz: 59f803dc2c934437730986b542e11be3b79d96c563406badd80a5b06c70474d82c282b6565f1cd8f3733867b37385e2bcb1cf06407223b98675ac7bb8c9ae511
+  metadata.gz: 06e3600e5bb04eb77f5b13f11a9fa757ea0731196f15c327943d8b0b188b4c05e2666684ca97f2369b8526b991f8faf9bd0a23291727a9effa30ca10c99f3ebb
+  data.tar.gz: 786f1feabf6f40cac7c23122e6052d94ba8011bd3170d9b48529e89e808c2a4a2963132043a145ccd80c96bc4afb91a7297ba7673794828739182e51d00b1087

data/lib/textutils/reader/values_reader.rb

@@ -86,11 +86,40 @@ class ValuesReader
 # and so on - lets us reuse code for tags and more
 
 
-  def each_line   # support multi line records
+  def each_line       # old style w/o meta hash   -- rename to each_record - why, why not???
+    each_line_with_meta do |attribs|
+        ## remove meta
+        if attribs[:meta].present?
+          attribs.delete(:meta)
+        end
+
+        ## (more) values array entry - make top level 
+        values = attribs[:values]
+        attribs.delete(:values)
+
+        yield( attribs, values )
+    end
+  end
+
+
+  def each_line_with_meta    # support multi line records   -- rename to each_record_with_  - why, why not??
 
     inside_record  = false
     blank_counter  = 0    # count of number of blank lines (note: 1+ blank lines clear multi-line record)
     values         = []
+    meta           = {}
+
+    ###
+    # meta
+    #  use format or style key ??
+    #   use   line|multiline   or classic|modern  or csv|csv+ etc.??
+    #
+    #  move header to meta (from top-level)  - why, why not ??
+    #    or use context for header and sections etc.????
+    #  move section to meta - why, why not ??
+    #
+    # might add lineno etc. in future??
+
 
     # keep track of last header
     #  e.g. lines like
@@ -164,8 +193,11 @@ class ValuesReader
           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 )
+          attribs[:values] = more_values 
+          attribs[:meta]   = meta
+          yield( attribs )
           values         = []
+          meta           = {}
         end
         inside_record  = false
         blank_counter  = 0
@@ -185,11 +217,15 @@ class ValuesReader
           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 )
+          attribs[:values] = more_values 
+          attribs[:meta]   = meta
+          yield( attribs )
           values         = []
+          meta           = {}
         end
         inside_record  = true
         blank_counter  = 0
+        meta[:format]  = :multiline    # use :modern - why, why not?
 
         # NB: every additional line is one value e.g. city:wien, etc.
         #  allows you to use any chars
@@ -199,6 +235,7 @@ class ValuesReader
       elsif inside_record && blank_counter == 0 && line =~ /\/{2}/ # check address line (must contain //)
         values += [line.dup]     # assume single value column (no need to escape commas)
       elsif inside_record && blank_counter == 0 && line =~ /^[a-z][a-z0-9.]*[a-z0-9]:/ # check key: value pair
+        ### todo: split key n value and add to attrib hash  - why, why not???
         values += [line.dup]     # assume single value column (no need to escape commas)
       else
         if inside_record && blank_counter == 0   # continue adding more values
@@ -208,12 +245,16 @@ class ValuesReader
             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 )
+            attribs[:values] = more_values
+            attribs[:meta]   = meta
+            yield( attribs )
             values         = []
+            meta           = {}
           end
           inside_record  = false
           blank_counter  = 0
-          values = find_values( line )
+          meta[:format]  = :line    # use :classic - why, why not?
+          values         = find_values( line )
         end
       end
 
@@ -224,7 +265,9 @@ class ValuesReader
       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 )
+      attribs[:values] = more_values 
+      attribs[:meta]   = meta
+      yield( attribs )
     end
 
   end # method each_line

data/lib/textutils/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textutils
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Gerald Bauer