sportdb-models 1.16.1 → 1.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10615c8f4aae44186f6e58fe21226b4c36dade4a
-  data.tar.gz: 4c990c6e759d0d75e759f15be206932583473e82
+  metadata.gz: 3e6613873f974d76aac5c937bed28e683c16622d
+  data.tar.gz: 4c08c536d892a0796aa39e102dd90064f5ab9e95
 SHA512:
-  metadata.gz: 0cf4c1dce575fd254f783b0434e29e6a1b61d5dd9451c29c7fbf553a1795e6df006c98d4f74937165db5291be1ddf00da510dc2ff07df2ea78dd5d93ef70dc3c
-  data.tar.gz: 951f5e611560a39e7287377dff861d5c596c08b8e51694518d62f7ca7571fcb1cbf8ae1c373ac5bf5a6ddbc6bff92a201e919b32c665b591e61f71e27943407a
+  metadata.gz: 6560646347df56c45606bfb2cf6c034e229d72822f3bb80ffc0e1b782ed7b14dec0d8c2ae1a4589112a4eccb9e8c0ce46b5752c3f8c112ed357d8b772ff6cd6a
+  data.tar.gz: 93241e25ca9f4e382094bacb3e147346bfb12e0a8e2cfc6db9b31b14898a2e91397308108d6c435267006ad302a3335c3e24df6761bd3c142ba677347b687696

data/Manifest.txt

@@ -17,6 +17,7 @@ lib/sportdb/deleter.rb
 lib/sportdb/finders/date.rb
 lib/sportdb/finders/goals.rb
 lib/sportdb/finders/scores.rb
+lib/sportdb/indexers/team.rb
 lib/sportdb/lang.rb
 lib/sportdb/mapper_teams.rb
 lib/sportdb/matcher.rb
@@ -151,6 +152,7 @@ test/test_event_meta_reader.rb
 test/test_event_reader.rb
 test/test_event_table_reader.rb
 test/test_goals.rb
+test/test_indexer_team.rb
 test/test_lang.rb
 test/test_load.rb
 test/test_pp.rb

data/lib/sportdb/indexers/team.rb

@@ -0,0 +1,87 @@
+# encoding: UTF-8
+
+module SportDb
+
+
+##
+#  todo/check:
+#     simply add index() method to TeamReader (and remove this class) - why? why not??
+
+
+class TeamIndexer
+
+  include LogUtils::Logging
+
+## make models available by default with namespace
+#  e.g. lets you use Usage instead of Model::Usage
+  include Models
+
+
+  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={} )
+    self.new( text, more_attribs )
+  end  
+
+  def initialize( text, more_attribs={} )
+    ## todo/fix: how to add opts={} ???
+    @text = text
+    @more_attribs = more_attribs
+  end
+
+
+  def read
+    ## return a hash (with all records) e.g.
+    ## {"austria"=>
+    ##   {:title=>"FK Austria Wien",
+    ##    :synonyms=>["Austria Wien", "Austria"],
+    ##    :values=>
+    ##     ["1911",
+    ##      "AUS",
+    ##      "www.fk-austria.at",
+    ##      "Fischhofgasse 12 // 1100 Wien",
+    ##      "city:wien"]},
+    ##  "rapid"=>
+    ##   {:title=>"SK Rapid Wien",
+    ##    :synonyms=>["Rapid Wien", "Rapid"],
+    ##    :values=>
+    ##     ["1899",
+    ##      "RAP",
+    ##      "www.skrapid.at",
+    ##      "Keisslergasse 3 // 1140 Wien",
+    ##      "city:wien"]},
+    ##      ...
+
+    reader = ValuesReader.from_string( @text, @more_attribs )
+
+    h = {}
+
+    reader.each_line do |new_attributes, values|
+      puts "attribs:"
+      pp new_attributes
+      
+      key = new_attributes.delete( :key )  ## remove key
+      
+      ## turn synonyms into an array
+      synonyms = new_attributes[ :synonyms ]
+      if synonyms
+        new_attributes[ :synonyms ] = synonyms.split('|')
+      end
+      
+      new_attributes[ :values ] = values
+      
+      h[ key ] = new_attributes
+      
+    end # each lines
+    
+    h ## return hash with all records (indexed by key)
+  end
+
+
+end # class TeamIndexer
+end # module SportDb

data/lib/sportdb/models.rb

@@ -85,6 +85,7 @@ require 'sportdb/reader'
 require 'sportdb/reader_file'
 require 'sportdb/reader_zip'
 
+require 'sportdb/indexers/team'
 
 
 require 'sportdb/lang'

data/lib/sportdb/version.rb

@@ -4,7 +4,7 @@ module SportDb
 
   MAJOR = 1    ## todo: namespace inside version or something - why? why not??
   MINOR = 16
-  PATCH = 1
+  PATCH = 2
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/helper.rb

@@ -46,6 +46,7 @@ AlltimeStandingEntry = SportDb::Model::AlltimeStandingEntry
 
 Reader                  = SportDb::Reader
 TeamReader              = SportDb::TeamReader
+TeamIndexer             = SportDb::TeamIndexer
 AssocReader             = SportDb::AssocReader
 SeasonReader            = SportDb::SeasonReader
 LeagueReader            = SportDb::LeagueReader
@@ -77,6 +78,13 @@ module TestTeamReader
   end
 end
 
+module TestTeamIndexer
+  def self.from_file( name, more_attribs={} )
+    TeamIndexer.from_file( "#{SportDb.test_data_path}/#{name}.txt", more_attribs )
+  end
+end
+
+
 module TestClubSquadReader
   def self.from_file( name, more_attribs={} )
     ClubSquadReader.from_file( "#{SportDb.test_data_path}/#{name}.txt", more_attribs )

data/test/test_indexer_team.rb

@@ -0,0 +1,34 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_indexer_team.rb
+#  or better
+#     rake -I ./lib test
+
+
+require 'helper'
+
+class TestTeamIndexerXX < MiniTest::Test    ## note: TestTeamIndexer already exists
+
+  def setup
+    WorldDb.delete!
+    SportDb.delete!
+    SportDb.read_builtin
+  end
+
+  def test_bl
+    at = Country.create!( key: 'at', name: 'Austria', code: 'AUT', pop: 1, area: 1)
+
+    indexer = TestTeamIndexer.from_file( 'at-austria/teams', country_id: at.id )
+    h = indexer.read()
+
+    pp h
+
+    ## indexer = TestTeamIndexer.from_file( 'at-austria/teams_2', country_id: at.id )
+    ## indexer.read()
+ 
+    assert true  ## assume everthing ok   
+  end
+
+end # class TestTeamIndexerXX

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-models
 version: !ruby/object:Gem::Version
-  version: 1.16.1
+  version: 1.16.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2015-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb-models
@@ -94,6 +94,7 @@ files:
 - lib/sportdb/finders/date.rb
 - lib/sportdb/finders/goals.rb
 - lib/sportdb/finders/scores.rb
+- lib/sportdb/indexers/team.rb
 - lib/sportdb/lang.rb
 - lib/sportdb/mapper_teams.rb
 - lib/sportdb/matcher.rb
@@ -228,6 +229,7 @@ files:
 - test/test_event_reader.rb
 - test/test_event_table_reader.rb
 - test/test_goals.rb
+- test/test_indexer_team.rb
 - test/test_lang.rb
 - test/test_load.rb
 - test/test_pp.rb