date-formats 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81aad612afdba8f85e731f97c1bc119499a8211d
-  data.tar.gz: e013e9bdac91e1938149d395b946c535b2c75714
+  metadata.gz: 1010733e087d7c58d3c5c0f9ca8ce2a3169b9c32
+  data.tar.gz: 9b4df62cec97cb802826beccfd6949f82f29a626
 SHA512:
-  metadata.gz: 718656e27eab527b211337e3a9fef08030017d2b31f7c59fa89b2292df61275a8b9f1ca247e5f9a5eacad03782d83890cd1a37f5d2d6c5ff541ce0ef67c579bc
-  data.tar.gz: c9470e38606e1b909230e8e62187cb1ba2f29f4bd4d99a48fc8125445d80b08e7ac37e37c7d08e463739d7bca767526ab535e0f0016d1f8abc546e16a55cb551
+  metadata.gz: c54b6785497270059a504664ebde54b6a978077a8f2cae242bfe59d1ea66d2bfff522c7f54ad12ca107528f061b8fc50643840b638c95db574b66f9a7eaa6494
+  data.tar.gz: b522cd86b0617a63f7c7fea943781601063f1bc6ac1c9be7978f134986962006f37926d38651fc66027ed2b8e6fe84f4ce54e197e27154eae3fdf859fd9dadee

data/Manifest.txt

@@ -3,12 +3,13 @@ Manifest.txt
 README.md
 Rakefile
 lib/date-formats.rb
-lib/date-formats/date.rb
 lib/date-formats/formats.rb
+lib/date-formats/names.rb
+lib/date-formats/parser.rb
 lib/date-formats/reader.rb
-lib/date-formats/source.rb
 lib/date-formats/version.rb
 lib/date/formats.rb
 test/helper.rb
-test/test_date.rb
-test/test_formats.rb
+test/test_parse.rb
+test/test_parse_custom.rb
+test/test_version.rb

data/lib/date-formats.rb

@@ -12,7 +12,7 @@ require 'logutils'
 # our own code
 require 'date-formats/version' # let version always go first
 require 'date-formats/reader'
-require 'date-formats/source'
+require 'date-formats/names'   ## month and day names (e.g. January,.. Monday,...)
 
 
 module DateFormats
@@ -37,7 +37,7 @@ end  # module DateFormats
 
 
 require 'date-formats/formats'
-require 'date-formats/date'
+require 'date-formats/parser'
 
 
 

data/lib/date-formats/formats.rb

@@ -150,6 +150,7 @@ EN__MONTH_DD__DATE_RE = /\b
                    \b/x
 
 
+
 # e.g.  12 Ene  w/ implied year
 ES__DD_MONTH__DATE_RE = /\b
                  (?<day>\d{1,2})

data/lib/date-formats/{date.rb → parser.rb}

@@ -9,6 +9,7 @@ module DateFormats
   end
   def self.lang=( value )
     @@lang = value.to_sym    ## note: make sure lang is always a symbol for now (NOT a string)
+    @@lang      ## todo/check: remove  =() method always returns passed in value? double check
   end
 
 
@@ -21,14 +22,14 @@ module DateFormats
   end
 
   def self.parse( line,
-                  lang:    self.class.lang,
+                  lang:    DateFormats.lang,    ## todo/check: is there a "generic" like self.class.lang form? yes, module DateFormats needs to get changed to class DateFormats to work!!
                   start:   Date.new( Date.today.year, 1, 1 )  ## note: default to current YYYY.01.01. if no start provided
                 )
     parser( lang: lang ).parse( line, start: start )
   end
 
   def self.find!( line,
-                  lang:  self.class.lang,
+                  lang:  DateFormats.lang,    ## todo/check: is there a "generic" like self.class.lang form?
                   start: Date.new( Date.today.year, 1, 1 ) ## note: default to current YYYY.01.01. if no start provided
                 )
     parser( lang: lang ).find!( line, start: start )
@@ -167,20 +168,20 @@ module DateFormats
       day     = h[:day]
       year    = h[:year]     || calc_year( month.to_i, day.to_i, start: start ).to_s
 
-      if h[:hours] || h[:minutes]   ## check time (hours or minutes) is present (otherwise asume just Date and NOT DateTime)
-        hours   = h[:hours]    || '00'   # default to 00:00 for HH:MM (hours:minutes)
-        minutes = h[:minutes]  || '00'
+      date =  if h[:hours] || h[:minutes]   ## check time (hours or minutes) is present (otherwise asume just Date and NOT DateTime)
+                 hours   = h[:hours]    || '00'   # default to 00:00 for HH:MM (hours:minutes)
+                 minutes = h[:minutes]  || '00'
 
-        value = '%d-%02d-%02d %02d:%02d' % [year.to_i, month.to_i, day.to_i, hours.to_i, minutes.to_i]
-        logger.debug "   datetime: >#{value}<"
+                 value = '%d-%02d-%02d %02d:%02d' % [year.to_i, month.to_i, day.to_i, hours.to_i, minutes.to_i]
+                 logger.debug "   datetime: >#{value}<"
 
-        date = DateTime.strptime( value, '%Y-%m-%d %H:%M' )
-      else
-        value = '%d-%02d-%02d' % [year.to_i, month.to_i, day.to_i]
-        logger.debug "   date: >#{value}<"
+                 DateTime.strptime( value, '%Y-%m-%d %H:%M' )
+              else
+                 value = '%d-%02d-%02d' % [year.to_i, month.to_i, day.to_i]
+                 logger.debug "   date: >#{value}<"
 
-        date = Date.strptime( value, '%Y-%m-%d' )
-      end
+                 Date.strptime( value, '%Y-%m-%d' )
+              end
 
       ## check/assert cwday if present!!!!
       date

data/lib/date-formats/version.rb

@@ -4,7 +4,7 @@
 module DateFormats
   MAJOR = 0    ## todo: namespace inside version or something - why? why not??
   MINOR = 2
-  PATCH = 0
+  PATCH = 1
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/{test_date.rb → test_parse.rb}

@@ -2,12 +2,12 @@
 
 ###
 #  to run use
-#     ruby -I ./lib -I ./test test/test_date.rb
+#     ruby -I ./lib -I ./test test/test_parse.rb
 
 
 require 'helper'
 
-class TestDate < MiniTest::Test
+class TestParse < MiniTest::Test
 
   def test_date
     data = [
@@ -43,17 +43,11 @@ class TestDate < MiniTest::Test
       [ 'Oct/12 2013 16:00', '2013-10-12 16:00', '[EN_MONTH_DD_YYYY_hh_mm]' ],
 
       [ 'Jan/26 2011',       '2011-01-26', '[EN_MONTH_DD_YYYY]' ],
-      [ 'Jan/26 2011',       '2011-01-26', '[EN_MONTH_DD_YYYY]' ],
-
-      [ 'Jan/26',            '2013-01-26', '[EN_MONTH_DD]' ],
       [ 'Jan/26',            '2013-01-26', '[EN_MONTH_DD]' ],
       [ '26 January',        '2013-01-26', '[EN_DD_MONTH]' ],
-      [ '26 January',        '2013-01-26', '[EN_DD_MONTH]' ],
 
-      [ 'Jun/13',            '2013-06-13', '[EN_MONTH_DD]' ],
       [ 'Jun/13',            '2013-06-13', '[EN_MONTH_DD]' ],
       [ '13 June',           '2013-06-13', '[EN_DD_MONTH]' ],
-      [ '13 June',           '2013-06-13', '[EN_DD_MONTH]' ]
     ]
 
     assert_dates( data, start: Date.new( 2013, 1, 1 ), lang: 'en' )
@@ -105,4 +99,4 @@ private
     assert_date( exp, value )
     assert_time( exp, value )
   end
-end # class TestDate
+end # class TestParse

data/test/test_parse_custom.rb

@@ -0,0 +1,25 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_parse_custom.rb
+
+
+require 'helper'
+
+class TestParseCustom < MiniTest::Test
+
+  def parse( line, start: )
+    @@parser ||= DateFormats::RsssfDateParser.new
+    @@parser.parse( line, start: start )
+  end
+
+  def test_rsssf
+    year  = Date.today.year
+    start = Date.new( year, 1, 1 )
+
+    assert_equal Date.new( year, 4, 12 ), parse( '[Apr 12]',   start: start )
+    assert_equal Date.new( year, 4, 12 ), parse( '[April 12]', start: start )
+  end
+
+end # class TestParseCustom

data/test/{test_formats.rb → test_version.rb}

@@ -2,12 +2,12 @@
 
 ###
 #  to run use
-#     ruby -I ./lib -I ./test test/test_formats.rb
+#     ruby -I ./lib -I ./test test/test_version.rb
 
 
 require 'helper'
 
-class TestFormats < MiniTest::Test
+class TestVersion < MiniTest::Test
 
   def test_version
     pp DateFormats::VERSION
@@ -15,4 +15,4 @@ class TestFormats < MiniTest::Test
     pp DateFormats.root
   end
 
-end # class TestFormats
+end # class TestVersion

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: date-formats
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Gerald Bauer
@@ -67,15 +67,16 @@ files:
 - README.md
 - Rakefile
 - lib/date-formats.rb
-- lib/date-formats/date.rb
 - lib/date-formats/formats.rb
+- lib/date-formats/names.rb
+- lib/date-formats/parser.rb
 - lib/date-formats/reader.rb
-- lib/date-formats/source.rb
 - lib/date-formats/version.rb
 - lib/date/formats.rb
 - test/helper.rb
-- test/test_date.rb
-- test/test_formats.rb
+- test/test_parse.rb
+- test/test_parse_custom.rb
+- test/test_version.rb
 homepage: https://github.com/sportdb/sport.db
 licenses:
 - Public Domain