eventdb 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ce9835b60dc43f40f40dbead99151906d27deae
-  data.tar.gz: ec81011031ec13b0ee2954b82566e512c543ff66
+  metadata.gz: c92b20bf06bb3d5a56fd77f5c0503db488782500
+  data.tar.gz: 5e62e9a5d2941b1e14e3de5180c1674ba4150c54
 SHA512:
-  metadata.gz: a7c4f46d4b8b832388b2f16597bdadda3e228266b8ea7827767394dbd6679b46d0b22281472c2f240411d7caad0fa9ec7198b22a16cd8489655af6eb5f343c71
-  data.tar.gz: 3ff8eaebf5e775fd87dd454e259e1d36b3300109e4566c85774e0c2742dec9b020ff7923c7928f438358f89c5f1e46d848ec4b98d6bfdeefe608a795da64cc14
+  metadata.gz: 7b37cea05c931afe5bc64b64701e28464ef0ce9b1145b8a523ceb76b85852c731183463bb0aeee6ba88c0cca68f672a4976640c7fccb863a08d33fc27b79c751
+  data.tar.gz: c1c3edf3764dd977709729f05c9521f55c12820e31bccb0865a3bf05f89fd02b9d96dbecddbec036d25bd3fed860cadf503b1975d33c45e171fe577276f3e05b

data/Manifest.txt

@@ -1,18 +1,20 @@
-HISTORY.md
-Manifest.txt
-README.md
-Rakefile
-lib/eventdb.rb
-lib/eventdb/calendar.rb
-lib/eventdb/database.rb
-lib/eventdb/models.rb
-lib/eventdb/reader.rb
-lib/eventdb/schema.rb
-lib/eventdb/version.rb
-test/data/RUBY.md
-test/helper.rb
-test/templates/RUBY.md.erb
-test/test_calendar.rb
-test/test_database.rb
-test/test_reader.rb
-test/test_version.rb
+CHANGELOG.md
+Manifest.txt
+README.md
+Rakefile
+lib/eventdb.rb
+lib/eventdb/calendar.rb
+lib/eventdb/database.rb
+lib/eventdb/models.rb
+lib/eventdb/outline_reader.rb
+lib/eventdb/reader.rb
+lib/eventdb/schema.rb
+lib/eventdb/version.rb
+test/data/RUBY.md
+test/data/conferences.yml
+test/helper.rb
+test/templates/RUBY.md.erb
+test/test_calendar.rb
+test/test_database.rb
+test/test_reader.rb
+test/test_version.rb

data/Rakefile

@@ -15,12 +15,11 @@ Hoe.spec 'eventdb' do
 
   # switch extension to .markdown for gihub formatting
   self.readme_file  = 'README.md'
-  self.history_file = 'HISTORY.md'
+  self.history_file = 'CHANGELOG.md'
 
   self.extra_deps = [
-    ['props', '>= 1.1.2'], # settings / prop(ertie)s / env / INI
+    ['props',    '>= 1.2.0'], # settings / prop(ertie)s / env / INI
     ['logutils', '>= 0.6.1'], # logging
-    ['textutils', '>= 1.3.1'],
 
     ## 3rd party
     ['activerecord'], # NB: will include activesupport,etc.
@@ -28,14 +27,14 @@ Hoe.spec 'eventdb' do
     ## more activerecord utils/addons
     ## ['tagutils', '>= 0.3.0'], # tags n categories for activerecord
     ## ['activerecord-utils', '>= 0.4.0'],
-    ['props-activerecord', '>= 0.1.0'],
+    ['props-activerecord',    '>= 0.2.0'],
     ['logutils-activerecord', '>= 0.2.1'],
   ]
 
   self.licenses = ['Public Domain']
 
   self.spec_extras = {
-    required_ruby_version: '>= 1.9.2'
+    required_ruby_version: '>= 2.2.2'
   }
 
 end

data/lib/eventdb.rb

@@ -4,12 +4,12 @@
 require 'pp'
 require 'date'
 require 'strscan'  ## StringScanner lib
+require 'yaml'
 require 'erb'
 
 # 3rd party libs (gems)
 require 'props'
 require 'logutils'
-require 'textutils'
 
 require 'props/activerecord'
 require 'logutils/activerecord'
@@ -22,6 +22,7 @@ require 'eventdb/version'      ## let version always go first
 require 'eventdb/schema'
 require 'eventdb/models'
 
+require 'eventdb/outline_reader'
 require 'eventdb/reader'
 require 'eventdb/calendar'   # note: depends (requires) models (first)
 require 'eventdb/database'
@@ -29,4 +30,4 @@ require 'eventdb/database'
 
 
 # say hello
-puts EventDb.banner    if defined?($RUBYLIBS_DEBUG) && $RUBYLIBS_DEBUG
+puts EventDb.banner    if defined?($RUBYCOCO_DEBUG) && $RUBYCOCO_DEBUG

data/lib/eventdb/calendar.rb

@@ -62,12 +62,12 @@ class EventCalendar
 
   def render( opts={} )
     tmpl_path  = opts[:template] || './templates/CALENDAR.md.erb'
-    tmpl       = File.read_utf8( tmpl_path )
+    tmpl       = File.open( tmpl_path, 'r:utf-8' ).read
 
     ERB.new( tmpl, nil, '<>' ).result( binding )   # <> omit newline for lines starting with <% and ending in %>
   end
 
-#  def save( path = './CALENDAR.md' )   ## use (rename to) save_as - why? why not?? 
+#  def save( path = './CALENDAR.md' )   ## use (rename to) save_as - why? why not??
 #    File.open( path, 'w' ) do |f|
 #      f.write( render )
 #    end

data/lib/eventdb/database.rb

@@ -3,7 +3,7 @@
 module EventDb
 
 
-class DatabaseBase     ## fix: rename to Database (see below)
+class Database
   def initialize( config={} )
     @config = config
   end
@@ -16,50 +16,22 @@ class DatabaseBase     ## fix: rename to Database (see below)
     CreateDb.new.up
     ConfDb::Model::Prop.create!( key: 'db.schema.event.version', value: VERSION )
   end
-  
+
   def create_all
     LogDb.create # add logs table
-    ConfDb.create 
+    ConfDb.create
     create
   end
 
   def add( events )
-    events.each do |ev|
-
-      ## note: extract title and link from line
-
-      ### 1) try "new" format first e.g.
-      ##    - **European Ruby Konference - EuRuKo** (web: [euruko.org](http://euruko.org), t: [euruko](https://twitter.com/euruko)) - _since 2003_
-      if m = (ev.title =~ /^\*{2}([^*]+)\*{2}/)   ## note: **title** must start line
-        title = $1
-        puts "  adding (new/modern format) => #{title} #{ev.start_date.year}, #{ev.date}"
-      ## 2) try "old" classic format - get title from first (markdown) link e.g.
-      ##   - [Oktoberfest ("Die Wiesn")](http://www.muenchen.de/veranstaltungen/oktoberfest.html)
-      elsif m = (ev.title =~ /^\[([^\]]+)\]/)    ## note: [title](link) must start line
-        title = $1
-        puts "  adding (old/classic format) => #{title} #{ev.start_date.year}, #{ev.date}"
-      else
-        puts "*** warn: cannot find event title in #{ev.title}"
-        next   # skip record; todo: issue error
-      end
-
-      ## try extract link - use first (markdown) link
-      ##   todo/fix: use shared markdown link regex!!!!!
-      if m = (ev.title =~ /\[[^\]]+\]\(([^\)]+)\)/)
-        link = $1
-        puts "                               => @ #{link}"
-      else
-        link = nil
-        puts "*** warn: cannot find event link in #{ev.title}"
-      end
-      
+    ## todo/fix: add check if Array and also allow single event
+    ##  change arg to event_or_events
 
+    events.each do |ev|
       Model::Event.create!(
-          title:      title,
-          link:       link,
-          text:       ev.title,   ### "full" title - incl. markdown links
+          title:      ev.title,
+          link:       ev.link,
           place:      ev.place,
-          date:       ev.date,
           start_date: ev.start_date,
           end_date:   ev.end_date,
           ## note: (pre)calculate duration in days
@@ -74,8 +46,7 @@ end  ## class DatabaseBase
 
 
 ## convenience class for in-memory (SQLite3) database
-
-class Database < DatabaseBase  ## fix: rename to MemDatabase or MemoryDatabase
+class MemoryDatabase < Database
 
   def initialize
     ## -- default to sqlite3 in-memory database
@@ -90,7 +61,7 @@ class Database < DatabaseBase  ## fix: rename to MemDatabase or MemoryDatabase
 
 end # class Database
 
-MemDatabase = Database    ## note: start using MemDatabase today (will get renamed!)
+MemDatabase = MemoryDatabase
+Memory      = MemoryDatabase
 
 end # module EventDb
-

data/lib/eventdb/models.rb

@@ -9,13 +9,48 @@ class Event < ActiveRecord::Base
   ##   move order('start_date') into its own scope ??
 
   scope :upcoming, ->(today) { order('start_date').where( 'start_date > ?', today )  }
-  
+
   ## rename to now_on/on_now/now_playing/running/etc. - why? why not??
   scope :live,     ->(today) { order('start_date').where( 'start_date <= ? AND end_date >= ?', today, today )  }
 
 
-  def date_str  # date pretty printed (pre-formatted) as string
-    
+
+  ## todo/fix: unify / merge  date and date_str !!! - add formt: or something
+  def date     # date pretty printed as string (no weeknames)
+    if days == 1
+      buf = ''
+      buf << Date::ABBR_MONTHNAMES[start_date.month]
+      buf << '/'
+      buf << start_date.day.to_s
+    elsif days == 2
+      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_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
+
+  def date_str  # date pretty printed (pre-formatted) as string (with weeknames)
+
     ## note: wday - (0-6, Sunday is zero).
     if days == 1
       buf = ''
@@ -63,7 +98,6 @@ class Event < ActiveRecord::Base
 end # class Event
 
   end # module Model
-  
+
   Models = Model   ## note: add conveniene shortcut for models
 end # module EventDb
-

data/lib/eventdb/outline_reader.rb

@@ -0,0 +1,65 @@
+# encoding: utf-8
+
+module EventDb
+
+  class OutlineReader
+
+    def self.read( path )   ## use - rename to read_file or from_file etc. - why? why not?
+      txt = File.open( path, 'r:utf-8' ).read
+      parse( txt )
+    end
+
+
+    HEADING_RE =  /^(\#{1,})       ## leading ####
+                    ([^#]+?)       ##  text - note: use non-greedy e.g. +?
+                    \#*            ## (optional) trailing ##
+                   $/x
+
+    LISTITEM_RE = /^  \s*
+                     -\s+        ## space required after dash (-)
+                     (.+)          ## text
+                    $/x
+
+
+
+    def self.parse( txt )
+      outline=[]   ## outline structure
+
+      # note: cut out; remove all html comments e.g. <!-- -->
+      #   supports multi-line comments too (e.g. uses /m - make dot match newlines)
+      txt = txt.gsub( /<!--
+                         .+?
+                        -->/xm, '' )    ## todo/fix: track/log cut out comments!!!
+
+
+      txt.each_line do |line|
+          line = line.strip      ## todo/fix: keep leading and trailing spaces - why? why not?
+
+          next if line.empty?    ## todo/fix: keep blank line nodes e.g. just remove comments and process headings?! - why? why not?
+          break if line == '__END__'
+
+          pp line
+
+           ## note:  all optional trailing ### too
+          if HEADING_RE.match( line )
+             heading_marker = $1
+             heading_level  = $1.length   ## count number of = for heading level
+             heading        = $2.strip
+
+             puts "heading #{heading_level} >#{heading}<"
+             outline << [:"h#{heading_level}", heading]
+          elsif LISTITEM_RE.match( line )
+             item =  $1.strip
+
+             puts "list item >#{item}<"
+             outline << [:li, item]
+          else
+             ## assume it's a (plain/regular) text line
+             outline << [:l, line]
+          end
+      end
+      outline
+    end # method read
+  end # class OutlineReader
+
+  end # module EventDb

data/lib/eventdb/reader.rb

@@ -6,25 +6,69 @@ module EventDb
 
 class EventReader
 
-  include LogUtils::Logging
-
+  Event = Struct.new( :title, :link,
+                      :place,
+                      :start_date, :end_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
-    self.from_string( worker.read_utf8!( src ) )
+    txt = worker.read_utf8!( src )
+
+    if src.end_with?( '.yml') ||
+       src.end_with?( '.yaml')
+      YamlReader.new( txt )
+    else
+      MarkdownReader.new( txt )
+    end
   end
 
   def self.from_file( path )
-    self.from_string( File.read_utf8( path ) )
+    txt = File.open( path, 'r:utf-8' ).read
+
+    if path.end_with?( '.yml') ||
+       path.end_with?( '.yaml')
+      YamlReader.new( txt )
+    else
+      MarkdownReader.new( txt )
+    end
   end
 
-  def self.from_string( text )
-    self.new( text )
+
+
+class YamlReader    ## fix/change: rename to YamlParser - why? why not?
+  include LogUtils::Logging
+
+  def initialize( text )
+    @text = text
+  end
+
+  def read
+    events = []
+    recs = YAML.load( @text )
+    recs.each do |rec|
+      title      = rec['name']
+      link       = rec['url']
+      place      = rec['location']
+      start_date = rec['start']    # note: already parsed into a date (NOT string) by yaml parser!!
+      end_date   = rec['end']      # note: already parsed into a date (NOT string) by yaml parser!!
+
+      event = Event.new( title, link,
+                         place,
+                         start_date, end_date )
+      ## pp event
+
+      events << event
+    end
+
+    events
   end
+end # class YamlReader
 
 
+class MarkdownReader     ## fix/change: rename to MarkdownParser - why? why not?
+  include LogUtils::Logging
+
   def initialize( text )
     @text = text
   end
@@ -50,8 +94,7 @@ class EventReader
 ## - 2015 @ Brussels / Brussel / Bruxelles; Jan/31+Feb/1
 ## - 2014 @ Porto de Galinhas, Pernambuco; Apr/24-27 (formerly: Abril Pro Ruby)
 
-  DATE_ENTRY_REGEX = /\s+
-                      (?<year>20\d\d)   ## year
+  DATE_ENTRY_RE = /(?<year>20\d\d)   ## year
                       \s+
                        @            ## at location
                       \s+
@@ -75,8 +118,7 @@ class EventReader
 ## example:
 ## - [RubyWorld Conference - rubyworldconf](http://www.rubyworld-conf.org/en)
 
-  LINK_ENTRY_REGEX = /\s+
-                       \[
+  LINK_ENTRY_RE = /\[
                          [^\]]+
                        \]
                        \(
@@ -85,48 +127,31 @@ class EventReader
                      /x
 
 
-  def read
 
+  def read
     events = []
     stack  = []   ## header/heading stack;  note: last_stack is stack.size; starts w/ 0
 
     last_link_entry = nil
 
-    # 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}<"   ## todo/check: line can contain newline?? 
-      line = line.rstrip  ## remove (possible) trailing newline
+    nodes = OutlineReader.parse( @text )
+    nodes.each do |node|
 
-      next  if line =~ /^\s*$/      #  skip blank lines
+      if [:h1,:h2,:h3,:h4,:h5,:h6].include?( node[0] )
+        heading = node[1]
+        #  stop when hitting >## More< or <Calendar> or <Thanks> etc. section
+        #   note: must escape # e.g. #{2,} must be escaped to \#{2,}
+        break if heading =~ /^(More|Calendar|Thanks|Meta)\b/
 
-      ### hack:
-      ##  todo - make more configurable ??
-      ##   skip_headings ?? end_markers/blocks ?? etc. - why, why not??
+        # skip "pseudo" headings (for contribs etc.)
+        ##  e.g. #### _Contributions welcome. Anything missing? Send in a pull request. Thanks._
+        next if heading =~ /Contributions welcome\.|Anything Missing\?/
 
-      #  stop when hitting >## More< or <Calendar> or <Thanks> etc. section
-      #   note: must escape # e.g. #{2,} must be escaped to \#{2,}
-      break if line =~ /^\#{2,} (More|Calendar|Thanks|Meta)\b/
 
+        level = node[0][1].to_i
 
-      # skip "pseudo" headings (for contribs etc.)
-      ##  e.g. #### _Contributions welcome. Anything missing? Send in a pull request. Thanks._
-      next  if line =~ /Contributions welcome\.|Anything Missing\?/
-
-
-      m = nil
-      if line =~ /^[ ]*(#+)[ ]+/    ## heading/headers - note: must escpape #
-          s = StringScanner.new( line )
-          s.skip( /[ ]*/ )  ## skip whitespaces
-          markers = s.scan( /#+/)
-          level   = markers.size
-          s.skip( /[ ]*/ )  ## skip whitespaces
-          title   = s.rest.rstrip
-          
-          logger.debug " heading level: #{level}, title: >#{title}<"
+          logger.debug " heading level: #{level}, title: >#{heading}<"
 
           level_diff = level - stack.size
 
@@ -144,19 +169,19 @@ class EventReader
             ## same level
             stack.pop
           end
-          stack.push( [level,title] )
+          stack.push( [level, heading] )
           logger.debug "  stack: #{stack.inspect}"
 
-      elsif line =~ /^[ ]*-[ ]+/     ## list item
-        if( m=LINK_ENTRY_REGEX.match( line ) )
+      elsif [:li].include?( node[0] )    ## list item
+        line = node[1]
+
+        if LINK_ENTRY_RE.match( line )
           logger.debug " link entry: #{line}"
 
-          s = StringScanner.new( line )
-          s.skip( /[ ]*-[ ]*/ )  ## skip leading list
-          last_link_entry = s.rest.rstrip  ## remove trailing spaces to
-        elsif( m=DATE_ENTRY_REGEX.match( line ) )
+          last_link_entry = line
+        elsif m=DATE_ENTRY_RE.match( line )
           year           = m[:year]
-          
+
           start_month_en = m[:start_month_en]
           start_day      = m[:start_day]
 
@@ -181,38 +206,78 @@ class EventReader
 
 
           s = StringScanner.new( line )
-          s.skip( /[ ]*-[ ]*/ )  ## skip leading list
           s.skip_until( /@/ )
 
           place = s.scan( /[^;]+/ ) ## get place (everything until ; (separator))
-          place = place.strip          
+          place = place.strip
           logger.debug "  place: #{place}, rest: >#{s.rest}<"
 
-          ## note: cut of heading 1 (e.g. awesome-events title)
+          ## todo/fix: make place uniform e.g. change
+          ##    Vienna, Austria  =>
+          ##    Vienna › Austria       - why? why not?
+
+          ## note: cut of heading 1 (e.g. page title)
           more_places = stack[1..-1].reverse.map {|it| it[1] }.join(' › ')
           place = "#{place} › #{more_places}"
           logger.debug "  place: #{place}"
 
-          s.skip( /;/ )
-          s.skip( /[ ]*/ ) ## skip whitespaces
-          date  = s.scan( /[^ ]+/ ) # e.g. everything untils first space (or end-of-line)
 
-          title = last_link_entry
+          title, link = find_title_and_link( last_link_entry )
+
 
-          event = Event.new( title, place, date, start_date, end_date )
+          event = Event.new( title, link,
+                             place,
+                             start_date, end_date )
           ## pp event
+
           events << event
         else
           logger.debug "  *** skip list item line: #{line}"
         end
       else
-        logger.debug "  *** skip line: #{line}"
+        logger.debug "  *** skip node:"
+        pp node
       end
     end
-    
+
     events
   end
 
+### helper
+def find_title_and_link( line )
+  title = nil
+  link  = nil
+
+    ## note: extract title and link from line
+
+    ### 1) try "new" format first e.g.
+    ##    - **European Ruby Konference - EuRuKo** (web: [euruko.org](http://euruko.org), t: [euruko](https://twitter.com/euruko)) - _since 2003_
+    if m = (line =~ /^\*{2}([^*]+)\*{2}/)   ## note: **title** must start line
+      title = $1
+      puts "  adding (new/modern format) => #{title}"
+    ## 2) try "old" classic format - get title from first (markdown) link e.g.
+    ##   - [Oktoberfest ("Die Wiesn")](http://www.muenchen.de/veranstaltungen/oktoberfest.html)
+    elsif m = (line =~ /^\[([^\]]+)\]/)    ## note: [title](link) must start line
+      title = $1
+      puts "  adding (old/classic format) => #{title}"
+    else
+      puts "*** !! ERROR !!: cannot find event title in #{line}"
+      exit 1
+    end
+
+    ## try extract link - use first (markdown) link
+    ##   todo/fix: use shared markdown link regex!!!!!
+    if m = (line =~ /\[[^\]]+\]\(([^\)]+)\)/)
+      link = $1
+      puts "                               => @ #{link}"
+    else
+      link = nil
+      puts "*** !! WARN !!: cannot find event link in #{line}"
+    end
+
+    [title,link]
+end # method find_title_and_link
+end # class MarkdownReader
 end # class EventReader
 
 end # module EventDb

data/lib/eventdb/schema.rb

@@ -10,9 +10,7 @@ def up
 create_table :events do |t|
   t.string  :title,      null: false   ##  title (just the first link text)
   t.string  :link        ## for now optional - why? why not??
-  t.string  :text,       null: false   ## -- "full" title - incl. markdown link(s)
   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

data/lib/eventdb/version.rb

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

data/test/data/RUBY.md

@@ -1,78 +1,10 @@
-# awesome-events
+# Awesome Events
 
-A collection of awesome Ruby events (meetups, conferences, camps, etc.) from around the world
-
----
 
-[ANNOUNCEMENT] Looking for awesome Ruby Gems? See the [Ruby Gems of the Week Series @ Planet Ruby](http://planetruby.github.io/gems).
-
----
+A collection of awesome Ruby events (meetups, conferences, camps, etc.) from around the world
 
 #### _Contributions welcome. Anything missing? Send in a pull request. Thanks._
 
-NOTE: A calendar page ([CALENDAR.md](CALENDAR.md)) gets auto-generated from this page listing conferences sorted by year and month.
-
-
-- [World](#world)
-- [Online](#online)
-- [Europe](#europe)
-  - [Central Europe](#central-europe)
-      - [Austria / Österreich](#austria--%C3%96sterreich-at)
-      - [Switzerland / Schweiz / Suisse](#switzerland--schweiz--suisse--confoederatio-helvetica-ch)
-      - [Germany / Deutschland](#germany--deutschland-de)
-      - [Slovakia](#slovakia-sk)
-      - [Slovenia](#slovenia-si)
-      - [Czech Republic](#czech-republic-cz)
-      - [Poland](#poland-pl)
-      - [Hungary](#hungary-hu)
-  - [Western Europe](#western-europe)
-     - [England](#england-en)
-     - [Scotland](#scotland)
-     - [Ireland / Éire](#ireland--%C3%89ire-ie)
-     - [France](#france-fr)
-     - [Belgium / België / Belgique](#belgium--belgi%C3%AB--belgique-be)
-     - [Netherlands](#netherlands-nl)
-  - [Southern Europe](#southern-europe)
-     - [Spain / España](#spain--espa%C3%B1a-es)
-     - [Portugal](#portugal-pt)
-     - [Italy](#italy-it)
-     - [Croatia / Hrvatska](#croatia--hrvatska-hr)
-  - [Northern Europe](#northern-europe)
-      - [Denmark / Danmark](#denmark--danmark-dk)
-      - [Sweden / Sverige](#sweden--sverige-se)
-      - [Finland / Suomi](#finland--suomi-fi)
-      - [Norway / Norge](#norway--norge-no)
-      - [Lithuania / Lietuva](#lithuania--lietuva-lt)
-  - [Eastern Europe](#eastern-europe)
-      - [Belarus / Беларусь](#belarus--%D0%91%D0%B5%D0%BB%D0%B0%D1%80%D1%83%D1%81%D1%8C-by)
-      - [Russia / Россия](#russia--%D0%A0%D0%BE%D1%81%D1%81%D0%B8%D1%8F-ru)
-      - [Ukraine / Україна / Украина](#ukraine--%D0%A3%D0%BA%D1%80%D0%B0%D1%97%D0%BD%D0%B0--%D0%A3%D0%BA%D1%80%D0%B0%D0%B8%D0%BD%D0%B0-ua)
-- [America](#america)
-   - [North America](#north-america)
-       - [Canada](#canada-ca)
-       - [United States](#united-states-us)
-       - [Mexico / México](#mexico--m%C3%A9xico-mx)
-   - [South America](#south-america)
-      - [Brazil / Brasil](#brazil--brasil-br)
-      - [Colombia](#colombia-co)
-      - [Peru / Perú](#peru--per%C3%BA-pe)
-      - [Uruguay](#uruguay-uy)
-      - [Argentina](#argentina-ar)
-- [Asia](#asia)
-   - [Japan](#japan-jp)
-   - [Taiwan](#taiwan-tw)
-   - [Singapore](#singapore-sg)
-   - [Philippines / Pilipinas](#philippines--pilipinas-ph) 
-   - [Vietnam](#vietnam-vn)
-   - [India](#india-in)
-- [Africa](#africa)
-   - [Kenya](#kenya-ke)
-   - [South Africa](#south-africa-za)
-- [Pacific / Oceania](#pacific--oceania)
-   - [Australia](#australia-au)
-- [More](#more)
-- [Friends & Family](#friends--family)
-- [Meta](#meta)
 
 ## World
 
@@ -237,7 +169,7 @@ NOTE: A calendar page ([CALENDAR.md](CALENDAR.md)) gets auto-generated from this
 
 - @ Amsterdam, Noord-Holland
    - [Amsterdam.rb](http://amsrb.org) - [:octocat:](https://github.com/amsrb)
-- @ Rotterdam, Zuid-Holland 
+- @ Rotterdam, Zuid-Holland
    - [Rotterdam.rb](http://rtmrb.org)
 
 
@@ -567,7 +499,7 @@ NOTE: A calendar page ([CALENDAR.md](CALENDAR.md)) gets auto-generated from this
 - @ Singapore
    - [Ruby Singapore](http://ruby.sg) - [:octocat:](https://github.com/rubysg)
 
-### Philippines / Pilipinas (ph) 
+### Philippines / Pilipinas (ph)
 
 - [RubyConf Philippines](http://rubyconf.ph)
     - 2015 @ Boracy Island; Mar/27-28

data/test/data/conferences.yml

@@ -0,0 +1,140 @@
+#############################
+#  ruby event news in 2020
+
+- name:     Rubyfuza
+  location: Cape Town, South Africa
+  start:    2020-02-06    # February 6-8, 2020
+  end:      2020-02-08
+  days:     3
+  month:    2
+  url:      http://www.rubyfuza.org
+  twitter:  rubyfuza
+  updated:  2019-12-03   ## note: used for feed.xml|json
+
+- name:      ParisRB Conf
+  location:  Paris, France
+  start:     2020-02-18     # February 18-19, 2020
+  end:       2020-02-19
+  days:      2
+  month:     2
+  url:       https://2020.rubyparis.org
+  twitter:   parisrb
+  updated:  2019-12-03   ## note: used for feed.xml|json
+
+- name: RubyConf Australia
+  location: Melbourne, Victoria, Australia
+  start: 2020-02-20
+  end:   2020-02-21
+  days:  2
+  month: 2
+  url:     https://www.rubyconf.org.au/2020
+  twitter: rubyconf_au
+  updated:  2019-12-03   ## note: used for feed.xml|json
+
+
+- name:      Wrocław <3 Ruby (wroclove.rb)
+  location:  Wrocław, Poland
+  start:     2020-03-20   # 20-22th March, 2020
+  end:       2020-03-22
+  days:      3
+  month:     3
+  url:       https://wrocloverb.com
+  twitter:   wrocloverb
+
+
+- name: RubyDay Italy
+  location: Verona, Veneto, Italy
+  start: 2020-04-02
+  end:   2020-04-02
+  days:  1
+  month: 4
+  url:     https://2020.rubyday.it
+  twitter: rubydayit
+
+# RubyKaigi 2020: April 9th - 11th, 2020 @ Matsumoto, Nagano, Japan https://rubykaigi.org/2020
+- name:      RubyKaigi
+  location:  Nagano, Japan
+  start:     2020-04-09
+  end:       2020-04-11
+  days:      3
+  month:     4
+  url:       https://rubykaigi.org/2020
+  twitter:   rubykaigi
+
+- name:      RubyConf India
+  location:  Goa, India
+  start:     2020-04-25    # April 25-26 2020
+  end:       2020-04-26
+  days:      2
+  month:     4
+  url:       http://rubyconfindia.org
+  twitter:   rubyconfindia
+
+
+# RailsConf 2020 will be in Portland, OR from May 5-7
+- name:      RailsConf (United States)
+  location:  Portland, Oregon, United States
+  start:     2020-05-05
+  end:       2020-05-07
+  days:      3
+  month:     5
+  url:       https://railsconf.com
+  twitter:   railsconf
+
+- name: Balkan Ruby
+  location: Sofia, Bulgaria
+  start: 2020-05-15
+  end:   2020-05-16
+  days:  2
+  month: 5
+  url:     https://balkanruby.com
+  twitter: balkanruby
+
+
+- name:       Ruby Unconf Hamburg
+  location:   Hamburg, Germany
+  start:      2020-06-06   ## June 6th & 7th 2020
+  end:        2020-06-07
+  days:       2
+  month:      6
+  url:        http://2020.rubyunconf.eu
+  twitter:    rubyunconfeu
+
+
+- name: Brighton RubyConf
+  location: Brighton, Sussex, England, United Kingdom
+  start:   2020-07-03
+  end:     2020-07-03
+  days:    1
+  month:   7
+  url:     https://brightonruby.com
+  twitter: brightonruby
+
+- name:      RubyConf Kenya
+  location:  Nairobi, Kenya
+  start:     2020-07-23
+  end:       2020-07-25
+  days:      3
+  month:     7
+  url:       http://rubyconf.nairuby.org/2020
+  twitter:   nairubyke
+
+
+- name:      European Ruby Konference (EuRuKo)
+  location:  Helsinki, Finnland
+  start:     2020-08-21      # 21–22.8.2020
+  end:       2020-08-22
+  days:      2
+  month:     8
+  url:       https://euruko2020.org
+  twitter:   euruko
+
+
+- name:     RubyConf (United States)
+  location: Houston, Texas, United States
+  start: 2020-11-17
+  end:   2020-11-19
+  days:  3
+  month: 11
+  url:     https://rubyconf.org
+  twitter: rubyconf

data/test/templates/RUBY.md.erb

@@ -19,6 +19,6 @@ on the [awesome-events](README.md) page. Anything missing? Contributions welcome
 
 <% end %>
 
-<%= ev.date %> • **<%= ev.text %>** @ <%= ev.place %>
+<%= ev.date %> • [**<%= ev.title %>**](<%= ev.link %>) @ <%= ev.place %>
 
 <% end %>

data/test/test_calendar.rb

@@ -14,7 +14,7 @@ class TestCalendar < MiniTest::Test
     r = EventDb::EventReader.from_file( "#{EventDb.root}/test/data/RUBY.md" )
     events = r.read
 
-    db = EventDb::Database.new
+    db = EventDb::Memory.new
     db.add( events )
 
     cal = EventDb::EventCalendar.new
@@ -38,7 +38,7 @@ on the [awesome-events](README.md) page. Anything missing? Contributions welcome
 **May**
 
 
-May/4-6 • **[RailsConf](http://railsconf.com)** @ Kansas City, Missouri › United States (us) › North America › America
+May/4-6 • [**RailsConf**](http://railsconf.com) @ Kansas City, Missouri › United States (us) › North America › America
 
 ## 2015
 

data/test/test_database.rb

@@ -10,12 +10,12 @@ require 'helper'
 class TestDatabase < MiniTest::Test
 
   def test_ruby
-    
+
     r = EventDb::EventReader.from_file( "#{EventDb.root}/test/data/RUBY.md" )
 
     events = r.read
 
-    db = EventDb::Database.new
+    db = EventDb::Memory.new
     db.add( events )
 
     ## get next 17 events

data/test/test_reader.rb

@@ -10,25 +10,28 @@ require 'helper'
 class TestReader < MiniTest::Test
 
   def test_ruby
-    
+
     r = EventDb::EventReader.from_file( "#{EventDb.root}/test/data/RUBY.md" )
     events = r.read
 
     ## pp events
     ev1 = events[0]
 
-    assert_equal '[Rails Rumble](https://railsrumble.com)', ev1.title
-    assert_equal 'Intertubes › Online',                     ev1.place
-    assert_equal 'Oct/18+19',                               ev1.date
-    assert_equal Date.new(2014,10,18),                      ev1.start_date
+    assert_equal 'Rails Rumble',            ev1.title
+    assert_equal 'https://railsrumble.com', ev1.link
+    assert_equal 'Intertubes › Online',     ev1.place
+    # assert_equal 'Oct/18+19',               ev1.date
+    assert_equal Date.new(2014,10,18),      ev1.start_date
+    assert_equal Date.new(2014,10,19),      ev1.end_date
 
-    ev2 = events[1]
 
-    assert_equal '**JekyllConf** (web: [jekyllconf.com](http://jekyllconf.com))', ev2.title
-    assert_equal 'Intertubes › Online',                     ev2.place
-    assert_equal 'May/2',                                   ev2.date
-    assert_equal Date.new(2015,5,2),                        ev2.start_date
+    ev2 = events[1]
 
+    assert_equal 'JekyllConf',                 ev2.title
+    assert_equal 'http://jekyllconf.com',      ev2.link
+    assert_equal 'Intertubes › Online',        ev2.place
+    # assert_equal 'May/2',                      ev2.date
+    assert_equal Date.new(2015,5,2),           ev2.start_date
   end
 
 end # class TestReader

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventdb
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-12 00:00:00.000000000 Z
+date: 2019-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: logutils
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.1
-- !ruby/object:Gem::Dependency
-  name: textutils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: logutils-activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -114,25 +100,24 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.16'
 description: eventdb - event.db schema 'n' models for easy (re)use
 email: ruby-talk@ruby-lang.org
 executables: []
 extensions: []
 extra_rdoc_files:
-- HISTORY.md
+- CHANGELOG.md
 - Manifest.txt
 - README.md
 files:
-- ".gemtest"
-- HISTORY.md
+- CHANGELOG.md
 - Manifest.txt
 - README.md
 - Rakefile
@@ -140,10 +125,12 @@ files:
 - lib/eventdb/calendar.rb
 - lib/eventdb/database.rb
 - lib/eventdb/models.rb
+- lib/eventdb/outline_reader.rb
 - lib/eventdb/reader.rb
 - lib/eventdb/schema.rb
 - lib/eventdb/version.rb
 - test/data/RUBY.md
+- test/data/conferences.yml
 - test/helper.rb
 - test/templates/RUBY.md.erb
 - test/test_calendar.rb
@@ -164,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -172,12 +159,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: eventdb - event.db schema 'n' models for easy (re)use
-test_files:
-- test/test_calendar.rb
-- test/test_database.rb
-- test/test_version.rb
-- test/test_reader.rb
+test_files: []