worlddb 1.0.1 → 1.1.0

data/lib/worlddb/cli/main.rb

@@ -118,18 +118,18 @@ command :load do |c|
     WorldDB.delete! if options.delete.present?
 
     # read plain text country/region/city fixtures
-    reader = WorldDB::Reader.new  # todo: add logger here?
+    reader = WorldDB::Reader.new
     args.each do |arg|
       name = arg     # File.basename( arg, '.*' )
 
       if myopts.countries?
-        reader.load_countries_with_include_path( name, myopts.data_path )
+        reader.load_countries( name, myopts.data_path )
       elsif myopts.regions?
-        reader.load_regions_with_include_path( myopts.country, name, myopts.data_path )
+        reader.load_regions( myopts.country, name, myopts.data_path )
       elsif myopts.cities?
-        reader.load_cities_with_include_path( myopts.country, name, myopts.data_path )
+        reader.load_cities( myopts.country, name, myopts.data_path )
       else
-        reader.load_with_include_path( name, myopts.data_path )
+        reader.load( name, myopts.data_path )
         ## todo: issue a warning here; no fixture type specified; assume country?
       end
       

data/lib/worlddb/models/prop.rb

@@ -4,14 +4,10 @@ module WorldDB::Models
 
   class Prop < ActiveRecord::Base
 
-    def self.create_from_worlddb_fixture!( name, path )
+    def self.create_from_fixture!( name, path )
       key   = "db.#{fixture_name_to_prop_key(name)}.version"
     
-      if path.starts_with?( WorldDB.data_path )
-        value = "world.yml.#{WorldDB::VERSION}"  # assume builtin
-      else
-        value = "file.txt.#{File.mtime(path).strftime('%Y.%m.%d')}"
-      end
+      value = "txt.#{File.mtime(path).strftime('%Y.%m.%d')}"
     
       Prop.create!( key: key, value: value )
     end

data/lib/worlddb/reader.rb

@@ -6,43 +6,44 @@ class Reader
 #  e.g. lets you use City instead of Models::City
   include WorldDB::Models
 
+  ### todo/fix: make include_path
+  ## required first arg in ctor!!!
+  ## cleanup load_   and remove include_path
 
-  def initialize( logger=nil )
-    if logger.nil?
-      @logger = LogUtils::Logger.new
-    else
-      @logger = logger
-    end
+  def initialize( opts={} )
+    @logger = LogUtils::Logger.new
+    
+    # todo/fix/cleanup: allow initialize( opts = {} ) for logger: logger 
   end
 
   attr_reader :logger
 
 
-  def load_with_include_path( name, include_path )
+  def load( name, include_path )
 
     if name =~ /^lang/
-       load_langs_with_include_path( name, include_path )
+       load_langs( name, include_path )
     elsif name =~ /\/lang/
-       load_usages_with_include_path( name, include_path )
+       load_usages( name, include_path )
     elsif name =~ /\/fifa/
-       load_xxx_with_include_path( 'fifa', name, include_path )
+       load_xxx( 'fifa', name, include_path )
     elsif name =~ /\/iso3/
-       load_xxx_with_include_path( 'iso3', name, include_path )
+       load_xxx( 'iso3', name, include_path )
     elsif name =~ /\/internet/
-       load_xxx_with_include_path( 'net', name, include_path )
+       load_xxx( 'net', name, include_path )
     elsif name =~ /\/motor/
-       load_xxx_with_include_path( 'motor', name, include_path )
+       load_xxx( 'motor', name, include_path )
     elsif name =~ /^tag.*\.(\d)$/
-       load_tags_with_include_path( name, include_path, :grade => $1.to_i )
+       load_tags( name, include_path, :grade => $1.to_i )
     elsif name =~ /^([a-z]{3,})\/countries/     # e.g. africa/countries or america/countries
       ## auto-add continent (from folder structure) as tag
-      load_countries_with_include_path( name, include_path, :tags => $1 )
+      load_countries( name, include_path, :tags => $1 )
     elsif name =~ /\/([a-z]{2})\/cities/
       ## auto-add required country code (from folder structure)
-      load_cities_with_include_path( $1, name, include_path )
+      load_cities( $1, name, include_path )
     elsif name =~ /\/([a-z]{2})\/regions/
       ## auto-add required country code (from folder structure)
-      load_regions_with_include_path( $1, name, include_path )
+      load_regions( $1, name, include_path )
     else
       logger.error "unknown world.db fixture type >#{name}<"
       # todo/fix: exit w/ error
@@ -50,121 +51,137 @@ class Reader
   end
   
 
-  def load_countries_with_include_path( name, include_path, more_values={} )
-    load_fixtures_with_include_path_for( Country, name, include_path, more_values )
+  def load_countries( name, include_path, more_values={} )
+    load_fixtures_for( Country, name, include_path, more_values )
   end
 
 
-  def load_regions_with_include_path( country_key, name, include_path )
+  def load_regions( country_key, name, include_path )
     country = Country.find_by_key!( country_key )
-    logger.info "Country #{country.key} >#{country.title} (#{country.code})<"
+    logger.debug "Country #{country.key} >#{country.title} (#{country.code})<"
 
-    load_fixtures_with_include_path_for( Region, name, include_path, country_id: country.id )
+    load_fixtures_for( Region, name, include_path, country_id: country.id )
   end
 
 
-  def load_cities_with_include_path( country_key, name, include_path )
+  def load_cities( country_key, name, include_path )
     country = Country.find_by_key!( country_key )
-    logger.info "Country #{country.key} >#{country.title} (#{country.code})<"
+    logger.debug "Country #{country.key} >#{country.title} (#{country.code})<"
 
-    load_fixtures_with_include_path_for( City, name, include_path, country_id: country.id )
+    load_fixtures_for( City, name, include_path, country_id: country.id )
   end
 
 
-  def load_langs_with_include_path( name, include_path )
+
+  def with_path_for( name, include_path )
+    ## todo: find a better name?
+    # e.g. find_path_for  or open_fixture_for ??
+
     path = "#{include_path}/#{name}.yml"
 
-    logger.info "*** parsing data '#{name}' (#{path})..."
+    logger.info "parsing data '#{name}' (#{path})..."
+    
+    yield( path )
+    
+    Prop.create_from_fixture!( name, path )
+  end
 
-    reader = HashReader.new( logger, path )
 
-    reader.each do |key, value|
 
-      logger.debug "adding lang >>#{key}<< >>#{value}<<..."
+  def load_langs( name, include_path )
+    
+    with_path_for( name, include_path) do |path|
+  
+      reader = HashReader.new( logger, path )
+
+      reader.each do |key, value|
+
+        logger.debug "adding lang >>#{key}<< >>#{value}<<..."
       
-      lang_key   = key.strip
-      lang_title = value.strip
+        lang_key   = key.strip
+        lang_title = value.strip
       
-      lang_attribs = {}
+        lang_attribs = {}
         
-      ## check if it exists
-      lang = Lang.find_by_key( lang_key )
-      if lang.present?
-        puts "*** update lang #{lang.id}-#{lang.key}:"
-      else
-        puts "*** create lang:"
-        lang = Lang.new
-        lang_attribs[ :key ] = lang_key
-      end
+        ## check if it exists
+        lang = Lang.find_by_key( lang_key )
+        if lang.present?
+          logger.debug "update lang #{lang.id}-#{lang.key}:"
+        else
+          logger.debug "create lang:"
+          lang = Lang.new
+          lang_attribs[ :key ] = lang_key
+        end
         
-      lang_attribs[ :title ] = lang_title
+        lang_attribs[ :title ] = lang_title
         
-      puts lang_attribs.to_json
-   
-      lang.update_attributes!( lang_attribs )
-    end # each key,value
-
-    Prop.create_from_worlddb_fixture!( name, path )
-  end
+        logger.debug lang_attribs.to_json
+     
+        lang.update_attributes!( lang_attribs )
+      end # each key,value
+    end # with_path_for
 
+  end # method load_langs
 
-  def load_tags_with_include_path( name, include_path, more_values={} )
-    path = "#{include_path}/#{name}.yml"
 
-    puts "*** parsing data '#{name}' (#{path})..."
+  def load_tags( name, include_path, more_values={} )
+    
+    with_path_for( name, include_path) do |path|
 
-    reader = HashReader.new( logger, path )
+      ### fix/todo/cleanup: HashReader -> make logger a keyword option only; do NOT use here
+      reader = HashReader.new( logger, path )
 
-    grade = 1
+      grade = 1
     
-    if more_values[:grade].present?
-      grade = more_values[:grade].to_i
-    end
+      if more_values[:grade].present?
+        grade = more_values[:grade].to_i
+      end
 
-    reader.each do |key, value|
-      ### split value by comma (e.g. northern america,southern america, etc.)
-      puts "adding grade #{grade} tags >>#{key}<< >>#{value}<<..."
-      tag_pairs = value.split(',')
-      tag_pairs.each do |pair|
+      reader.each do |key, value|
+        ### split value by comma (e.g. northern america,southern america, etc.)
+        logger.debug "adding grade #{grade} tags >>#{key}<< >>#{value}<<..."
+        tag_pairs = value.split(',')
+        tag_pairs.each do |pair|
         ## split key|title
-        values = pair.split('|')
+          values = pair.split('|')
         
-        key   = values[0]
-        ### remove (optional comment) from key (e.g. carribean (islands))
-        key = key.gsub( /\(.+\)/, '' )
-        ## remove leading n trailing space
-        key = key.strip
+          key   = values[0]
+          ### remove (optional comment) from key (e.g. carribean (islands))
+          key = key.gsub( /\(.+\)/, '' )
+          ## remove leading n trailing space
+          key = key.strip
         
-        title = values[1] || ''  # nb: title might be empty/missing
-        title = title.strip
+          title = values[1] || ''  # nb: title might be empty/missing
+          title = title.strip
         
-        tag_attribs = {}
+          tag_attribs = {}
         
-        ## check if it exists
-        ## todo/fix: add country_id for lookup?
-        tag = Tag.find_by_key( key )
-        if tag.present?
-          puts "*** update tag #{tag.id}-#{tag.key}:"
-        else
-          puts "*** create tag:"
-          tag = Tag.new
-          tag_attribs[ :key ] = key
-        end
+          ## check if it exists
+          ## todo/fix: add country_id for lookup?
+          tag = Tag.find_by_key( key )
+          if tag.present?
+            logger.debug "update tag #{tag.id}-#{tag.key}:"
+          else
+            logger.debug "create tag:"
+            tag = Tag.new
+            tag_attribs[ :key ] = key
+          end
         
-        tag_attribs[ :title ] = title
-        tag_attribs[ :grade ] = grade
+          tag_attribs[ :title ] = title
+          tag_attribs[ :grade ] = grade
         
-        puts tag_attribs.to_json
+          logger.debug tag_attribs.to_json
    
-        tag.update_attributes!( tag_attribs )
-      end
-    end # each key,value
-
-    Prop.create_from_worlddb_fixture!( name, path )
-  end # method load_tags_with_include_path
+          tag.update_attributes!( tag_attribs )
+        end
+      end # each key,value
+    
+    end # with_path_for
+    
+  end # method load_tags
 
 
-  def load_usages_with_include_path( name, include_path )
+  def load_usages( name, include_path )
     path = "#{include_path}/#{name}.yml"
 
     puts "*** parsing data '#{name}' (#{path})..."
@@ -189,11 +206,11 @@ class Reader
       end
     end
 
-    Prop.create_from_worlddb_fixture!( name, path )
+    Prop.create_from_fixture!( name, path )
   end
 
 
-  def load_xxx_with_include_path( xxx, name, include_path )
+  def load_xxx( xxx, name, include_path )
     path = "#{include_path}/#{name}.yml"
 
     puts "*** parsing data '#{name}' (#{path})..."
@@ -206,12 +223,12 @@ class Reader
       country.save!
     end
 
-    Prop.create_from_worlddb_fixture!( name, path )
+    Prop.create_from_fixture!( name, path )
   end
 
 
 private
-  def load_fixtures_with_include_path_for( clazz, name, include_path, more_values={} )  # load from file system
+  def load_fixtures_for( clazz, name, include_path, more_values={} )  # load from file system
     path = "#{include_path}/#{name}.txt"
 
     puts "*** parsing data '#{name}' (#{path})..."
@@ -220,7 +237,7 @@ private
     
     load_fixtures_worker_for( clazz, reader )
 
-    Prop.create_from_worlddb_fixture!( name, path )
+    Prop.create_from_fixture!( name, path )
   end
 
 

data/lib/worlddb/version.rb

@@ -1,4 +1,4 @@
 
 module WorldDB
-  VERSION = '1.0.1'  # sync version w/ sport.db - why? why not?
+  VERSION = '1.1.0'  # sync version w/ sport.db - why? why not?
 end

data/lib/worlddb.rb

@@ -65,7 +65,7 @@ module WorldDB
   def self.read( ary, include_path )
     reader = Reader.new
     ary.each do |name|
-      reader.load_with_include_path( name, include_path )
+      reader.load( name, include_path )
     end
   end
 
@@ -81,7 +81,7 @@ module WorldDB
     ary = Fixtures.all - fixture_excludes
     
     ary.each do |name|
-     reader.load_with_include_path( name, include_path )
+     reader.load( name, include_path )
     end # each name
   end # method read_all
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: worlddb
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-20 00:00:00 Z
+date: 2013-02-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: textutils