eventdb 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b70e8ad30cf78baa0d12cb0b6551ea3fd6176639
-  data.tar.gz: 4a3eaf01f136569c7213892566c75e4a13a30460
+  metadata.gz: 7354bd8a2d3f10f919d50e6c6d1bda249bd2e076
+  data.tar.gz: a13aea328e4e0fc4772649eaf5c3ddfb615753db
 SHA512:
-  metadata.gz: aa45f7e75736a32f1bc049706aee236699e859ad15e94b29e9f9a9f60182c711dfe0533c78db41582fd284f83ec26e1d530c4797a14a7555ee7d8c9438706d28
-  data.tar.gz: 1434e0b8c81f5f4ce6976355b4e7b34f2ffc3d79dc19a47c4438ea2b469105b12bdf9d98deac04537178bc71abd57b44602225c304c34f23f4f2b1a423ee3eaf
+  metadata.gz: aa749db10bce863a77b3458bee269369fc040641e4bb08953461b405e69e575725a4aaea82bf5f3ff5f0f8f56684206d6b57916ad1d9a2c7edb3e883e0016e3f
+  data.tar.gz: 7fcf7970a79751124501c75b9d0c81dfbeb82680beca921aa1cbe5de74c941723e91710c2f3102b17e6e22fbc48cc107c545b142fd68ae6fb1e2d2183686e34f

data/Manifest.txt

@@ -3,14 +3,16 @@ Manifest.txt
 README.md
 Rakefile
 bin/beerfest
+bin/kickoff
 bin/rubyconf
 lib/eventdb.rb
-lib/eventdb/beerfest.rb
 lib/eventdb/calendar.rb
 lib/eventdb/database.rb
+lib/eventdb/datasets/beerfest.rb
+lib/eventdb/datasets/football.rb
+lib/eventdb/datasets/rubyconf.rb
 lib/eventdb/models.rb
 lib/eventdb/reader.rb
-lib/eventdb/rubyconf.rb
 lib/eventdb/schema.rb
 lib/eventdb/version.rb
 templates/CALENDAR.md.erb

data/README.md

@@ -12,7 +12,7 @@ event.db models n tools
 ## Command-Line Tool Usage
 
 The eventdb gem includes command-line tools
-to list upcoming events (ruby conferences, beer festivals. etc.).
+to list upcoming events (ruby conferences, football tournaments, beer festivals. etc.).
 
 
 ### Upcoming Ruby Conferences
@@ -28,24 +28,47 @@ to list upcoming Ruby (un)conferences from around the world. Will print:
 ~~~
 Upcoming Ruby Conferences:
 
-  Jul/1+2 - RubyMotion Conference - #inspect @ Paris, France › Europe
-  Jul/20 - Brighton Ruby Conference @ Brighton, East Sussex › England (en) › Western Europe › Europe
-  Jul/31-Aug/2 - European Ruby Camp - eurucamp @ Berlin (Potsdam), Germany › Europe
-  Jul/31 - JRuby Conference Europe - JRubyConf EU @ Berlin (Potsdam), Germany › Europe
-  Aug/1+2 - Burlington Ruby Conference @ Burlington, Vermont › New England › United States (us) › North America › America
-  Aug/21+22 - Madison+ Ruby @ Madison, Wisconsin › Great Lakes › United States (us) › North America › America
-  Sept/1–5 - Full Stack Fest - Barcelona Ruby Conference (BaRuCo) + Barcelona Future JS @ Barcelona, Catalonia › Spain / España (es) › Southern Europe › Europe
-  Sept/11+12 - RubyConf Taiwan @ Taipei › Taiwan (tw) › Asia
-  Sep/14+15 - RubyConf Portugal @ Braga › Portugal (pt) › Southern Europe › Europe
-  Sept/18+19 - RubyConf Brasil @ São Paulo › Brazil / Brasil (br) › South America › America
-  Sept/23-25 - Rocky Mountain Ruby Conference @ Boulder, Colorado › Rocky Mountains › United States (us) › North America › America
-  Sept/26 - Ruby Open Source Software (ROSS) Conference - ROSSConf @ Berlin, Germany › Europe
-  Oct/1+2 - ArrrCamp @ Ghent, Oost-Vlaanderen › Belgium / België / Belgique (be) › Western Europe › Europe
-  Oct/15+16 - RubyConf Colombia @ Medellin › Colombia (co) › South America › America
-  Oct/17+18 - European Ruby Konference - EuRuKo @ Salzburg, Austria › Europe
-  Nov/11+12 - RubyWorld Conference @ Matsue › Japan (jp) › Asia
+  in 8d  Wed+Thu Jul/1+2 (2d) - RubyMotion Conference - #inspect @ Paris, France › Europe
+  in 27d  Mon Jul/20 (1d) - Brighton Ruby Conference @ Brighton, East Sussex › England (en) › Western Europe › Europe
+  in 38d  Fri-Sun Jul/31-Aug/2 (3d) - European Ruby Camp - eurucamp @ Berlin (Potsdam), Germany › Europe
+  in 38d  Fri Jul/31 (1d) - JRuby Conference Europe - JRubyConf EU @ Berlin (Potsdam), Germany › Europe
+  in 39d  Sat+Sun Aug/1+2 (2d) - Burlington Ruby Conference @ Burlington, Vermont › New England › United States (us) › North America › America
+  in 59d  Fri+Sat Aug/21+22 (2d) - Madison+ Ruby @ Madison, Wisconsin › Great Lakes › United States (us) › North America › America
+  in 70d  Tue-Sat Sep/1-5 (5d) - Full Stack Fest - Barcelona Ruby Conference (BaRuCo) + Barcelona Future JS @ Barcelona, Catalonia › Spain / España (es) › Southern Europe › Europe
+  in 80d  Fri+Sat Sep/11+12 (2d) - RubyConf Taiwan @ Taipei › Taiwan (tw) › Asia
+  in 83d  Mon+Tue Sep/14+15 (2d) - RubyConf Portugal @ Braga › Portugal (pt) › Southern Europe › Europe
+  in 87d  Fri+Sat Sep/18+19 (2d) - RubyConf Brasil @ São Paulo › Brazil / Brasil (br) › South America › America
+  in 92d  Wed-Fri Sep/23-25 (3d) - Rocky Mountain Ruby Conference @ Boulder, Colorado › Rocky Mountains › United States (us) › North America › America
+  in 95d  Sat Sep/26 (1d) - Ruby Open Source Software (ROSS) Conference - ROSSConf @ Berlin, Germany › Europe
+  in 100d  Thu+Fri Oct/1+2 (2d) - ArrrCamp @ Ghent, Oost-Vlaanderen › Belgium / België / Belgique (be) › Western Europe › Europe
+  in 114d  Thu+Fri Oct/15+16 (2d) - RubyConf Colombia @ Medellin › Colombia (co) › South America › America
+  in 116d  Sat+Sun Oct/17+18 (2d) - European Ruby Konference - EuRuKo @ Salzburg, Austria › Europe
+  in 141d  Wed+Thu Nov/11+12 (2d) - RubyWorld Conference @ Matsue › Japan (jp) › Asia
+  ...
 ~~~
 
+
+### Upcoming Football Tournaments
+
+Use
+
+~~~
+$ kickoff
+~~~
+
+to list upcoming football tournaments from around the world. Will print:
+
+~~~
+Upcoming Football Tournaments:
+
+  in 14d  Tue-Sun Jul/7-26 (20d) - Gold Cup / Copa de Oro 2015 @ United States+Canada › North America (CONCACAF)
+  in 346d  Fri-Sun Jun/3-26 (24d) - Copa América 2016 @ United States › South America  (CONMEBOL)
+  in 353d  Fri-Sun Jun/10-Jul/10 (31d) - European Championship (Euro) 2016 @ France › Europe (UEFA) 
+  in 1087d  Thu-Sun Jun/14-Jul/15 (32d) - World Cup 2018 @ Russia › World (FIFA)
+  ...
+~~~
+
+
 ### Upcoming Beerfests
 
 Use
@@ -59,18 +82,20 @@ to list upcoming beer festivals from around the world. Will print:
 ~~~
 Upcoming Beerfests:
 
-  Jul/2-Sept/2 - Ottakringer Braukultur Wochen (9 Brauereien in 9 Wochen) @ 16., Ottakring › Vienna / Wien › Austria / Österreich (at) › Central Europe › Europe
-  Jul/24-Aug/3 - Annafest ("Auf den Kellern") @ Forchheim › Upper Franconia / Oberfranken › Bavaria / Bayern › Germany / Deutschland (de) › Central Europe › Europe
-  Jul/25-Aug/2 - Kulmbacher Bierwoche @ Kulmbach › Upper Franconia / Oberfranken › Bavaria / Bayern › Germany / Deutschland (de) › Central Europe › Europe
-  Aug/20-24 - Sandwerka (Sandkirchweih) @ Bamberg › Upper Franconia / Oberfranken › Bavaria / Bayern › Germany / Deutschland (de) › Central Europe › Europe
-  Sept/19-Oct/4 - Oktoberfest ("Die Wiesn") @ Munich / München › Upper Bavaria / Oberbayern › Bavaria / Bayern › Germany / Deutschland (de) › Central Europe › Europe
-  Oct/24+25 - Biermesse Ried (Festival der Biervielfalt) @ Ried i. Innkreis › Upper Austria / Oberösterreich › Austria / Österreich (at) › Central Europe › Europe
+  in 9d  Thu-Wed Jul/2-Sep/2 (63d) - Ottakringer Braukultur Wochen (9 Brauereien in 9 Wochen) @ 16., Ottakring › Vienna / Wien › Austria / Österreich (at) › Central Europe › Europe
+  in 31d  Fri-Mon Jul/24-Aug/3 (11d) - Annafest ("Auf den Kellern") @ Forchheim › Upper Franconia / Oberfranken › Bavaria / Bayern › Germany / Deutschland (de) › Central Europe › Europe
+  in 32d  Sat-Sun Jul/25-Aug/2 (9d) - Kulmbacher Bierwoche @ Kulmbach › Upper Franconia / Oberfranken › Bavaria / Bayern › Germany / Deutschland (de) › Central Europe › Europe
+  in 58d  Thu-Mon Aug/20-24 (5d) - Sandwerka (Sandkirchweih) @ Bamberg › Upper Franconia / Oberfranken › Bavaria / Bayern › Germany / Deutschland (de) › Central Europe › Europe
+  in 88d  Sat-Sun Sep/19-Oct/4 (16d) - Oktoberfest ("Die Wiesn") @ Munich / München › Upper Bavaria / Oberbayern › Bavaria / Bayern › Germany / Deutschland (de) › Central Europe › Europe
+  in 123d  Sat+Sun Oct/24+25 (2d) - Biermesse Ried (Festival der Biervielfalt) @ Ried i. Innkreis › Upper Austria / Oberösterreich › Austria / Österreich (at) › Central Europe › Europe
+  ...
 ~~~
 
 
 ## Public Event Datasets
 
 - [awesome-events @ Planet Ruby](https://github.com/planetruby/awesome-events) - a collection of awesome Ruby events (meetups, conferences, camps, etc.) from around the world
+- [calendar @ football.db](https://github.com/openfootball/calendar) - a collection of awesome football tournaments, cups, etc. from around the world
 - [calendar @ beer.db](https://github.com/openbeer/calendar) - a collection of awesome beer events (oktoberfest, starkbierfest, etc.) from around the world
 
 

data/bin/kickoff

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+###################
+# == DEV TIPS:
+#
+# For local testing run like:
+#
+#    ruby -Ilib bin/kickoff
+#
+# Set the executable bit in Linux. Example:
+#
+#    % chmod a+x bin/kickoff
+#
+
+require 'eventdb'
+
+EventDb::Football.new.print
+

data/lib/eventdb/database.rb

@@ -35,7 +35,12 @@ class Database
           title:      title,
           place:      ev.place,
           date:       ev.date,
-          start_date: ev.start_date
+          start_date: ev.start_date,
+          end_date:   ev.end_date,
+          ## note: (pre)calculate duration in days
+          ##   -- mjd == Modified Julian Day Number
+          ##   -- note: 0 = same day (end==start), thus always add plus one (for one day event)
+          days:       ev.end_date.mjd - ev.start_date.mjd + 1
         )
     end
   end

data/lib/eventdb/{beerfest.rb → datasets/beerfest.rb}

@@ -17,9 +17,12 @@ class BeerFest
   
   def print
     ## get next 17 events
+    
+    today = Date.today
+
     up = EventDb::Model::Event.limit( 17 )
                               .order( 'start_date' )
-                              .where( 'start_date >= ?', Date.today )
+                              .where( 'start_date >= ?', today )
     ## pp up.to_sql
     ## pp up
 
@@ -28,7 +31,8 @@ class BeerFest
     puts "Upcoming Beerfests:"
     puts ''
     up.each do |e|
-      puts "  #{e.date} - #{e.title} @ #{e.place}"
+      diff_days = e.start_date.mjd - today.mjd   ## note: mjd == Modified Julian Day Number 
+      puts "  in #{diff_days}d  #{e.date_str} (#{e.days}d) - #{e.title} @ #{e.place}"
     end
     puts ''
     puts "    More @ github.com/openbeer/calendar"

data/lib/eventdb/datasets/football.rb

@@ -0,0 +1,44 @@
+# encoding: utf-8
+
+module EventDb
+
+class Football
+
+  def initialize
+    ## turn down logger (default :debug?)
+    LogUtils::Logger.root.level = :info
+
+    r = EventDb::EventReader.from_url( "https://github.com/openfootball/calendar/raw/master/README.md" )
+    events = r.read
+
+    @db = EventDb::Database.new
+    @db.add( events )
+  end
+
+  def print
+    ## get next 17 events
+    
+    today = Date.today
+    
+    up = EventDb::Model::Event.limit( 17 )
+                              .order( 'start_date' )
+                              .where( 'start_date >= ?', today )
+    ## pp up.to_sql
+    ## pp up
+
+    puts ''
+    puts ''
+    puts "Upcoming Football Tournaments:"
+    puts ''
+    up.each do |e|
+      diff_days = e.start_date.mjd - today.mjd   ## note: mjd == Modified Julian Day Number 
+      puts "  in #{diff_days}d  #{e.date_str} (#{e.days}d) - #{e.title} #{e.start_date.year} @ #{e.place}"
+    end
+    puts ''
+    puts "    More @ github.com/openfootball/calendar"
+    puts ''
+  end
+
+end # class Football
+
+end # module EventDb

data/lib/eventdb/{rubyconf.rb → datasets/rubyconf.rb}

@@ -17,9 +17,12 @@ class RubyConf
   
   def print
     ## get next 17 events
+
+    today = Date.today
+
     up = EventDb::Model::Event.limit( 17 )
                               .order( 'start_date' )
-                              .where( 'start_date >= ?', Date.today )
+                              .where( 'start_date >= ?', today )
     ## pp up.to_sql
     ## pp up
 
@@ -28,7 +31,8 @@ class RubyConf
     puts "Upcoming Ruby Conferences:"
     puts ''
     up.each do |e|
-      puts "  #{e.date} - #{e.title} @ #{e.place}"
+      diff_days = e.start_date.mjd - today.mjd   ## note: mjd == Modified Julian Day Number
+      puts "  in #{diff_days}d  #{e.date_str} (#{e.days}d) - #{e.title} @ #{e.place}"
     end
     puts ''
     puts "    More @ github.com/planetruby/awesome-events"

data/lib/eventdb/models.rb

@@ -5,6 +5,52 @@ module EventDb
 
 class Event < ActiveRecord::Base
 
+  def date_str  # date pretty printed (pre-formatted) as string
+    
+    ## note: wday - (0-6, Sunday is zero).
+    if days == 1
+      buf = ''
+      buf << Date::ABBR_DAYNAMES[start_date.wday]
+      buf << ' '
+      buf << Date::ABBR_MONTHNAMES[start_date.month]
+      buf << '/'
+      buf << start_date.day.to_s
+    elsif days == 2
+      buf = ''
+      buf << Date::ABBR_DAYNAMES[start_date.wday]
+      buf << '+'
+      buf << Date::ABBR_DAYNAMES[end_date.wday]
+      buf << ' '
+      buf << Date::ABBR_MONTHNAMES[start_date.month]
+      buf << '/'
+      buf << start_date.day.to_s
+      buf << '+'
+      if start_date.month != end_date.month
+        buf << Date::ABBR_MONTHNAMES[end_date.month]
+        buf << '/'
+      end
+      buf << end_date.day.to_s
+    else  ## assume multi day
+      buf = ''
+      buf << Date::ABBR_DAYNAMES[start_date.wday]
+      buf << '-'
+      buf << Date::ABBR_DAYNAMES[end_date.wday]
+      buf << ' '
+      buf << Date::ABBR_MONTHNAMES[start_date.month]
+      buf << '/'
+      buf << start_date.day.to_s
+      buf << '-'
+      if start_date.month != end_date.month
+        buf << Date::ABBR_MONTHNAMES[end_date.month]
+        buf << '/'
+      end
+      buf << end_date.day.to_s
+    end
+
+    buf
+  end # method date_str
+
+
 end # class Event
 
   end # module Model

data/lib/eventdb/reader.rb

@@ -9,7 +9,7 @@ class EventReader
   include LogUtils::Logging
 
 
-  Event = Struct.new( :title, :place, :date, :start_date)
+  Event = Struct.new( :title, :place, :date, :start_date, :end_date, :days)
 
   def self.from_url( src )   # note: src assumed a string
     worker = Fetcher::Worker.new
@@ -58,9 +58,17 @@ class EventReader
                       [^;]+        ##  use ; as separator between place and date
                       ;
                       \s+
-                      (?<month_en>#{MONTH_EN})
+                      (?<start_month_en>#{MONTH_EN})
                       \/
-                      (?<day>[0-9]{1,2})          ## start date
+                      (?<start_day>[0-9]{1,2})          ## start date
+                      (?:
+                        [+\-]     ## use + for two days, - for more than two days
+                        (?:
+                          (?<end_month_en>#{MONTH_EN})
+                          \/
+                        )?   ## optional end_month
+                        (?<end_day>[0-9]{1,2})
+                      )? ## optional end_date
                       /x
 
 
@@ -84,7 +92,11 @@ class EventReader
 
     last_link_entry = nil
 
-    @text.each_line do |line|
+    # note: cut out; remove all html comments e.g. <!-- -->
+    #   supports multi-line comments too (e.g. uses /m - make dot match newlines)
+    text = @text.gsub( /<!--.+?-->/m, '' )  ## todo/fix: track/log cut out comments!!!
+
+    text.each_line do |line|
 
       logger.debug "line: >#{line}<"
       line = line.rstrip  ## remove (possible) trailing newline
@@ -130,15 +142,30 @@ class EventReader
           s.skip( /[ ]*-[ ]*/ )  ## skip leading list
           last_link_entry = s.rest.rstrip  ## remove trailing spaces to
         elsif( m=DATE_ENTRY_REGEX.match( line ) )
-          year     = m[:year]
-          month_en = m[:month_en]
-          month    = MONTH_EN_TO_MM[ month_en ]
-          day      = m[:day]
-          start_date = Date.new( year.to_i, month.to_i, day.to_i )
+          year           = m[:year]
+          
+          start_month_en = m[:start_month_en]
+          start_day      = m[:start_day]
+
+          start_month    = MONTH_EN_TO_MM[ start_month_en ]
+          start_date = Date.new( year.to_i, start_month.to_i, start_day.to_i )
+
+
+          end_month_en   = m[:end_month_en]
+          end_month_en    = start_month_en    if end_month_en.nil? # no end month; use same as start
+
+          end_day        = m[:end_day]
+          end_day        = start_day   if end_day.nil?  # no end day; single day event (use start day)
+
+          end_month     = MONTH_EN_TO_MM[ end_month_en ]
+          end_date = Date.new( year.to_i, end_month.to_i, end_day.to_i )
+
           ## pp start_date
 
-          logger.debug " date entry: #{line}"        
-          logger.debug "   start_date: #{start_date}, year: #{year}, month_en: #{month_en}, month: #{month} day: #{day} => #{last_link_entry}"
+          logger.debug " date entry: #{line}"
+          logger.debug "   start_date: #{start_date}, year: #{year}, start_month_en: #{start_month_en}, start_month: #{start_month} start_day: #{start_day} => #{last_link_entry}"
+          logger.debug "   end_date: #{end_date}, end_month_en: #{end_month_en}, end_day_en: #{end_day}"
+
 
           s = StringScanner.new( line )
           s.skip( /[ ]*-[ ]*/ )  ## skip leading list
@@ -159,7 +186,7 @@ class EventReader
 
           title = last_link_entry
 
-          event = Event.new( title, place, date, start_date )
+          event = Event.new( title, place, date, start_date, end_date )
           ## pp event
           events << event
         else

data/lib/eventdb/schema.rb

@@ -12,6 +12,8 @@ create_table :events do |t|
   t.string  :place,      null: false
   t.string  :date,       null: false   # note: full date range (start to end) for now as *string*
   t.date    :start_date, null: false   ## use (rename) to start_at - why? why not?
+  t.date    :end_date,   null: false   ## use (rename) to end_at   - why? why not?
+  t.integer :days,       null: false
 
   t.timestamps
 end

data/lib/eventdb/version.rb

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

data/lib/eventdb.rb

@@ -26,9 +26,9 @@ require 'eventdb/models'
 require 'eventdb/database'
 
 
-require 'eventdb/beerfest'
-require 'eventdb/rubyconf'
-
+require 'eventdb/datasets/beerfest'   ## used by beerfest bin(ary) tool
+require 'eventdb/datasets/rubyconf'   ## used by rubyconf bin(ary) tool
+require 'eventdb/datasets/football'   ## used by kickoff bin(ary) tool
 
 
 

data/test/test_calendar.rb

@@ -22,7 +22,7 @@ class TestCalendar < MiniTest::Test
 # Ruby Conference Calendar
 
 NOTE: This page gets auto-generated from the [awesome-events](README.md) page @ Planet Ruby.
-(Last update on 2015-06-21.) Do NOT edit this page, please update or edit conferences, camps, meetups etc.
+(Last update on #{Date.today}.) Do NOT edit this page, please update or edit conferences, camps, meetups etc.
 on the [awesome-events](README.md) page. Anything missing? Contributions welcome. Thanks!
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventdb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-21 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
@@ -182,6 +182,7 @@ description: eventdb - event.db models n tools
 email: ruby-talk@ruby-lang.org
 executables:
 - beerfest
+- kickoff
 - rubyconf
 extensions: []
 extra_rdoc_files:
@@ -195,14 +196,16 @@ files:
 - README.md
 - Rakefile
 - bin/beerfest
+- bin/kickoff
 - bin/rubyconf
 - lib/eventdb.rb
-- lib/eventdb/beerfest.rb
 - lib/eventdb/calendar.rb
 - lib/eventdb/database.rb
+- lib/eventdb/datasets/beerfest.rb
+- lib/eventdb/datasets/football.rb
+- lib/eventdb/datasets/rubyconf.rb
 - lib/eventdb/models.rb
 - lib/eventdb/reader.rb
-- lib/eventdb/rubyconf.rb
 - lib/eventdb/schema.rb
 - lib/eventdb/version.rb
 - templates/CALENDAR.md.erb