sportdb-market 0.4.1 → 0.5.0

data/README.md

@@ -2,8 +2,8 @@
 
 sportdb plugin for market quotes (odds, etc)
 
-* home  :: [github.com/openbookie/sport.db-market](https://github.com/openbookie/sport.db-market)
-* bugs  :: [github.com/openbookie/sport.db-market/issues](https://github.com/openbookie/sport.db-market/issues)
+* home  :: [github.com/openbookie/sport.db.market](https://github.com/openbookie/sport.db.market)
+* bugs  :: [github.com/openbookie/sport.db.market/issues](https://github.com/openbookie/sport.db.market/issues)
 * gem   :: [rubygems.org/gems/sportdb-market](https://rubygems.org/gems/sportdb-market)
 * rdoc  :: [rubydoc.info/gems/sportdb-market](http://rubydoc.info/gems/sportdb-market)
 * forum :: [groups.google.com/group/opensport](https://groups.google.com/group/opensport)

data/Rakefile

@@ -1,4 +1,4 @@
-require 'pp'
+
 require 'hoe'
 require './lib/sportdb/market/version.rb'
 
@@ -11,7 +11,7 @@ Hoe.spec 'sportdb-market' do
   self.summary = 'sportdb plugin for market quotes (odds, etc)'
   self.description = summary
 
-  self.urls    = ['https://github.com/openbookie/sport.db-market']
+  self.urls    = ['https://github.com/openbookie/sport.db.market']
   
   self.author  = 'Gerald Bauer'
   self.email   = 'opensport@googlegroups.com'
@@ -27,65 +27,3 @@ Hoe.spec 'sportdb-market' do
   }
 
 end
-
-
-namespace :dev do
-  
-  
-  ### NB: use rake -I ./lib dev:test      # fresh import (starts w/ clean wipe out)
-  ### NB: use rake -I ./lib dev:update    # just update quotes
-
-  BUILD_DIR = "./build"
-  
-  SPORT_DB_PATH = "#{BUILD_DIR}/sport.db"
-
-  DB_CONFIG = {
-    :adapter   =>  'sqlite3',
-    :database  =>  SPORT_DB_PATH
-  }
-
-  directory BUILD_DIR
-
-  task :clean do
-    rm SPORT_DB_PATH if File.exists?( SPORT_DB_PATH )
-  end
-
-  task :env => BUILD_DIR do
-    require 'sportdb'
-    require './lib/sportdb/market.rb'
-
-    pp DB_CONFIG
-    ActiveRecord::Base.establish_connection( DB_CONFIG )
-  end
-
-  task :create => :env do
-    WorldDB.create
-    SportDB.create
-    SportDB::Market.create
-  end
-  
-  task :import => :env do
-    WorldDB.read_all  # populate world tables
-
-    SportDB.load_all
-    SportDB.read_all
-
-    SportDB.stats
-  end
-
-
-  desc 'sportdb-market - test loading of builtin fixtures'
-  task :test => [:clean, :create, :import] do
-    SportDB::Market.load_all
-    SportDB::Market.read_all
-  end
-
-  desc 'sportdb-market - test loading of builtin fixtures (just update)'
-  task :update => :env do
-    SportDB::Market.delete!
-    SportDB::Market.load_all
-    SportDB::Market.read_all
-  end
-
-
-end  # namespace :dev

data/lib/sportdb/market.rb

@@ -31,59 +31,21 @@ module SportDb::Market
   end
   
   def self.create
-    CreateDb.up
+    CreateDb.new.up
+    # WorldDb::Models::Prop.create!( key: 'db.schema.sport.market.version', value: SportDb::Market::VERSION )
   end
 
-  def self.fixtures_rb  # all builtin ruby fixtures; helper for covenience
-    ['services',
-     'at/2012_13/bl',
-     'at/2012_13/cup',
-     'cl/2012_13/cl',
-    ## 'euro/2012'
-    ]
-  end
-
-  def self.load_all( include_path )
-    load( fixtures_rb, include_path )
-  end
 
-  def self.fixtures_txt
-    [['betathome', 'at.2012/13',       'at/2012_13/bl_betathome'],
-     ['tipp3',     'at.2012/13',       'at/2012_13/bl_tipp3'],
-     ['betathome', 'at.cup.2012/13',   'at/2012_13/cup_betathome'],
-     ['tipp3',     'at.cup.2012/13',   'at/2012_13/cup_tipp3'],
-     ['betathome', 'cl.2012/13',       'cl/2012_13/cl_betathome'],
-     ['tipp3',     'cl.2012/13',       'cl/2012_13/cl_tipp3'],
-  ##   ['tipico',    'euro.2012',        'euro/2012_tipico'],
-  ##   ['tipp3',     'euro.2012',        'euro/2012_tipp3' ],
-     ['tipp3',     'world.quali.europe.2014', 'world/quali_tipp3']]
+  def self.read_setup( setup, include_path )
+    reader = Reader.new( include_path )
+    reader.load_setup( setup )
   end
 
-  def self.read_all( include_path )
-    read( fixtures_txt, include_path )
+  def self.read_all( include_path )   # convenience helper
+    read_setup( 'setups/all', include_path )
   end
 
 
-  # load built-in (that is, bundled within the gem) named seeds
-  # - pass in an array of seed names e.g. [ 'cl/teams', 'cl/2012_13/cl' ] etc.
-
-  def self.load( ary, include_path )
-    loader = Loader.new( include_path )
-    ary.each do |name|
-      loader.load( name )
-    end
-  end
-
-  # load built-in (that is, bundled within the gem) named plain text seeds
-  # - pass in an array of pairs of event/seed names e.g. [['at.2012/13', 'at/2012_13/bl'], ['cl.2012/13', 'cl/2012_13/cl']] etc.
-
-  def self.read( ary, include_path )
-    reader = Reader.new( include_path )
-    ary.each do |rec|
-      reader.load( rec[0], rec[1], rec[2] ) # service_key, event_key, name
-    end
-  end
-
   class Deleter
     ## todo: move into its own file???    
     

data/lib/sportdb/market/reader.rb

@@ -12,12 +12,86 @@ class Reader
   include SportDb::Models
 
   attr_reader :include_path
-  
+  attr_reader :loader
+
   def initialize( include_path )
     @include_path = include_path
+    @loader       = Loader.new( include_path )
+  end
+
+  def load_setup( name )
+    path = "#{include_path}/#{name}.yml"
+
+    logger.info "parsing data '#{name}' (#{path})..."
+
+    reader = FixtureReader.new( path )
+
+    reader.each do |fixture_name|
+      load( fixture_name )
+    end
+  end # method load_setup
+
+
+  def load( name )   # convenience helper for all-in-one reader
+
+    logger.debug "enter load( name=>>#{name}<<, include_path=>>#{include_path}<<)"
+    
+    # check if name exits if extension .rb  ##
+    #  if yes, use loader (for ruby code)
+    #  otherwise assume
+    #  plain text match/game quotes
+    
+    ## todo: add sub for !/ prefix in name
+
+    path = "#{@include_path}/#{name}.rb"
+    
+    if File.exist?( path )   # if it's ruby use (code) loader
+      loader.load( name )
+    else
+      meta = fetch_quotes_meta( name )
+ 
+      service_key = meta['service_key']
+      event_key   = "#{meta['league_key']}.#{meta['season_key']}"
+      
+      load_quotes( service_key, event_key, name )
+    end
+
+  end  # method load
+
+
+
+  def fetch_quotes_meta( name )
+    # get/fetch/find event from yml file
+
+    ## todo/fix: use h = HashFile.load( path ) or similar instead of HashReader!!
+
+    ## todo/fix: add option for not adding prop automatically?? w/ HashReaderV2
+
+    reader = HashReaderV2.new( name, include_path )
+
+    attribs = {}
+
+    reader.each_typed do |key, value|
+
+      ## puts "processing event attrib >>#{key}<< >>#{value}<<..."
+
+      if key == 'league'
+        attribs[ 'league_key' ] = value.to_s.strip
+      elsif key == 'season'
+        attribs[ 'season_key' ] = value.to_s.strip
+      elsif key == 'service'
+        attribs[ 'service_key' ] = value.to_s.strip
+      else
+        puts "*** warn: skipping unknown quote config/meta key >#{key}< w/ value >#{value}<"
+      end
+    end # each key,value
+    
+    attribs
   end
 
-  def load( service_key, event_key, name )
+
+
+  def load_quotes( service_key, event_key, name )
     path = "#{@include_path}/#{name}.txt"
 
     puts "*** parsing data '#{name}' (#{path})..."
@@ -41,8 +115,16 @@ private
     ##
     
     @service = Service.find_by_key!( service_key )
-    @event   = Event.find_by_key!( event_key )
     
+    #### fix:
+    ## for now skip if event not present
+    @event   = Event.find_by_key( event_key )
+    
+    unless @event.present?
+      puts "*** error: event key >>#{event_key}<< not found/present; skip loading quotes"
+      return
+    end
+
     puts "Quote Service #{@service.key} >#{@service.title}<"
     puts "Event #{@event.key} >#{@event.title}<"
     
@@ -56,6 +138,30 @@ private
   include SportDb::FixtureHelpers
 
 
+  def find_handicap!( line )
+    # fix/todo:
+    #   use find_handicap_team1! and
+    #       find_handicap_team2!  ??? why? why not??
+    #   how can we know if the handicap is for team1 or team2
+    #    needs to get fixed; find some
+    
+    # for now ignore handicap  e.g. +1 or +2 or +3 +4 +5
+    
+    regex = /\+(\d)[ \t]+/
+    
+    match = regex.match( line )
+    unless match.nil?
+      value = match[1].to_i
+      puts "   handicap: >#{value}<"
+      
+      line.sub!( regex, ' [HANDICAP] ' )
+
+      return value
+    end
+    nil # if no handicap found
+  end
+
+
   def find_quotes!( line )
     # extract quotes triplet from line
     # and return it
@@ -117,10 +223,18 @@ private
         team1_key = find_team1!( line )
         team2_key = find_team2!( line )
 
+        handicap = find_handicap!( line )
+
         quotes = find_quotes!( line )
 
         puts "  line: >#{line}<"
 
+        if quotes.nil?
+          puts 'no quotes found; skipping line'  # skip lines w/o quotes
+          next
+        end
+        
+
 
         ### todo: cache team lookups in hash?
 

data/lib/sportdb/market/schema.rb

@@ -1,17 +1,11 @@
+# encoding: UTF-8
 
 module SportDb::Market
 
 
-class CreateDb
+class CreateDb < ActiveRecord::Migration
 
-## make models available in sportdb module by default with namespace
-#  e.g. lets you use Team instead of Models::Team 
-  include SportDb::Models
-
-
-  def self.up
-  
-    ActiveRecord::Schema.define do
+  def up
 
 create_table :services do |t|  # quote service (e.g. tipp3,tipico,etc.)
   t.string     :title,  :null => false
@@ -47,11 +41,11 @@ create_table :group_quotes do |t|
   t.timestamps
 end
 
-    end # block Schema.define
-
-    Prop.create!( key: 'db.schema.sport.market.version', value: SportDb::Market::VERSION )
+  end # method up
 
-  end # method self.up
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
 
 end # class CreateDb
 

data/lib/sportdb/market/version.rb

@@ -2,5 +2,5 @@
 module SportDb ; end    # forward reference (for hoe require)
 
 module SportDb::Market
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-market
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-01 00:00:00.000000000 Z
+date: 2013-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &84559360 !ruby/object:Gem::Requirement
+  requirement: &75451570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *84559360
+  version_requirements: *75451570
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &84557810 !ruby/object:Gem::Requirement
+  requirement: &75469300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *84557810
+  version_requirements: *75469300
 description: sportdb plugin for market quotes (odds, etc)
 email: opensport@googlegroups.com
 executables: []
@@ -55,7 +55,7 @@ files:
 - lib/sportdb/market/schema.rb
 - lib/sportdb/market/version.rb
 - lib/sportdb_plugin.rb
-homepage: https://github.com/openbookie/sport.db-market
+homepage: https://github.com/openbookie/sport.db.market
 licenses:
 - Public Domain
 post_install_message: