persondb 0.3.0 → 0.3.1

data/Manifest.txt

@@ -5,9 +5,9 @@ Rakefile
 lib/persondb.rb
 lib/persondb/models/forward.rb
 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/models/world/city.rb
+lib/persondb/models/world/country.rb
+lib/persondb/models/world/region.rb
 lib/persondb/reader.rb
 lib/persondb/schema.rb
 lib/persondb/version.rb

data/lib/persondb/models/forward.rb

@@ -15,7 +15,7 @@ module PersonDb
 
     Prop      = ConfDb::Model::Prop
 
-  class Person < ActiveRecord::Base ; end
+    class Person < ActiveRecord::Base ; end
 
   end # module Model
 

data/lib/persondb/models/person.rb

@@ -23,6 +23,8 @@ class Person < ActiveRecord::Base
         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
+
+      #### fix: use more generic/better date reader (allow more formats!!!)
       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.)
@@ -43,6 +45,41 @@ class Person < ActiveRecord::Base
       new_attributes[ :nationality_id ] = new_attributes[ :country_id ]
     end
 
+
+    ####################################################
+    # title-ize / normal-ize names (titles/synonyms)
+
+    ##
+    ##  make sure title and synonyms do NOT use all UPPERCASE
+    ##   e.g. convert Neymar DA SILVA SANTOS to Neymar Da Sliva Santos etc.
+
+    ### fix:  add auto camelcase/titlecase
+    ## move to textutils
+    ##  make it an option for name to auto Camelcase/titlecase?
+    ##  e.g. BONFIM COSTA SANTOS    becomes
+    ##       Bonfim Costa Santos  etc.
+    ##  fix: better move into person parser?
+    ##   store all alt_names titleized!!!
+
+    raw_title = new_attributes[ :title ]
+    new_title = titleize( raw_title )
+    if raw_title != new_title
+      logger.debug "  change person title/name to <#{new_title}> from >#{raw_title}<"
+      new_attributes[ :title ] = new_title
+    end
+
+    raw_synonyms = new_attributes[ :synonyms ]
+    if raw_synonyms.present?
+       new_synonyms = raw_synonyms.split('|').map { |value| titleize(value) }.join('|')
+       
+       if raw_synonyms != new_synonyms
+         logger.debug "  change person synonyms/alt_names to <#{new_synonyms}> from >#{raw_synonyms}<"
+         new_attributes[ :synonyms ] = new_synonyms
+       end
+    end
+
+
+
     rec = Person.find_by_key( new_attributes[ :key ] )
     if rec.present?
       logger.debug "update Person #{rec.id}-#{rec.key}:"
@@ -56,6 +93,15 @@ class Person < ActiveRecord::Base
     rec.update_attributes!( new_attributes )
   end # create_or_update_from_values
 
+private
+
+
+  def self.titleize( str )    # note: added as class-level method for self.create etc.
+    ## fix: for now works only with ASCII only
+    ##  words 2 letters and ups
+    ##  fix also allow words w/ quote e.g.  O'Connor etc.
+    str.gsub(/\b[A-Z]{2,}\b/) { |match| match.capitalize }
+  end
 
 end # class Person
 

data/lib/persondb/version.rb

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

data/lib/persondb.rb

@@ -1,26 +1,17 @@
 # encoding: utf-8
 
 # core and stdlibs
+#  todo: check already included in worlddb - thus, remove? why? why not?
 require 'json'
 require 'uri'
 require 'pp'
 
 
 # 3rd party gems / libs
-require 'active_record'   ## todo: add sqlite3? etc.
+require 'worlddb'    # note: let worlddb pull in all 3rd party gems / libs (do NOT duplicate here)
 
-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'  # NB: explict require required for LogDb (NOT automatic); includes ConfDb (ConfDb::Model::Prop, etc.)
-
-require 'worlddb'
+## fix: add/move to worlddb
+require 'logutils/db'
 
 
 ### our own code
@@ -30,9 +21,9 @@ require 'persondb/schema'
 
 require 'persondb/models/forward'
 
-require 'persondb/models/worlddb/city'
-require 'persondb/models/worlddb/region'
-require 'persondb/models/worlddb/country'
+require 'persondb/models/world/city'
+require 'persondb/models/world/region'
+require 'persondb/models/world/country'
 
 require 'persondb/models/person'
 require 'persondb/reader'

data/test/test_reader.rb

@@ -13,7 +13,7 @@ class TestReader < MiniTest::Unit::TestCase
 
   def add_world
     ## add some counties
-    br = Country.create!( key: 'br', title: 'Brazil', code: 'BRA', pop: 0, area: 0 )
+    Country.create!( key: 'br', title: 'Brazil', code: 'BRA', pop: 0, area: 0 )
   end
 
   def test_read
@@ -24,6 +24,11 @@ class TestReader < MiniTest::Unit::TestCase
 
     assert_equal  23, Person.count
     assert_equal  23, br.persons.count
+    
+    jefferson = Person.find_by_key!( 'jefferson' )
+    assert_equal 'Jefferson De Oliveira Galvao', jefferson.synonyms
+    ## todo: add more asserts - use assert_persons ?
+
   end
 
 end # class TestReader

metadata

@@ -1,141 +1,115 @@
 --- !ruby/object:Gem::Specification
 name: persondb
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
+  prerelease: 
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &75685120 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *75685120
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &75684720 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *75684720
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &75684280 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *75684280
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &75683770 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *75683770
 - !ruby/object:Gem::Dependency
   name: tagutils
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &75683300 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *75683300
 - !ruby/object:Gem::Dependency
   name: activerecord-utils
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &75682920 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *75682920
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &75682620 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *75682620
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &75682000 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
+  version_requirements: *75682000
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &75681240 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.11'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
+  version_requirements: *75681240
 description: persondb - person schema n models for easy (re)use
 email: webslideshow@googlegroups.com
 executables: []
@@ -152,9 +126,9 @@ files:
 - lib/persondb.rb
 - lib/persondb/models/forward.rb
 - 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/models/world/city.rb
+- lib/persondb/models/world/country.rb
+- lib/persondb/models/world/region.rb
 - lib/persondb/reader.rb
 - lib/persondb/schema.rb
 - lib/persondb/version.rb
@@ -166,7 +140,6 @@ files:
 homepage: https://github.com/geraldb/person.db.ruby
 licenses:
 - Public Domain
-metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -174,20 +147,22 @@ 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: 2.1.10
+rubygems_version: 1.8.17
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: persondb - person schema n models for easy (re)use
 test_files:
 - test/test_models.rb

checksums.yaml

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