worlddb 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bcd0cfff41045906128dcc7c1d4a21a161f97f8
-  data.tar.gz: 77b2b023d09ffd92a1f6b409dc12cea150f4204a
+  metadata.gz: 6b65594f88cfffccc8acebb72f70c8a159f0567b
+  data.tar.gz: 992aee423be6b539415f6dadd8a38dd59a7d32ca
 SHA512:
-  metadata.gz: 15bb7a864dcb23fcfb99f15c64c83cdc8a2f0d17e1f51ea59ac81f581114ccca9f647d7e6ed9a3dcba58847d4768a0171f2cc3c7a43c294ebd4dab246e1fadc3
-  data.tar.gz: fa1f5a379da46acd7ce1b250b98ab61a41a1d8e7940420758c5c7631adf4ce8d0b55c4eef3ad64cb4ae91b59e6f27ba85395c75cadf433291a42c4a92c6f6a6c
+  metadata.gz: ab185997dfc12146ed72b4b7e78a38307e1bff1312ce6a0cf65e77c5038446e42da0dde0849031eb43238024331fb6f66d7815cc17fffab34a0f82869188bf49
+  data.tar.gz: 15a37472e6017d9609ad4d057a4480d022793f853219d693f35add17d09e1705e6db1e6a181302eee1dd81f894ee1f1108da8df2ac8b023e4746dffd1f1d0ff3

data/Manifest.txt

@@ -34,7 +34,6 @@ lib/worlddb/readers/region.rb
 lib/worlddb/readers/usage.rb
 lib/worlddb/schema.rb
 lib/worlddb/stats.rb
-lib/worlddb/utils.rb
 lib/worlddb/version.rb
 test/helper.rb
 test/test_fixture_matchers.rb

data/README.md

@@ -5,33 +5,94 @@ world.db Command Line Tool in Ruby
 * home  :: [github.com/geraldb/world.db.ruby](https://github.com/geraldb/world.db.ruby)
 * bugs  :: [github.com/geraldb/world.db.ruby/issues](https://github.com/geraldb/world.db.ruby/issues)
 * gem   :: [rubygems.org/gems/worlddb](https://rubygems.org/gems/worlddb)
-* rdoc  :: [rubydoc.info/gems/wrolddb](http://rubydoc.info/gems/worlddb)
+* rdoc  :: [rubydoc.info/gems/worlddb](http://rubydoc.info/gems/worlddb)
 * forum :: [groups.google.com/group/openmundi](https://groups.google.com/group/openmundi)
 
 
 ## Usage Command Line
 
-    world.db command line tool, version 2.0.0
-    
-    Commands:
-      create               Create DB schema
-      help                 Display global or [command] help documentation.
-      load                 Load fixtures
-      logs                 Show logs
-      props                Show props
-      setup                Create DB schema 'n' load all data
-      stats                Show stats
-      test                 Debug/test command suite
-    
-    Global Options:
-      -i, --include PATH   Data path (default is .)
-      -d, --dbpath PATH    Database path (default is .)
-      -n, --dbname NAME    Database name (datault is world.db)
-      -q, --quiet          Only show warnings, errors and fatal messages
-      -w, --verbose        Show debug messages
-      -h, --help           Display help documentation
-      -v, --version        Display version information
-      -t, --trace          Display backtrace when an error occurs
+The worlddb gem lets you load plain text fixtures into your database
+(and also includes schema n models for easy reuse). 
+
+~~~
+SYNOPSIS
+    worlddb [global options] command [command options] [arguments...]
+
+VERSION
+    2.0
+
+GLOBAL OPTIONS
+    -d, --dbpath=PATH - Database path (default: .)
+    -n, --dbname=NAME - Database name (default: world.db)
+    --verbose         - (Debug) Show debug messages
+    --version         - Show version
+
+COMMANDS
+    create        - Create DB schema
+    setup, s      - Create DB schema 'n' load all world data
+    update, up, u - Update all world data
+    load, l       - Load world fixtures
+    logs          - Show logs
+    props         - Show props
+    stats         - Show stats
+    test          - (Debug) Test command suite
+    help          - Shows a list of commands or help for one command
+~~~
+
+
+### `setup` Command
+
+~~~
+NAME
+    setup - Create DB schema 'n' load all world data
+
+SYNOPSIS
+    worlddb [global options] setup [command options] NAME
+
+COMMAND OPTIONS
+    -i, --include=PATH  - World data path (default: .)
+
+EXAMPLES
+    worlddb setup --include ./world.db
+    worlddb setup us --include ./world.db
+~~~
+
+
+### `update` Command
+
+~~~
+NAME
+    update - Update all world data
+
+SYNOPSIS
+    worlddb [global options] update [command options] NAME
+
+COMMAND OPTIONS
+    --delete           - Delete all world data records
+    -i, --include=PATH - World data path (default: .)
+
+EXAMPLES
+    worlddb update --include ./world.db
+    worlddb update --include ./world.db --delete
+~~~
+
+
+### `load` Command
+
+~~~
+NAME
+    load - Load world fixtures
+
+SYNOPSIS
+    worlddb [global options] load [command options] NAME
+
+COMMAND OPTIONS
+    --delete           - Delete all world data records
+    -i, --include=PATH - World data path (default: .)
+
+EXAMPLES
+    worlddb load --include ./world.db europe/countries
+~~~
 
 
 
@@ -53,10 +114,10 @@ world.db Command Line Tool in Ruby
     # => [ 'Wien', 'Niederösterreich', 'Oberösterreich', ... ]
 
     at.cities.by_pop
-    # => [ 'Wien', 'Graz', 'Linz', 'Salzburg', ... ]
+    # => [ 'Wien', 'Graz', 'Linz', 'Salzburg', 'Innsbruck' ... ]
 
 
-'City' Model - Example:
+`City` Model - Example:
 
     c = City.find_by! key: 'wien'
     c.name
@@ -81,7 +142,7 @@ world.db Command Line Tool in Ruby
     # => 'North America'
 
 
-'Tag' Model - Example:
+`Tag` Model - Example:
 
     euro = Tag.find_by! key: 'euro'
     euro.countries.count
@@ -93,7 +154,7 @@ world.db Command Line Tool in Ruby
     flanders.regions.count
     # => 5
     flanders.regions
-    # => ['Antwerpen', 'Brabant Wallon', 'Limburg', 'Oost-Vlaanderen', ... ]
+    # => ['Antwerpen', 'Brabant Wallon', 'Limburg', 'Oost-Vlaanderen', 'West-Vlaanderen']
     flanders.regions.first.country.name
     # => 'Belgium'
 

data/Rakefile

@@ -17,7 +17,7 @@ Hoe.spec 'worlddb' do
   self.extra_deps = [
     ['props'],         # settings / prop(ertie)s / env / INI
     ['logutils'],     # logging
-    ['textutils', '>= 0.8.7'], # e.g.  >= 0.6 && <= 1.0  ## will include logutils, props
+    ['textutils', '>= 0.9.2'], # e.g.  >= 0.6 && <= 1.0  ## will include logutils, props
     ['tagutils'],     # tags n categories for activerecord
 
      ## 3rd party

data/lib/worlddb/models/continent.rb

@@ -16,11 +16,16 @@ class Continent < ActiveRecord::Base
   def on_create
     place_rec = Place.create!( name: name, kind: place_kind )
     self.place_id = place_rec.id 
+
+    self.slug = TextUtils.slugify( name )  if slug.blank?
   end
 
   def on_update
     ## fix/todo: check - if name or kind changed - only update if changed ?? why? why not??
     place.update_attributes!( name: name, kind: place_kind )
+    
+    ## check if name changed -- possible?
+    ## update slug too??
   end
 
   def place_kind   # use place_kind_of_code ??

data/lib/worlddb/models/country.rb

@@ -45,14 +45,20 @@ class Country < ActiveRecord::Base
   before_create :on_create
   before_update :on_update
 
+
   def on_create
     place_rec = Place.create!( name: name, kind: place_kind )
-    self.place_id = place_rec.id 
+    self.place_id = place_rec.id
+    
+    self.slug = TextUtils.slugify( name )  if slug.blank?
   end
-
+  
   def on_update
     ## fix/todo: check - if name or kind changed - only update if changed ?? why? why not??
     place.update_attributes!( name: name, kind: place_kind )
+
+    ## check if name changed -- possible?
+    ## update slug too??
   end
 
   def place_kind   # use place_kind_of_code ??
@@ -87,6 +93,11 @@ class Country < ActiveRecord::Base
   end
 
 
+  def to_path( opts={} )
+    # e.g. europe/at-austria
+    "#{continent.slug}/#{key}-#{slug}"
+  end
+
 
   def self.create_or_update_from_values( values, more_attribs={} )
 

data/lib/worlddb/schema.rb

@@ -62,6 +62,7 @@ end
 
 create_table :continents do |t|
   t.string     :name,     null: false
+  t.string     :slug,     null: false   # auto-generate default
   t.string     :key,      null: false
   t.references :place,    null: false
   t.string     :alt_names  # comma separated list of alternate names (synonyms)
@@ -75,6 +76,7 @@ add_index :continents, :key, unique: true
 
 create_table :countries do |t|
   t.string     :name,   null: false
+  t.string     :slug,   null: false   # auto-generate default
   t.string     :key,    null: false
   t.references :place,  null: false
   t.string     :code,   null: false  # short three letter code (FIFA country code e.g. ITA)

data/lib/worlddb/version.rb

@@ -1,4 +1,5 @@
 
 module WorldDb
-  VERSION = '2.0.0'  # sync version w/ sport.db - why? why not?
+  VERSION = '2.0.1'  # sync version w/ sport.db - why? why not?
 end
+

data/lib/worlddb.rb

@@ -27,8 +27,6 @@ require 'props/db'  # includes ConfDb (ConfDb::Model::Prop, etc.)
 
 require 'worlddb/version'   # always goes first
 
-require 'worlddb/utils'
-
 require 'worlddb/models/forward'
 
 require 'worlddb/models/name'

data/test/test_model_country.rb

@@ -9,6 +9,16 @@ class TestModelCountry < MiniTest::Unit::TestCase
     WorldDb.delete!
   end
 
+  def test_to_path
+    eu = Continent.create!( key: 'eu', name: 'Europe' )
+    assert_equal 'europe', eu.slug
+    
+    at = Country.create!( key: 'at', name: 'Austria', code: 'AUT', area: 83_871, pop: 8_414_638, continent: eu )
+    assert_equal 'austria', at.slug
+    
+    assert_equal 'europe/at-austria', at.to_path
+  end
+
   def test_load_values
 
     new_attributes = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worlddb
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2014-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: tagutils
   requirement: !ruby/object:Gem::Requirement
@@ -168,7 +168,6 @@ files:
 - lib/worlddb/readers/usage.rb
 - lib/worlddb/schema.rb
 - lib/worlddb/stats.rb
-- lib/worlddb/utils.rb
 - lib/worlddb/version.rb
 - test/helper.rb
 - test/test_fixture_matchers.rb

data/lib/worlddb/utils.rb

@@ -1,22 +0,0 @@
-# encoding: utf-8
-
-######
-# fix:
-#  move to textutils ???
-
-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
-