worlddb-models 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6f4e2c609b98e4e47364d364685e82cdb315ab7
-  data.tar.gz: 9329d22376b1a85b186780ff0db0884de86f85af
+  metadata.gz: 085e42158476f2f859016c01201f21833b8e18ab
+  data.tar.gz: 727bf2b5fc3e74034128984a808e87f81d032680
 SHA512:
-  metadata.gz: ac729c3828ed5e4ffd2c54cf3e700bb1f6f20e0be8fc670b2b7c524700e50ef2544aa0fd1838ca72a7d16581fbc0def39628afd9cdb02a6c1c27b92e0321b6bf
-  data.tar.gz: 3c8e225f39c7481fca92ec4395f2ef262c8c91bc7065e85f69e8662bbdc67c6d4883d4a1b5b3cf4866653106bc3182111666b62b66b2238da2c33a5bdc3d0a59
+  metadata.gz: 946a9dea95eccfa4ade780bf4164dbf7cbcfdd32ba3ac04d59d9524debef91185f6b6d187d4de7585ade785cf713a1bf7119b6e36bcf53f62d8dbd995b789eed
+  data.tar.gz: 206c286650fda59da6f5f33bca634e6e2998c0cac8e83ec20976d2a25113197c0f9f327d01aae85f6635576859892fbb2b9059c304904ca6362774a85c11fa75

data/Manifest.txt

@@ -6,19 +6,19 @@ lib/worlddb/deleter.rb
 lib/worlddb/matcher.rb
 lib/worlddb/models.rb
 lib/worlddb/models/city.rb
-lib/worlddb/models/city_comp.rb
+lib/worlddb/models/city_compat.rb
 lib/worlddb/models/continent.rb
-lib/worlddb/models/continent_comp.rb
+lib/worlddb/models/continent_compat.rb
 lib/worlddb/models/country.rb
 lib/worlddb/models/country_code.rb
-lib/worlddb/models/country_comp.rb
+lib/worlddb/models/country_compat.rb
 lib/worlddb/models/forward.rb
 lib/worlddb/models/lang.rb
-lib/worlddb/models/lang_comp.rb
+lib/worlddb/models/lang_compat.rb
 lib/worlddb/models/name.rb
 lib/worlddb/models/place.rb
 lib/worlddb/models/region.rb
-lib/worlddb/models/region_comp.rb
+lib/worlddb/models/region_compat.rb
 lib/worlddb/models/tagdb/tag.rb
 lib/worlddb/models/tagdb/tagging.rb
 lib/worlddb/models/usage.rb

data/README.md

@@ -1,6 +1,6 @@
 # worlddb-models
 
-worlddb-models gem - world.db schema & models for easy (re)use
+worlddb-models gem - world.db schema 'n' models for easy (re)use
 
 * home  :: [github.com/worlddb/world.db.models](https://github.com/worlddb/world.db.models)
 * bugs  :: [github.com/worlddb/world.db.models/issues](https://github.com/worlddb/world.db.models/issues)

data/Rakefile

@@ -3,10 +3,10 @@ require './lib/worlddb/version.rb'
 
 
 Hoe.spec 'worlddb-models' do
-  
+
   self.version = WorldDb::VERSION
 
-  self.summary = "worlddb -  world.db schema & models for easy (re)use"
+  self.summary = "worlddb -  world.db schema 'n' models for easy (re)use"
   self.description = summary
 
   self.urls    = ['https://github.com/worlddb/world.db.models']
@@ -15,14 +15,14 @@ Hoe.spec 'worlddb-models' do
   self.email   = 'openmundi@googlegroups.com'
 
   self.extra_deps = [
-    ['props'],         # settings / prop(ertie)s / env / INI
-    ['logutils'],     # logging
-    ['textutils', '>= 0.9.9'], # e.g.  >= 0.6 && <= 1.0  ## will include logutils, props
-
-    ['tagutils'],     # tags n categories for activerecord
-    ['activerecord-utils'],
-    ['props-activerecord'],
-    ['logutils-activerecord'],
+    ['props',     '>= 1.1.2'],         # settings / prop(ertie)s / env / INI
+    ['logutils',  '>= 0.6.1'],     # logging
+    ['textutils', '>= 0.10.0'], 
+
+    ['tagutils',              '>= 0.3.0'],  # tags n categories for activerecord
+    ['activerecord-utils',    '>= 0.2.0'],
+    ['props-activerecord',    '>= 0.1.0'],
+    ['logutils-activerecord', '>= 0.2.0'],
 
      ## 3rd party
     ['rubyzip'],       ## todo: pull in via textutils ??

data/lib/worlddb/models.rb

@@ -1,4 +1,5 @@
-# encoding: UTF-8
+# encoding: utf-8
+
 
 # core and stlibs
 
@@ -9,6 +10,8 @@ require 'erb'
 require 'json'
 require 'yaml'
 
+require 'logger'    # Note: use for ActiveRecord::Base.logger -- remove/replace later w/ LogUtils::Logger ???
+
 
 # 3rd party gems / libs
 
@@ -39,16 +42,16 @@ require 'worlddb/models/forward'
 require 'worlddb/models/name'
 require 'worlddb/models/place'
 require 'worlddb/models/continent'
-require 'worlddb/models/continent_comp'
+require 'worlddb/models/continent_compat'    # todo: move to compat gem
 require 'worlddb/models/country'
-require 'worlddb/models/country_comp'
+require 'worlddb/models/country_compat'      # todo: move to compat gem
 require 'worlddb/models/country_code'
 require 'worlddb/models/region'
-require 'worlddb/models/region_comp'
+require 'worlddb/models/region_compat'       # todo: move to compat gem
 require 'worlddb/models/city'
-require 'worlddb/models/city_comp'
+require 'worlddb/models/city_compat'         # todo: move to compat gem
 require 'worlddb/models/lang'
-require 'worlddb/models/lang_comp'
+require 'worlddb/models/lang_compat'         # todo: move to compat gem 
 require 'worlddb/models/usage'
 
 require 'worlddb/models/tagdb/tag'
@@ -125,20 +128,14 @@ module WorldDb
   end
 
 
- ####
- ## todo: remove stats ??? why? why not? better use .tables
-  def self.stats
-    Stats.new.tables
-  end
-
   def self.tables
     Stats.new.tables
   end
 
 
-  def self.connect( db_config={} )
+  def self.connect( config={} )
 
-    if db_config.empty?
+    if config.empty?
       puts "ENV['DATBASE_URL'] - >#{ENV['DATABASE_URL']}<"
 
       ### change default to ./sport.db ?? why? why not?
@@ -160,8 +157,6 @@ module WorldDb
          database: db.path[1..-1] # world.db (NB: cut off leading /, thus 1..-1)
       }
       end
-    else
-      config = db_config  # use passed in config hash
     end
 
     ## todo/check: use if defined?( JRUBY_VERSION ) instead ??

data/lib/worlddb/version.rb

@@ -1,9 +1,10 @@
+# encoding: utf-8
 
 module WorldDb
 
   # sync version w/ sport.db n friends - why? why not?
   MAJOR = 2 ## todo: namespace inside version or something - why? why not??
-  MINOR = 1
+  MINOR = 2
   PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worlddb-models
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2014-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
@@ -16,98 +16,98 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: logutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: textutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: tagutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: activerecord-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: props-activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: logutils-activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +164,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.13'
-description: worlddb -  world.db schema & models for easy (re)use
+description: worlddb -  world.db schema 'n' models for easy (re)use
 email: openmundi@googlegroups.com
 executables: []
 extensions: []
@@ -182,19 +182,19 @@ files:
 - lib/worlddb/matcher.rb
 - lib/worlddb/models.rb
 - lib/worlddb/models/city.rb
-- lib/worlddb/models/city_comp.rb
+- lib/worlddb/models/city_compat.rb
 - lib/worlddb/models/continent.rb
-- lib/worlddb/models/continent_comp.rb
+- lib/worlddb/models/continent_compat.rb
 - lib/worlddb/models/country.rb
 - lib/worlddb/models/country_code.rb
-- lib/worlddb/models/country_comp.rb
+- lib/worlddb/models/country_compat.rb
 - lib/worlddb/models/forward.rb
 - lib/worlddb/models/lang.rb
-- lib/worlddb/models/lang_comp.rb
+- lib/worlddb/models/lang_compat.rb
 - lib/worlddb/models/name.rb
 - lib/worlddb/models/place.rb
 - lib/worlddb/models/region.rb
-- lib/worlddb/models/region_comp.rb
+- lib/worlddb/models/region_compat.rb
 - lib/worlddb/models/tagdb/tag.rb
 - lib/worlddb/models/tagdb/tagging.rb
 - lib/worlddb/models/usage.rb
@@ -242,7 +242,7 @@ rubyforge_project:
 rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
-summary: worlddb -  world.db schema & models for easy (re)use
+summary: worlddb -  world.db schema 'n' models for easy (re)use
 test_files:
 - test/test_model_comp.rb
 - test/test_models.rb