eventdb 0.7.1 → 1.0.0

data/test/templates/RUBY.md.erb

@@ -7,18 +7,18 @@ on the [awesome-events](README.md) page. Anything missing? Contributions welcome
 
 [2016](#2016) • [2015](#2015) • [2014](#2014)  • [2013](#2013)
 
-<% events.each do |ev,evd| %>
-<% if evd.new_year? %>
+<% events.each do |ev,q| %>
+<% if q.new_year? %>
 
 ## <%= ev.start_date.year %>
 
 <% end %>
-<% if evd.new_month? %>
+<% if q.new_month? %>
 
 **<%= Date::MONTHNAMES[ev.start_date.month] %>**
 
 <% end %>
 
-<%= ev.date %> • [**<%= ev.title %>**](<%= ev.link %>) @ <%= ev.place %>
+<%= ev.date_fmt( 'short' ) %> • [**<%= ev.title %>**](<%= ev.link %>) @ <%= ev.place %>
 
 <% end %>

data/test/test_calendar.rb

@@ -10,18 +10,14 @@ require 'helper'
 class TestCalendar < MiniTest::Test
 
   def test_ruby
-
-    r = EventDb::EventReader.from_file( "#{EventDb.root}/test/data/RUBY.md" )
-    events = r.read
-
     db = EventDb::Memory.new
-    db.add( events )
+    db.read( "#{EventDb.root}/test/data/RUBY.md" )
 
     cal = EventDb::EventCalendar.new
     buf = cal.render( template: "#{EventDb.root}/test/templates/RUBY.md.erb" )
-    pp buf
+    puts buf
 
-    start_buf =<<EOS
+    start_buf =<<TXT
 # Ruby Conference Calendar
 
 NOTE: This page gets auto-generated from the [awesome-events](README.md) page @ Planet Ruby.
@@ -38,13 +34,13 @@ 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, North America, America
 
 ## 2015
 
 
 **December**
-EOS
+TXT
 
    assert_equal start_buf, buf[0...start_buf.size]
 

data/test/test_database.rb

@@ -10,22 +10,18 @@ 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::Memory.new
-    db.add( events )
+    db.read( "#{EventDb.root}/test/data/RUBY.md" )
 
     ## get next 17 events
-    up = EventDb::Model::Event.limit( 17 ).upcoming( Date.today )
+    today = Date.new( 2015, 1, 1 )
+    up = EventDb::Model::Event.limit( 17 ).upcoming( today )
     pp up.to_sql
     pp up
 
     puts "Upcoming Ruby Conferences:"
     up.each do |e|
-      puts "  #{e.date} | #{e.date_str} - #{e.title} @ #{e.place}"
+      puts "  #{e.date_fmt('short')} | #{e.date_fmt} - #{e.title} @ #{e.place}"
     end
 
     assert true  # assume ok if we get here

data/test/test_parser.rb

@@ -0,0 +1,83 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_parser.rb
+
+
+require 'helper'
+
+class TestParser < MiniTest::Test
+
+  def test_ruby_markdown
+txt =<<TXT
+# Awesome Events
+
+## Online
+
+<!-- try classic format -->
+
+- [Rails Rumble](https://railsrumble.com)
+    - 2014 @ Intertubes; Oct/18+19
+
+<!-- try modern format -->
+
+- **JekyllConf** (web: [jekyllconf.com](http://jekyllconf.com))
+    - 2015 @ Intertubes; May/2
+TXT
+
+    events = EventDb::EventReader::MarkdownParser.parse( txt )
+
+    ## pp events
+    ev = events[0]
+
+    assert_equal 'Rails Rumble',            ev.title
+    assert_equal 'https://railsrumble.com', ev.link
+    assert_equal 'Intertubes, Online',      ev.place
+    assert_equal Date.new(2014,10,18),      ev.start_date
+    assert_equal Date.new(2014,10,19),      ev.end_date
+
+    ev = events[1]
+
+    assert_equal 'JekyllConf',              ev.title
+    assert_equal 'http://jekyllconf.com',   ev.link
+    assert_equal 'Intertubes, Online',      ev.place
+    assert_equal Date.new(2015,5,2),        ev.start_date
+  end
+
+  def test_ruby_yaml
+txt =<<TXT
+# Awesome Events
+
+- name:  Rails Rumble
+  url:   https://railsrumble.com
+  place: Intertubes, Online
+  start: 2014-10-18
+  end:   2014-10-19
+
+- name:  JekyllConf
+  url:   http://jekyllconf.com
+  place: Intertubes, Online
+  start: 2015-05-02
+  end:   2015-05-02
+TXT
+
+    events = EventDb::EventReader::YamlParser.parse( txt )
+
+    ## pp events
+    ev = events[0]
+
+    assert_equal 'Rails Rumble',            ev.title
+    assert_equal 'https://railsrumble.com', ev.link
+    assert_equal 'Intertubes, Online',      ev.place
+    assert_equal Date.new(2014,10,18),      ev.start_date
+    assert_equal Date.new(2014,10,19),      ev.end_date
+
+    ev = events[1]
+
+    assert_equal 'JekyllConf',              ev.title
+    assert_equal 'http://jekyllconf.com',   ev.link
+    assert_equal 'Intertubes, Online',      ev.place
+    assert_equal Date.new(2015,5,2),        ev.start_date
+  end
+end # class TestParser

data/test/test_reader.rb

@@ -11,27 +11,24 @@ class TestReader < MiniTest::Test
 
   def test_ruby
 
-    r = EventDb::EventReader.from_file( "#{EventDb.root}/test/data/RUBY.md" )
-    events = r.read
+    events = EventDb::EventReader.read( "#{EventDb.root}/test/data/RUBY.md" )
 
     ## pp events
-    ev1 = events[0]
+    ev = events[0]
 
-    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
+    assert_equal 'Rails Rumble',            ev.title
+    assert_equal 'https://railsrumble.com', ev.link
+    assert_equal 'Intertubes, Online',      ev.place
+    assert_equal Date.new(2014,10,18),      ev.start_date
+    assert_equal Date.new(2014,10,19),      ev.end_date
 
 
-    ev2 = events[1]
+    ev = 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
+    assert_equal 'JekyllConf',              ev.title
+    assert_equal 'http://jekyllconf.com',   ev.link
+    assert_equal 'Intertubes, Online',      ev.place
+    assert_equal Date.new(2015,5,2),        ev.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.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-05 00:00:00.000000000 Z
+date: 2019-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
@@ -135,6 +135,7 @@ files:
 - test/templates/RUBY.md.erb
 - test/test_calendar.rb
 - test/test_database.rb
+- test/test_parser.rb
 - test/test_reader.rb
 - test/test_version.rb
 homepage: https://github.com/textkit/event.db