textutils 0.8.7 → 0.9.0

data/Manifest.txt

@@ -1,4 +1,4 @@
-History.md
+HISTORY.md
 Manifest.txt
 README.md
 Rakefile
@@ -21,8 +21,11 @@ lib/textutils/patterns.rb
 lib/textutils/reader/code_reader.rb
 lib/textutils/reader/fixture_reader.rb
 lib/textutils/reader/hash_reader.rb
+lib/textutils/reader/hash_reader_v2.rb
 lib/textutils/reader/line_reader.rb
+lib/textutils/reader/line_reader_v2.rb
 lib/textutils/reader/values_reader.rb
+lib/textutils/reader/values_reader_v2.rb
 lib/textutils/sanitizier.rb
 lib/textutils/title.rb
 lib/textutils/utils.rb

data/Rakefile

@@ -15,10 +15,13 @@ Hoe.spec 'textutils' do
 
   # switch extension to .markdown for gihub formatting
   self.readme_file  = 'README.md'
-  self.history_file = 'History.md'
+  self.history_file = 'HISTORY.md'
 
   self.extra_deps = [
-    ['logutils', '~> 0.5']  # e.g. >= 0.5 <= 1.0
+    ['props'],
+    ['logutils', '~> 0.5'],  # e.g. >= 0.5 <= 1.0
+    ### 3rd party gems
+    ['activesupport']
   ]
 
   self.licenses = ['Public Domain']
@@ -26,6 +29,5 @@ Hoe.spec 'textutils' do
   self.spec_extras = {
    :required_ruby_version => '>= 1.9.2'
   }
-  
 
-end
+end

data/lib/textutils.rb

@@ -12,6 +12,11 @@ require 'erb'
 
 # 3rd party gems / libs
 
+# fix: remove version from activerecord in deps
+require 'active_support/all'   # String.starts_with?, Object.blank?, etc.
+
+require 'props'
+require 'props/db'   ## for Prop model --> move create_from fixtures to textutils!!
 require 'logutils'
 
 # our own code
@@ -39,8 +44,11 @@ require 'textutils/helper/value_helper'
 require 'textutils/utils'
 require 'textutils/reader/code_reader'
 require 'textutils/reader/hash_reader'
+require 'textutils/reader/hash_reader_v2'
 require 'textutils/reader/line_reader'
+require 'textutils/reader/line_reader_v2'
 require 'textutils/reader/values_reader'
+require 'textutils/reader/values_reader_v2'
 require 'textutils/reader/fixture_reader'
 
 require 'textutils/classifier'

data/lib/textutils/helper/title_helper.rb

@@ -106,6 +106,7 @@ module TextUtils
         ['ğ', 'g' ],  # e.g. Qarabağ
         ['ì', 'i' ],  # e.g. Potosì
         ['í', 'i' ],  # e.g. Ústí
+        ['ï', 'i' ],  # e.g. El Djazaïr
         ['ł', 'l' ],  # e.g. Wisła, Wrocław
         ['ñ', 'n' ],  # e.g. Porteño
         ['ň', 'n' ],  # e.g. Plzeň, Třeboň
@@ -114,6 +115,7 @@ module TextUtils
         ['ó', 'o' ],  # e.g. Colón, Łódź, Kraków
         ['õ', 'o' ],  # e.g. Nõmme
         ['ô', 'o' ],  # e.g. Amazônia (pt)
+        ['ō', 'o' ],  # e.g. Tōkyō
         ['ø', 'o' ],  # e.g. Fuglafjørdur, København
         ['ř', 'r' ],  # e.g. Třeboň
         ['ș', 's' ],  # e.g. Chișinău, București
@@ -199,27 +201,34 @@ module TextUtils
       alternatives = [
         ['-', '(-| )'],  ## e.g. Blau-Weiß Linz
         ['æ', '(æ|ae)'],  ## e.g. 
+        ['ä', '(ä|ae)'],  ## e.g. 
+        ['Ö', '(Ö|Oe)'],  ## e.g. Österreich
+        ['ö', '(ö|oe)'],  ## e.g. Mönchengladbach
+        ['ß', '(ß|ss)'],  ## e.g. Blau-Weiß Linz
+        ['ü', '(ü|ue)'],  ## e.g. 
+
         ['á', '(á|a)'],  ## e.g. Bogotá, Sársfield
         ['ã', '(ã|a)'],  ## e.g  São Paulo
-        ['ä', '(ä|ae)'],  ## e.g. 
         ['ç', '(ç|c)'],  ## e.g. Fenerbahçe
         ['é', '(é|e)'],  ## e.g. Vélez
         ['ê', '(ê|e)'],  ## e.g. Grêmio
+        ['ï', '(ï|i)' ], ## e.g. El Djazaïr
         ['ñ', '(ñ|n)'],  ## e.g. Porteño
         ['ň', '(ň|n)'],  ## e.g. Plzeň
-        ['Ö', '(Ö|Oe)'], ## e.g. Österreich
-        ['ö', '(ö|oe)'],  ## e.g. Mönchengladbach
         ['ó', '(ó|o)'],   ## e.g. Colón
+        ['ō', '(ō|o)'],  # # e.g. Tōkyō
         ['ș', '(ș|s)'],   ## e.g. Bucarești
-        ['ß', '(ß|ss)'],  ## e.g. Blau-Weiß Linz
-        ['ü', '(ü|ue)'],  ## e.g. 
         ['ú', '(ú|u)']  ## e.g. Fútbol
       ]
-      
+
       ### fix/todo:  check for  dot+space e.g. . and make dot optional
-      ##    e.g. U. de. G. or U de G or U.de.G ??
+      ##
+      #  e.g. make  dot (.) optional plus allow alternative optional space e.g.
+      #   -- for U.S.A. => allow USA or U S A
+      #
+      ##    e.g. U. de G. or U de G or U.de G. ??
       ##   collect some more (real-world) examples first!!!!!
-      
+
       alternatives.each do |alt|
         title = title.gsub( alt[0], alt[1] )
       end

data/lib/textutils/reader/hash_reader.rb

@@ -1,71 +1,8 @@
 # encoding: utf-8
 
-
 # fix: move into TextUtils namespace/module!!
 
 
-## todo/fix: find a better name than HashReaderV2 (HashReaderPlus?) ??
-
-class HashReaderV2
-  include LogUtils::Logging
-
-  def initialize( name, include_path )
-    @name          = name
-    @include_path  = include_path
-
-    # map name to name_real_path
-    #   name might include !/ for virtual path (gets cut off)
-    #   e.g. at-austria!/w-wien/beers becomse w-wien/beers
-
-    pos = @name.index( '!/')
-    if pos.nil?
-      @name_real_path = @name   # not found; real path is the same as name
-    else
-      # cut off everything until !/ e.g.
-      #   at-austria!/w-wien/beers becomes
-      #   w-wien/beers
-      @name_real_path = @name[ (pos+2)..-1 ]
-    end
-  end
-
-  attr_reader :name
-  attr_reader :name_real_path
-  attr_reader :include_path
-
-  def each
-    path          = "#{include_path}/#{name_real_path}.yml"
-    reader        = HashReader.new( path )
-
-    logger.info "parsing data '#{name}' (#{path})..."
-
-    reader.each do |key, value|
-      yield( key, value )
-    end
-
-    ## fix: move Prop table to props gem - why? why not??
-    WorldDb::Models::Prop.create_from_fixture!( name, path )
-  end
-
-
-  def each_typed
-    path          = "#{include_path}/#{name_real_path}.yml"
-    reader        = HashReader.new( path )
-
-    logger.info "parsing data '#{name}' (#{path})..."
-
-    reader.each_typed do |key, value|
-      yield( key, value )
-    end
-
-    ## fix: move Prop table to props gem - why? why not??
-    WorldDb::Models::Prop.create_from_fixture!( name, path )
-  end
-
-
-end # class HashReaderV2
-
-
-
 class HashReader
 
   include LogUtils::Logging

data/lib/textutils/reader/hash_reader_v2.rb

@@ -0,0 +1,61 @@
+# encoding: utf-8
+
+# fix: move into TextUtils namespace/module!!
+
+## todo/fix: find a better name than HashReaderV2 (HashReaderPlus?) ??
+
+class HashReaderV2
+  include LogUtils::Logging
+
+  def initialize( name, include_path )
+    @name          = name
+    @include_path  = include_path
+
+    # map name to name_real_path
+    #   name might include !/ for virtual path (gets cut off)
+    #   e.g. at-austria!/w-wien/beers becomse w-wien/beers
+
+    pos = @name.index( '!/')
+    if pos.nil?
+      @name_real_path = @name   # not found; real path is the same as name
+    else
+      # cut off everything until !/ e.g.
+      #   at-austria!/w-wien/beers becomes
+      #   w-wien/beers
+      @name_real_path = @name[ (pos+2)..-1 ]
+    end
+  end
+
+  attr_reader :name
+  attr_reader :name_real_path
+  attr_reader :include_path
+
+  def each
+    path          = "#{include_path}/#{name_real_path}.yml"
+    reader        = HashReader.new( path )
+
+    logger.info "parsing data '#{name}' (#{path})..."
+
+    reader.each do |key, value|
+      yield( key, value )
+    end
+
+    ConfDb::Model::Prop.create_from_fixture!( name, path )
+  end
+
+
+  def each_typed
+    path          = "#{include_path}/#{name_real_path}.yml"
+    reader        = HashReader.new( path )
+
+    logger.info "parsing data '#{name}' (#{path})..."
+
+    reader.each_typed do |key, value|
+      yield( key, value )
+    end
+
+    ConfDb::Model::Prop.create_from_fixture!( name, path )
+  end
+
+
+end # class HashReaderV2

data/lib/textutils/reader/line_reader.rb

@@ -41,49 +41,6 @@ class StringLineReader
 end
 
 
-class LineReaderV2
-  include LogUtils::Logging
-
-  def initialize( name, include_path )
-    @name          = name
-    @include_path  = include_path
-    
-    # map name to name_real_path
-    #   name might include !/ for virtual path (gets cut off)
-    #   e.g. at-austria!/w-wien/beers becomse w-wien/beers
-
-    pos = @name.index( '!/')
-    if pos.nil?
-      @name_real_path = @name   # not found; real path is the same as name
-    else
-      # cut off everything until !/ e.g.
-      #   at-austria!/w-wien/beers becomes
-      #   w-wien/beers
-      @name_real_path = @name[ (pos+2)..-1 ]
-    end
-  end
-
-  attr_reader :name
-  attr_reader :name_real_path
-  attr_reader :include_path
-
-  def each_line
-    path          = "#{include_path}/#{name_real_path}.txt"
-    reader        = LineReader.new( path )
-
-    logger.info "parsing data '#{name}' (#{path})..."
-
-    reader.each_line do |line|
-      yield( line )
-    end
-
-    ## fix: move Prop table to props gem - why? why not??
-    WorldDb::Models::Prop.create_from_fixture!( name, path )
-  end
-
-end # class LineReaderV2
-
-
 class LineReader
 
   include LogUtils::Logging

data/lib/textutils/reader/line_reader_v2.rb

@@ -0,0 +1,47 @@
+# encoding: utf-8
+
+
+# fix: move into TextUtils namespace/module!!
+
+
+class LineReaderV2
+  include LogUtils::Logging
+
+  def initialize( name, include_path )
+    @name          = name
+    @include_path  = include_path
+    
+    # map name to name_real_path
+    #   name might include !/ for virtual path (gets cut off)
+    #   e.g. at-austria!/w-wien/beers becomse w-wien/beers
+
+    pos = @name.index( '!/')
+    if pos.nil?
+      @name_real_path = @name   # not found; real path is the same as name
+    else
+      # cut off everything until !/ e.g.
+      #   at-austria!/w-wien/beers becomes
+      #   w-wien/beers
+      @name_real_path = @name[ (pos+2)..-1 ]
+    end
+  end
+
+  attr_reader :name
+  attr_reader :name_real_path
+  attr_reader :include_path
+
+  def each_line
+    path          = "#{include_path}/#{name_real_path}.txt"
+    reader        = LineReader.new( path )
+
+    logger.info "parsing data '#{name}' (#{path})..."
+
+    reader.each_line do |line|
+      yield( line )
+    end
+
+    ConfDb::Model::Prop.create_from_fixture!( name, path )
+  end
+
+end # class LineReaderV2
+

data/lib/textutils/reader/values_reader.rb

@@ -2,53 +2,6 @@
 
 # fix: move into TextUtils namespace/module!!
 
-## todo/fix: find a better name than HashReaderV2 (HashReaderPlus?) ??
-
-class ValuesReaderV2
-  include LogUtils::Logging
-
-  def initialize( name, include_path, more_attribs={} )
-    @name          = name
-    @include_path  = include_path
-    @more_attribs  = more_attribs
-    
-    # map name to name_real_path
-    #   name might include !/ for virtual path (gets cut off)
-    #   e.g. at-austria!/w-wien/beers becomse w-wien/beers
-
-    pos = @name.index( '!/')
-    if pos.nil?
-      @name_real_path = @name   # not found; real path is the same as name
-    else
-      # cut off everything until !/ e.g.
-      #   at-austria!/w-wien/beers becomes
-      #   w-wien/beers
-      @name_real_path = @name[ (pos+2)..-1 ]
-    end
-  end
-
-  attr_reader :name
-  attr_reader :name_real_path
-  attr_reader :include_path
-  attr_reader :more_attribs
-
-  def each_line
-    path          = "#{include_path}/#{name_real_path}.txt"
-    reader        = ValuesReader.new( path, more_attribs )
-
-    logger.info "parsing data '#{name}' (#{path})..."
-
-    reader.each_line do |attribs, values|
-      yield( attribs, values )
-    end
-
-    ## fix: move Prop table to props gem - why? why not??
-    WorldDb::Model::Prop.create_from_fixture!( name, path )
-  end
-
-end # class ValuesReaderV2
-
-
 
 class ValuesReader
 

data/lib/textutils/reader/values_reader_v2.rb

@@ -0,0 +1,49 @@
+# encoding: utf-8
+
+# fix: move into TextUtils namespace/module!!
+
+## todo/fix: find a better name than HashReaderV2 (HashReaderPlus?) ??
+
+class ValuesReaderV2
+  include LogUtils::Logging
+
+  def initialize( name, include_path, more_attribs={} )
+    @name          = name
+    @include_path  = include_path
+    @more_attribs  = more_attribs
+    
+    # map name to name_real_path
+    #   name might include !/ for virtual path (gets cut off)
+    #   e.g. at-austria!/w-wien/beers becomse w-wien/beers
+
+    pos = @name.index( '!/')
+    if pos.nil?
+      @name_real_path = @name   # not found; real path is the same as name
+    else
+      # cut off everything until !/ e.g.
+      #   at-austria!/w-wien/beers becomes
+      #   w-wien/beers
+      @name_real_path = @name[ (pos+2)..-1 ]
+    end
+  end
+
+  attr_reader :name
+  attr_reader :name_real_path
+  attr_reader :include_path
+  attr_reader :more_attribs
+
+  def each_line
+    path          = "#{include_path}/#{name_real_path}.txt"
+    reader        = ValuesReader.new( path, more_attribs )
+
+    logger.info "parsing data '#{name}' (#{path})..."
+
+    reader.each_line do |attribs, values|
+      yield( attribs, values )
+    end
+
+    ConfDb::Model::Prop.create_from_fixture!( name, path )
+  end
+
+end # class ValuesReaderV2
+

data/lib/textutils/version.rb

@@ -1,6 +1,6 @@
 
 module TextUtils
 
-  VERSION = '0.8.7'
+  VERSION = '0.9.0'
 
 end   # module TextUtils

data/test/helper.rb

@@ -10,7 +10,7 @@ require 'minitest/autorun'
 
 ## make sure activesupport gets included/required
 # note: just activesupport or active_support will NOT work
-require 'active_support/all'
+# require 'active_support/all'  # -- now included in textutils itself
 
 ## our own code
 

data/test/test_title_helper.rb

@@ -36,7 +36,9 @@ class TestTitleHelper < MiniTest::Unit::TestCase
       [ 'Minerva 8:60', 'minerva860' ],
       [ 'Hop Crisis!', 'hopcrisis' ],
       [ '$Alianz$ Arena', 'alianzarena' ],
-      [ 'Arena Amazônia', 'arenaamazonia' ]
+      [ 'Arena Amazônia', 'arenaamazonia' ],
+      [ 'Tōkyō [Tokyo]', 'tokyo' ],
+      [ 'El Djazaïr [Algiers]', 'eldjazair' ]
     ]
 
     txt_io.each do |txt|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textutils
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-02 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: props
+  requirement: &76193510 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *76193510
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &78669010 !ruby/object:Gem::Requirement
+  requirement: &76193110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +32,21 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *78669010
+  version_requirements: *76193110
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &76192860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *76192860
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &78668430 !ruby/object:Gem::Requirement
+  requirement: &76192430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *78668430
+  version_requirements: *76192430
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &78667530 !ruby/object:Gem::Requirement
+  requirement: &76191590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *78667530
+  version_requirements: *76191590
 description: textutils - Text Filters, Helpers, Readers and More
 email: ruby-talk@ruby-lang.org
 executables: []
@@ -51,7 +73,7 @@ extensions: []
 extra_rdoc_files:
 - Manifest.txt
 files:
-- History.md
+- HISTORY.md
 - Manifest.txt
 - README.md
 - Rakefile
@@ -74,8 +96,11 @@ files:
 - lib/textutils/reader/code_reader.rb
 - lib/textutils/reader/fixture_reader.rb
 - lib/textutils/reader/hash_reader.rb
+- lib/textutils/reader/hash_reader_v2.rb
 - lib/textutils/reader/line_reader.rb
+- lib/textutils/reader/line_reader_v2.rb
 - lib/textutils/reader/values_reader.rb
+- lib/textutils/reader/values_reader_v2.rb
 - lib/textutils/sanitizier.rb
 - lib/textutils/title.rb
 - lib/textutils/utils.rb