worlddb 1.7.2 → 1.8.0

data/Manifest.txt

@@ -7,7 +7,6 @@ lib/worlddb.rb
 lib/worlddb/cli/main.rb
 lib/worlddb/cli/opts.rb
 lib/worlddb/console.rb
-lib/worlddb/data/fixtures.rb
 lib/worlddb/deleter.rb
 lib/worlddb/matcher.rb
 lib/worlddb/models/city.rb
@@ -25,4 +24,5 @@ lib/worlddb/stats.rb
 lib/worlddb/utils.rb
 lib/worlddb/version.rb
 test/helper.rb
+test/test_fixture_matchers.rb
 test/test_values.rb

data/README.md

@@ -1,13 +1,41 @@
-# worlddb - world.db Command Line Tool in Ruby
+# worlddb
+
+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/worldb](https://rubygems.org/gems/worlddb)
+* gem   :: [rubygems.org/gems/worlddb](https://rubygems.org/gems/worlddb)
 * rdoc  :: [rubydoc.info/gems/wrolddb](http://rubydoc.info/gems/worlddb)
-* forum :: [groups.google.com/group/opensport](https://groups.google.com/group/opensport)
+* forum :: [groups.google.com/group/openmundi](https://groups.google.com/group/openmundi)
+
+
+## Usage Command Line
 
+    world.db command line tool, version 1.8.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
+
+
+## Usage Models
 
-## Usage
 
 TBD
 
@@ -19,7 +47,18 @@ Just install the gem:
     $ gem install worlddb
 
 
+## Free Open Public Domain Datasets
+
+- [`world.db`](https://github.com/openmundi) - free open public domain countries, regions, cities n more data for use in any (programming) language
+
+
 ## License
 
 The `worlddb` scripts are dedicated to the public domain.
-Use it as you please with no restrictions whatsoever.
+Use it as you please with no restrictions whatsoever.
+
+## Questions? Comments?
+
+Send them along to the [Open Mundi (world.db) Database Forum/Mailing List](http://groups.google.com/group/openmundi).
+Thanks!
+

data/Rakefile

@@ -1,4 +1,3 @@
-require 'pp'
 require 'hoe'
 require './lib/worlddb/version.rb'
 
@@ -16,7 +15,7 @@ Hoe.spec 'worlddb' do
   self.urls    = ['https://github.com/geraldb/world.db.ruby']
   
   self.author  = 'Gerald Bauer'
-  self.email   = 'opensport@googlegroups.com'
+  self.email   = 'openmundi@googlegroups.com'
 
   self.extra_deps = [
     ['textutils', '~> 0.6'], # e.g.  >= 0.6 && <= 1.0
@@ -32,54 +31,3 @@ Hoe.spec 'worlddb' do
   }
 
 end
-
-##############################
-## for testing 
-##
-## NB: use rake -I ./lib dev:test      # fresh import (starts w/ clean wipe out)
-
-namespace :worlddb do
-  
-  BUILD_DIR = "./build"
-  
-  WORLD_DB_PATH = "#{BUILD_DIR}/world.db"
-
-  DB_CONFIG = {
-    :adapter   =>  'sqlite3',
-    :database  =>  WORLD_DB_PATH
-  }
-
-  directory BUILD_DIR
-
-  task :clean do
-    rm WORLD_DB_PATH if File.exists?( WORLD_DB_PATH )
-  end
-
-  task :env => BUILD_DIR do
-    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
-
-    pp DB_CONFIG
-    ActiveRecord::Base.establish_connection( DB_CONFIG )
-  end
-
-  task :create => :env do
-    LogDb.create
-    WorldDb.create
-  end
-  
-  task :import => :env do
-    WorldDb.read_setup( 'setups/europe.at', '../world.db', skip_tags: true )  # populate world tables
-    WorldDb.stats
-  end
-
-
-  desc 'worlddb - build from scratch'
-  task :build => [:clean, :create, :import]
-
-  desc 'worlddb - update'
-  task :update => [:import]
-
-end  # namespace :worlddb

data/lib/worlddb/console.rb

@@ -14,13 +14,13 @@ require 'yaml'
 
 ## shortcuts for models
 
-Tag        = WorldDb::Models::Tag
-Tagging    = WorldDb::Models::Tagging
-Continent  = WorldDb::Models::Continent
-Country    = WorldDb::Models::Country
-Region     = WorldDb::Models::Region
-City       = WorldDb::Models::City
-Prop       = WorldDb::Models::Prop
+Tag        = WorldDb::Model::Tag
+Tagging    = WorldDb::Model::Tagging
+Continent  = WorldDb::Model::Continent
+Country    = WorldDb::Model::Country
+Region     = WorldDb::Model::Region
+City       = WorldDb::Model::City
+Prop       = WorldDb::Model::Prop
 
 ## connect to db
 

data/lib/worlddb/matcher.rb

@@ -4,34 +4,43 @@ module WorldDb
 
 module Matcher
 
-  def match_xxx_for_country( name, xxx, blk )  # xxx e.g. cities|regions|beers|breweries
-    if name =~ /(?:^|\/)([a-z]{2})-[^\/]+\/#{xxx}/
-      # new style: e.g. /at-austria/beers or ^at-austria!/beers
-      # auto-add required country code (from folder structure)
+  def match_xxx_for_country( name, xxx )  # xxx e.g. cities|regions|beers|breweries
+    #      auto-add required country code (from folder structure)
+    if name =~ /(?:^|\/)([a-z]{2,3})-[^\/]+\/#{xxx}/         ||    # (1)
+       name =~ /(?:^|\/)[0-9]+--([a-z]{2,3})-[^\/]+\/#{xxx}/ ||    # (2)
+       name =~ /(?:^|\/)([a-z]{2,3})\/#{xxx}/                      # (3)
+
       country_key = $1.dup
-      blk.call( country_key )
+      yield( country_key )
       true # bingo - match found
-    elsif name =~ /\/([a-z]{2})\/#{xxx}/
-      # classic style: e.g. /at/beers (europe/at/beers)
-      # auto-add required country code (from folder structure)
-      country_key = $1.dup
-      blk.call( country_key )
-      true
+      
+      ######
+      # (1)  new style: e.g. /at-austria/beers or ^at-austria!/beers
+      #
+      # (2)  new-new style e.g. /1--at-austria--central/beers
+      #
+      # (3)  classic style: e.g. /at/beers (europe/at/beers)
     else
       false # no match found
     end
   end
 
-  def match_xxx_for_country_n_region( name, xxx, blk ) # xxx e.g. beers|breweries
-    if name =~ /(?:^|\/)([a-z]{2})-[^\/]+\/([a-z]{1,2})-[^\/]+\/#{xxx}/
-      # new style: e.g.  /at-austria/w-wien/beers or
-      #                  ^at-austria!/w-wien/beers 
+  def match_xxx_for_country_n_region( name, xxx ) # xxx e.g. beers|breweries
+    # auto-add required country n region code (from folder structure)
+    if name =~ /(?:^|\/)([a-z]{2,3})-[^\/]+\/([a-z]{1,3})-[^\/]+\/#{xxx}/  ||              # (1)
+       name =~ /(?:^|\/)[0-9]+--([a-z]{2,3})-[^\/]+\/[0-9]+--([a-z]{1,3})-[^\/]+\/#{xxx}/  # (2)
+      
+      #######
       # nb: country must start name (^) or coming after / e.g. europe/at-austria/...
-      #
-      # auto-add required country n region code (from folder structure)
+      # (1)
+      # new style: e.g.  /at-austria/w-wien/beers or
+      #                  ^at-austria!/w-wien/beers
+      # (2)
+      # new new style e.g.  /1--at-austria--central/1--w-wien--eastern/beers
+
       country_key = $1.dup
       region_key  = $2.dup
-      blk.call( country_key, region_key )
+      yield( country_key, region_key )
       true # bingo - match found
     else
       false # no match found
@@ -40,23 +49,25 @@ module Matcher
 
 
   def match_cities_for_country( name, &blk )
-    match_xxx_for_country( name, 'cities', blk )
+    ## todo: check if there's a better (more ruby way) to pass along code block ??
+    match_xxx_for_country( name, 'cities', &blk )
   end
 
   def match_regions_for_country( name, &blk )
-    match_xxx_for_country( name, 'regions', blk )
+    ## todo: check if there's a better (more ruby way) to pass along code block ??
+    match_xxx_for_country( name, 'regions', &blk )
   end
 
   def match_regions_abbr_for_country( name, &blk )
-    match_xxx_for_country( name, 'regions\.abbr', blk )  # NB: . gets escaped for regex, that is, \.
+    match_xxx_for_country( name, 'regions\.abbr', &blk )  # NB: . gets escaped for regex, that is, \.
   end
 
   def match_regions_iso_for_country( name, &blk )  # NB: . gets escaped for regex, that is, \.
-    match_xxx_for_country( name, 'regions\.iso', blk )
+    match_xxx_for_country( name, 'regions\.iso', &blk )
   end
 
   def match_regions_nuts_for_country( name, &blk )  # NB: . gets escaped for regex, that is, \.
-    match_xxx_for_country( name, 'regions\.nuts', blk )
+    match_xxx_for_country( name, 'regions\.nuts', &blk )
   end
 
 

data/lib/worlddb/models/city.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module WorldDb::Models
+module WorldDb::Model
 
 class City < ActiveRecord::Base
   
@@ -201,4 +201,4 @@ class City < ActiveRecord::Base
 
 end # class Cities
 
-end # module WorldDb::Models
+end # module WorldDb::Model

data/lib/worlddb/models/continent.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module WorldDb::Models
+module WorldDb::Model
 
   class Continent < ActiveRecord::Base
     
@@ -10,4 +10,5 @@ module WorldDb::Models
     
   end  # class Continent
 
-end # module WorldDb::Models
+end # module WorldDb::Model
+

data/lib/worlddb/models/country.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module WorldDb::Models
+module WorldDb::Model
 
 class Country < ActiveRecord::Base
 
@@ -225,4 +225,4 @@ class Country < ActiveRecord::Base
 end # class Country
 
 
-end # module WorldDb::Models
+end # module WorldDb::Model

data/lib/worlddb/models/lang.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module WorldDb::Models
+module WorldDb::Model
 
   class Lang < ActiveRecord::Base
     
@@ -12,4 +12,6 @@ module WorldDb::Models
 
   end  # class Lang
 
-end # module WorldDb::Models
+end # module WorldDb::Model
+
+

data/lib/worlddb/models/prop.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module WorldDb::Models
+module WorldDb::Model
 
   class Prop < ActiveRecord::Base
 
@@ -28,4 +28,5 @@ private
     
   end  # class Prop
 
-end # module WorldDb::Models
+end # module WorldDb::Model
+

data/lib/worlddb/models/region.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-module WorldDb::Models
+module WorldDb::Model
 
 class Region < ActiveRecord::Base
 
@@ -150,4 +150,4 @@ class Region < ActiveRecord::Base
 
 end # class Region
 
-end # module WorldDb::Models
+end # module WorldDb::Model

data/lib/worlddb/models/tag.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
 
-module WorldDb::Models
+module WorldDb::Model
 
   class Tag < ActiveRecord::Base
     
     has_many :taggings
     
-    has_many :cities,    :through => :taggings, :source => :taggable, :source_type => 'WorldDb::Models::City',    :class_name => 'City'
-    has_many :countries, :through => :taggings, :source => :taggable, :source_type => 'WorldDb::Models::Country', :class_name => 'Country'
-    has_many :regions,   :through => :taggings, :source => :taggable, :source_type => 'WorldDb::Models::Region',  :class_name => 'Region'
+    has_many :cities,    :through => :taggings, :source => :taggable, :source_type => 'WorldDb::Model::City',    :class_name => 'City'
+    has_many :countries, :through => :taggings, :source => :taggable, :source_type => 'WorldDb::Model::Country', :class_name => 'Country'
+    has_many :regions,   :through => :taggings, :source => :taggable, :source_type => 'WorldDb::Model::Region',  :class_name => 'Region'
 
     ## nb: only allow spaces and underscore inbetween; do not allow digit as first char
     validates :key,  :format => { :with => /^[a-z]$|^[a-z][a-z0-9_ ]*[a-z0-9]$/, :message => 'expected one or more lowercase letters a-z or 0-9 digits or space or underscore' }
@@ -29,4 +29,5 @@ module WorldDb::Models
       
   end  # class Tag
   
-end # module WorldDb::Models
+end # module WorldDb::Model
+

data/lib/worlddb/models/tagging.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module WorldDb::Models
+module WorldDb::Model
 
   class Tagging < ActiveRecord::Base
 
@@ -9,4 +9,5 @@ module WorldDb::Models
 
   end  # class Tagging
 
-end # module WorldDb::Models
+end # module WorldDb::Model
+

data/lib/worlddb/models/usage.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module WorldDb::Models
+module WorldDb::Model
 
   class Usage < ActiveRecord::Base
 
@@ -9,4 +9,5 @@ module WorldDb::Models
 
   end  # class Usage
 
-end # module WorldDb::Models
+end # module WorldDb::Model
+

data/lib/worlddb/version.rb

@@ -1,6 +1,6 @@
 
 module WorldDb
-  VERSION = '1.7.2'  # sync version w/ sport.db - why? why not?
+  VERSION = '1.8.0'  # sync version w/ sport.db - why? why not?
 end
 
 ###########################################

data/lib/worlddb.rb

@@ -36,15 +36,18 @@ require 'worlddb/models/tag'
 require 'worlddb/models/tagging'
 require 'worlddb/models/lang'
 require 'worlddb/models/usage'
+
+module WorldDb
+  Models = Model   # note: alias for Model - remove later -- DEPRECIATED!!
+end
+
+
 require 'worlddb/schema'       # NB: requires worlddb/models (include WorldDB::Models)
 require 'worlddb/matcher'
 require 'worlddb/reader'
 require 'worlddb/deleter'
 require 'worlddb/stats'
 
-require 'worlddb/data/fixtures'
-
-
 
 module WorldDb
 
@@ -63,7 +66,7 @@ module WorldDb
   
   def self.create
     CreateDb.new.up
-    WorldDb::Models::Prop.create!( key: 'db.schema.world.version', value: VERSION )
+    WorldDb::Model::Prop.create!( key: 'db.schema.world.version', value: VERSION )
   end
 
 

data/test/helper.rb

@@ -24,9 +24,9 @@ require 'active_record'
 require 'worlddb'
 require 'logutils/db'   # NB: explict require required for LogDb (not automatic) 
 
-Country = WorldDb::Models::Country
-Region  = WorldDb::Models::Region
-City    = WorldDb::Models::City
+Country = WorldDb::Model::Country
+Region  = WorldDb::Model::Region
+City    = WorldDb::Model::City
 
 
 def setup_in_memory_db

data/test/test_fixture_matchers.rb

@@ -0,0 +1,96 @@
+# encoding: utf-8
+
+require 'helper'
+
+
+class TestFixtureMatchers < MiniTest::Unit::TestCase
+
+  include WorldDb::Matcher
+
+
+  def  test_cities_for_country
+
+    cities_at = [
+      'europe/at/cities',
+      'europe/at-austria/cities',
+      'at-austria/cities',
+      'at-austria!/cities'
+    ]
+
+    cities_at.each do |name|
+      found = match_cities_for_country( name ) do |country_key|
+        assert_equal country_key, 'at'
+      end
+      assert found
+    end
+  end # method test_cities_for_country
+
+  def test_country
+
+    beers_at = [
+      'europe/at/beers',
+      'europe/at-austria/beers',
+      'at-austria/beers',
+      'at-austria!/beers',
+      '1--at-austria--central/beers',
+      'europe/1--at-austria--central/beers'
+    ]
+
+    beers_at.each do |name|
+      found = match_xxx_for_country( name, 'beers' ) do |country_key|
+        assert_equal country_key, 'at'
+      end
+      assert found
+    end
+
+    breweries_at = [
+      'europe/at/breweries',
+      'europe/at-austria/breweries',
+      'at-austria/breweries',
+      'at-austria!/breweries'
+    ]
+
+    breweries_at.each do |name|
+      found = match_xxx_for_country( name, 'breweries' ) do |country_key|
+        assert_equal country_key, 'at'
+      end
+      assert found
+    end
+  end # method test_country
+
+
+  def test_country_n_region
+
+    beers_at = [
+      'europe/at-austria/w-wien/beers',
+      'at-austria/w-wien/beers',
+      'at-austria!/w-wien/beers',
+      '1--at-austria--central/1--w-wien--eastern/beers',
+      'europe/1--at-austria--central/1--w-wien--eastern/beers'
+    ]
+
+    beers_at.each do |name|
+      found = match_xxx_for_country_n_region( name, 'beers' ) do |country_key,region_key|
+        assert_equal country_key, 'at'
+        assert_equal region_key,  'w'
+      end
+      assert found
+    end
+
+    breweries_at = [
+      'europe/at-austria/w-wien/breweries',
+      'at-austria/w-wien/breweries',
+      'at-austria!/w-wien/breweries'
+    ]
+
+    breweries_at.each do |name|
+      found = match_xxx_for_country_n_region( name, 'breweries' ) do |country_key,region_key|
+        assert_equal country_key, 'at'
+        assert_equal region_key,  'w'
+      end
+      assert found
+    end
+  end # method test_country_n_region
+
+
+end # class TestFixtureMatchers

data/test/test_values.rb

@@ -33,11 +33,11 @@ class TestValues < MiniTest::Unit::TestCase
     c = Country.create_or_update_from_attribs( new_attributes, values )
 
     c2 = Country.find_by_key!( new_attributes[:key] )
-    assert( c.id == c2.id )
+    assert_equal c.id, c2.id
 
-    assert( c.title   == new_attributes[:title] )
-    assert( c.pop     == 8_414_638 )
-    assert( c.area    == 83_871 )
+    assert_equal c.title, new_attributes[:title]
+    assert_equal c.pop,   8_414_638
+    assert_equal c.area,  83_871
     ## todo: assert tag count; add supra:eu etc.
   end
 
@@ -64,10 +64,10 @@ class TestValues < MiniTest::Unit::TestCase
     r = Region.create_or_update_from_attribs( new_attributes, values )
 
     r2 = Region.find_by_key!( new_attributes[:key] )
-    assert( r.id == r2.id )
+    assert_equal r.id, r2.id
 
-    assert( r.title == new_attributes[:title] )
-    assert( r.area  == 415 )
+    assert_equal r.title, new_attributes[:title]
+    assert_equal r.area, 415
     ## todo: assert country_id & country.title for assoc
   end
 
@@ -99,14 +99,14 @@ class TestValues < MiniTest::Unit::TestCase
     c = City.create_or_update_from_attribs( new_attributes, values )
 
     c2 = City.find_by_key!( new_attributes[:key] )
-    assert( c.id == c2.id )
-
-    assert( c.title      == new_attributes[:title] )
-    assert( c.pop        == 1_731_236 )
-    assert( c.popm       == 1_724_000 )
-    assert( c.m          == true )
-    assert( c.region_id  == w.id  )
-    assert( c.country_id == at.id )
+    assert_equal c.id, c2.id
+
+    assert_equal c.title, new_attributes[:title]
+    assert_equal c.pop,   1_731_236
+    assert_equal c.popm,  1_724_000
+    assert_equal c.m,     true
+    assert_equal c.region_id,  w.id
+    assert_equal c.country_id, at.id
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: worlddb
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-22 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &75034640 !ruby/object:Gem::Requirement
+  requirement: &20916804 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *75034640
+  version_requirements: *20916804
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &75034420 !ruby/object:Gem::Requirement
+  requirement: &20916432 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *75034420
+  version_requirements: *20916432
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &75034210 !ruby/object:Gem::Requirement
+  requirement: &20916120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,36 +43,38 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *75034210
+  version_requirements: *20916120
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &75033990 !ruby/object:Gem::Requirement
+  requirement: &20915748 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *75033990
+  version_requirements: *20915748
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &75033770 !ruby/object:Gem::Requirement
+  requirement: &20915328 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.7'
   type: :development
   prerelease: false
-  version_requirements: *75033770
+  version_requirements: *20915328
 description: worlddb - world.db command line tool
-email: opensport@googlegroups.com
+email: openmundi@googlegroups.com
 executables:
 - worlddb
 extensions: []
 extra_rdoc_files:
+- History.md
 - Manifest.txt
+- README.md
 files:
 - History.md
 - Manifest.txt
@@ -83,7 +85,6 @@ files:
 - lib/worlddb/cli/main.rb
 - lib/worlddb/cli/opts.rb
 - lib/worlddb/console.rb
-- lib/worlddb/data/fixtures.rb
 - lib/worlddb/deleter.rb
 - lib/worlddb/matcher.rb
 - lib/worlddb/models/city.rb
@@ -101,6 +102,7 @@ files:
 - lib/worlddb/utils.rb
 - lib/worlddb/version.rb
 - test/helper.rb
+- test/test_fixture_matchers.rb
 - test/test_values.rb
 - .gemtest
 homepage: https://github.com/geraldb/world.db.ruby
@@ -126,9 +128,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: worlddb
-rubygems_version: 1.8.17
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: worlddb - world.db command line tool
 test_files:
+- test/test_fixture_matchers.rb
 - test/test_values.rb

data/lib/worlddb/data/fixtures.rb

@@ -1,42 +0,0 @@
-# encoding: utf-8
-
-
-def find_world_db_path_from_gemfile_gitref!
-  puts "[debug] find_world_db_path..."
-  puts "load path:"
-  pp $LOAD_PATH
-  
-  candidates = []
-  $LOAD_PATH.each do |path|
-    
-    # nb: avoid matching /world.db.ruby/ (e.g. gem "worlddb", "0.10.0", :path => "../world.db.ruby")
-    
-    if path =~ /\/(world\.db-[a-z0-9]+)|(world\.db)\//
-      candidates << path.dup
-    end
-  end
-  
-  puts "found candidates:"
-  pp candidates
-  
-  cand = candidates[0]
-  
-  puts "cand before: #{cand}"
-  
-  ## nb: *? is non-greedy many operator
-  
-  ## todo: why not just cut off trailing /lib - is it good enough??
-  # it's easier  
-  
-  regex = /(\/world\.db.*?)(\/.*)/
-  cand = cand.sub( regex ) do |_|
-    puts "cutting off >>#{$2}<<"
-    $1
-  end
-  
-  puts "cand after: #{cand}"
-  
-  ## todo:exit with error if not found!!!
-  
-  cand
-end