textutils 0.5.12 → 0.5.13

data/lib/textutils/helper/address_helper.rb

@@ -24,6 +24,30 @@ module TextUtils
 
     new_address_line
   end
+  
+
+  #  todo/fix: add _in_adr or _in_addr to name - why? why not?
+
+  def find_city_for_country( country_key, address )
+
+    return nil if address.blank?    # do NOT process nil or empty address lines; sorry
+
+    lines = address.split( '//' )
+
+    if country_key == 'at' || country_key == 'de'
+      # first line strip numbers (assuming zip code) and whitespace
+      line1 = lines[0]
+      line1 = line1.gsub( /\b[0-9]+\b/, '' )   # use word boundries (why? why not?)
+      line1 = line1.strip
+      
+      return nil if line1.blank?   # nothing left sorry; better return nil
+      
+      line1   # assume its the city
+    else
+      nil   # unsupported country/address schema for now; sorry
+    end
+  end
+  
 
   end # module AddressHelper
 end # module TextUtils

data/lib/textutils/helper/title_helper.rb

@@ -4,6 +4,9 @@
 module TextUtils
   module TitleHelper
 
+
+
+
   def strip_translations( title )
       # remove optional english translation in square brackets ([])
       # e.g. Wien [Vienna]  =>  Wien

data/lib/textutils/helper/value_helper.rb

@@ -34,5 +34,26 @@ module TextUtils
   end
 
 
+  def find_grade( text )  # NB: returns ary [grade,text] / two values
+    grade = 4  # defaults to grade 4  e.g  *** => 1, ** => 2, * => 3, -/- => 4
+
+    text = text.sub( /\s+(\*{1,3})\s*$/ ) do |_|  # NB: stars must end field/value
+      if $1 == '***'
+        grade = 1
+      elsif $1 == '**'
+        grade = 2
+      elsif $1 == '*'
+        grade = 3
+      else
+        # unknown grade; not possible, is'it?
+      end
+      ''  # remove * from title if found
+    end
+
+    [grade,text]
+  end
+
+
+
   end # module ValueHelper
 end # module TextUtils

data/lib/textutils/reader/values_reader.rb

@@ -5,6 +5,9 @@
 class ValuesReader
 
   include LogUtils::Logging
+  
+  include TextUtils::ValueHelper # e.g. includes find_grade()
+
 
   def initialize( path, more_values={} )
     @path = path
@@ -68,7 +71,7 @@ class ValuesReader
       if line =~ /^[a-z][a-z0-9.]*[a-z0-9]:/
          # NB: every additional line is one value e.g. city:wien, etc.
          #  allows you to use any chars
-         logger.debug "   multi-line record - add key-value >#{line}<"
+         logger.debug "   multi-line record - add key-value »#{line}«"
 
          more_cols.unshift( line.dup )   # add value upfront to array (first value); lets us keep (optional) tags as last entry; fix!! see valuereaderEx v2
          next
@@ -85,18 +88,17 @@ class ValuesReader
 
 
       ### guard escaped commas (e.g. \,)
-      line = line.gsub( '\,', '@commma@' )
+      line = line.gsub( '\,', '♣' )  # use black club suit/=shamrock char for escaped separator
       
       ## use generic separator (allow us to configure separator)
-      line = line.gsub( ',', '@sep@')
+      line = line.gsub( ',', '♦')  # use black diamond suit for separator
       
       ## restore escaped commas (before split)
-      line = line.gsub( '@commma@', ',' )
-
+      line = line.gsub( '♣', ',' )
 
-      logger.debug "line: >>#{line}<<"
+      logger.debug "line: »#{line}«"
 
-      values = line.split( '@sep@' )
+      values = line.split( '♦' )
       
       # pass 1) remove leading and trailing whitespace for values
 
@@ -107,14 +109,14 @@ class ValuesReader
       
       values = values.select do |value|
         if value =~ /^#/  ## start with # treat it as a comment column; e.g. remove it
-          logger.debug "   removing column with value >>#{value}<<"
+          logger.debug "   removing column with value »#{value}«"
           false
         else
           true
         end
       end
       
-      logger.debug "  values: >>#{values.join('<< >>')}<<"
+      logger.debug "  values: »#{values.join('« »')}«"
       
       
       ### todo/fix: allow check - do NOT allow mixed use of with key and w/o key
@@ -141,6 +143,15 @@ class ValuesReader
 
       attribs = {}
 
+      ## check title_col for grade (e.g. ***/**/*) and use returned stripped title_col if exits
+      grade, title_col = find_grade( title_col )
+
+      # NB: for now - do NOT include default grade e.g. if grade (***/**/*) not present; attrib will not be present too
+      if grade == 1 || grade == 2 || grade == 3  # grade found/present
+        logger.debug "   found grade #{grade} in title"
+        attribs[:grade] = grade
+      end
+
       ## title (split of optional synonyms)
       # e.g. FC Bayern Muenchen|Bayern Muenchen|Bayern
       titles = title_col.split('|')
@@ -153,7 +164,7 @@ class ValuesReader
       if key_col == '<auto>'
         ## autogenerate key from first title
         key_col = TextUtils.title_to_key( titles[0] )
-        logger.debug "   autogen key >#{key_col}< from title >#{titles[0]}<, textutils version #{TextUtils::VERSION}"
+        logger.debug "   autogen key »#{key_col}« from title »#{titles[0]}«, textutils version #{TextUtils::VERSION}"
       end
       
       attribs[ :key ] = key_col

data/lib/textutils/version.rb

@@ -1,6 +1,6 @@
 
 module TextUtils
 
-  VERSION = '0.5.12'
+  VERSION = '0.5.13'
 
 end   # module TextUtils

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textutils
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-09 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &80007180 !ruby/object:Gem::Requirement
+  requirement: &83466980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *80007180
+  version_requirements: *83466980
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &80006960 !ruby/object:Gem::Requirement
+  requirement: &83466720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *80006960
+  version_requirements: *83466720
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &80006740 !ruby/object:Gem::Requirement
+  requirement: &83466490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *80006740
+  version_requirements: *83466490
 description: textutils - Text Filters, Helpers, Readers and More
 email: webslideshow@googlegroups.com
 executables: []