worlddb 0.2.2 → 0.3.0

data/lib/worlddb/models/city.rb

@@ -8,6 +8,10 @@ class City < ActiveRecord::Base
   belongs_to :country, :class_name => 'Country', :foreign_key => 'country_id'
   belongs_to :region,  :class_name => 'Region',  :foreign_key => 'region_id'
   
+  has_many :taggings, :as => :taggable
+  has_many :tags,  :through => :taggings
+  
+  
   def self.create_from_ary!( cities, more_values={} )
     cities.each do |values|
       

data/lib/worlddb/models/country.rb

@@ -8,6 +8,9 @@ class Country < ActiveRecord::Base
   has_many :regions, :class_name => 'Region', :foreign_key => 'country_id'
   has_many :cities,  :class_name => 'City',   :foreign_key => 'country_id'
 
+  has_many :taggings, :as => :taggable
+  has_many :tags,     :through => :taggings
+
   def self.create_from_ary!( countries )
     countries.each do |values|
       

data/lib/worlddb/models/region.rb

@@ -6,6 +6,10 @@ class Region < ActiveRecord::Base
 
   has_many :cities, :class_name => 'City', :foreign_key => 'region_id'
 
+  has_many :taggings, :as => :taggable
+  has_many :tags,     :through => :taggings
+
+
   def self.create_from_ary!( regions, more_values={} )
     regions.each do |values|
             

data/lib/worlddb/models/tag.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+
+module WorldDB::Models
+
+  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'
+    
+  end  # class Tag
+  
+end # module WorldDB::Models

data/lib/worlddb/models/tagging.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+
+module WorldDB::Models
+
+  class Tagging < ActiveRecord::Base
+
+    belongs_to :tag
+    belongs_to :taggable, :polymorphic => true
+
+  end  # class Tagging
+
+end # module WorldDB::Models

data/lib/worlddb/reader.rb

@@ -0,0 +1,211 @@
+module WorldDB
+
+class Reader
+
+## make models available in sportdb module by default with namespace
+#  e.g. lets you use City instead of Models::City
+  include WorldDB::Models
+
+
+  def initialize( logger=nil )
+    if logger.nil?
+      @logger = Logger.new(STDOUT)
+      @logger.level = Logger::INFO
+    else
+      @logger = logger
+    end
+  end
+
+  attr_reader :logger
+
+  def run( opts, args )
+ 
+    args.each do |arg|
+      name = arg     # File.basename( arg, '.*' )
+
+      if opts.load?
+        load_countries_builtin( name )             if opts.countries?
+        load_regions_builtin( opts.country, name ) if opts.regions?
+        load_cities_builtin( opts.country, name )  if opts.cities?
+      else
+        load_countries_with_include_path( name, opts.data_path )              if opts.countries?
+        load_regions_with_include_path( opts.country, name, opts.data_path )  if opts.regions?
+        load_cities_with_include_path( opts.country, name, opts.data_path )   if opts.cities?
+      end
+    end
+
+  end
+
+  ############################
+  # load from file system
+  
+  def load_countries_with_include_path( name, include_path )
+    load_fixtures_with_include_path_for( Country, name, include_path )
+  end
+
+  def load_regions_with_include_path( country_key, name, include_path )
+    country = Country.find_by_key!( country_key )
+    puts "Country #{country.key} >#{country.title} (#{country.tag})<"
+
+    load_fixtures_with_include_path_for( Region, name, include_path, country_id: country.id )
+  end
+
+  def load_cities_with_include_path( country_key, name, include_path )  
+    country = Country.find_by_key!( country_key )
+    puts "Country #{country.key} >#{country.title} (#{country.tag})<"
+
+    load_fixtures_with_include_path_for( City, name, include_path, country_id: country.id )
+  end
+  
+  ##################################
+  #  load from gem (built-in)
+
+  def load_countries_builtin( name ) 
+    load_fixtures_builtin_for( Country, name )
+  end
+
+  def load_regions_builtin( country_key, name )
+    country = Country.find_by_key!( country_key )
+    puts "Country #{country.key} >#{country.title} (#{country.tag})<"
+  
+    load_fixtures_builtin_for( Region, name, country_id: country.id )
+  end
+  
+  def load_cities_builtin( country_key, name )
+    country = Country.find_by_key!( country_key )
+    puts "Country #{country.key} >#{country.title} (#{country.tag})<"
+
+    load_fixtures_builtin_for( City, name, country_id: country.id )
+  end
+
+
+private
+  def load_fixtures_with_include_path_for( clazz, name, include_path, more_values={} )  # load from file system
+    path = "#{include_path}/#{name}.txt"
+
+    puts "*** parsing data '#{name}' (#{path})..."
+
+    text = File.read( path )
+    
+    load_fixtures_worker_for( clazz, text, more_values )
+  end
+
+  def load_fixtures_builtin_for( clazz, name, more_values={} ) # load from gem (built-in)
+    path = "#{WorldDB.root}/db/#{name}.txt"
+
+    puts "*** parsing data '#{name}' (#{path})..."
+
+    text = File.read( path )
+    
+    load_fixtures_worker_for( clazz, text, more_values )
+  end
+
+  def load_fixtures_worker_for( clazz, data, more_values )
+   
+    ## NB: assumes active activerecord db connection
+    ##
+
+    data.each_line do |line|
+  
+      if line =~ /^\s*#/
+        # skip komments and do NOT copy to result (keep comments secret!)
+        logger.debug 'skipping comment line'
+        next
+      end
+        
+      if line =~ /^\s*$/ 
+        # kommentar oder leerzeile überspringen 
+        logger.debug 'skipping blank line'
+        next
+      end
+
+      # remove leading and trailing whitespace
+      line = line.strip
+
+      puts "line: >>#{line}<<"
+
+      values = line.split(',')
+      
+      # remove leading and trailing whitespace for values
+      values = values.map { |value| value.strip }
+
+      ## remove comment columns
+      ##  todo: also removecomments from inside columns ?? why? why not??
+      
+      values = values.select do |value|
+        if value =~ /^#/  ## start with # treat it as a comment column; e.g. remove it
+          puts "   removing column with value >>#{value}<<"
+          false
+        else
+          true
+        end
+      end 
+      
+      puts "  values: >>#{values.join('<< >>')}<<"
+      
+      attribs = {
+        key: values[0]
+      }
+      
+      ## title (split of optional synonyms)
+      # e.g. FC Bayern Muenchen|Bayern Muenchen|Bayern
+      titles = values[1].split('|')
+      
+      attribs[ :title ]    =  titles[0]
+      ## add optional synonyms
+      attribs[ :synonyms ] =  titles[1..-1].join('|')  if titles.size > 1
+      
+      attribs = attribs.merge( more_values )  # e.g. merge country_id and other defaults if present
+            
+      value_numbers = []
+      
+      ## check for optional values
+      values[2..-1].each_with_index do |value,index|
+        if value =~ /^region:/   ## region:
+          value_region_key = value[7..-1]  ## cut off region: prefix
+          value_region = Region.find_by_key!( value_region_key )
+          attribs[ :region_id ] = value_region.id
+        elsif value =~ /^[A-Z]{3}$/  ## assume three-letter code
+          attribs[ :tag ] = value    # todo: rename to code??
+        elsif value =~ /^\d+$/    ## numeric
+          value_numbers << value.to_i
+        elsif (values.size==(index+3)) && value =~ /^[a-z0-9\| ]+$/   # tags must be last entry
+          puts "   skipping tags: #{value}"
+        else
+          # issue warning: unknown type for value
+          puts "*** warning: unknown type for value >#{value}<"
+        end
+      end
+      
+      if value_numbers.size > 0
+        if clazz == City
+          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]
+        end
+      end
+
+      rec = clazz.find_by_key( attribs[ :key ] )
+      if rec.present?
+        ## nb: [17..-1] cut off WorldDB::Models:: in name
+        puts "*** update #{clazz.name[17..-1].downcase} #{rec.id}-#{rec.key}:"
+      else
+        puts "*** create #{clazz.name[17..-1].downcase}:"
+        rec = clazz.new
+      end
+      
+      puts attribs.to_json
+   
+      rec.update_attributes!( attribs )
+        
+    end # data.each
+    
+    ## todo/fix: add Prop.create!( name )
+        
+  end # method load_fixture_worker_for
+
+  
+end # class Reader
+end # module WorldDB

data/lib/worlddb/schema.rb

@@ -43,6 +43,23 @@ create_table :cities do |t|
   t.timestamps
 end
 
+create_table :tags do |t|
+  t.string :key,  :null => false
+  t.string :title    # todo: make required? 
+  ## todo: add parent or similar for hierachy (for tag stacks/packs)
+  t.timestamps
+end
+
+create_table :taggings do |t|
+  t.references :tag,  :null => false
+  t.references :taggable, :polymorphic => true
+  t.timestamps   # todo: use only t.datetime :created_at (do we get ar magic? is updated used/needed??)
+end
+
+add_index :taggings, :tag_id
+add_index :taggings, [:taggable_id, :taggable_type]
+
+
 create_table :props do |t|
   t.string :key,   :null => false
   t.string :value, :null => false

data/lib/worlddb/version.rb

@@ -1,4 +1,5 @@
 
 module WorldDB
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end
+

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-08 00:00:00 Z
+date: 2012-11-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -70,51 +70,97 @@ extensions: []
 
 extra_rdoc_files: 
 - Manifest.txt
+- db/africa/countries.txt
+- db/america/br/cities.txt
+- db/america/br/regions.txt
+- db/america/ca/cities.txt
+- db/america/ca/regions.txt
+- db/america/countries.txt
+- db/america/mx/cities.txt
+- db/america/us/cities.txt
+- db/america/us/regions.txt
+- db/america/ve/cities.txt
+- db/america/ve/regions.txt
+- db/asia/countries.txt
+- db/asia/jp/cities.txt
+- db/europe/at/cities.txt
+- db/europe/at/regions.txt
+- db/europe/be/cities.txt
+- db/europe/by/cities.txt
+- db/europe/ch/cities.txt
+- db/europe/countries.txt
+- db/europe/cy/cities.txt
+- db/europe/de/cities.txt
+- db/europe/de/regions.txt
+- db/europe/dk/cities.txt
+- db/europe/en/cities.txt
+- db/europe/es/cities.txt
+- db/europe/fr/cities.txt
+- db/europe/gr/cities.txt
+- db/europe/hr/cities.txt
+- db/europe/it/cities.txt
+- db/europe/nl/cities.txt
+- db/europe/pt/cities.txt
+- db/europe/ro/cities.txt
+- db/europe/ru/cities.txt
+- db/europe/sc/cities.txt
+- db/europe/tr/cities.txt
+- db/europe/ua/cities.txt
+- db/oceania/au/cities.txt
+- db/oceania/countries.txt
 files: 
 - History.markdown
 - Manifest.txt
 - README.markdown
 - Rakefile
 - bin/worlddb
-- db/africa/countries.rb
+- db/africa/countries.txt
 - db/africa/de.countries.yml
-- db/america/ca/cities.rb
-- db/america/countries.rb
+- db/america/br/cities.txt
+- db/america/br/regions.txt
+- db/america/ca/cities.txt
+- db/america/ca/regions.txt
+- db/america/countries.motor.yml
+- db/america/countries.txt
 - db/america/de.countries.yml
 - db/america/es.countries.yml
-- db/america/mx/cities.rb
-- db/america/us/cities.rb
-- db/america/ve/cities.rb
-- db/asia/countries.rb
+- db/america/mx/cities.txt
+- db/america/us/cities.txt
+- db/america/us/regions.txt
+- db/america/ve/cities.txt
+- db/america/ve/regions.txt
+- db/asia/countries.txt
 - db/asia/de.countries.yml
-- db/asia/jp/cities.rb
-- db/europe/at/cities.rb
-- db/europe/be/cities.rb
-- db/europe/by/cities.rb
-- db/europe/ch/cities.rb
-- db/europe/countries.rb
-- db/europe/cy/cities.rb
+- db/asia/jp/cities.txt
+- db/europe/at/cities.txt
+- db/europe/at/regions.txt
+- db/europe/be/cities.txt
+- db/europe/by/cities.txt
+- db/europe/ch/cities.txt
+- db/europe/countries.txt
+- db/europe/cy/cities.txt
 - db/europe/de.countries.yml
-- db/europe/de/cities.rb
-- db/europe/dk/cities.rb
-- db/europe/en/cities.rb
+- db/europe/de/cities.txt
+- db/europe/de/regions.txt
+- db/europe/dk/cities.txt
+- db/europe/en/cities.txt
 - db/europe/es.countries.yml
-- db/europe/es/cities.rb
-- db/europe/fr/cities.rb
-- db/europe/gr/cities.rb
-- db/europe/hr/cities.rb
-- db/europe/it/cities.rb
-- db/europe/nl/cities.rb
-- db/europe/pt/cities.rb
-- db/europe/ro/cities.rb
-- db/europe/ru/cities.rb
-- db/europe/sc/cities.rb
-- db/europe/tr/cities.rb
-- db/europe/ua/cities.rb
-- db/oceania/au/cities.rb
-- db/oceania/countries.rb
+- db/europe/es/cities.txt
+- db/europe/fr/cities.txt
+- db/europe/gr/cities.txt
+- db/europe/hr/cities.txt
+- db/europe/it/cities.txt
+- db/europe/nl/cities.txt
+- db/europe/pt/cities.txt
+- db/europe/ro/cities.txt
+- db/europe/ru/cities.txt
+- db/europe/sc/cities.txt
+- db/europe/tr/cities.txt
+- db/europe/ua/cities.txt
+- db/oceania/au/cities.txt
+- db/oceania/countries.txt
 - db/oceania/de.countries.yml
-- db/tags.rb
+- db/tags.yml
 - lib/worlddb.rb
 - lib/worlddb/cli/opts.rb
 - lib/worlddb/cli/runner.rb
@@ -123,6 +169,9 @@ files:
 - lib/worlddb/models/country.rb
 - lib/worlddb/models/prop.rb
 - lib/worlddb/models/region.rb
+- lib/worlddb/models/tag.rb
+- lib/worlddb/models/tagging.rb
+- lib/worlddb/reader.rb
 - lib/worlddb/schema.rb
 - lib/worlddb/version.rb
 homepage: http://geraldb.github.com/world.db