sportdb 1.7.7 → 1.7.8

data/lib/sportdb/utils.rb

@@ -200,6 +200,10 @@ module SportDb::FixtureHelpers
     # e.g. 12 May 2013 14:00  => D|DD.MMM.YYYY H|HH:MM
     regex_en = /\b(\d{1,2})\s(#{month_abbrev_en})\s(\d{4})\s+(\d{1,2}):(\d{2})\b/
 
+    ## todo: add version w/ hours
+    # e.g.  Jun/12  w/ implied year and implied hours (set to 12:00)
+    regex_en2 = /\b(#{month_abbrev_en})\/(\d{1,2})\b/
+
 
     if line =~ regex_db
       value = '%d-%02d-%02d %02d:%02d' % [$1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i]
@@ -276,6 +280,32 @@ module SportDb::FixtureHelpers
       line.sub!( regex_en, '[DATE.EN]' )
 
       return DateTime.strptime( value, '%Y-%b-%d %H:%M' )   ## %b - abbreviated month name (e.g. Jan,Feb, etc.)
+    elsif line =~ regex_en2
+      # todo: make more generic for reuse
+      month_abbrev_en_to_i = {
+        'Jan' => 1,
+        'Feb' => 2,
+        'Mar' => 3,
+        'Apr' => 4,
+        'May' => 5,
+        'Jun' => 6,
+        'Jul' => 7,
+        'Aug' => 8,
+        'Sep' => 9,
+        'Oct' => 10,
+        'Nov' => 11,
+        'Dec' => 12 }
+
+      day   = $2.to_i
+      month = month_abbrev_en_to_i[ $1 ]
+      year = calculate_year( day, month, opts[:start_at] )
+
+      value = '%d-%02d-%02d 12:00' % [year, month, day]
+      logger.debug "   date: >#{value}<"
+
+      line.sub!( regex_en2, '[DATE.EN2] ' )
+
+      return DateTime.strptime( value, '%Y-%m-%d %H:%M' )
     else
       return nil
     end

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.7.7'
+  VERSION = '1.7.8'
 end
 
 

data/test/test_date.rb

@@ -11,6 +11,17 @@ class TestDate < MiniTest::Unit::TestCase
     assert_date     DateTime.new( 2013, 1, 26 ),         parse_date( '26.01.2013' )
   end
 
+  def test_date_en
+    start_at = DateTime.new( 2013, 1, 25 )
+
+    assert_date     DateTime.new( 2013, 1, 26 ),         parse_date( 'Jan/26', start_at: start_at )
+    assert_datetime DateTime.new( 2013, 1, 26, 12, 00 ), parse_date( 'Jan/26', start_at: start_at )
+
+    assert_date     DateTime.new( 2013, 6, 13 ),         parse_date( 'Jun/13', start_at: start_at )
+    assert_datetime DateTime.new( 2013, 6, 13, 12, 00 ), parse_date( 'Jun/13', start_at: start_at )
+  end
+
+
 private
 
   ## todo: check if assert_datetime or assert_date exist already? what is the best practice to check dates ???

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.7.7
+  version: 1.7.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &70825440 !ruby/object:Gem::Requirement
+  requirement: &22578024 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70825440
+  version_requirements: *22578024
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &70825170 !ruby/object:Gem::Requirement
+  requirement: &22577724 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70825170
+  version_requirements: *22577724
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70824860 !ruby/object:Gem::Requirement
+  requirement: &22577412 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,36 +43,38 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *70824860
+  version_requirements: *22577412
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70824550 !ruby/object:Gem::Requirement
+  requirement: &22577124 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *70824550
+  version_requirements: *22577124
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70824310 !ruby/object:Gem::Requirement
+  requirement: &22576836 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.7'
   type: :development
   prerelease: false
-  version_requirements: *70824310
+  version_requirements: *22576836
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables:
 - sportdb
 extensions: []
 extra_rdoc_files:
+- History.md
 - Manifest.txt
+- README.md
 files:
 - History.md
 - Manifest.txt
@@ -199,16 +201,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sportdb
-rubygems_version: 1.8.17
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: sportdb - sport.db command line tool
 test_files:
+- test/test_changes.rb
+- test/test_cursor.rb
 - test/test_date.rb
 - test/test_lang.rb
-- test/test_cursor.rb
 - test/test_round.rb
 - test/test_scores.rb
-- test/test_winner.rb
 - test/test_utils.rb
-- test/test_changes.rb
+- test/test_winner.rb