worlddb 1.3.0 → 1.4.0

data/Rakefile

@@ -56,7 +56,8 @@ namespace :dev do
   end
 
   task :env => BUILD_DIR do
-    require './lib/worlddb.rb'
+    require 'worlddb'   ### NB: for local testing use rake -I ./lib dev:test e.g. do NOT forget to add -I ./lib
+    require 'logutils/db'
 
     LogUtils::Logger.root.level = :info
 
@@ -65,6 +66,7 @@ namespace :dev do
   end
 
   task :create => :env do
+    LogDb.create
     WorldDB.create
   end
   

data/lib/worlddb.rb

@@ -69,27 +69,16 @@ module WorldDB
     end
   end
 
-  def self.read_all( include_path )  # load all builtins (using plain text reader); helper for convenience
-    reader = Reader.new
 
-    # too big for heroku free db plan (10,000 record limit)
-    #  - sorry, can't load by default
-    fixture_excludes = [
-      'america/ve/cities'
-    ]
-    
-    ary = Fixtures.all - fixture_excludes
-    
-    ary.each do |name|
-     reader.load( name, include_path )
-    end # each name
-  end # method read_all
-  
-  
   def self.read_setup( setup, include_path )
-    ## fix: to be done  (see sport.db.ruby)
+    reader = Reader.new
+    reader.load_setup( setup, include_path )
   end
 
+  def self.read_all( include_path )  # load all builtins (using plain text reader); helper for convenience
+    read_setup( 'setups/all', include_path )
+  end # method read_all
+
   
   # delete ALL records (use with care!)
   def self.delete!

data/lib/worlddb/data/fixtures.rb

@@ -40,129 +40,3 @@ def find_world_db_path_from_gemfile_gitref!
   
   cand
 end
-
-
-
-module WorldDB
-
-  module Fixtures   # use shortcut/alias Fx?
-
-  def self.all  # all builtin fixtures; helper for covenience
-     tag_fixtures  + 
-     country_fixtures +
-     lang_fixtures +
-     africa_fixtures  +
-     america_fixtures +
-     europe_fixtures  +
-     asia_fixtures    +
-     oceania_fixtures
-  end
-
-  def self.tag_fixtures
-    ['tags.1', 'tags.3']
-  end
-  
-  def self.country_fixtures
-    ['africa/countries',
-     'america/countries',
-     'asia/countries',
-     'europe/countries',
-     'oceania/countries']
-  end
-
-  def self.lang_fixtures
-    ['langs',
-     'africa/3_more/lang',
-     'america/3_more/lang',
-     'asia/3_more/lang',
-     'europe/3_more/lang',
-     'oceania/3_more/lang'
-    ]
-  end
-
-  def self.africa_fixtures
-    ['1_codes/fifa',
-     '1_codes/internet',
-     '1_codes/iso3'].map { |path| "africa/#{path}" }
-  end
-
-  def self.america_fixtures
-  ['1_codes/fifa',
-   '1_codes/internet',
-   '1_codes/iso3',
-   '1_codes/motor',
-   'br/regions',
-   'ca/regions',
-   'ca/cities',
-   'mx/regions',
-   'mx/cities',
-   'us/regions',
-   'us/cities',
-   've/regions',
-   've/cities'].map { |path| "america/#{path}" }
-  end
-
-  def self.asia_fixtures
-  ['1_codes/fifa',
-   '1_codes/internet',
-   '1_codes/iso3',
-   'jp/cities'].map { |path| "asia/#{path}" }
-  end
-  
-  def self.europe_fixtures
-  ['1_codes/fifa',
-   '1_codes/internet',
-   '1_codes/iso3',
-   '1_codes/motor',
-   'at/regions',
-   'at/cities',
-   'be/regions',
-   'be/cities',
-   'bg/cities',
-   'by/cities',
-   'ch/cities',
-   'cy/cities',
-   'cz/regions',
-   'cz/cities',
-   'de/regions',
-   'de/cities',
-   'dk/cities',
-   'ee/cities',
-   'en/regions',
-   'en/cities',
-   'es/regions',
-   'es/cities',
-   'fi/cities',
-   'fr/regions',
-   'fr/cities',
-   'gr/cities',
-   'hr/cities',
-   'hu/cities',
-   'ie/cities',
-   'it/cities',
-   'lt/cities',
-   'lv/cities',
-   'nl/cities',
-   'no/cities',
-   'pl/cities',
-   'pt/cities',
-   'ro/cities',
-   'rs/cities',
-   'ru/cities',
-   'sc/cities',
-   'se/cities',
-   'tr/cities',
-   'ua/cities',
-   'wa/cities'].map { |path| "europe/#{path}" }
-  end
-
-  def self.oceania_fixtures
-   ['1_codes/fifa',
-    '1_codes/internet',
-    '1_codes/iso3',
-    'au/cities'].map { |path| "oceania/#{path}" }
-  end
-
-  end # module Fixtures
-
-end # module WorldDB

data/lib/worlddb/reader.rb

@@ -16,6 +16,64 @@ class Reader
   end
 
 
+  def load_setup( setup, include_path )
+    ary = load_fixture_setup( setup, include_path )
+
+    ### fix/todo:
+    #  use to setups - use comment to remove fixtures
+
+    # too big for heroku free db plan (10,000 record limit)
+    #  - sorry, can't load by default
+    fixture_excludes = [
+      'south-america/ve/cities'
+    ]
+    
+    ary = ary - fixture_excludes
+
+    ary.each do |name|
+      load( name, include_path )
+    end
+  end # method load_setup
+
+
+  ## fix/todo: rename ??
+  def load_fixture_setup( name, include_path )
+    
+   ## todo/fix: cleanup quick and dirty code
+    
+    path = "#{include_path}/#{name}.yml"
+
+    logger.info "parsing data '#{name}' (#{path})..."
+
+    text = File.read_utf8( path )
+    
+    hash = YAML.load( text )
+    
+    ### build up array for fixtures from hash
+    
+    ary = []
+    
+    hash.each do |key_wild, value_wild|
+      key   = key_wild.to_s.strip
+      
+      logger.debug "yaml key:#{key_wild.class.name} >>#{key}<<, value:#{value_wild.class.name} >>#{value_wild}<<"
+    
+      if value_wild.kind_of?( String ) # assume single fixture name
+        ary << value_wild
+      elsif value_wild.kind_of?( Array ) # assume array of fixture names as strings
+        ary = ary + value_wild
+      else
+        logger.error "unknow fixture type in setup (yaml key:#{key_wild.class.name} >>#{key}<<, value:#{value_wild.class.name} >>#{value_wild}<<); skipping"
+      end
+    end
+    
+    logger.debug "fixture setup:"
+    logger.debug ary.to_json
+    
+    ary
+  end # load_fixture_setup
+
+
   def load( name, include_path )
 
     if name =~ /^lang/
@@ -32,9 +90,12 @@ class Reader
        load_xxx( 'motor', name, include_path )
     elsif name =~ /^tag.*\.(\d)$/
        load_tags( name, include_path, :grade => $1.to_i )
-    elsif name =~ /^([a-z]{3,})\/countries/     # e.g. africa/countries or america/countries
+    elsif name =~ /^([a-z][a-z\-]+[a-z])\/countries/     # e.g. africa/countries or america/countries
+      ### NB: continent changed to regions (e.g. middle-east, caribbean, north-america, etc.)
+      ### fix/cleanup/todo:
       ## auto-add continent (from folder structure) as tag
-      load_countries( name, include_path, :tags => $1 )
+      ## load_countries( name, include_path, :tags => $1 )
+      load_countries( name, include_path )
     elsif name =~ /\/([a-z]{2})\/cities/
       ## auto-add required country code (from folder structure)
       load_cities( $1, name, include_path )

data/lib/worlddb/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: worlddb
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-24 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &73677590 !ruby/object:Gem::Requirement
+  requirement: &73513430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *73677590
+  version_requirements: *73513430
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &73677370 !ruby/object:Gem::Requirement
+  requirement: &73513210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *73677370
+  version_requirements: *73513210
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &73677160 !ruby/object:Gem::Requirement
+  requirement: &73513000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *73677160
+  version_requirements: *73513000
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &73676940 !ruby/object:Gem::Requirement
+  requirement: &73512780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *73676940
+  version_requirements: *73512780
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &73676720 !ruby/object:Gem::Requirement
+  requirement: &73512560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *73676720
+  version_requirements: *73512560
 description: worlddb - world.db command line tool
 email: opensport@googlegroups.com
 executables: