textutils 0.5.10 → 0.5.11

data/Manifest.txt

@@ -7,8 +7,10 @@ lib/textutils/filter/code_filter.rb
 lib/textutils/filter/comment_filter.rb
 lib/textutils/filter/erb_django_filter.rb
 lib/textutils/filter/erb_filter.rb
+lib/textutils/helper/address_helper.rb
 lib/textutils/helper/title_helper.rb
 lib/textutils/helper/unicode_helper.rb
+lib/textutils/helper/value_helper.rb
 lib/textutils/reader/code_reader.rb
 lib/textutils/reader/fixture_reader.rb
 lib/textutils/reader/hash_reader.rb

data/lib/textutils/helper/address_helper.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+
+
+module TextUtils
+  module AddressHelper
+
+  def normalize_address( old_address_line )
+    # for now only checks german 5-digit zip code
+    #
+    #  e.g.  Alte Plauener Straße 24 // 95028 Hof  becomes
+    #        95028 Hof // Alte Plauener Straße 24 
+
+    new_address_line = old_address_line   # default - do nothing - just path through
+
+    lines = old_address_line.split( '//' )
+
+    if lines.size == 2   # two lines / check for switching lines
+      line1 = lines[0].strip
+      line2 = lines[1].strip
+      if line2 =~ /^[0-9]{5}\s/
+        new_address_line = "#{line2} // #{line1}"   # swap - let line w/ 5-digit zip code go first
+      end
+    end
+
+    new_address_line
+  end
+
+  end # module AddressHelper
+end # module TextUtils

data/lib/textutils/helper/title_helper.rb

@@ -4,29 +4,57 @@
 module TextUtils
   module TitleHelper
 
-  def title_to_key( title )
+  def strip_translations( title )
+      # remove optional english translation in square brackets ([])
+      # e.g. Wien [Vienna]  =>  Wien
+
+      title.gsub( /\[.+\]/, '' )
+  end
+
+  def strip_subtitles( title )
+      # remove optional longer title part in ()
+      # e.g. Las Palmas (de Gran Canaria) => Las Palmas
+      #      Palma (de Mallorca) => Palma
+
+      title.gsub( /\(.+\)/, '' )
+  end
+
+  def strip_tags( title )   # todo: use an alias or rename for better name ??
+      # remove optional longer title part in {}
+      #  e.g. Ottakringer {Bio}   => Ottakringer
+      #       Ottakringer {Alkoholfrei} => Ottakringer
+      #
+      # todo: use for autotags? e.g. {Bio} => bio 
+      
+      title.gsub( /\{.+\}/, '' )
+  end
+
+  def strip_whitespaces( title )
+      # remove all whitespace and punctuation
+      title.gsub( /[ \t_\-\.()\[\]'"\/]/, '' )
+  end
+
+  def strip_special_chars( title )
+      # remove special chars (e.g. %°&)
+      title.gsub( /[%&°]/, '' )
+  end
 
-   ## NB: used in/moved from readers/values_reader.rb
+  def title_to_key( title )
 
+      ## NB: used in/moved from readers/values_reader.rb
 
       ## NB: downcase does NOT work for accented chars (thus, include in alternatives)
       key = title.downcase
 
-      ### remove optional english translation in square brackets ([]) e.g. Wien [Vienna]
-      key = key.gsub( /\[.+\]/, '' )
+      key = strip_translations( key )
 
-      ## remove optional longer title part in () e.g. Las Palmas (de Gran Canaria), Palma (de Mallorca)
-      key = key.gsub( /\(.+\)/, '' )
-      
-      ## remove optional longer title part in {} e.g. Ottakringer {Bio} or {Alkoholfrei}
-      ## todo: use for autotags? e.g. {Bio} => bio 
-      key = key.gsub( /\{.+\}/, '' )
+      key = strip_subtitles( key )
+
+      key = strip_tags( key )
 
-      ## remove all whitespace and punctuation
-      key = key.gsub( /[ \t_\-\.()\[\]'"\/]/, '' )
+      key = strip_whitespaces( key )
 
-      ## remove special chars (e.g. %°&)
-      key = key.gsub( /[%&°]/, '' )
+      key = strip_special_chars( key )
 
       ##  turn accented char into ascii look alike if possible
       ##

data/lib/textutils/helper/value_helper.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+
+
+module TextUtils
+  module ValueHelper
+
+
+  def is_region?( value )
+    # assume region code e.g. TX or N
+    value =~ /^[A-Z]{1,2}$/
+  end
+
+  def is_year?( value )
+    # founded/established year e.g. 1776
+    value =~ /^[0-9]{4}$/
+  end
+
+  def is_website?( value )
+    # check for url/internet address e.g. www.ottakringer.at
+    #  - must start w/  www. or
+    #  - must end w/   .com
+    #
+    # fix: support more url format (e.g. w/o www. - look for .com .country code etc.)
+    value =~ /^www\.|\.com$/
+  end
+
+  def is_address?( value )
+    # if value includes // assume address e.g. 3970 Weitra // Sparkasseplatz 160
+    value =~ /\/{2}/
+  end
+
+  def is_taglist?( value )
+    value =~ /^[a-z0-9\|_ ]+$/
+  end
+
+
+  end # module ValueHelper
+end # module TextUtils

data/lib/textutils/reader/values_reader.rb

@@ -171,124 +171,4 @@ class ValuesReader
   end # method each_line
 
 
-
-  def each_line_old_single_line_records_only
-      
-    @data.each_line do |line|
-  
-      ## allow alternative comment lines
-      ## e.g. -- comment or
-      ##      % comment
-      ##  why?  # might get used by markdown for marking headers, for example
-
-      ## NB: for now alternative comment lines not allowed as end of line style e.g
-      ##  some data, more data   -- comment here
-
-      if line =~ /^\s*#/ || line =~ /^\s*--/ || line =~ /^\s*%/
-        # skip komments and do NOT copy to result (keep comments secret!)
-        logger.debug 'skipping comment line'
-        next
-      end
-
-      if line =~ /^\s*$/
-        # kommentar oder leerzeile überspringen 
-        logger.debug 'skipping blank 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
-
-      line = line.sub( /\s+#.+$/, '' )
-
-      # pass 2) remove leading and trailing whitespace
-      
-      line = line.strip
-
-      ### guard escaped commas (e.g. \,)
-      line = line.gsub( '\,', '@commma@' )
-      
-      ## use generic separator (allow us to configure separator)
-      line = line.gsub( ',', '@sep@')
-      
-      ## restore escaped commas (before split)
-      line = line.gsub( '@commma@', ',' )
-
-
-      logger.debug "line: >>#{line}<<"
-
-      values = line.split( '@sep@' )
-      
-      # pass 1) remove leading and trailing whitespace for values
-
-      values = values.map { |value| value.strip }
-
-      ##### todo remove support of comment column? (NB: must NOT include commas)
-      # pass 2) remove comment columns
-      
-      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}<<"
-          false
-        else
-          true
-        end
-      end
-      
-      logger.debug "  values: >>#{values.join('<< >>')}<<"
-      
-      
-      ### todo/fix: allow check - do NOT allow mixed use of with key and w/o key
-      ##  either use keys or do NOT use keys; do NOT mix in a single fixture file
-      
-      
-      ### support autogenerate key from first title value
-      
-      # if it looks like a key (only a-z lower case allowed); assume it's a key
-      #   - also allow . in keys e.g. world.quali.america, at.cup, etc.
-      #   - also allow 0-9 in keys e.g. at.2, at.3.1, etc.
-
-      # fix/todo: add support for leading underscore _
-      #   or allow keys starting w/ digits?
-      if values[0] =~ /^([a-z][a-z0-9.]*[a-z0-9]|[a-z])$/    # NB: key must start w/ a-z letter (NB: minimum one letter possible)
-        key_col         = values[0]
-        title_col       = values[1]
-        more_cols       = values[2..-1]
-      else
-        key_col         = '<auto>'
-        title_col       = values[0]
-        more_cols       = values[1..-1]
-      end
-
-      attribs = {}
-
-      ## title (split of optional synonyms)
-      # e.g. FC Bayern Muenchen|Bayern Muenchen|Bayern
-      titles = title_col.split('|')
-      
-      attribs[ :title ]    =  titles[0]
-     
-      ## add optional synonyms if present
-      attribs[ :synonyms ] =  titles[1..-1].join('|')  if titles.size > 1
-      
-      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}"
-      end
-      
-      attribs[ :key ] = key_col
-      
-      attribs = attribs.merge( @more_values )  # e.g. merge country_id and other defaults if present
-                        
-      yield( attribs, more_cols )
-
-    end # each lines
-
-  end # method each_line
-
-
-
 end # class ValuesReader

data/lib/textutils/utils.rb

@@ -6,6 +6,7 @@ module TextUtils
   # make helpers available as class methods e.g. TextUtils.convert_unicode_dashes_to_plain_ascii
   extend UnicodeHelper
   extend TitleHelper
+  extend AddressHelper
 end
 
 

data/lib/textutils/version.rb

@@ -1,6 +1,6 @@
 
 module TextUtils
 
-  VERSION = '0.5.10'
+  VERSION = '0.5.11'
 
 end   # module TextUtils

data/lib/textutils.rb

@@ -23,6 +23,8 @@ require 'textutils/filter/erb_filter'
 
 require 'textutils/helper/unicode_helper'
 require 'textutils/helper/title_helper'
+require 'textutils/helper/address_helper'
+require 'textutils/helper/value_helper'
 
 require 'textutils/utils'
 require 'textutils/reader/code_reader'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textutils
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.5.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &72786300 !ruby/object:Gem::Requirement
+  requirement: &75139420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *72786300
+  version_requirements: *75139420
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &72786080 !ruby/object:Gem::Requirement
+  requirement: &75139200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *72786080
+  version_requirements: *75139200
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &72785860 !ruby/object:Gem::Requirement
+  requirement: &75138980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *72785860
+  version_requirements: *75138980
 description: textutils - Text Filters, Helpers, Readers and More
 email: webslideshow@googlegroups.com
 executables: []
@@ -60,8 +60,10 @@ files:
 - lib/textutils/filter/comment_filter.rb
 - lib/textutils/filter/erb_django_filter.rb
 - lib/textutils/filter/erb_filter.rb
+- lib/textutils/helper/address_helper.rb
 - lib/textutils/helper/title_helper.rb
 - lib/textutils/helper/unicode_helper.rb
+- lib/textutils/helper/value_helper.rb
 - lib/textutils/reader/code_reader.rb
 - lib/textutils/reader/fixture_reader.rb
 - lib/textutils/reader/hash_reader.rb