worlddb 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b65594f88cfffccc8acebb72f70c8a159f0567b
-  data.tar.gz: 992aee423be6b539415f6dadd8a38dd59a7d32ca
+  metadata.gz: c62e293d5310b55d31543e8153f06671c432d3ff
+  data.tar.gz: 84b4808b38432d6e67eef3c136719af4231ee060
 SHA512:
-  metadata.gz: ab185997dfc12146ed72b4b7e78a38307e1bff1312ce6a0cf65e77c5038446e42da0dde0849031eb43238024331fb6f66d7815cc17fffab34a0f82869188bf49
-  data.tar.gz: 15a37472e6017d9609ad4d057a4480d022793f853219d693f35add17d09e1705e6db1e6a181302eee1dd81f894ee1f1108da8df2ac8b023e4746dffd1f1d0ff3
+  metadata.gz: 0e9a6f9c97537eee941f18178d6d0115d9dd4dd202390c260054b90c4601c10b913ee8fd2cbc4f22ea552c590ea6e2297e663215331bd82471b980298e1dd92e
+  data.tar.gz: 07649e1df32a66995c83d72d0f7ff8ff29575a2d17b6c1b347b15812e80786777dc2d50b667241570431a0f74bc4cd45e5169439b0a0485f09bef1955b8a56ea

data/Manifest.txt

@@ -25,6 +25,7 @@ lib/worlddb/models/region_comp.rb
 lib/worlddb/models/tagdb/tag.rb
 lib/worlddb/models/tagdb/tagging.rb
 lib/worlddb/models/usage.rb
+lib/worlddb/patterns.rb
 lib/worlddb/reader.rb
 lib/worlddb/readers/base.rb
 lib/worlddb/readers/city.rb
@@ -34,6 +35,7 @@ lib/worlddb/readers/region.rb
 lib/worlddb/readers/usage.rb
 lib/worlddb/schema.rb
 lib/worlddb/stats.rb
+lib/worlddb/stats_comp.rb
 lib/worlddb/version.rb
 test/helper.rb
 test/test_fixture_matchers.rb

data/Rakefile

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

data/lib/worlddb.rb

@@ -27,6 +27,7 @@ require 'props/db'  # includes ConfDb (ConfDb::Model::Prop, etc.)
 
 require 'worlddb/version'   # always goes first
 
+require 'worlddb/patterns'  # regex patterns (constants)
 require 'worlddb/models/forward'
 
 require 'worlddb/models/name'
@@ -61,6 +62,7 @@ require 'worlddb/readers/city'
 require 'worlddb/reader'
 require 'worlddb/deleter'
 require 'worlddb/stats'
+require 'worlddb/stats_comp'
 
 
 module WorldDb

data/lib/worlddb/deleter.rb

@@ -13,6 +13,7 @@ module WorldDb
       
       ## Tagging.delete_all   # - use TagDb.delete!
       ## Tag.delete_all
+
       Name.delete_all
       Place.delete_all
       City.delete_all
@@ -21,9 +22,10 @@ module WorldDb
       Continent.delete_all
       Usage.delete_all
       Lang.delete_all
+
       #  Prop.delete_all    # - use ConfDb.delete!
     end
-    
+
   end # class Deleter
 
-end # module WorldDb
+end # module WorldDb

data/lib/worlddb/models/city.rb

@@ -80,8 +80,8 @@ class City < ActiveRecord::Base
   end
 
 
-  validates :key,  format: { with: /^[a-z]{3,}$/, message: 'expected three or more lowercase letters a-z' }
-  validates :code, format: { with: /^[A-Z_]{3}$/, message: 'expected three uppercase letters A-Z (and _)' }, :allow_nil => true
+  validates :key,  format: { with: /#{CITY_KEY_PATTERN}/, message: CITY_KEY_PATTERN_MESSAGE }
+  validates :code, format: { with: /#{CITY_CODE_PATTERN}/, message: CITY_CODE_PATTERN_MESSAGE }, allow_nil: true
 
 
   scope :by_key,   ->{ order( 'key asc' )  }  # order by key (a-z)
@@ -175,7 +175,7 @@ class City < ActiveRecord::Base
       elsif match_number( value ) do |num|    # numeric (nb: can use any _ or spaces inside digits e.g. 1_000_000 or 1 000 000)
               value_numbers << num
             end
-      elsif value =~ /^[A-Z]{3}$/  ## assume three-letter code
+      elsif value =~ /#{CITY_CODE_PATTERN}/  ## assume three-letter code
         new_attributes[ :code ] = value
       elsif (values.size==(index+1)) && is_taglist?( value )   # tags must be last entry
         logger.debug "   found tags: >>#{value}<<"

data/lib/worlddb/models/country.rb

@@ -32,8 +32,8 @@ class Country < ActiveRecord::Base
 
   has_many_tags
 
-  validates :key,  format: { with: /^[a-z]{2}$/,  message: 'expected two lowercase letters a-z' }
-  validates :code, format: { with: /^[A-Z_]{3}$/, message: 'expected three uppercase letters A-Z (and _)' }
+  validates :key,  format: { with: /#{COUNTRY_KEY_PATTERN}/,  message: COUNTRY_KEY_PATTERN_MESSAGE }
+  validates :code, format: { with: /#{COUNTRY_CODE_PATTERN}/, message: COUNTRY_CODE_PATTERN_MESSAGE }
 
 
   scope :by_key,   ->{ order( 'key asc' ) }    # order by key (a-z)
@@ -49,10 +49,16 @@ class Country < 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?
+
+    if slug.blank?
+      ## todo: change and to n  (if en/english) ?? - why? why not?
+      ##  remove subtitles/subnames e.g. () -- why? why not?
+
+      ## remove translations []  e.g. México [Mexico] -> México etc.
+      self.slug = TextUtils.slugify( name.gsub( /\[[^\]]+\]/, '' ) )
+    end
   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 )
@@ -151,7 +157,7 @@ class Country < ActiveRecord::Base
         elsif match_number( value ) do |num|  # numeric (nb: can use any _ or spaces inside digits e.g. 1_000_000 or 1 000 000)
                 value_numbers << num
               end
-        elsif value =~ /^[A-Z]{2,3}$/  ## assume two or three-letter code
+        elsif value =~ /#{COUNTRY_CODE_PATTERN}/  ## three letter code 
           new_attributes[ :code ] = value
         elsif (values.size==(index+1)) && is_taglist?( value )   # tags must be last entry
           logger.debug "   found tags: >>#{value}<<"

data/lib/worlddb/models/lang.rb

@@ -9,11 +9,10 @@ class Lang < ActiveRecord::Base
     
   has_many :countries, :through => :usages
 
-  validates :key, format: { with: /^[a-z]{2}$/, message: 'expected two lowercase letters a-z' }
+  validates :key, format: { with: /#{LANG_KEY_PATTERN}/, message: LANG_KEY_PATTERN_MESSAGE }
 
 end  # class Lang
 
   end # module Model
 end # module WorldDb
 
-

data/lib/worlddb/models/region.rb

@@ -19,8 +19,9 @@ class Region < ActiveRecord::Base
 
   has_many_tags
 
-  validates :key,  format: { with: /^[a-z]+$/,      message: 'expected one or more lowercase letters a-z' }
-  validates :code, format: { with: /^[A-Z_]{2,3}$/, message: 'expected two or three uppercase letters A-Z (and _)' }, allow_nil: true
+  validates :key,  format: { with: /#{REGION_KEY_PATTERN}/,  message: REGION_KEY_PATTERN_MESSAGE }
+  validates :code, format: { with: /#{REGION_CODE_PATTERN}/, message: REGION_CODE_PATTERN_MESSAGE }, allow_nil: true
+
 
   before_create :on_create
   before_update :on_update
@@ -91,7 +92,7 @@ class Region < ActiveRecord::Base
       elsif match_number( value ) do |num|  # numeric (nb: can use any _ or spaces inside digits e.g. 1_000_000 or 1 000 000)
               value_numbers << num
             end
-      elsif value =~ /^[A-Z]{2,3}$/  ## assume two or three-letter code
+      elsif value =~ /#{REGION_CODE_PATTERN}/  ## assume two or three-letter code
         new_attributes[ :code ] = value
       elsif (values.size==(index+1)) && is_taglist?( value )   # tags must be last entry
         logger.debug "   found tags: >>#{value}<<"

data/lib/worlddb/patterns.rb

@@ -0,0 +1,54 @@
+# encoding: utf-8
+
+module WorldDb
+
+# collection of regex patterns for reuse (WorldDb specific)
+
+### todo: add a patterns.md page to  github ??
+##  - add regexper pics??
+
+############
+# about ruby regexps
+#
+# try the rubular - Ruby regular expression editor and tester
+#  -> http://rubular.com
+#   code -> ??  by ??
+#
+#
+# Jeff Avallone's Regexper - Shows State-Automata Diagrams
+#  try -> http://regexper.com
+#    code -> https://github.com/javallone/regexper
+#
+#
+#  Regular Expressions | The Bastards Book of Ruby by Dan Nguyen
+# http://ruby.bastardsbook.com/chapters/regexes/
+#
+# move to notes  regex|patterns on  geraldb.github.io ??
+#
+
+  COUNTRY_KEY_PATTERN = '^[a-z]{2,3}$'    # allow two AND three letter keys e.g. at, mx, eng, sco, etc.
+  COUNTRY_KEY_PATTERN_MESSAGE = "expected two or three lowercase letters a-z /#{COUNTRY_KEY_PATTERN}/"
+
+  COUNTRY_CODE_PATTERN = '^[A-Z_]{3}$'
+  COUNTRY_CODE_PATTERN_MESSAGE = "expected three uppercase letters A-Z (and _) /#{COUNTRY_CODE_PATTERN}/"
+
+
+  REGION_KEY_PATTERN = '^[a-z]+$'
+  REGION_KEY_PATTERN_MESSAGE = "expected one or more lowercase letters a-z /#{REGION_KEY_PATTERN}/"
+
+  REGION_CODE_PATTERN = '^[A-Z_]{2,3}$'
+  REGION_CODE_PATTERN_MESSAGE = "expected two or three uppercase letters A-Z (and _) /#{REGION_CODE_PATTERN}/"
+
+
+  CITY_KEY_PATTERN = '^[a-z]{3,}$'
+  CITY_KEY_PATTERN_MESSAGE = "expected three or more lowercase letters a-z' /#{CITY_KEY_PATTERN}/"
+  
+  CITY_CODE_PATTERN = '^[A-Z_]{3}$'
+  CITY_CODE_PATTERN_MESSAGE = "expected three uppercase letters A-Z (and _)' /#{CITY_CODE_PATTERN}/"
+
+
+  LANG_KEY_PATTERN = '^[a-z]{2}$'
+  LANG_KEY_PATTERN_MESSAGE = "expected two lowercase letters a-z' /#{LANG_KEY_PATTERN}/"
+
+end # module WorldDb
+

data/lib/worlddb/reader.rb

@@ -35,22 +35,14 @@ class Reader
 
 
   def load_setup( name )
-    path = "#{include_path}/#{name}.yml"
+    path = "#{include_path}/#{name}.txt"
 
     logger.info "parsing data '#{name}' (#{path})..."
 
     reader = FixtureReader.new( path )
 
-    # too big for heroku free db plan (10,000 record limit)
-    #  - sorry, can't load by default
-    fixture_excludes = [
-      'south-america/ve/cities'
-    ]
-
-    reader.each do |fixture_name|
-      next if fixture_excludes.include?( fixture_name )  # skip loading
-      
-      load( fixture_name )
+    reader.each do |fixture|
+      load( fixture )
     end
   end # method load_setup
 

data/lib/worlddb/schema.rb

@@ -1,10 +1,11 @@
 
 module WorldDb
 
-class CreateDb < ActiveRecord::Migration
+class CreateDb 
 
 def up
 
+ActiveRecord::Schema.define do
 
 create_table :places do |t|
   t.string  :name,   null: false
@@ -173,13 +174,11 @@ create_table :usages do |t|  # join table for countries_langs
   t.timestamps
 end
 
+end # block Schema.define
 
 end # method up
 
-def down
-  raise ActiveRecord::IrreversibleMigration
-end
 
 end # class CreateDb
 
-end # module WorldDb
+end # module WorldDb

data/lib/worlddb/stats.rb

@@ -21,17 +21,7 @@ module WorldDb
       puts " #{'%5d' % Usage.count} usages"
     end
 
-
-#
-# fix: move to ConfDb for (re)use !!!!!
-
-    def props
-      puts "Props:"
-      Prop.order( 'created_at asc' ).all.each do |prop|
-        puts "  #{prop.key} / #{prop.value} || #{prop.created_at}"
-      end
-    end
   end # class Stats
 
+end # module WorldDb
 
-end # module WorldDb

data/lib/worlddb/stats_comp.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+
+module WorldDb
+
+  class Stats
+
+#
+# fix: move to ConfDb for (re)use - do not use - use Props.dump or similar!!!!!
+
+    def props
+      puts "deprecated API - WorldDb::Stats.props  -- use Props.dump or similar"
+      
+      puts "Props:"
+      Prop.order( 'created_at asc' ).all.each do |prop|
+        puts "  #{prop.key} / #{prop.value} || #{prop.created_at}"
+      end
+    end
+  end # class Stats
+
+
+end # module WorldDb

data/lib/worlddb/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worlddb
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-29 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.4
 - !ruby/object:Gem::Dependency
   name: tagutils
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +159,7 @@ files:
 - lib/worlddb/models/tagdb/tag.rb
 - lib/worlddb/models/tagdb/tagging.rb
 - lib/worlddb/models/usage.rb
+- lib/worlddb/patterns.rb
 - lib/worlddb/reader.rb
 - lib/worlddb/readers/base.rb
 - lib/worlddb/readers/city.rb
@@ -168,6 +169,7 @@ files:
 - lib/worlddb/readers/usage.rb
 - lib/worlddb/schema.rb
 - lib/worlddb/stats.rb
+- lib/worlddb/stats_comp.rb
 - lib/worlddb/version.rb
 - test/helper.rb
 - test/test_fixture_matchers.rb