worlddb 0.4.0 → 0.5.0

data/Manifest.txt

@@ -53,6 +53,7 @@ db/tags.yml
 lib/worlddb.rb
 lib/worlddb/cli/opts.rb
 lib/worlddb/cli/runner.rb
+lib/worlddb/console.rb
 lib/worlddb/loader.rb
 lib/worlddb/models/city.rb
 lib/worlddb/models/country.rb
@@ -61,6 +62,8 @@ lib/worlddb/models/region.rb
 lib/worlddb/models/tag.rb
 lib/worlddb/models/tagging.rb
 lib/worlddb/reader.rb
+lib/worlddb/readers/line_reader.rb
+lib/worlddb/readers/values_reader.rb
 lib/worlddb/schema.rb
 lib/worlddb/utils.rb
 lib/worlddb/version.rb

data/lib/worlddb/console.rb

@@ -0,0 +1,71 @@
+## for use to run with interactive ruby (irb)
+##  e.g.  irb -r worlddb/console
+
+require 'worlddb'
+
+# some ruby stdlibs
+
+require 'logger'
+require 'pp'   # pretty printer
+require 'uri'
+require 'json'
+require 'yaml'
+
+
+## shortcuts for models
+
+Tag     = WorldDB::Models::Tag
+Tagging = WorldDB::Models::Tagging
+Country = WorldDB::Models::Country
+Region  = WorldDB::Models::Region
+City    = WorldDB::Models::City
+Prop    = WorldDB::Models::Prop
+
+## connect to db
+
+DB_CONFIG = {
+  adapter:  'sqlite3',
+  database: 'world.db'
+}
+
+pp DB_CONFIG
+ActiveRecord::Base.establish_connection( DB_CONFIG )
+
+
+
+## test drive
+
+puts "Welcome to world.db, version #{WorldDB::VERSION}!"
+puts "  #{'%6d' % Country.count} countries"
+puts "  #{'%6d' % Region.count} regions"
+puts "  #{'%6d' % City.count} cities"
+puts "  #{'%6d' % Tagging.count} taggings"
+puts "  #{'%6d' % Tag.count} tags"
+puts "Ready."
+
+## some countries
+
+## add some predefined shortcuts
+
+##### some countries
+
+at = Country.find_by_key( 'at' )
+de = Country.find_by_key( 'de' )
+en = Country.find_by_key( 'en' )
+
+us = Country.find_by_key( 'us' )
+ca = Country.find_by_key( 'ca' )
+mx = Country.find_by_key( 'mx' )
+
+### some cities
+
+nyc = City.find_by_key( 'newyork' )
+lon = City.find_by_key( 'london' )
+vie = City.find_by_key( 'wien' )
+
+## todo: add some predefined tags (e.g. europe, america, g8, euro, etc.)
+
+
+## turn on activerecord logging to console
+
+ActiveRecord::Base.logger = Logger.new( STDOUT )

data/lib/worlddb/reader.rb

@@ -112,9 +112,11 @@ private
 
     puts "*** parsing data '#{name}' (#{path})..."
 
-    text = File.read( path )
+    reader = ValuesReader.new( logger, path, more_values )
     
-    load_fixtures_worker_for( clazz, text, more_values )
+    load_fixtures_worker_for( clazz, reader )
+
+    Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "file.txt.#{File.mtime(path).strftime('%Y.%m.%d')}" )        
   end
 
   def load_fixtures_builtin_for( clazz, name, more_values={} ) # load from gem (built-in)
@@ -122,72 +124,25 @@ private
 
     puts "*** parsing data '#{name}' (#{path})..."
 
-    text = File.read( path )
+    reader = ValuesReader.new( logger, path, more_values )
     
-    load_fixtures_worker_for( clazz, text, more_values )
+    load_fixtures_worker_for( clazz, reader )
+
+    Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "world.txt.#{WorldDB::VERSION}" )
   end
 
-  def load_fixtures_worker_for( clazz, data, more_values )
+
+  def load_fixtures_worker_for( clazz, reader )
    
     ## NB: assumes active activerecord db connection
     ##
 
-    data.each_line do |line|
+    reader.each_line do |attribs, values|
   
-      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
-
-      puts "line: >>#{line}<<"
-
-      values = line.split(',')
-      
-      # remove leading and trailing whitespace for values
-      values = values.map { |value| value.strip }
-
-      ## remove comment columns
-      ##  todo: also removecomments from inside columns ?? why? why not??
-      
-      values = values.select do |value|
-        if value =~ /^#/  ## start with # treat it as a comment column; e.g. remove it
-          puts "   removing column with value >>#{value}<<"
-          false
-        else
-          true
-        end
-      end 
-      
-      puts "  values: >>#{values.join('<< >>')}<<"
-      
-      attribs = {
-        key: values[0]
-      }
-      
-      ## title (split of optional synonyms)
-      # e.g. FC Bayern Muenchen|Bayern Muenchen|Bayern
-      titles = values[1].split('|')
-      
-      attribs[ :title ]    =  titles[0]
-      ## add optional synonyms
-      attribs[ :synonyms ] =  titles[1..-1].join('|')  if titles.size > 1
-      
-      attribs = attribs.merge( more_values )  # e.g. merge country_id and other defaults if present
-            
       value_numbers = []
       
       ## check for optional values
-      values[2..-1].each_with_index do |value,index|
+      values.each_with_index do |value,index|
         if value =~ /^region:/   ## region:
           value_region_key = value[7..-1]  ## cut off region: prefix
           value_region = Region.find_by_key!( value_region_key )
@@ -227,10 +182,8 @@ private
    
       rec.update_attributes!( attribs )
         
-    end # data.each
-    
-    ## todo/fix: add Prop.create!( name )
-        
+    end # each_line
+            
   end # method load_fixture_worker_for
 
   

data/lib/worlddb/readers/line_reader.rb

@@ -0,0 +1,45 @@
+# encoding: utf-8
+
+class LineReader
+
+  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 # each lines
+  end # method each_line
+  
+end # class LineReader

data/lib/worlddb/readers/values_reader.rb

@@ -0,0 +1,84 @@
+# encoding: utf-8
+
+class ValuesReader
+
+  def initialize( logger, path, more_values={} )
+    ## todo: check - can we make logger=nil a default arg too?
+    if logger.nil?
+      @logger = Logger.new(STDOUT)
+      @logger.level = Logger::INFO
+    else
+      @logger = logger
+    end
+    
+    @path = path
+
+    @more_values = more_values
+
+    @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
+
+      puts "line: >>#{line}<<"
+
+      values = line.split(',')
+      
+      # remove leading and trailing whitespace for values
+      values = values.map { |value| value.strip }
+
+      ## remove comment columns
+      ##  todo: also removecomments from inside columns ?? why? why not??
+      
+      values = values.select do |value|
+        if value =~ /^#/  ## start with # treat it as a comment column; e.g. remove it
+          puts "   removing column with value >>#{value}<<"
+          false
+        else
+          true
+        end
+      end 
+      
+      puts "  values: >>#{values.join('<< >>')}<<"
+            
+      attribs = {
+        key: values[0]
+      }
+      
+      ## title (split of optional synonyms)
+      # e.g. FC Bayern Muenchen|Bayern Muenchen|Bayern
+      titles = values[1].split('|')
+      
+      attribs[ :title ]    =  titles[0]
+      ## add optional synonyms
+      attribs[ :synonyms ] =  titles[1..-1].join('|')  if titles.size > 1
+      
+      attribs = attribs.merge( @more_values )  # e.g. merge country_id and other defaults if present
+                        
+      yield( attribs, values[2..-1] )
+
+    end # each lines
+
+  end # method each_line
+  
+end # class ValuesReader
+

data/lib/worlddb/utils.rb

@@ -91,50 +91,3 @@ end # class File
       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.4.0'
+  VERSION = '0.5.0'
 end
 

data/lib/worlddb.rb

@@ -30,6 +30,8 @@ require 'worlddb/models/tag'
 require 'worlddb/models/tagging'
 require 'worlddb/schema'       # NB: requires worlddb/models (include WorldDB::Models)
 require 'worlddb/utils'
+require 'worlddb/readers/line_reader'
+require 'worlddb/readers/values_reader'
 require 'worlddb/reader'
 require 'worlddb/loader'
 require 'worlddb/cli/opts'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: worlddb
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-20 00:00:00 Z
+date: 2012-11-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -164,6 +164,7 @@ files:
 - lib/worlddb.rb
 - lib/worlddb/cli/opts.rb
 - lib/worlddb/cli/runner.rb
+- lib/worlddb/console.rb
 - lib/worlddb/loader.rb
 - lib/worlddb/models/city.rb
 - lib/worlddb/models/country.rb
@@ -172,6 +173,8 @@ files:
 - lib/worlddb/models/tag.rb
 - lib/worlddb/models/tagging.rb
 - lib/worlddb/reader.rb
+- lib/worlddb/readers/line_reader.rb
+- lib/worlddb/readers/values_reader.rb
 - lib/worlddb/schema.rb
 - lib/worlddb/utils.rb
 - lib/worlddb/version.rb