worlddb 2.0.9 → 2.1.0

data/lib/worlddb/models/country_comp.rb

@@ -1,35 +0,0 @@
-# encoding: utf-8
-
-module WorldDb
-  module Model
-
-#############################################################
-# collect depreciated or methods for future removal here
-#  - keep for now for commpatibility (for old code)
-
-
-class Country
-
-  def title()       name;              end
-  def title=(value) self.name = value; end
-
-  scope :by_title, ->{ order( 'name asc' ) }   # order by title (a-z)
-
-  def iso2()       alpha2;              end
-  def iso2=(value) self.alpha2 = value; end
-
-  def iso3()       alpha3;              end
-  def iso3=(value) self.alpha3 = value; end
-
-
-  def synonyms()       alt_names;      end
-  def synonyms=(value) self.alt_names = value; end
-
-  def title_w_synonyms( opts={} )  all_names( opts );  end    # depreciated: use all_names instead
-
-
-end # class Country
-
-  end # module Model
-end # module WorldDb
-

data/lib/worlddb/models/forward.rb

@@ -1,57 +0,0 @@
-
-### forward references
-##   require first to resolve circular references
-
-module WorldDb
-  module Model
-
-#############
-# ConfDb
-Prop      = ConfDb::Model::Prop
-
-###########
-# TagDb
-Tagging   = TagDb::Model::Tagging
-Tag       = TagDb::Model::Tag
-
-
-class Name < ActiveRecord::Base ; end
-class Place < ActiveRecord::Base ; end
-class Continent < ActiveRecord::Base ; end
-class Country < ActiveRecord::Base ; end
-class Region < ActiveRecord::Base ; end
-class City < ActiveRecord::Base ; end
-
-class Lang < ActiveRecord::Base ; end
-class Usage < ActiveRecord::Base ; end
-
-class CountryCode < ActiveRecord::Base ; end
-
-  end
-
-  # note: convenience alias for Model
-  # lets you use include WorldDb::Models
-  Models = Model   
-end # module # WorldDb
-
-
-module TagDb
-  module Model
-
-# add alias? why? why not? # is there a better way?
-#  - just include WorldDb::Models  - why? why not?
-
-Name        = WorldDb::Model::Name
-Place       = WorldDb::Model::Place
-Continent   = WorldDb::Model::Continent
-Country     = WorldDb::Model::Country
-Region      = WorldDb::Model::Region
-City        = WorldDb::Model::City
-
-Lang        = WorldDb::Model::Lang
-Usage       = WorldDb::Model::Usage
-
-CountryCode = WorldDb::Model::CountryCode
-
-  end
-end

data/lib/worlddb/models/lang.rb

@@ -1,18 +0,0 @@
-# encoding: utf-8
-
-module WorldDb
-  module Model
-
-class Lang < ActiveRecord::Base
-    
-  has_many :usages  # join table for countries_langs
-    
-  has_many :countries, :through => :usages
-
-  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/lang_comp.rb

@@ -1,23 +0,0 @@
-# encoding: utf-8
-
-module WorldDb
-  module Model
-
-#############################################################
-# collect depreciated or methods for future removal here
-#  - keep for now for commpatibility (for old code)
-
-
-class Lang
-
-  #####################################################
-  # alias for name (remove! add depreciated api call ???)
-  def title()       name;              end
-  def title=(value) self.name = value; end
-
-  scope :by_title, ->{ order( 'name asc' ) }   # order by title (a-z)
-
-end # class Lang
-
-  end # module Model
-end # module WorldDb

data/lib/worlddb/models/name.rb

@@ -1,13 +0,0 @@
-# encoding: utf-8
-
-module WorldDb
-  module Model
-
-class Name < ActiveRecord::Base
-
-
-end  # class Name
-
-
-  end # module Model
-end # module WorldDb

data/lib/worlddb/models/place.rb

@@ -1,16 +0,0 @@
-# encoding: utf-8
-
-module WorldDb
-  module Model
-
-class Place < ActiveRecord::Base
-
-  ## todo: depending on type
-  ##  has_one continent, country, region, city etc.
-
-end  # class Place
-
-
-  end # module Model
-end # module WorldDb
-

data/lib/worlddb/models/region.rb

@@ -1,176 +0,0 @@
-# encoding: UTF-8
-
-module WorldDb
-  module Model
-
-
-class Region < ActiveRecord::Base
-
-  extend TextUtils::TagHelper  # will add self.find_tags, self.find_tags_in_attribs!, etc.
-
-  # NB: use extend - is_<type>? become class methods e.g. self.is_<type>? for use in
-  #   self.create_or_update_from_values
-  extend TextUtils::ValueHelper  # e.g. is_year?, is_region?, is_address?, is_taglist? etc.
-
-  belongs_to :place,   class_name: 'Place',   foreign_key: 'place_id'
-  belongs_to :country, class_name: 'Country', foreign_key: 'country_id'
-
-  has_many :cities, class_name: 'City', foreign_key: 'region_id'
-
-  has_many_tags
-
-  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
-
-  def on_create
-    place_rec = Place.create!( name: name, kind: place_kind )
-    self.place_id = place_rec.id 
-  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 )
-  end
-
-  def place_kind   # use place_kind_of_code ??
-    'ADM1'
-  end
-
-
-  def all_names( opts={} )
-    ### fix:
-    ## allow to passing in sep or separator e.g. | or other
-
-    return name if alt_names.blank?
-    
-    buf = ''
-    buf << name
-    buf << ' | '
-    buf << alt_names.split('|').join(' | ')
-    buf
-  end
-
-
-
-  def self.create_or_update_from_values( values, more_attribs={} )
-
-    ## key & title & country required
-    attribs, more_values = find_key_n_title( values )
-    attribs = attribs.merge( more_attribs )
-
-    ## check for optional values
-    Region.create_or_update_from_attribs( attribs, more_values )
-  end
-
-
-  def self.create_or_update_from_attribs( new_attributes, values, opts={} )
-
-    ## opts e.g. :skip_tags true|false
-
-    ## fix: add/configure logger for ActiveRecord!!!
-    logger = LogKernel::Logger.root
-
-    value_numbers     = []
-    value_tag_keys    = []
-    value_cities      = []
-
-    ### check for "default" tags - that is, if present new_attributes[:tags] remove from hash
-    value_tag_keys += find_tags_in_attribs!( new_attributes )
-
-    ## check for optional values
-    values.each_with_index do |value,index|
-      if match_country( value ) do |country| # country:
-           new_attributes[ :country_id ] = country.id
-         end
-      elsif match_km_squared( value ) do |num| # allow numbers like 453 km²
-              value_numbers << num
-            end
-      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 =~ /#{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}<<"
-        value_tag_keys += find_tags( value )
-      else
-          
-        ### assume it is the capital city - mark it for auto add
-        value_cities << value
-        next
-   
-        # issue warning: unknown type for value
-        # logger.warn "unknown type for value >#{value}<"
-      end
-    end # each value
-
-    if value_numbers.size > 0
-      new_attributes[ :area ] = value_numbers[0]
-      new_attributes[ :pop  ] = value_numbers[1]
-    end  # if value_numbers.size > 0
-
-    ## todo: assert that country_id is present/valid, that is, NOT null
-    rec = Region.find_by_key_and_country_id( new_attributes[ :key ], new_attributes[ :country_id] )
-
-    if rec.present?
-      logger.debug "update Region #{rec.id}-#{rec.key}:"
-    else
-      logger.debug "create Region:"
-      rec = Region.new
-    end
-      
-    logger.debug new_attributes.to_json
-   
-    rec.update_attributes!( new_attributes )
-
-    #################
-    # auto add capital cities
-
-    City.create_or_update_from_titles( value_cities,
-                                            region_id:  rec.id,
-                                            country_id: rec.country_id )
-
-    ### todo/fix: add captial ref to country/region
-    ## todo/fix: use update_from_title and only allow one capital city
-
-
-    ##################
-    # add taggings 
-
-    ## todo/fix: reuse - move add taggings into method etc.
-
-      if value_tag_keys.size > 0
-        
-        if opts[:skip_tags].present?
-          logger.debug "   skipping add taggings (flag skip_tag)"
-        else
-          value_tag_keys.uniq!  # remove duplicates
-          logger.debug "   adding #{value_tag_keys.size} taggings: >>#{value_tag_keys.join('|')}<<..."
-
-          ### fix/todo: check tag_ids and only update diff (add/remove ids)
-
-          value_tag_keys.each do |key|
-            tag = Tag.find_by_key( key )
-            if tag.nil?  # create tag if it doesn't exit
-              logger.debug "   creating tag >#{key}<"
-              tag = Tag.create!( key: key )
-            end
-            rec.tags << tag
-          end
-        end
-      end
-
-    rec
-
-  end # method create_or_update_from_values
-
-
-
-end # class Region
-
-  end # module Model
-end # module WorldDb

data/lib/worlddb/models/region_comp.rb

@@ -1,26 +0,0 @@
-# encoding: utf-8
-
-module WorldDb
-  module Model
-
-#############################################################
-# collect depreciated or methods for future removal here
-#  - keep for now for commpatibility (for old code)
-
-class Region
-  
-  def title()       name;              end
-  def title=(value) self.name = value; end
-
-  scope :by_title, ->{ order( 'name asc' ) } # order by title (a-z)
-
-  def synonyms()       alt_names;      end
-  def synonyms=(value) self.alt_names = value; end
-
-  def title_w_synonyms( opts={} )  all_names( opts );  end    # depreciated: use all_names instead
-
-
-end # class Region
-
-  end # module Model
-end # module WorldDb

data/lib/worlddb/models/tagdb/tag.rb

@@ -1,16 +0,0 @@
-# encoding: utf-8
-
-module TagDb
-  module Model
-
-class Tag
-
-  has_many :cities,    :through => :taggings, :source => :taggable, source_type: 'WorldDb::Model::City',    class_name: 'WorldDb::Model::City'
-  has_many :countries, :through => :taggings, :source => :taggable, source_type: 'WorldDb::Model::Country', class_name: 'WorldDb::Model::Country'
-  has_many :regions,   :through => :taggings, :source => :taggable, source_type: 'WorldDb::Model::Region',  class_name: 'WorldDb::Model::Region'
-
-end  # class Tag
-
-  end # module Model
-end # module WorldDb
-

data/lib/worlddb/models/tagdb/tagging.rb

@@ -1,15 +0,0 @@
-# encoding: utf-8
-
-module TagDb
-  module Model
-
-
-class Tagging
-
-  ## add some code here
-
-end  # class Tagging
-
-
-  end # module Model
-end # module WorldDb

data/lib/worlddb/models/usage.rb

@@ -1,17 +0,0 @@
-# encoding: utf-8
-
-module WorldDb
-  module Model
-
-
-class Usage < ActiveRecord::Base
-
-  belongs_to :country
-  belongs_to :lang
-
-end  # class Usage
-
-
-  end # module Model
-end # module WorldDb
-

data/lib/worlddb/patterns.rb

@@ -1,54 +0,0 @@
-# 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[a-z]{2,3}\z'    # 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[A-Z_]{3}\z'
-  COUNTRY_CODE_PATTERN_MESSAGE = "expected three uppercase letters A-Z (and _) /#{COUNTRY_CODE_PATTERN}/"
-
-
-  REGION_KEY_PATTERN = '\A[a-z]+\z'
-  REGION_KEY_PATTERN_MESSAGE = "expected one or more lowercase letters a-z /#{REGION_KEY_PATTERN}/"
-
-  REGION_CODE_PATTERN = '\A[A-Z_]{2,3}\z'
-  REGION_CODE_PATTERN_MESSAGE = "expected two or three uppercase letters A-Z (and _) /#{REGION_CODE_PATTERN}/"
-
-
-  CITY_KEY_PATTERN = '\A[a-z]{3,}\z'
-  CITY_KEY_PATTERN_MESSAGE = "expected three or more lowercase letters a-z' /#{CITY_KEY_PATTERN}/"
-  
-  CITY_CODE_PATTERN = '\A[A-Z_]{3}\z'
-  CITY_CODE_PATTERN_MESSAGE = "expected three uppercase letters A-Z (and _)' /#{CITY_CODE_PATTERN}/"
-
-
-  LANG_KEY_PATTERN = '\A[a-z]{2}\z'
-  LANG_KEY_PATTERN_MESSAGE = "expected two lowercase letters a-z' /#{LANG_KEY_PATTERN}/"
-
-end # module WorldDb
-