worlddb 0.6.3 → 0.6.4

data/db/europe/countries.txt

@@ -27,7 +27,7 @@
 
 ## eu 27 (+ euro 17)
 
-eu, European Union, EUR,  4_324_782, 503_492_041,  supra   # NB: no FIFA code exists; use EUR
+eu, European Union, EUR,  4_324_782, 503_492_041,  supra,  g20   # NB: no FIFA code exists; use EUR
 
 ## todo: auto-add tag eu?? for supra:eu?
 

data/db/europe/cz/cities.txt

@@ -19,8 +19,8 @@ pardubice, Pardubice,  region:pa, 91_073
 karlovyvary, Karlovy Vary [Carlsbad], region:ka, 53_737
 kutnahora,   Kutná Hora,              region:st, 20_839
 
-tabor,   Tábor,         region:jc, 35_769
-krumlov, Český Krumlov  region:jc, 13_752
-trebon,  Třeboň,        region:jc,  8_840
+tabor,   Tábor,          region:jc, 35_769
+krumlov, Český Krumlov,  region:jc, 13_752
+trebon,  Třeboň,         region:jc,  8_840
 
-mikulov, Mikulov,       region:jm,  7_624
+mikulov, Mikulov,        region:jm,  7_624

data/lib/worlddb/models/city.rb

@@ -15,6 +15,22 @@ class City < ActiveRecord::Base
   validates :code, :format => { :with => /^[A-Z_]{3}$/, :message => 'expected three uppercase letters A-Z (and _)' }, :allow_nil => true
 
 
+  def self.by_key  # order by key (a-z)
+    self.order( 'key asc' )
+  end
+
+  def self.by_title  # order by title (a-z)
+    self.order( 'title asc' )
+  end
+  
+  def self.by_pop  # order by pop(ulation)
+    self.order( 'pop desc' )
+  end
+  
+  def self.by_area  # order by area (in square km)
+    self.order( 'area desc')
+  end
+
   def title_w_synonyms
     return title if synonyms.blank?
     

data/lib/worlddb/models/country.rb

@@ -18,17 +18,20 @@ class Country < ActiveRecord::Base
   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 _)' }
 
+  def self.by_key  # order by key (a-z)
+    self.order( 'key asc' )
+  end
 
   def self.by_title  # order by title (a-z)
     self.order( 'title asc' )
   end
   
   def self.by_pop  # order by pop(ulation)
-    self.order( 'pop asc' )
+    self.order( 'pop desc' )
   end
   
   def self.by_area  # order by area (in square km)
-    self.order( 'area asc')
+    self.order( 'area desc')
   end
 
   def title_w_synonyms

data/lib/worlddb/models/tag.rb

@@ -9,6 +9,24 @@ module WorldDB::Models
     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'
+
+    ## fix/todo: improve regex use   [a-z][a-z0-9] | [a-z][a-z0-9_ ]+[a-z0-9] to only allow spaces and underscore inbetween; do not allow digit as first char 
+    validates :key, :format => { :with => /^[a-z0-9_ ]{2,}$/, :message => 'expected two or more lowercase letters a-z or 0-9 digits or space or underscore' }
+
+    before_save :on_before_save
+
+    def on_before_save
+      # replace space with underscore e.g. north america becomes north_america and so on
+      self.slug = key.gsub( ' ', '_' )
+    end
+    
+    def self.by_key
+      self.order( 'key desc' )
+    end
+    
+    def self.by_title
+      self.order( 'title desc' )
+    end
     
   end  # class Tag
   

data/lib/worlddb/reader.rb

@@ -227,8 +227,8 @@ private
           attribs[ :pop  ] = value_numbers[0]   # assume first number is pop for cities
           attribs[ :area ] = value_numbers[1]  
         else   # countries,regions
-          attribs[ :area ] = value_numbers[1]
-          attribs[ :pop  ] = value_numbers[0]
+          attribs[ :area ] = value_numbers[0]
+          attribs[ :pop  ] = value_numbers[1]
         end
       end
 

data/lib/worlddb/schema.rb

@@ -68,6 +68,7 @@ end
 
 create_table :tags do |t|
   t.string :key,  :null => false
+  t.string :slug, :null => false
   t.string :title    # todo: make required? 
   ## todo: add parent or similar for hierachy (for tag stacks/packs)
   t.timestamps

data/lib/worlddb/version.rb

@@ -1,5 +1,5 @@
 
 module WorldDB
-  VERSION = '0.6.3'
+  VERSION = '0.6.4'
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: worlddb
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 6
-  - 3
-  version: 0.6.3
+  - 4
+  version: 0.6.4
 platform: ruby
 authors: 
 - Gerald Bauer