persondb 0.2.0 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8ae3400852fe3e86d39cef68b9b9d5dbfb15bc97
+  data.tar.gz: 1af4911c17764d27463a5bf4124910bab85d123e
+SHA512:
+  metadata.gz: e9a92a35b7aea6f0cfaf16b7783cfed55f8db4a56e82bfde653b4aebe231bbbf7984ced2d24987a52d18c346f54bda509c92ea03ee9dc78436dc7525bca9b0c0
+  data.tar.gz: 579c4f48464a2c5e44b2e4a7363dd0b13699731ad90c735733d82c9f720cc0b10543d8aef4971573242d3510e124e27e67b3a4cb940f9fdcf9d49124318d381e

data/Manifest.txt

@@ -8,7 +8,10 @@ lib/persondb/models/person.rb
 lib/persondb/models/worlddb/city.rb
 lib/persondb/models/worlddb/country.rb
 lib/persondb/models/worlddb/region.rb
+lib/persondb/reader.rb
 lib/persondb/schema.rb
 lib/persondb/version.rb
+test/data/players/south-america/br-brazil/players.txt
 test/helper.rb
 test/test_models.rb
+test/test_reader.rb

data/lib/persondb/models/person.rb

@@ -6,7 +6,56 @@ module PersonDb
 class Person < ActiveRecord::Base
 
   self.table_name = 'persons'
-  ## to be done
+
+  def title()       name               end  # alias for name
+  def title=(value) self.name = value  end  # alias for name
+
+
+  def self.create_or_update_from_values( new_attributes, values )
+
+    ## fix: add/configure logger for ActiveRecord!!!
+    logger = LogKernel::Logger.root
+
+    ## check optional values
+    values.each_with_index do |value, index|
+      if value =~ /^[a-z]{2}$/  ## assume two-letter country key e.g. at,de,mx,etc.
+        value_country = Country.find_by_key!( value )
+        new_attributes[ :country_id ] = value_country.id
+      elsif value =~ /^[A-Z]{3}$/  ## assume three-letter code e.g. AUS, MAL, etc.
+        new_attributes[ :code ] = value
+      elsif value =~ /^([0-9]{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s([0-9]{4})$/  ## assume birthday
+        value_date_str = '%02d/%s/%d' % [$1, $2, $3]     ## move to matcher!!
+        value_date = Date.strptime( value_date_str, '%d/%b/%Y' )  ## %b - abbreviated month name (e.g. Jan,Feb, etc.)
+        logger.debug "   birthday #{value_date_str}  -  #{value_date}"
+        new_attributes[ :born_at ] = value_date
+        ## todo: convert to date
+      else
+        ## todo: assume title2 ??
+        ## assume title2 if title2 is empty (not already in use)
+        ##  and if it title2 contains at least two letter e.g. [a-zA-Z].*[a-zA-Z]
+        # issue warning: unknown type for value
+        logger.warn "unknown type for value >#{value}< - key #{new_attributes[:key]}"
+      end
+    end
+
+    ## quick hack: set nationality_id if not present to country_id
+    if new_attributes[ :nationality_id ].blank?
+      new_attributes[ :nationality_id ] = new_attributes[ :country_id ]
+    end
+
+    rec = Person.find_by_key( new_attributes[ :key ] )
+    if rec.present?
+      logger.debug "update Person #{rec.id}-#{rec.key}:"
+    else
+      logger.debug "create Person:"
+      rec = Person.new
+    end
+
+    logger.debug new_attributes.to_json
+
+    rec.update_attributes!( new_attributes )
+  end # create_or_update_from_values
+
 
 end # class Person
 

data/lib/persondb/reader.rb

@@ -0,0 +1,33 @@
+# encoding: UTF-8
+
+module PersonDb
+
+
+class PersonReader
+
+  include LogUtils::Logging
+
+## make models available by default with namespace
+#  e.g. lets you use Usage instead of Model::Usage
+  include Models
+
+
+  attr_reader :include_path
+
+  def initialize( include_path, opts = {} )
+    @include_path = include_path
+  end
+
+
+  def read( name, more_attribs={} )
+    reader = ValuesReaderV2.new( name, include_path, more_attribs )
+
+    reader.each_line do |new_attributes, values|
+      Person.create_or_update_from_values( new_attributes, values )
+    end # each lines
+  end
+
+
+end # class PersonReader
+end # module PersonDb
+

data/lib/persondb/version.rb

@@ -1,5 +1,5 @@
 
 module PersonDb
-   VERSION = '0.2.0'
+   VERSION = '0.3.0'
 end
 

data/lib/persondb.rb

@@ -1,15 +1,25 @@
+# encoding: utf-8
+
+# core and stdlibs
+require 'json'
+require 'uri'
+require 'pp'
 
-# 3rd party gems / libs
 
+# 3rd party gems / libs
 require 'active_record'   ## todo: add sqlite3? etc.
 
 require 'activerecord/utils'   # check - if dependency on logutils? or props? etc let others go first
 
 require 'logutils'
+require 'logutils/db'   # NB: explict require required for LogDb (NOT automatic)
+
 require 'textutils'
 require 'tagutils'
+
 require 'props'
-require 'props/db'  # includes ConfDb (ConfDb::Model::Prop, etc.)
+require 'props/db'  # NB: explict require required for LogDb (NOT automatic); includes ConfDb (ConfDb::Model::Prop, etc.)
+
 require 'worlddb'
 
 
@@ -25,6 +35,7 @@ require 'persondb/models/worlddb/region'
 require 'persondb/models/worlddb/country'
 
 require 'persondb/models/person'
+require 'persondb/reader'
 
 
 
@@ -38,6 +49,10 @@ module PersonDb
     "#{File.expand_path( File.dirname(File.dirname(__FILE__)) )}"
   end
 
+  def self.test_data_path
+    "#{root}/test/data"
+  end
+
 
   def self.create
     CreateDb.new.up
@@ -55,6 +70,25 @@ module PersonDb
     puts "  #{Model::Person.count} persons"
   end
 
+  def self.setup_in_memory_db
+    # Database Setup & Config
+
+    ActiveRecord::Base.logger = Logger.new( STDOUT )
+    ## ActiveRecord::Base.colorize_logging = false  - no longer exists - check new api/config setting?
+
+    ## NB: every connect will create a new empty in memory db
+    ActiveRecord::Base.establish_connection(
+                                  adapter:  'sqlite3',
+                                  database: ':memory:' )
+
+    ## build schema
+    LogDb.create
+    ConfDb.create
+    TagDb.create
+    WorldDb.create
+    PersonDb.create
+  end  # method setup_in_memory_db
+
 
 end  # module PersonDb
 

data/test/data/players/south-america/br-brazil/players.txt

@@ -0,0 +1,39 @@
+###
+# NB: let official (player) shirt name go first (e.g. Neymar Jr)
+
+
+## GK / Goalkeepers
+
+Jefferson|Jefferson DE OLIVEIRA GALVAO,          2 Jan 1983, 190
+Júlio César|Júlio César SOARES DE ESPINDOLA,     3 Sep 1979, 186
+D. Cavalieri|Diego CAVALIERI,                    1 Dec 1982, 189
+
+
+## DF / Defenders
+
+Dani Alves|Daniel ALVES DA SILVA,    6 May 1983, 172
+T. Silva|Thiago SILVA|Thiago EMILIANO DA SILVA, 22 Sep 1984, 183
+David Luiz, David Luiz MOREIRA MARINHO,  22 Apr 1987, 189
+Marcelo|Marcelo VIEIRA DA SILVA JUNIOR, 12 May 1988, 174
+Dante|Dante BONFIM COSTA SANTOS, 18 Oct 1983, 188
+Filipe Luís|Filipe Luís KASMIRSKI, 9 Aug 1985, 182
+Réver|Réver Humberto ALVES ARAUJO, 4 Jan 1985, 192
+
+## MF / Midfielders
+
+Fernando|Fernando Lucas MARTINS, 3 Mar 1992, 175
+Lucas|Lucas RODRIGUES MOURA SILVA, 13 Aug 1992, 173
+Hernanes|Anderson Hernanes DE CARVALHO VIANA LIMA, 29 May 1985, 180
+Oscar|Oscar DOS SANTOS EMBOABA JUNIOR,  9 Sep 1991, 180
+Jean|Jean Raphael VANDERLEI MOREIRA,  24 Jun 1986, 170
+L. Gustavo|Luiz Gustavo|Luiz Gustavo DIAS,   23 Jul 1987, 186
+Paulinho|José Paulo BEZERRA MACIEL JUNIOR, 25 Jul 1988, 182
+Bernard|Bernard ANICIO CALDEIRA DUARTE, 8 Sep 1992, 164
+Jádson|Jádson RODRIGUES, 5 Oct 1983, 169
+
+## FW / Forwards
+
+Fred|Frederico CHAVES GUEDES, 3 Oct 1983, 185
+Neymar Jr|Neymar|Neymar DA SILVA SANTOS JUNIOR,  5 Feb 1992, 174
+Hulk|Givanildo VIEIRA DE SOUSA, 25 Jul 1986, 180
+Jô|João Alves de Assis Silva,  20 Mar 1987

data/test/helper.rb

@@ -10,68 +10,23 @@ require 'minitest/autorun'
 # include MiniTest::Unit  # lets us use TestCase instead of MiniTest::Unit::TestCase
 
 
-# ruby stdlibs
-
-require 'json'
-require 'uri'
-require 'pp'
-
 # our own code
 
 require 'persondb'
-require 'logutils/db'   # NB: explict require required for LogDb (not automatic) 
 
+################
+# shortcuts
 Country = WorldDb::Model::Country
 Region  = WorldDb::Model::Region
 City    = WorldDb::Model::City
 
 ## todo: get all models aliases (e.g. from console script)
 
-Person   = PersonDb::Model::Person
-
-
-
-
-def setup_in_memory_db
-  # Database Setup & Config
-
-  db_config = {
-    adapter:  'sqlite3',
-    database: ':memory:'
-  }
-
-  pp db_config
-
-  ActiveRecord::Base.logger = Logger.new( STDOUT )
-  ## ActiveRecord::Base.colorize_logging = false  - no longer exists - check new api/config setting?
-
-  ## NB: every connect will create a new empty in memory db
-  ActiveRecord::Base.establish_connection( db_config )
-
-
-  ## build schema
-
-  LogDb.create
-  ConfDb.create
-  TagDb.create
-  WorldDb.create
-  PersonDb.create
-end
-
-
-def fillup_in_memory_db
-  ## add some counties
-
-  at          = Country.create!( key: 'at', title: 'Austria', code: 'AUT', pop: 0, area: 0 )
-  n           = Region.create!( key: 'n', title: 'Niederösterreich', country_id: at.id )
-  feuersbrunn = City.create!( key: 'feuersbrunn', title: 'Feuersbrunn', country_id: at.id, region_id: n.id )
-
-end
+Person        = PersonDb::Model::Person
+PersonReader  = PersonDb::PersonReader
 
-setup_in_memory_db()
-fillup_in_memory_db()
 
-AT          =  Country.find_by_key!( 'at' )
-N           =  Region.find_by_key!( 'n' )
-FEUERSBRUNN =  City.find_by_key!( 'feuersbrunn' )
+############
+# setup
+PersonDb.setup_in_memory_db
 

data/test/test_models.rb

@@ -8,12 +8,26 @@ class TestModels < MiniTest::Unit::TestCase
 
   def setup  # runs before every test
     PersonDb.delete!   # always clean-out tables
+    WorldDb.delete!
+    add_world
   end
-  
+
+  def add_world
+    ## add some counties
+    at          = Country.create!( key: 'at', title: 'Austria', code: 'AUT', pop: 0, area: 0 )
+    n           = Region.create!( key: 'n', title: 'Niederösterreich', country_id: at.id )
+    feuersbrunn = City.create!( key: 'feuersbrunn', title: 'Feuersbrunn', country_id: at.id, region_id: n.id )
+  end
+
+
   def test_worlddb_assocs
-    assert_equal 0, AT.persons.count
-    assert_equal 0, N.persons.count
-    assert_equal 0, FEUERSBRUNN.persons.count
+    at          =  Country.find_by_key!( 'at' )
+    n           =  Region.find_by_key!( 'n' )
+    feuersbrunn =  City.find_by_key!( 'feuersbrunn' )
+
+    assert_equal 0, at.persons.count
+    assert_equal 0, n.persons.count
+    assert_equal 0, feuersbrunn.persons.count
   end
 
   def test_count

data/test/test_reader.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+
+require 'helper'
+
+
+class TestReader < MiniTest::Unit::TestCase
+
+  def setup  # runs before every test
+    PersonDb.delete!   # always clean-out tables
+    WorldDb.delete!
+    add_world
+  end
+
+  def add_world
+    ## add some counties
+    br = Country.create!( key: 'br', title: 'Brazil', code: 'BRA', pop: 0, area: 0 )
+  end
+
+  def test_read
+    br = Country.find_by_key!( 'br' )
+
+    reader = PersonReader.new( PersonDb.test_data_path )
+    reader.read( 'players/south-america/br-brazil/players',  country_id: br.id )
+
+    assert_equal  23, Person.count
+    assert_equal  23, br.persons.count
+  end
+
+end # class TestReader
+

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: persondb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Gerald Bauer
@@ -13,103 +12,130 @@ date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &83236560 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83236560
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &83236220 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83236220
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &83235830 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83235830
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &83235410 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83235410
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tagutils
-  requirement: &83234330 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83234330
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord-utils
-  requirement: &83249150 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83249150
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &83248700 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83248700
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &83248000 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *83248000
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &83247450 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *83247450
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
 description: persondb - person schema n models for easy (re)use
 email: webslideshow@googlegroups.com
 executables: []
@@ -129,14 +155,18 @@ files:
 - lib/persondb/models/worlddb/city.rb
 - lib/persondb/models/worlddb/country.rb
 - lib/persondb/models/worlddb/region.rb
+- lib/persondb/reader.rb
 - lib/persondb/schema.rb
 - lib/persondb/version.rb
+- test/data/players/south-america/br-brazil/players.txt
 - test/helper.rb
 - test/test_models.rb
+- test/test_reader.rb
 - .gemtest
 homepage: https://github.com/geraldb/person.db.ruby
 licenses:
 - Public Domain
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -144,22 +174,21 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: persondb - person schema n models for easy (re)use
 test_files:
 - test/test_models.rb
+- test/test_reader.rb