sportdb-market 0.1.3 → 0.1.4

data/Manifest.txt

@@ -16,8 +16,8 @@ db/euro/2012_tipico.txt
 db/euro/2012_tipp3.txt
 db/services.rb
 db/world/quali_tipp3.txt
+lib/sportdb/market.rb
 lib/sportdb/market/loader.rb
-lib/sportdb/market/market.rb
 lib/sportdb/market/models/event_quote.rb
 lib/sportdb/market/models/game.rb
 lib/sportdb/market/models/group_quote.rb

data/lib/sportdb/{market/market.rb → market.rb}

@@ -6,6 +6,7 @@
 ## todo: how to include 'sportdb/market/version' - does it work? ?
 
 require 'sportdb/market/version'
+
 require 'sportdb/market/schema'
 require 'sportdb/market/models/service'
 require 'sportdb/market/models/group_quote'
@@ -22,9 +23,9 @@ module SportDB::Market
     "sportdb-market #{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
   end
 
-  ##  cut off folders lib(#1)/sportdb(#2)/market(#3) to get to root
+  ##  cut off folders lib(#1)/sportdb(#2) to get to root
   def self.root
-    "#{File.expand_path( File.dirname(File.dirname(File.dirname(File.dirname(__FILE__)))) )}"
+    "#{File.expand_path( File.dirname(File.dirname(File.dirname(__FILE__))) )}"
   end
   
   
@@ -53,7 +54,7 @@ module SportDB::Market
      ['tipp3',     'cl.2012/13',       'cl/2012_13/cl_tipp3'],
      ['tipico',    'euro.2012',        'euro/2012_tipico'],
      ['tipp3',     'euro.2012',        'euro/2012_tipp3' ],
-     ['tipp3',     'wmq.euro',         'world/quali_tipp3']]
+     ['tipp3',     'world.quali.euro.2012/13', 'world/quali_tipp3']]
   end
 
   def self.read_all
@@ -105,7 +106,8 @@ module SportDB::Market
     Deleter.new.run
   end # method delete!
 
-  ## say hello
-  puts SportDB::Market.banner
-
 end  # module SportDB::Market
+
+
+## say hello
+puts SportDB::Market.banner

data/lib/sportdb/market/loader.rb

@@ -23,13 +23,32 @@ class Loader
  
     puts "*** loading data '#{name}' (#{path})..."
 
-    code = File.read( path )
+    code = File.read_utf8( path )
     
     load_worker( code )
+    
+    ## for builtin fixtures use VERSION of gem
+
+    Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "sport.market.rb.#{SportDB::Market::VERSION}" )
   end
 
 
 private
+
+ ##
+  # fix/todo: share helper w/ other readers
+  
+  # helper
+  #   change at/2012_13/bl           to at.2012/13.bl
+  #    or    quali_2012_13_europe_c  to quali.2012/13.europe.c
+  
+  def fixture_name_to_prop_key( name )
+    prop_key = name.gsub( '/', '.' )
+    prop_key = prop_key.gsub( /(\d{4})_(\d{2})/, '\1/\2' )  # 2012_13 => 2012/13
+    prop_key = prop_key.gsub( '_', '.' )
+    prop_key
+  end
+
   def load_worker( code )
     self.class_eval( code )
   end

data/lib/sportdb/market/reader.rb

@@ -22,9 +22,11 @@ class Reader
 
     puts "*** parsing data '#{name}' (#{path})..."
 
-    code = File.read( path )
+    code = File.read_utf8( path )
     
     load_worker( service_key, event_key, code )
+    
+    Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "file.txt.#{File.mtime(path).strftime('%Y.%m.%d')}" )
   end
 
   def load_builtin( service_key, event_key, name ) # load from gem (built-in)
@@ -32,12 +34,29 @@ class Reader
 
     puts "*** parsing data '#{name}' (#{path})..."
 
-    code = File.read( path )
+    code = File.read_utf8( path )
     
     load_worker( service_key, event_key, code )
+
+    Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "sport.market.txt.#{SportDB::Market::VERSION}" )
   end
 
 private
+
+  ##
+  # fix/todo: share helper w/ other readers
+  
+  # helper
+  #   change at/2012_13/bl           to at.2012/13.bl
+  #    or    quali_2012_13_europe_c  to quali.2012/13.europe.c
+  
+  def fixture_name_to_prop_key( name )
+    prop_key = name.gsub( '/', '.' )
+    prop_key = prop_key.gsub( /(\d{4})_(\d{2})/, '\1/\2' )  # 2012_13 => 2012/13
+    prop_key = prop_key.gsub( '_', '.' )
+    prop_key
+  end
+
   def load_worker( service_key, event_key, data )
 
     ## assume active activerecord connection
@@ -48,43 +67,11 @@ private
     
     puts "Quote Service #{@service.key} >#{@service.title}<"
     puts "Event #{@event.key} >#{@event.title}<"
-
-
-    ## build known teams table w/ synonyms e.g.
-    #
-    #   nb: synonyms can be a regex not just a literal string
-    # [[ 'wolfsbrug', [ 'VfL Wolfsburg' ]],
-    #  [ 'augsburg',  [ 'FC Augsburg', 'Augi2', 'Augi3' ]],
-    #  [ 'stuttgart', [ 'VfB Stuttgart' ]] ]
     
-    ### todo/fix: move known_teams code to model and reuse in readers!!
-    ##    do NOT duplicate
+    @known_teams = @event.known_teams_table
     
-    @known_teams = []
- 
-    @event.teams.each_with_index do |team,index|
-
-      titles = []
-      titles << team.title
-      titles += team.synonyms.split('|')  if team.synonyms.present?
-
-      ## NB: sort here by length (largest goes first - best match)
-      #  exclude code and key (key should always go last)
-      titles = titles.sort { |left,right| right.length <=> left.length }
-      
-      titles << team.code                  if team.code.present?
-      titles << team.key
-            
-      @known_teams << [ team.key, titles ]
-      
-      puts "  Team[#{index+1}] #{team.key} >#{titles.join('|')}<"
-    end
- 
- 
     parse_quotes( data )
-    
-    puts 'Done.'
-    
+
   end   # method load
 
 
@@ -123,25 +110,29 @@ private
     regex1 = /[ \t]+(\d{1,3}(?:\.\d{1,3})?)[ \t]+(\d{1,3}(?:\.\d{1,3})?)[ \t]+(\d{1,3}(?:\.\d{1,3})?)/
     regex2 = /[ \t]+(\d{1,3}(?:,\d{1,3})?)[ \t]+(\d{1,3}(?:,\d{1,3})?)[ \t]+(\d{1,3}(?:,\d{1,3})?)/
     
-    if line =~ regex1
-      values = [$1.to_f, $2.to_f, $3.to_f]
+    match = regex1.match( line )
+    unless match.nil?
+      values = [match[1].to_f, match[2].to_f, match[3].to_f]
       puts "   quotes: >#{values.join('|')}<"
       
       line.sub!( regex1, ' [QUOTES.EN]' )
 
       return values
-    elsif line =~ regex2
-      values = [$1.tr(',','.').to_f,
-                $2.tr(',','.').to_f,
-                $3.tr(',','.').to_f]
+    end
+    
+    match = regex2.match( line )
+    unless match.nil?
+      values = [match[1].tr(',','.').to_f,
+                match[2].tr(',','.').to_f,
+                match[3].tr(',','.').to_f]
       puts "   quotes: >#{values.join('|')}<"
       
       line.sub!( regex2, ' [QUOTES.DE]' )
 
       return values
-    else
-      return nil
     end
+    
+    nil  # return nil; nothing found
   end
 
 
@@ -171,18 +162,10 @@ private
 
   def match_team_worker!( line, key, values )
     values.each do |value|
-      ## todo: how to mark value as regex?
-      ##  for now escape regex special chars e.g. . to \.
-      value_for_regex = value.gsub( '.', '\.' ) # e.g. Benfica Lis.
-      
-      ## fix: todo: match accented char with or without accents
-      ##  add (ü|ue) etc.
-      ## also make - optional change to (-| ) e.g. Blau-Weiss == Blau Weiss
-      ##  reuse for all readers!
-      
+
       ## nb: \b does NOT include space or newline for word boundry (only alphanums e.g. a-z0-9)
       ## (thus add it, allows match for Benfica Lis.  for example - note . at the end)
-      regex = /\b#{value_for_regex}[\b\s]/   # wrap with world boundry (e.g. match only whole words e.g. not wac in wacker) 
+      regex = /\b#{value}(\b| |\t|$)/   # wrap with world boundry (e.g. match only whole words e.g. not wac in wacker) 
       if line =~ regex
         puts "     match for team >#{key}< >#{value}<"
         # make sure @@oo{key}oo@@ doesn't match itself with other key e.g. wacker, wac, etc.

data/lib/sportdb/market/version.rb

@@ -2,5 +2,5 @@
 module SportDB ; end    # forward reference (for hoe require)
 
 module SportDB::Market
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/sportdb_plugin.rb

@@ -2,7 +2,7 @@
 
 puts "hello from sportdb_plugin script (sportdb-market)"
 
-require 'sportdb/market/market'
+require 'sportdb/market'
 
 
 #require 'rubygems/command_manager'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sportdb-market
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-18 00:00:00 Z
+date: 2012-11-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rdoc
@@ -83,8 +83,8 @@ files:
 - db/euro/2012_tipp3.txt
 - db/services.rb
 - db/world/quali_tipp3.txt
+- lib/sportdb/market.rb
 - lib/sportdb/market/loader.rb
-- lib/sportdb/market/market.rb
 - lib/sportdb/market/models/event_quote.rb
 - lib/sportdb/market/models/game.rb
 - lib/sportdb/market/models/group_quote.rb