worlddb 0.3.2 → 0.4.0

data/Manifest.txt

@@ -62,4 +62,5 @@ lib/worlddb/models/tag.rb
 lib/worlddb/models/tagging.rb
 lib/worlddb/reader.rb
 lib/worlddb/schema.rb
+lib/worlddb/utils.rb
 lib/worlddb/version.rb

data/lib/worlddb/utils.rb

@@ -0,0 +1,140 @@
+# encoding: utf-8
+
+
+class Time
+  
+  def self.cet( str )   # central european time (cet) + central european summer time (cest)  
+    ActiveSupport::TimeZone['Vienna'].parse( str )
+  end
+
+  def self.eet( str )  # eastern european time (eet)  + 2 hours
+    ActiveSupport::TimeZone['Bucharest'].parse( str )
+  end
+  
+  def self.cst( str )  # central standard time (cst) - 6 hours 
+    ActiveSupport::TimeZone['Mexico City'].parse( str )
+  end
+  
+end # class Time
+
+
+class File
+  def self.read_utf8( path )
+    open( path, 'r:bom|utf-8' ) do |file|
+      file.read
+    end
+  end
+end # class File
+
+
+
+  ##
+  # fix/todo: share helper w/ other readers
+  
+  # helper
+  #   change at/2012_13/bl           to at.2012/13.bl
+  #    or    quali_2012_13_europe_c  to quali.2012/13.europe.c
+  
+  def fixture_name_to_prop_key( name )
+    prop_key = name.gsub( '/', '.' )
+    prop_key = prop_key.gsub( /(\d{4})_(\d{2})/, '\1/\2' )  # 2012_13 => 2012/13
+    prop_key = prop_key.gsub( '_', '.' )
+    prop_key
+  end
+  
+  ############
+  ### fix/todo: share helper for all text readers/parsers- where to put it?  
+  ###
+  
+  def title_esc_regex( title_unescaped )
+      
+      ##  escape regex special chars e.g. . to \. and ( to \( etc.
+      # e.g. Benfica Lis.
+      # e.g. Club Atlético Colón (Santa Fe)
+
+      ## NB: cannot use Regexp.escape! will escape space '' to '\ '
+      ## title = Regexp.escape( title_unescaped )
+      title = title_unescaped.gsub( '.', '\.' )
+      title = title.gsub( '(', '\(' )
+      title = title.gsub( ')', '\)' )
+
+      ##  match accented char with or without accents
+      ##  add (ü|ue) etc.
+      ## also make - optional change to (-| ) e.g. Blau-Weiss == Blau Weiss
+
+      ## todo: add some more
+      ## see http://en.wikipedia.org/wiki/List_of_XML_and_HTML_character_entity_references  for more
+      ##
+      ##  reuse for all readers!
+      
+      alternatives = [
+        ['-', '(-| )'],
+        ['ß', '(ß|ss)'],
+        ['æ', '(æ|ae)'],
+        ['á', '(á|a)'],  ## e.g. Bogotá
+        ['ã', '(ã|a)'],  ## e.g  São Paulo
+        ['ä', '(ä|ae)'],  ## add a ?
+        ['Ö', '(Ö|Oe)'], ## e.g. Österreich
+        ['ö', '(ö|oe)'],  ## add o ?
+        ['ó', '(ó|o)'],  ## e.g. Colón
+        ['ü', '(ü|ue)'],  ## add u ?
+        ['é', '(é|e)'],  ## e.g. Vélez
+        ['ê', '(ê|e)'],  ## e.g. Grêmio
+        ['ñ', '(ñ|n)'],  ## e.g. Porteño
+        ['ú', '(ú|u)']  ## e.g. Fútbol
+      ]
+      
+      alternatives.each do |alt|
+        title = title.gsub( alt[0], alt[1] )
+      end
+
+      title
+  end
+
+
+class FixtureReader
+
+  def initialize( logger=nil, path )
+    if logger.nil?
+      @logger = Logger.new(STDOUT)
+      @logger.level = Logger::INFO
+    else
+      @logger = logger
+    end
+    
+    @path = path
+
+    ## nb: assume/enfore utf-8 encoding (with or without BOM - byte order mark)
+    ## - see worlddb/utils.rb
+    @data = File.read_utf8( @path )
+  end
+
+  attr_reader :logger
+
+
+  def each_line
+    @data.each_line do |line|
+  
+      if 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
+
+      # remove leading and trailing whitespace
+      line = line.strip
+ 
+      yield(line)
+    end # lines.each
+  end
+  
+end # class FixtureReader
+
+
+

data/lib/worlddb/version.rb

@@ -1,5 +1,5 @@
 
 module WorldDB
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end
 

data/lib/worlddb.rb

@@ -19,8 +19,8 @@ require 'active_record'   ## todo: add sqlite3? etc.
 
 # our own code
 
-module WorldDB   # forward reference; more to come later
-end
+
+require 'worlddb/version'
 
 require 'worlddb/models/prop'
 require 'worlddb/models/country'
@@ -29,9 +29,9 @@ require 'worlddb/models/city'
 require 'worlddb/models/tag'
 require 'worlddb/models/tagging'
 require 'worlddb/schema'       # NB: requires worlddb/models (include WorldDB::Models)
+require 'worlddb/utils'
 require 'worlddb/reader'
 require 'worlddb/loader'
-require 'worlddb/version'
 require 'worlddb/cli/opts'
 require 'worlddb/cli/runner'
 
@@ -154,6 +154,7 @@ module WorldDB
   
   # delete ALL records (use with care!)
   def self.delete!
+    puts '*** deleting world table records/data...'
     Deleter.new.run
   end # method delete!
 
@@ -194,4 +195,9 @@ module WorldDB
 end  # module WorldDB
 
 
-WorldDB.main if __FILE__ == $0
+if __FILE__ == $0
+  WorldDB.main
+else
+  # say hello
+  puts WorldDB.banner
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: worlddb
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-16 00:00:00 Z
+date: 2012-11-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -173,6 +173,7 @@ files:
 - lib/worlddb/models/tagging.rb
 - lib/worlddb/reader.rb
 - lib/worlddb/schema.rb
+- lib/worlddb/utils.rb
 - lib/worlddb/version.rb
 homepage: http://geraldb.github.com/world.db
 licenses: []