sportdb 1.0.1 → 1.1.0

data/Rakefile

@@ -23,7 +23,7 @@ Hoe.spec 'sportdb' do
   # self.history_file = 'History.md'
   
   self.extra_deps = [
-    ['worlddb', '~> 1.0.1'],  # NB: worlddb already includes
+    ['worlddb', '~> 1.1.0'],  # NB: worlddb already includes
                                #         - commander
                                #         - logutils
                                #         - textutils

data/lib/sportdb.rb

@@ -99,7 +99,7 @@ module SportDB
 
   def self.read_setup( setup, include_path )
     reader = Reader.new
-    reader.load_setup_with_include_path( setup, include_path )
+    reader.load_setup( setup, include_path )
   end
 
   def self.read_all( include_path )   # convenience helper
@@ -114,7 +114,7 @@ module SportDB
 
   def self.read( ary, include_path )
     reader = Reader.new
-    reader.load_with_include_path( ary, include_path )
+    reader.load( ary, include_path )
   end
   
   

data/lib/sportdb/cli/main.rb

@@ -136,21 +136,19 @@ command :load do |c|
     
     SportDB.delete! if options.delete.present?
 
-    logger = LogUtils::Logger.new
+    reader = SportDB::Reader.new
 
-    reader = SportDB::Reader.new( logger )
- 
     args.each do |arg|
       name = arg     # File.basename( arg, '.*' )
 
       if myopts.event.present?
         ## fix: rename to load_event_fixtures_w... or similar
-        reader.load_fixtures_with_include_path( myopts.event, name, myopts.data_path )
+        reader.load_fixtures( myopts.event, name, myopts.data_path )
       else
         ## fix> add a convenience method for loading single fixture
         ary = []
         ary << name
-        reader.load_with_include_path( ary, myopts.data_path )
+        reader.load( ary, myopts.data_path )
       end
     end # each arg
 

data/lib/sportdb/reader.rb

@@ -9,26 +9,20 @@ class Reader
   include SportDB::Models
 
 
-  def initialize( logger=nil )
-    if logger.nil?
-      @logger = LogUtils::Logger.new
-      ## @logger = Logger.new(STDOUT)
-      ## @logger.level = Logger::INFO
-    else
-      @logger = logger
-    end
+  def initialize( opts={} )
+    @logger = LogUtils::Logger.new
   end
 
   attr_reader :logger
 
-  def load_setup_with_include_path( setup, include_path )
-    ary = load_fixture_setup_with_include_path( setup, include_path )
-    load_with_include_path( ary, include_path )
-  end # method load_setup_with_include_path
+  def load_setup( setup, include_path )
+    ary = load_fixture_setup( setup, include_path )
+    load( ary, include_path )
+  end # method load_setup
 
 
   ## fix/todo: rename ??
-  def load_fixture_setup_with_include_path( name, include_path )
+  def load_fixture_setup( name, include_path )
     
    ## todo/fix: cleanup quick and dirty code
     
@@ -74,12 +68,12 @@ class Reader
     
     ary
       
-  end # load_fixture_setup_with_include_path
+  end # load_fixture_setup
 
 
-  def load_with_include_path( ary, include_path )   # convenience helper for all-in-one reader
+  def load( ary, include_path )   # convenience helper for all-in-one reader
     
-    puts "[debug] enter load_with_include_path (include_path=>>#{include_path}<<):"
+    puts "[debug] enter load(include_path=>>#{include_path}<<):"
     pp ary
     
     ary.each do |rec|
@@ -88,30 +82,30 @@ class Reader
         name = rec
         
         if name =~ /^seasons/
-          load_seasons_with_include_path( name, include_path )
+          load_seasons( name, include_path )
         elsif name =~ /^leagues/
           if name =~ /club/
             # e.g. leagues_club
-            load_leagues_with_include_path( name, include_path, { club: true } )
+            load_leagues( name, include_path, { club: true } )
           else
             # e.g. leagues
-            load_leagues_with_include_path( name, include_path )
+            load_leagues( name, include_path )
           end
         elsif name =~ /^([a-z]{2})\/teams/
           # auto-add country code (from folder structure) for country-specific teams
           #  e.g. at/teams at/teams2 de/teams etc.
           country_key = $1
           country = Country.find_by_key!( country_key )
-          load_teams_with_include_path( name, include_path, { club: true, country_id: country.id } )
+          load_teams( name, include_path, { club: true, country_id: country.id } )
         elsif name =~ /\/teams/
           if name =~ /club/
             # club teams (many countries)
             # e.g. club/europe/teams
-            load_teams_with_include_path( name, include_path, { club: true } )
+            load_teams( name, include_path, { club: true } )
           else
             # assume national teams
             # e.g. world/teams  amercia/teams_n
-            load_teams_with_include_path( name, include_path, { national: true } )
+            load_teams( name, include_path, { national: true } )
           end
         else
           logger.error "unknown sportdb fixture type >#{name}<"
@@ -126,17 +120,17 @@ class Reader
         event_name     = rec[1]  # e.g. at/2012_13/bl
         fixture_names  = rec[1..-1]  # e.g. at/2012_13/bl, at/2012_13/bl2
       
-        load_event_with_include_path( event_name, include_path )
+        load_event( event_name, include_path )
         fixture_names.each do |fixture_name|
-          load_fixtures_with_include_path( event_key, fixture_name, include_path )
+          load_fixtures( event_key, fixture_name, include_path )
         end
       end
       
     end # each ary
-  end # method load_with_include_path
+  end # method load
 
 
-  def load_leagues_with_include_path( name, include_path, more_values={} )
+  def load_leagues( name, include_path, more_values={} )
     
     path = "#{include_path}/#{name}.txt"
 
@@ -149,10 +143,10 @@ class Reader
     ### todo/fix: add prop
     ### Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "file.txt.#{File.mtime(path).strftime('%Y.%m.%d')}" )
      
-  end # load_leagues_with_include_path
+  end # load_leagues
 
 
-  def load_seasons_with_include_path( name, include_path )
+  def load_seasons( name, include_path )
     path = "#{include_path}/#{name}.yml"
 
     puts "*** parsing data '#{name}' (#{path})..."
@@ -198,11 +192,11 @@ class Reader
     ### todo/fix: add prop
     ### Prop.create_from_sportdb_fixture!( name, path )
   
-  end  # load_seasons_with_include_path
+  end  # load_seasons
 
 
 
-  def load_event_with_include_path( name, include_path )
+  def load_event( name, include_path )
     path = "#{include_path}/#{name}.yml"
 
     logger.info "parsing data '#{name}' (#{path})..."
@@ -286,7 +280,7 @@ class Reader
     
     ### todo/fix: add prop
   
-  end  # load_event_with_include_path
+  end  # load_event
 
 
   def load_fixtures_from_string( event_key, text )  # load from string (e.g. passed in via web form)
@@ -300,7 +294,7 @@ class 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_fixtures_with_include_path( event_key, name, include_path )  # load from file system
+  def load_fixtures( event_key, name, include_path )  # load from file system
      
     path = "#{include_path}/#{name}.txt"
 
@@ -317,7 +311,7 @@ class Reader
   end
 
 
-  def load_teams_with_include_path( name, include_path, more_values={} )
+  def load_teams( name, include_path, more_values={} )
     path = "#{include_path}/#{name}.txt"
 
     puts "*** parsing data '#{name}' (#{path})..."
@@ -328,7 +322,7 @@ class Reader
     
     ## todo/fix: add prop
     ## Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "sport.txt.#{SportDB::VERSION}" )    
-  end # load_teams_with_include_path
+  end # load_teams
 
 private
 

data/lib/sportdb/version.rb

@@ -1,4 +1,4 @@
 
 module SportDB
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sportdb
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-20 00:00:00 Z
+date: 2013-02-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: worlddb
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 19
         segments: 
         - 1
-        - 0
         - 1
-        version: 1.0.1
+        - 0
+        version: 1.1.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency