worlddb 0.3.1 → 0.3.2

data/lib/worlddb/cli/runner.rb

@@ -106,32 +106,11 @@ EOS
       end
     end
 
-    dump_stats
-    dump_props
+    WorldDB.stats
     
     puts 'Done.'
     
   end   # method run
 
-
-  def dump_stats
-    # todo: use %5d or similar to format string
-    puts "Stats:"
-    puts "  #{Country.count} countries"
-    puts "  #{Region.count} regions"
-    puts "  #{City.count} cities"
-    puts "  #{Tag.count} tags"
-    puts "  #{Tagging.count} taggings"
-  end
-
-
-  def dump_props
-    # todo: use %5 or similar to format string
-    puts "Props:"
-    Prop.order( 'created_at asc' ).all.each do |prop|
-      puts "  #{prop.key} / #{prop.value} || #{prop.created_at}"
-    end
-  end
-  
 end # class Runner
 end # module WorldDB

data/lib/worlddb/reader.rb

@@ -36,9 +36,23 @@ class Reader
 
   end
 
+
   ############################
   # load from file system
   
+  def load_with_include_path( name, include_path )
+    if name =~ /\/countries/
+      load_countries_with_include_path( name, include_path )
+    elsif name =~ /\/([a-z]{2})\/cities/
+      load_cities_with_include_path( $1, name, include_path )
+    elsif name =~ /\/([a-z]{2})\/regions/
+      load_regions_with_include_path( $1, name, include_path )
+    else
+      puts "*** error: unknown world.db fixture type >#{name}<"
+      # todo/fix: exit w/ error
+    end
+  end
+
   def load_countries_with_include_path( name, include_path )
     load_fixtures_with_include_path_for( Country, name, include_path )
   end

data/lib/worlddb/version.rb

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

data/lib/worlddb.rb

@@ -157,7 +157,40 @@ module WorldDB
     Deleter.new.run
   end # method delete!
 
-  
+  class Stats
+    include WorldDB::Models
+
+    def tables
+      puts "Stats:"
+      puts " #{'%5d' % Country.count} countries"
+      puts " #{'%5d' % Region.count} regions"
+      puts " #{'%5d' % City.count} cities"
+      puts " #{'%5d' % Tag.count} tags"
+      puts " #{'%5d' % Tagging.count} taggings"
+    end
+    
+    def props
+      puts "Props:"
+      Prop.order( 'created_at asc' ).all.each do |prop|
+        puts "  #{prop.key} / #{prop.value} || #{prop.created_at}"
+      end
+    end
+  end
+
+  def self.stats
+    stats = Stats.new
+    stats.tables
+    stats.props
+  end
+
+  def self.tables
+    Stats.new.tables
+  end
+
+  def self.props
+    Stats.new.props
+  end
+
 end  # module WorldDB
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: worlddb
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Gerald Bauer