worlddb 1.6.6 → 1.7.0

data/Rakefile

@@ -19,7 +19,7 @@ Hoe.spec 'worlddb' do
   self.email   = 'opensport@googlegroups.com'
 
   self.extra_deps = [
-    ['textutils', '~> 0.5'], # e.g.  >= 0.5 && <= 1.0
+    ['textutils', '~> 0.6'], # e.g.  >= 0.6 && <= 1.0
     ['commander', '~> 4.1.3'],
     ['activerecord', '~> 3.2']  # NB: will include activesupport,etc.
     ### ['sqlite3',      '~> 1.3']  # NB: install on your own; remove dependency

data/lib/worlddb/models/city.rb

@@ -4,13 +4,13 @@ module WorldDb::Models
 
 class City < ActiveRecord::Base
   
-  extend WorldDb::TagHelper  # will add self.find_tags, self.find_tags_in_hash!, etc.
+  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.
+  extend TextUtils::ValueHelper  # e.g. self.is_year?, self.is_region?, self.is_address?, self.is_taglist? etc.
+
 
-  
   self.table_name = 'cities'
 
   belongs_to :country, :class_name => 'Country', :foreign_key => 'country_id'
@@ -70,90 +70,31 @@ class City < ActiveRecord::Base
   end
 
 
-  def self.create_from_ary!( cities, more_values={} )
-    cities.each do |values|
-      
-      ## key & title & country required
-      attr = {
-        key: values[0]
-      }
-      
-      ## title (split of optional synonyms)
-      # e.g. FC Bayern Muenchen|Bayern Muenchen|Bayern
-      titles = values[1].split('|')
-      
-      attr[ :title ]    =  titles[0]
-      ## add optional synonyms
-      attr[ :synonyms ] =  titles[1..-1].join('|')  if titles.size > 1
-      
-      attr = attr.merge( more_values )
-      
-      value_numbers = []
-      
-      ## check for optional values
-      values[2..-1].each do |value|
-        if value.is_a? Country
-          attr[ :country_id ] = value.id
-        elsif value.is_a? Numeric
-          value_numbers << value
-        elsif value =~ /^[A-Z_]{3}$/    ## assume its three letter code (e.g. NYC,VIE,etc.)
-          attr[ :code ] = value
-        elsif value =~ /^region:/   ## region:
-          value_region_key = value[7..-1]  ## cut off region: prefix
-          value_region = Region.find_by_key!( value_region_key )
-          attr[ :region_id ] = value_region.id
-        else
-          # issue warning: unknown type for value
-        end
-      end
-      
-      if value_numbers.size > 0
-        attr[ :pop  ] = value_numbers[0]
-        attr[ :area ] = value_numbers[1]
-      end
+  def self.create_or_update_from_values( values, more_attribs={} )
+    ## key & title & country required
 
-      
-      City.create!( attr )
-    end # each city
-  end
+    attribs, more_values = find_key_n_title( values )
+    attribs = attribs.merge( more_attribs )
 
+    ## check for optional values
+    City.create_or_update_from_attribs( attribs, more_values )
+  end
 
-  def self.create_or_update_from_titles( titles, more_attributes = {} )  # ary of titles e.g. ['Wien', 'Graz'] etc.
 
-    # fix: add/configure logger for ActiveRecord!!!
-    logger = LogKernel::Logger.root
+  def self.create_or_update_from_titles( titles, more_attribs = {} )
+    # ary of titles e.g. ['Wien', 'Graz'] etc.
 
     titles.each do |title|
-
-      new_attributes = {}
-      key = TextUtils.title_to_key( title )   # auto generate key from title
-
-      # check if it exists
-      # todo/fix: add country_id for lookup?
-      city = City.find_by_key( key )
-      if city.present?
-        logger.debug "update city #{city.id}-#{city.key}:"
-      else
-        logger.debug "create city:"
-        city = City.new
-        new_attributes[ :key ] = key
-      end
-        
-      new_attributes[ :title ] = title
-     
-      ## merge in passed in attribes (e.g. country_id etc.)
-      new_attributes.merge!( more_attributes )
-      
-      logger.debug new_attributes.to_json
-   
-      city.update_attributes!( new_attributes )
-      
-      ### todo/fix: add captial ref to country/region
+      values = [title]
+      City.create_or_update_from_values( values, more_attribs ) 
     end # each city
   end  # method create_or_update_from_titles
 
 
-  def self.create_or_update_from_values( new_attributes, values, opts={} )
+
+  def self.create_or_update_from_attribs( new_attributes, values, opts={} )
+    #   attribs -> key/value pairs e.g. hash
+    #   values  -> ary of string values/strings (key not yet known; might be starting of value e.g. city:wien)
 
     ## opts e.g. :skip_tags true|false
 
@@ -164,11 +105,14 @@ class City < ActiveRecord::Base
     value_tag_keys    = []
       
     ### check for "default" tags - that is, if present new_attributes[:tags] remove from hash
-    value_tag_keys += find_tags_in_hash!( new_attributes )
+    value_tag_keys += find_tags_in_attribs!( new_attributes )
 
     new_attributes[ :c ] = true   # assume city type by default (use metro,district to change in fixture)
 
     ## check for optional values
+    
+    ### fix: todo: use matcher from ValueHelper !!!!!
+
     values.each_with_index do |value,index|
       if value =~ /^region:/   ## region:
         value_region_key = value[7..-1]  ## cut off region: prefix
@@ -263,6 +207,7 @@ class City < ActiveRecord::Base
     rec
   end # method create_or_update_from_values
 
+
 end # class Cities
 
 end # module WorldDb::Models

data/lib/worlddb/models/country.rb

@@ -4,11 +4,11 @@ module WorldDb::Models
 
 class Country < ActiveRecord::Base
 
-  extend WorldDb::TagHelper  # will add self.find_tags, self.find_tags_in_hash!, etc.
+  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.
+  extend TextUtils::ValueHelper  # e.g. self.is_year?, self.is_region?, self.is_address?, is_taglist? etc.
 
 
   self.table_name = 'countries'
@@ -65,46 +65,18 @@ class Country < ActiveRecord::Base
   end
 
 
-  def self.create_from_ary!( countries )
-    countries.each do |values|
-      
-      ## key & title required
-      attr = {
-        :key   => values[0],
-        :title => values[1],
-        :code  => values[2]
-      }
-      
-      value_numbers = []
-      
-      ## check for optional values
-      values[3..-1].each do |value|
-        if value.is_a? Numeric
-          value_numbers << value
-        elsif value =~ /^motor:/  
-          value_motor = value[6..-1]  ## cut off region: motor
-          attr[ :motor ] = value_motor
-        elsif value =~ /^tags:/   
-          value_tags = value[5..-1]  ## cut off tags: prefix
-          # do nothing now
-        else
-          # issue warning: unknown type for value
-        end
-      end
-      
-      if value_numbers.size > 0
-        attr[ :area ] = value_numbers[0]  # NB: area for countries goes first
-        attr[ :pop  ] = value_numbers[1]
-      end
-      
-      
-      
-      Country.create!( attr )
-    end # each country
+  def self.create_or_update_from_values( values, more_attribs={} )
+
+      ## key & title
+      ## NB: three-letter code (.e.g AUT) required - enforce in values? why? why not?
+      attribs, more_values = find_key_n_title( values )
+      attribs = attribs.merge( more_attribs )
+
+      Country.create_or_update_from_attribs( attribs, more_values )
   end
 
 
-  def self.create_or_update_from_values( new_attributes, values, opts={} )
+  def self.create_or_update_from_attribs( new_attributes, values, opts={} )
 
     ## opts e.g. :skip_tags true|false
 
@@ -116,7 +88,7 @@ class Country < ActiveRecord::Base
       value_cities      = []
 
       ### check for "default" tags - that is, if present new_attributes[:tags] remove from hash
-      value_tag_keys += find_tags_in_hash!( new_attributes )
+      value_tag_keys += find_tags_in_attribs!( new_attributes )
 
 
       new_attributes[ :c ] = true   # assume country type by default (use supra,depend to change)

data/lib/worlddb/models/region.rb

@@ -4,7 +4,7 @@ module WorldDb::Models
 
 class Region < ActiveRecord::Base
 
-  extend WorldDb::TagHelper  # will add self.find_tags, self.find_tags_in_hash!, etc.
+  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
@@ -33,32 +33,19 @@ class Region < ActiveRecord::Base
   end
 
 
-  def self.create_from_ary!( regions, more_values={} )
-    regions.each do |values|
-            
-      ## key & title & country required
-      attr = {
-        key:   values[0],
-        title: values[1]
-      }
 
-      attr = attr.merge( more_values )
-      
-      ## check for optional values
-      values[2..-1].each do |value|
-        if value.is_a? Country
-          attr[ :country_id ] = value.id
-        else
-          # issue warning: unknown type for value
-        end
-      end
-      
-      Region.create!( attr )
-    end # each region
+  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_values( new_attributes, values, opts={} )
+  def self.create_or_update_from_attribs( new_attributes, values, opts={} )
 
     ## opts e.g. :skip_tags true|false
 
@@ -70,7 +57,7 @@ class Region < ActiveRecord::Base
     value_cities      = []
 
     ### check for "default" tags - that is, if present new_attributes[:tags] remove from hash
-    value_tag_keys += find_tags_in_hash!( new_attributes )
+    value_tag_keys += find_tags_in_attribs!( new_attributes )
 
     ## check for optional values
     values.each_with_index do |value,index|

data/lib/worlddb/reader.rb

@@ -3,40 +3,6 @@
 module WorldDb
 
 
-  ### fix: move to textutils
-  ##   PlusReaderWrapper find a better name than Plus?
-  #
-  #  todo: also add a ValuesReaderPlus and use it
-
-  class HashReaderPlus
-    include LogUtils::Logging
-
-    def initialize( name, include_path )
-       @name          = name
-       @include_path  = include_path
-    end
-
-    attr_reader :name
-    attr_reader :include_path
-
-    def each
-      path          = "#{include_path}/#{name}.yml"
-      reader        = HashReader.new( path )
-
-      logger.info "parsing data '#{name}' (#{path})..."
-
-      reader.each do |key, value|
-        yield( key, value )
-      end
-      
-      WorldDb::Models::Prop.create_from_fixture!( name, path )
-    end
-
-  end # class HashReaderPlus
-
-
-
-
 class Reader
 
   include LogUtils::Logging
@@ -133,10 +99,10 @@ class Reader
       # todo/fix: exit w/ error
     end
   end
-  
 
-  def load_countries( name, more_values={} )
-    load_fixtures_for( Country, name, more_values )
+
+  def load_countries( name, more_attribs={} )
+    load_fixtures_for( Country, name, more_attribs )
   end
 
 
@@ -152,7 +118,7 @@ class Reader
     country = Country.find_by_key!( country_key )
     logger.debug "Country #{country.key} >#{country.title} (#{country.code})<"
 
-    reader = HashReaderPlus.new( name, include_path )
+    reader = HashReaderV2.new( name, include_path )
 
     reader.each do |key, value|
       region = Region.find_by_country_id_and_key!( country.id, key )
@@ -171,7 +137,7 @@ class Reader
 
 
   def load_continent_refs( name )
-    reader = HashReaderPlus.new( name, include_path )
+    reader = HashReaderV2.new( name, include_path )
 
     reader.each do |key, value|
       country = Country.find_by_key!( key )
@@ -182,12 +148,8 @@ class Reader
   end
 
 
-  def load_continent_defs( name, more_values={} )
-    path = "#{include_path}/#{name}.txt"
-
-    logger.info "parsing data '#{name}' (#{path})..."
-
-    reader = ValuesReader.new( path, more_values )
+  def load_continent_defs( name, more_attribs={} )
+    reader = ValuesReaderV2.new( name, include_path, more_attribs )
 
     reader.each_line do |attribs, values|
 
@@ -209,15 +171,12 @@ class Reader
       rec.update_attributes!( attribs )
 
     end # each lines
-    
-    Prop.create_from_fixture!( name, path )
-     
   end # load_continent_defs
 
 
   def load_langs( name )
-    
-    reader = HashReaderPlus.new( name, include_path )
+
+    reader = HashReaderV2.new( name, include_path )
 
     reader.each do |key, value|
 
@@ -248,14 +207,14 @@ class Reader
   end # method load_langs
 
 
-  def load_tags( name, more_values={} )
+  def load_tags( name, more_attribs={} )
     
-      reader = HashReaderPlus.new( name, include_path )
+      reader = HashReaderV2.new( name, include_path )
 
       grade = 1
     
-      if more_values[:grade].present?
-        grade = more_values[:grade].to_i
+      if more_attribs[:grade].present?
+        grade = more_attribs[:grade].to_i
       end
 
       reader.each do |key, value|
@@ -301,7 +260,7 @@ class Reader
 
 
   def load_usages( name )
-    reader = HashReaderPlus.new( name, include_path )
+    reader = HashReaderV2.new( name, include_path )
 
     reader.each do |key, value|
       logger.debug "   adding langs >>#{value}<<to country >>#{key}<<"
@@ -324,7 +283,7 @@ class Reader
 
 
   def load_xxx( xxx, name )
-    reader = HashReaderPlus.new( name, include_path )
+    reader = HashReaderV2.new( name, include_path )
 
     reader.each do |key, value|
       country = Country.find_by_key!( key )
@@ -334,20 +293,14 @@ class Reader
   end
 
 private
-  def load_fixtures_for( clazz, name, more_values={} )  # load from file system
-    path = "#{include_path}/#{name}.txt"
-
-    logger.info "parsing data '#{name}' (#{path})..."
-
-    reader = ValuesReader.new( path, more_values )
+  def load_fixtures_for( clazz, name, more_attribs={} )
+    reader = ValuesReaderV2.new( name, include_path, more_attribs )
     
-    reader.each_line do |new_attributes, values|
+    reader.each_line do |attribs, values|
       opts = { skip_tags: skip_tags? }
-      clazz.create_or_update_from_values( new_attributes, values, opts )
+      clazz.create_or_update_from_attribs( attribs, values, opts )
     end
-
-    Prop.create_from_fixture!( name, path )
   end
-  
+
 end # class Reader
 end # module WorldDb

data/lib/worlddb/utils.rb

@@ -17,38 +17,3 @@ class Time
   
 end # class Time
 
-
-##### fix/todo: move to helper folder - use one file per module/helper
-
-module WorldDb
-  module TagHelper
-
-  def find_tags( value )
-    # logger.debug "   found tags: >>#{value}<<"
-
-    tag_keys = value.split('|')
-
-    ## unify; replace _w/ space; remove leading n trailing whitespace
-    tag_keys = tag_keys.map do |key|
-      key = key.gsub( '_', ' ' )
-      key = key.strip
-      key
-    end
-
-    tag_keys # return tag keys as ary
-  end
-
-  def find_tags_in_hash!( h )
-    # NB: will remove :tags from hash
-
-    if h[:tags].present?
-      tag_keys = find_tags( h[:tags] )
-      h.delete(:tags)
-      tag_keys   # return tag keys as ary
-    else
-      []  # nothing found; return empty ary
-    end
-  end
-
-  end # module
-end # module WorldDb

data/lib/worlddb/version.rb

@@ -1,6 +1,6 @@
 
 module WorldDb
-  VERSION = '1.6.6'  # sync version w/ sport.db - why? why not?
+  VERSION = '1.7.0'  # sync version w/ sport.db - why? why not?
 end
 
 ###########################################

data/test/test_values.rb

@@ -30,7 +30,7 @@ class TestValues < MiniTest::Unit::TestCase
       'un|fifa|uefa|eu|euro|schengen|central_europe|western_europe'
     ]
 
-    c = Country.create_or_update_from_values( new_attributes, values )
+    c = Country.create_or_update_from_attribs( new_attributes, values )
 
     c2 = Country.find_by_key!( new_attributes[:key] )
     assert( c.id == c2.id )
@@ -61,7 +61,7 @@ class TestValues < MiniTest::Unit::TestCase
       'eastern austria'
     ]
 
-    r = Region.create_or_update_from_values( new_attributes, values )
+    r = Region.create_or_update_from_attribs( new_attributes, values )
 
     r2 = Region.find_by_key!( new_attributes[:key] )
     assert( r.id == r2.id )
@@ -96,7 +96,7 @@ class TestValues < MiniTest::Unit::TestCase
       'm:1_724_000'
     ]
 
-    c = City.create_or_update_from_values( new_attributes, values )
+    c = City.create_or_update_from_attribs( new_attributes, values )
 
     c2 = City.find_by_key!( new_attributes[:key] )
     assert( c.id == c2.id )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: worlddb
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-12 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &87983620 !ruby/object:Gem::Requirement
+  requirement: &81436760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *87983620
+  version_requirements: *81436760
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &87983400 !ruby/object:Gem::Requirement
+  requirement: &81436540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *87983400
+  version_requirements: *81436540
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &87983190 !ruby/object:Gem::Requirement
+  requirement: &81436330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *87983190
+  version_requirements: *81436330
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &87982970 !ruby/object:Gem::Requirement
+  requirement: &81436110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *87982970
+  version_requirements: *81436110
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &87982750 !ruby/object:Gem::Requirement
+  requirement: &81435890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *87982750
+  version_requirements: *81435890
 description: worlddb - world.db command line tool
 email: opensport@googlegroups.com
 executables: