textutils 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b0282aa2a7a821c25f24b39dd50a4486d3d3a68
-  data.tar.gz: 5d7c21778e9c4f3ebfec10bdcf18c861a84fd31a
+  metadata.gz: d5ec47749fc531cb8ffbc71fc152c2a31e53e637
+  data.tar.gz: eb485b1f3e40c1a8653f3a5d19e17a0d30b3079c
 SHA512:
-  metadata.gz: 703c28f053cbc841cbcaffcecafab2896b5756be3a4a33b53bb0fc6fe83d310f5c249690301916343724ad1819c4c21b0f27a37d26702a7e109ab4aa87fc0070
-  data.tar.gz: 61d6e63ca7cbdc13ea4c70ee82ef3282835a71ccd29e04da8a7af5657398c81ed4f3c04ccbd2c7cd79dd7a77b2b8d6d1def52674a926f2e1c2a51fa56af3f491
+  metadata.gz: 574f8628d2bebd407b0ee4846be97833d840cc734dcccb137d8eb64cdc5b2498a70888e15b22a6f118501dbc8bf1cbf72ed1d01ab0f02d0f186b6bbcf3251d68
+  data.tar.gz: 59f803dc2c934437730986b542e11be3b79d96c563406badd80a5b06c70474d82c282b6565f1cd8f3733867b37385e2bcb1cf06407223b98675ac7bb8c9ae511

data/lib/textutils/reader/values_reader.rb

@@ -113,7 +113,13 @@ class ValuesReader
       ## NOTE: for now alternative comment lines not allowed as end of line style e.g
       ##  some data, more data   -- comment here
 
-      if line =~ /^\s*#/  ||
+      ######
+      ## note:
+      ##   # comment MUST follow a space or end-of-line e.g.
+      ##     #1 or #hello or #(hello) or #{hello}  is NOT a comment
+      ##   ###### is however
+
+      if line =~ /^\s*#+(\s|$)/  ||    # old - simple rule -- /^\s*#/
          line =~ /^\s*--/ ||
          line =~ /^\s*%/  ||
          line =~ /^\s*__/
@@ -129,26 +135,31 @@ class ValuesReader
         next
       end
 
-      ### NOTE: skip sections lines (marked w/ at least ==) for now
-      ###  e.g.  === Waldviertel ===
-      if line =~ /^\s*={2,}\s+/
-        logger.debug "skipping section line |»#{line}«|"
-        next
-      end
-
-
       # pass 1) remove possible trailing eol comment
       ##  e.g    -> nyc, New York   # Sample EOL Comment Here (with or without commas,,,,)
       ## becomes -> nyc, New York
+      #
+      ##  note - comment must follow a space or end-of-line
+      #    #1 or #hello or #{hello} is NOT a comment !!!
+      #    note ###### is a comment
 
-      line = line.sub( /\s+#.+$/, '' )
+      line = line.sub( /\s+#+(\s.+)?$/, '' )
 
       # pass 2) remove leading and trailing whitespace
-      
+
       line = line.strip
 
 
-      if line =~ /^-\s+/   # check for group headers  e.g.  - St. James Brewery
+
+
+      ### NOTE: skip sections lines (marked w/ at least ==) for now
+      ###  e.g.  === Waldviertel ===
+      if line =~ /^\s*={2,}\s+/
+        logger.debug "skipping section line |»#{line}«|"
+        next
+      end
+
+      if line =~ /^-\s+/   # check for group headers (MUST start w/ dash (-) 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
@@ -160,14 +171,16 @@ class ValuesReader
         blank_counter  = 0
 
         # update last_header
-        last_header = line.gsub( /^-\s/, '' )  # cut-off leading marker and space
+        last_header = line.sub( /^-\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
-      ##    must start with key e.g. [guiness]
-      ##   for now only supports key with letter a-z (no digits/numbers or underscore or dots)
- 
+      end
+
+
+      if line =~ /^\[(.+)\]$/   # note: check for multiline record; MUST start w/ [ and end w/ ]
+
+        value = $1.strip    # note: remove (allow) possible leading n trailing spaces
+
         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
@@ -180,9 +193,9 @@ class ValuesReader
 
         # NB: every additional line is one value e.g. city:wien, etc.
         #  allows you to use any chars
-        logger.debug "   multi-line record w/ key »#{$1}«"
+        logger.debug "   start multi-line record w/ »#{value}«"
 
-        values         = [$1.dup]    # add key as first value in ary
+        values         = [value]    # add as first value in ary - note: find_key_n_title will check if value is a key or not
       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
@@ -245,26 +258,9 @@ class ValuesReader
 
     values = values.map { |value| value.strip }
 
-
-    ##### todo/fix:
-    #  !!!REMOVE!!!
-    # remove support of comment column? (NB: must NOT include commas)
-    # pass 2) remove comment columns
-    #
-    #  todo/fix: check if still possible ?? - add an example here how it looks like/works
-
-    values = values.select do |value|
-      if value =~ /^#/  ## start with # treat it as a comment column; e.g. remove it
-        logger.info "   removing column with value »#{value}«"
-        false
-      else
-        true
-      end
-    end
-
     logger.debug "  values: |»#{values.join('« »')}«|"
     values
   end
 
 
-end # class ValuesReader
+end # class ValuesReader

data/lib/textutils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: textutils
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-18 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props