persondb-models 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3da2b33fdafe18b96c185cc7917c19da383f99c
-  data.tar.gz: be15b5111437540510df731ad51315d97ed7de37
+  metadata.gz: e3ea4bb59d89558848fb8796b32e712210b1cfa4
+  data.tar.gz: 7392c52df086e03deba2d078f82f4caecff5c5f5
 SHA512:
-  metadata.gz: 6d25360bbcfb330021ff1662838385e2b174fc61e0f2947e583e46b49e97b3977234f77f9d585f386aea4b6c853b18edbc5f57fde6619513ecbf070de360cc2d
-  data.tar.gz: a16843304349ee92544a26e01f26d8781dddc80f704afba593973732d9dc2b0c0d0bb56dad4df26dba77af5e6e193b9da637cb10092450cf1efb27ef386aa349
+  metadata.gz: 28682887dfe9f105434045157d6e715c4165e326875410db512a379eb96c1f03f957e2f723cb2c8c384397f7da3b6dec7381d401ede19b8d917d144f7c37bc6f
+  data.tar.gz: 0d9402cc73e0cec129daaf947b1d133b66cf496227287c50427cb566afa03fa37d4885a1a67c4ed43be29b7a2c8229a16b3bdfe98e20c98cc8921907891b315b

data/Manifest.txt

@@ -7,7 +7,7 @@ lib/persondb/models/forward.rb
 lib/persondb/models/person.rb
 lib/persondb/models/world/city.rb
 lib/persondb/models/world/country.rb
-lib/persondb/models/world/region.rb
+lib/persondb/models/world/state.rb
 lib/persondb/reader.rb
 lib/persondb/schema.rb
 lib/persondb/version.rb

data/lib/persondb/models.rb

@@ -14,7 +14,7 @@ require 'persondb/schema'
 require 'persondb/models/forward'
 
 require 'persondb/models/world/city'
-require 'persondb/models/world/region'
+require 'persondb/models/world/state'
 require 'persondb/models/world/country'
 
 require 'persondb/models/person'
@@ -68,4 +68,4 @@ module PersonDb
 end  # module PersonDb
 
 # say hello
-puts PersonDb.banner  if $DEBUG || (defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG)  
+puts PersonDb.banner  if defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG

data/lib/persondb/models/forward.rb

@@ -7,7 +7,7 @@ module PersonDb
     ## todo: why? why not use include WorldDb::Models here???
     Continent = WorldDb::Model::Continent
     Country   = WorldDb::Model::Country
-    Region    = WorldDb::Model::Region
+    State     = WorldDb::Model::State
     City      = WorldDb::Model::City
 
     Tagging   = TagDb::Model::Tagging

data/lib/persondb/models/world/{region.rb → state.rb}

@@ -1,9 +1,9 @@
 module WorldDb
   module Model
 
-class Region
-  has_many :persons,   class_name: 'PersonDb::Model::Person',  foreign_key: 'region_id'
-end # class Region
+class State
+  has_many :persons,   class_name: 'PersonDb::Model::Person',  foreign_key: 'state_id'
+end # class State
 
   end # module Model
 end # module WorldDb

data/lib/persondb/reader.rb

@@ -40,7 +40,7 @@ class PersonReader
     @more_attribs = more_attribs
   end
 
-  def read()
+  def read
     reader = ValuesReader.from_string( @text, @more_attribs )
 
     reader.each_line do |new_attributes, values|

data/lib/persondb/schema.rb

@@ -24,7 +24,7 @@ create_table :persons do |t|
   ## todo: add country of birth  might not be the same as nationality
 
   t.references  :city
-  t.references  :region
+  t.references  :state
   t.references  :country      ## ,  null: false
 
   t.references  :nationality  ## , null: false  # by default assume same as country of birth (see above)

data/lib/persondb/version.rb

@@ -3,8 +3,8 @@
 module PersonDb
 
   MAJOR = 0 ## todo: namespace inside version or something - why? why not??
-  MINOR = 4
-  PATCH = 2
+  MINOR = 5
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/helper.rb

@@ -13,7 +13,7 @@ require 'persondb/models'
 ################
 # shortcuts
 Country = WorldDb::Model::Country
-Region  = WorldDb::Model::Region
+State   = WorldDb::Model::State
 City    = WorldDb::Model::City
 
 ## todo: get all models aliases (e.g. from console script)

data/test/test_models.rb

@@ -15,15 +15,15 @@ class TestModels < MiniTest::Test
   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 )
+    n           = State.create!( key: 'n', title: 'Niederösterreich', country_id: at.id )
+    feuersbrunn = City.create!( key: 'feuersbrunn', title: 'Feuersbrunn', country_id: at.id, state_id: n.id )
   end
 
 
   def test_worlddb_assocs
-    at          =  Country.find_by_key!( 'at' )
-    n           =  Region.find_by_key!( 'n' )
-    feuersbrunn =  City.find_by_key!( 'feuersbrunn' )
+    at          =  Country.find_by!( key: 'at' )
+    n           =  State.find_by!( key: 'n' )
+    feuersbrunn =  City.find_by!( key: 'feuersbrunn' )
 
     assert_equal 0, at.persons.count
     assert_equal 0, n.persons.count

data/test/test_reader.rb

@@ -17,11 +17,11 @@ class TestReader < MiniTest::Test
   end
 
   def test_read
-    br = Country.find_by_key!( 'br' )
+    br = Country.find_by!( key: 'br' )
 
     path = "#{PersonDb.test_data_path}/players/south-america/br-brazil/players.txt"
     reader = PersonReader.from_file( path, country_id: br.id )
-    reader.read()
+    reader.read
 
     assert_equal  23, Person.count
     assert_equal  23, br.persons.count

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: persondb-models
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb-models
@@ -71,7 +71,7 @@ files:
 - lib/persondb/models/person.rb
 - lib/persondb/models/world/city.rb
 - lib/persondb/models/world/country.rb
-- lib/persondb/models/world/region.rb
+- lib/persondb/models/world/state.rb
 - lib/persondb/reader.rb
 - lib/persondb/schema.rb
 - lib/persondb/version.rb