persondb 0.3.1 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: aa10af4e394c638075a36596fce234db307645e4
+  data.tar.gz: c410185d031420f2122b86f3c0c853ba3b2d7885
+SHA512:
+  metadata.gz: a225a1f9699e149a6c540515bac204152828f825858ac5a86da0164bdc4aa657b90589ca35ab1515d00e2d33cdd02d8a1a58a1c67da7feeb4640b3578d5b24af
+  data.tar.gz: 94a36208e799bec83d98ed270edc740fd7178dcaaf2cf9bbf2b476288cac7bcd7938dbb6192222dd5ae2d103a55206a44f3031fb290efebcc0edf514eae3e363

data/README.md

@@ -1,9 +1,9 @@
 # persondb
 
-persondb gems - person schema n models for easy (re) use
+persondb gems - person schema 'n' models for easy (re) use
 
-* home  :: [github.com/geraldb/person.db.ruby](https://github.com/geraldb/person.db.ruby)
-* bugs  :: [github.com/geraldb/person.db.ruby/issues](https://github.com/geraldb/person.db.ruby/issues)
+* home  :: [github.com/persondb/person.db.ruby](https://github.com/persondb/person.db.ruby)
+* bugs  :: [github.com/persondb/person.db.ruby/issues](https://github.com/persondb/person.db.ruby/issues)
 * gem   :: [rubygems.org/gems/persondb](https://rubygems.org/gems/persondb)
 * rdoc  :: [rubydoc.info/gems/persondb](http://rubydoc.info/gems/persondb)
 

data/Rakefile

@@ -5,10 +5,10 @@ Hoe.spec 'persondb' do
 
   self.version = PersonDb::VERSION
 
-  self.summary = 'persondb - person schema n models for easy (re)use'
+  self.summary = "persondb - person schema 'n' models for easy (re)use"
   self.description = summary
 
-  self.urls    = ['https://github.com/geraldb/person.db.ruby']
+  self.urls    = ['https://github.com/persondb/person.db.ruby']
 
   self.author  = 'Gerald Bauer'
   self.email   = 'webslideshow@googlegroups.com'
@@ -21,7 +21,7 @@ Hoe.spec 'persondb' do
     ['props' ],
     ['logutils'],
     ['textutils'],
-    ['worlddb'],
+    ['worlddb-models'],
     ['tagutils'],             # tags n tagging tables
     ['activerecord-utils'],   # extras e.g. rnd, find_by! for 3.x etc.
     ## 3rd party
@@ -31,8 +31,8 @@ Hoe.spec 'persondb' do
   self.licenses = ['Public Domain']
 
   self.spec_extras = {
-   :required_ruby_version => '>= 1.9.2'
+   required_ruby_version: '>= 1.9.2'
   }
 
-
 end
+

data/lib/persondb.rb

@@ -1,17 +1,8 @@
 # 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 'worlddb'    # note: let worlddb pull in all 3rd party gems / libs (do NOT duplicate here)
-
-## fix: add/move to worlddb
-require 'logutils/db'
+require 'worlddb/models'    # note: let worlddb pull in all 3rd party gems / libs (do NOT duplicate here)
 
 
 ### our own code
@@ -83,6 +74,5 @@ module PersonDb
 
 end  # module PersonDb
 
-
-puts PersonDb.banner    # say hello
-
+# say hello
+puts PersonDb.banner  if $DEBUG || (defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG)  

data/lib/persondb/reader.rb

@@ -1,4 +1,5 @@
-# encoding: UTF-8
+# encoding: utf-8
+
 
 module PersonDb
 
@@ -11,23 +12,41 @@ class PersonReader
 #  e.g. lets you use Usage instead of Model::Usage
   include Models
 
+  def self.from_zip( zip_file, entry_path, more_attribs={} )
+    ## get text content from zip
+    entry = zip_file.find_entry( entry_path )
+
+    text = entry.get_input_stream().read()
+    text = text.force_encoding( Encoding::UTF_8 )
 
-  attr_reader :include_path
+    self.from_string( text, more_attribs )
+  end
 
-  def initialize( include_path, opts = {} )
-    @include_path = include_path
+  def self.from_file( path, more_attribs={} )
+    ## note: assume/enfore utf-8 encoding (with or without BOM - byte order mark)
+    ## - see textutils/utils.rb
+    text = File.read_utf8( path )
+    self.from_string( text, more_attribs )
   end
 
+  def self.from_string( text, more_attribs={} )
+    PersonReader.new( text, more_attribs )
+  end  
+
 
-  def read( name, more_attribs={} )
-    reader = ValuesReaderV2.new( name, include_path, more_attribs )
+  def initialize( text, more_attribs={} )
+    ## todo/fix: how to add opts={} ???
+    @text = text
+    @more_attribs = more_attribs
+  end
+
+  def read()
+    reader = ValuesReader.from_string( @text, @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.3.1'
+   VERSION = '0.4.0'
 end
 

data/test/helper.rb

@@ -1,15 +1,10 @@
-# encoding: UTF-8
+# encoding: utf-8
 
 ## $:.unshift(File.dirname(__FILE__))
 
 ## minitest setup
-
-# require 'minitest/unit'
 require 'minitest/autorun'
 
-# include MiniTest::Unit  # lets us use TestCase instead of MiniTest::Unit::TestCase
-
-
 # our own code
 
 require 'persondb'

data/test/test_models.rb

@@ -4,7 +4,7 @@
 require 'helper'
 
 
-class TestModels < MiniTest::Unit::TestCase
+class TestModels < MiniTest::Test
 
   def setup  # runs before every test
     PersonDb.delete!   # always clean-out tables

data/test/test_reader.rb

@@ -3,7 +3,7 @@
 require 'helper'
 
 
-class TestReader < MiniTest::Unit::TestCase
+class TestReader < MiniTest::Test
 
   def setup  # runs before every test
     PersonDb.delete!   # always clean-out tables
@@ -19,8 +19,9 @@ class TestReader < MiniTest::Unit::TestCase
   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 )
+    path = "#{PersonDb.test_data_path}/players/south-america/br-brazil/players.txt"
+    reader = PersonReader.from_file( path, country_id: br.id )
+    reader.read()
 
     assert_equal  23, Person.count
     assert_equal  23, br.persons.count

metadata

@@ -1,116 +1,142 @@
 --- !ruby/object:Gem::Specification
 name: persondb
 version: !ruby/object:Gem::Version
-  version: 0.3.1
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-24 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &75685120 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75685120
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &75684720 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75684720
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &75684280 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75684280
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: worlddb
-  requirement: &75683770 !ruby/object:Gem::Requirement
-    none: false
+  name: worlddb-models
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75683770
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tagutils
-  requirement: &75683300 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75683300
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord-utils
-  requirement: &75682920 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75682920
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &75682620 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75682620
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &75682000 !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: *75682000
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &75681240 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '3.13'
   type: :development
   prerelease: false
-  version_requirements: *75681240
-description: persondb - person schema n models for easy (re)use
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
+description: persondb - person schema 'n' models for easy (re)use
 email: webslideshow@googlegroups.com
 executables: []
 extensions: []
@@ -119,6 +145,7 @@ extra_rdoc_files:
 - Manifest.txt
 - README.md
 files:
+- ".gemtest"
 - HISTORY.md
 - Manifest.txt
 - README.md
@@ -136,34 +163,32 @@ files:
 - test/helper.rb
 - test/test_models.rb
 - test/test_reader.rb
-- .gemtest
-homepage: https://github.com/geraldb/person.db.ruby
+homepage: https://github.com/persondb/person.db.ruby
 licenses:
 - Public Domain
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
 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.4.2
 signing_key: 
-specification_version: 3
-summary: persondb - person schema n models for easy (re)use
+specification_version: 4
+summary: persondb - person schema 'n' models for easy (re)use
 test_files:
 - test/test_models.rb
 - test/test_reader.rb