sportdb-market 0.3.0 → 0.4.0

data/Manifest.txt

@@ -2,20 +2,6 @@ History.md
 Manifest.txt
 README.md
 Rakefile
-data/at/2012_13/bl.rb
-data/at/2012_13/bl_betathome.txt
-data/at/2012_13/bl_tipp3.txt
-data/at/2012_13/cup.rb
-data/at/2012_13/cup_betathome.txt
-data/at/2012_13/cup_tipp3.txt
-data/cl/2012_13/cl.rb
-data/cl/2012_13/cl_betathome.txt
-data/cl/2012_13/cl_tipp3.txt
-data/euro/2012.rb
-data/euro/2012_tipico.txt
-data/euro/2012_tipp3.txt
-data/services.rb
-data/world/quali_tipp3.txt
 lib/sportdb/market.rb
 lib/sportdb/market/loader.rb
 lib/sportdb/market/models/event_quote.rb

data/README.md

@@ -2,7 +2,11 @@
 
 sportdb plugin for market quotes (odds, etc)
 
-* [geraldb.github.com/sport.db](http://geraldb.github.com/sport.db)
+* 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)
 
 
 ## Usage

data/Rakefile

@@ -2,22 +2,16 @@ require 'pp'
 require 'hoe'
 require './lib/sportdb/market/version.rb'
 
-## NB: plugin (hoe-manifest) not required; just used for future testing/development
-Hoe::plugin :manifest   # more options for manifests (in the future; not yet)
 
-###########
-#### NB: if you try this script at home
-#    you need to create a (symbolic) link to the sport.db-market fixtures
-#     e.g. use ln -s ../sport.db-market  data  or similar
 
 Hoe.spec 'sportdb-market' do
   
-  self.version = SportDB::Market::VERSION
+  self.version = SportDb::Market::VERSION
   
   self.summary = 'sportdb plugin for market quotes (odds, etc)'
   self.description = summary
 
-  self.urls    = ['https://github.com/geraldb/sport.db.ruby-market']
+  self.urls    = ['https://github.com/openbookie/sport.db-market']
   
   self.author  = 'Gerald Bauer'
   self.email   = 'opensport@googlegroups.com'

data/lib/sportdb/market.rb

@@ -14,7 +14,7 @@ require 'sportdb/market/loader'
 require 'sportdb/market/reader'
 
 
-module SportDB::Market
+module SportDb::Market
 
   def self.banner
     "sportdb-market #{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
@@ -31,9 +31,9 @@ module SportDB::Market
   end
   
   def self.create
-    CreateDB.up
+    CreateDb.up
   end
-  
+
   def self.fixtures_rb  # all builtin ruby fixtures; helper for covenience
     ['services',
      'at/2012_13/bl',
@@ -43,8 +43,8 @@ module SportDB::Market
     ]
   end
 
-  def self.load_all
-    load( fixtures_rb )
+  def self.load_all( include_path )
+    load( fixtures_rb, include_path )
   end
 
   def self.fixtures_txt
@@ -56,31 +56,31 @@ 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',     'world.quali.euro.2012/13', 'world/quali_tipp3']]
+     ['tipp3',     'world.quali.europe.2014', 'world/quali_tipp3']]
   end
 
-  def self.read_all
-    read( fixtures_txt )
+  def self.read_all( include_path )
+    read( fixtures_txt, 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 )
-    loader = Loader.new
+  def self.load( ary, include_path )
+    loader = Loader.new( include_path )
     ary.each do |name|
-      loader.load_builtin( 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 )
-    reader = Reader.new
+  def self.read( ary, include_path )
+    reader = Reader.new( include_path )
     ary.each do |rec|
-      reader.load_builtin( rec[0], rec[1], rec[2] ) # service_key, event_key, name
+      reader.load( rec[0], rec[1], rec[2] ) # service_key, event_key, name
     end
   end
 
@@ -89,7 +89,7 @@ module SportDB::Market
     
     ## make models available in sportdb module by default with namespace
     #  e.g. lets you use Team instead of Models::Team 
-    include SportDB::Models
+    include SportDb::Models
 
     def run( args=[] )
       # for now delete all tables
@@ -108,8 +108,8 @@ module SportDB::Market
     Deleter.new.run
   end # method delete!
 
-end  # module SportDB::Market
+end  # module SportDb::Market
 
 
 ## say hello
-puts SportDB::Market.banner
+puts SportDb::Market.banner

data/lib/sportdb/market/loader.rb

@@ -1,35 +1,32 @@
-module SportDB::Market
+
+module SportDb::Market
 
 class Loader
 
+  include LogUtils::Logging
+
 ## make models available in sportdb module by default with namespace
 #  e.g. lets you use Team instead of Models::Team 
-  include SportDB::Models
+  include SportDb::Models
 
-
-  def initialize( logger=nil )
-    if logger.nil?
-      @logger = Logger.new(STDOUT)
-      @logger.level = Logger::INFO
-    else
-      @logger = logger
-    end
+  attr_reader :include_path
+  
+  def initialize( include_path )
+    @include_path
   end
 
-  attr_reader :logger
-  
-  def load_builtin( name ) # load from gem (built-in)
-    path = "#{SportDB::Market.data_path}/#{name}.rb"
- 
+  def load( name ) # load from gem (built-in)
+    path = "#{@include_path}/#{name}.rb"
+
     puts "*** loading data '#{name}' (#{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}" )
+    ### Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "sport.market.rb.#{SportDB::Market::VERSION}" )
   end
 
 
@@ -37,21 +34,23 @@ private
 
  ##
   # fix/todo: share helper w/ other readers
-  
+ ##
+ ## todo/check/fix:  check w/ version in textutils  - remove here
+ 
   # 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 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
-  
+
 end # class Loader
-end # module SportDB::Market
+end # module SportDb::Market

data/lib/sportdb/market/models/event_quote.rb

@@ -1,7 +1,7 @@
 
-## NB: just use namespace SportDB::Models (not SportDB::Models::Market)
+# NB: just use namespace SportDb::Models (not SportDb::Models::Market)
 
-module SportDB::Models
+module SportDb::Models
 
 class EventQuote < ActiveRecord::Base
   
@@ -24,4 +24,4 @@ class EventQuote < ActiveRecord::Base
 
 end  # class EventQuote
 
-end  # module SportDB::Models
+end  # module SportDb::Models

data/lib/sportdb/market/models/game.rb

@@ -1,10 +1,10 @@
 
-## NB: just use namespace SportDB::Models (not SportDB::Models::Market)
+# NB: just use namespace SportDb::Models (not SportDb::Models::Market)
 
-module SportDB::Models
+module SportDb::Models
 
 ################################
-## extend Game w/ quotes etc.
+# extend Game w/ quotes etc.
 
 class Game
   
@@ -12,4 +12,4 @@ class Game
    
 end  # class Game
 
-end  # module SportDB::Models
+end  # module SportDb::Models

data/lib/sportdb/market/models/group_quote.rb

@@ -1,7 +1,7 @@
 
-## NB: just use namespace SportDB::Models (not SportDB::Models::Market)
+# NB: just use namespace SportDb::Models (not SportDb::Models::Market)
 
-module SportDB::Models
+module SportDb::Models
 
 class GroupQuote < ActiveRecord::Base
   
@@ -23,4 +23,4 @@ class GroupQuote < ActiveRecord::Base
   
 end  # class GroupQuote
 
-end  # module SportDB::Models
+end  # module SportDb::Models

data/lib/sportdb/market/models/quote.rb

@@ -1,6 +1,7 @@
-## NB: just use namespace SportDB::Models (not SportDB::Models::Market)
 
-module SportDB::Models
+## NB: just use namespace SportDb::Models (not SportDb::Models::Market)
+
+module SportDb::Models
 
 class Quote < ActiveRecord::Base
     
@@ -29,7 +30,7 @@ class Quote < ActiveRecord::Base
     end # each games
   end
 
-    
+
 end  # class Quote
 
-end  # module SportDB::Models
+end  # module SportDb::Models

data/lib/sportdb/market/models/service.rb

@@ -1,7 +1,7 @@
 
-## NB: just use namespace SportDB::Models (not SportDB::Models::Market)
+# NB: just use namespace SportDb::Models (not SportDb::Models::Market)
 
-module SportDB::Models
+module SportDb::Models
 
 class Service < ActiveRecord::Base
     
@@ -10,4 +10,4 @@ class Service < ActiveRecord::Base
    
 end  # class Service
 
-end  # module SportDB::Models
+end  # module SportDb::Models

data/lib/sportdb/market/reader.rb

@@ -1,44 +1,32 @@
 
-module SportDB::Market
+module SportDb::Market
 
 ### load quotes from plain text files
 
 class Reader
 
+  include LogUtils::Logging
+
 ## make models available in sportdb module by default with namespace
 #  e.g. lets you use Team instead of Models::Team 
-  include SportDB::Models
-  
+  include SportDb::Models
+
+  attr_reader :include_path
   
-  def initialize
-    @logger = Logger.new(STDOUT)
-    @logger.level = Logger::INFO
+  def initialize( include_path )
+    @include_path
   end
 
-  attr_reader :logger
-
-  def load_with_include_path( service_key, event_key, name, include_path )  # load from file system
-    path = "#{include_path}/#{name}.txt"
+  def load( service_key, event_key, name )
+    path = "#{@include_path}/#{name}.txt"
 
     puts "*** parsing data '#{name}' (#{path})..."
 
-    reader = LineReader.new( logger, path )
-    
-    load_worker( service_key, event_key, reader )
-    
-    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)
-    path = "#{SportDB::Market.data_path}/#{name}.txt"
+    reader = LineReader.new( path )
 
-    puts "*** parsing data '#{name}' (#{path})..."
-
-    reader = LineReader.new( logger, path )
-    
     load_worker( service_key, event_key, reader )
 
-    Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "sport.market.txt.#{SportDB::Market::VERSION}" )
+    ## Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "file.txt.#{File.mtime(path).strftime('%Y.%m.%d')}" )
   end
 
 private
@@ -62,7 +50,7 @@ private
   end   # method load
 
 
-  include SportDB::FixtureHelpers
+  include SportDb::FixtureHelpers
 
 
   def find_quotes!( line )
@@ -173,4 +161,4 @@ private
 
 end # class Reader
 
-end # module SportDB::Market
+end # module SportDb::Market

data/lib/sportdb/market/schema.rb

@@ -1,12 +1,12 @@
 
-module SportDB::Market
+module SportDb::Market
 
 
-class CreateDB
+class CreateDb
 
 ## make models available in sportdb module by default with namespace
 #  e.g. lets you use Team instead of Models::Team 
-  include SportDB::Models
+  include SportDb::Models
 
 
   def self.up
@@ -49,11 +49,11 @@ end
 
     end # block Schema.define
 
-    Prop.create!( key: 'db.schema.sport.market.version', value: SportDB::Market::VERSION )
+    Prop.create!( key: 'db.schema.sport.market.version', value: SportDb::Market::VERSION )
 
   end # method self.up
 
-end # class CreateDB
+end # class CreateDb
 
 
-end # module SportDB::Market
+end # module SportDb::Market

data/lib/sportdb/market/version.rb

@@ -1,6 +1,6 @@
 
-module SportDB ; end    # forward reference (for hoe require)
+module SportDb ; end    # forward reference (for hoe require)
 
-module SportDB::Market
-  VERSION = '0.3.0'
+module SportDb::Market
+  VERSION = '0.4.0'
 end

metadata

@@ -1,79 +1,49 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sportdb-market
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.4.0
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-04 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-09-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rdoc
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &71884950 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *71884950
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &71884600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 3
-        version: "3.3"
+      - !ruby/object:Gem::Version
+        version: '3.3'
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *71884600
 description: sportdb plugin for market quotes (odds, etc)
 email: opensport@googlegroups.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - Manifest.txt
-files: 
+files:
 - History.md
 - Manifest.txt
 - README.md
 - Rakefile
-- data/at/2012_13/bl.rb
-- data/at/2012_13/bl_betathome.txt
-- data/at/2012_13/bl_tipp3.txt
-- data/at/2012_13/cup.rb
-- data/at/2012_13/cup_betathome.txt
-- data/at/2012_13/cup_tipp3.txt
-- data/cl/2012_13/cl.rb
-- data/cl/2012_13/cl_betathome.txt
-- data/cl/2012_13/cl_tipp3.txt
-- data/euro/2012.rb
-- data/euro/2012_tipico.txt
-- data/euro/2012_tipp3.txt
-- data/services.rb
-- data/world/quali_tipp3.txt
 - lib/sportdb/market.rb
 - lib/sportdb/market/loader.rb
 - lib/sportdb/market/models/event_quote.rb
@@ -85,41 +55,31 @@ files:
 - lib/sportdb/market/schema.rb
 - lib/sportdb/market/version.rb
 - lib/sportdb_plugin.rb
-homepage: https://github.com/geraldb/sport.db.ruby-market
-licenses: 
+homepage: https://github.com/openbookie/sport.db-market
+licenses:
 - Public Domain
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.md
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 55
-      segments: 
-      - 1
-      - 9
-      - 2
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: sportdb-market
-rubygems_version: 1.8.24
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: sportdb plugin for market quotes (odds, etc)
 test_files: []
-