eventdb 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 757265d114eb64c9f578024115c21041535b8cd9
-  data.tar.gz: a1c2148b333d7751b77bc65dbb6ebc49dcbf484a
+  metadata.gz: 6ce9835b60dc43f40f40dbead99151906d27deae
+  data.tar.gz: ec81011031ec13b0ee2954b82566e512c543ff66
 SHA512:
-  metadata.gz: dccfd18666bcf7787a700b0eee990705e74afdbc8fb4e5c530cc8c1b62b3468217624e8d23634a2cc669edf667adfe318cd9e5ed48212861ce0fe6a53c4eb280
-  data.tar.gz: fe3c1037f4c4116236afee2c2f64127adba16478fce58adea00f799b97c794bdb5d7160d38dae52450265f2871172db8e2d0acd4a04c6b83254acd69f1064542
+  metadata.gz: a7c4f46d4b8b832388b2f16597bdadda3e228266b8ea7827767394dbd6679b46d0b22281472c2f240411d7caad0fa9ec7198b22a16cd8489655af6eb5f343c71
+  data.tar.gz: 3ff8eaebf5e775fd87dd454e259e1d36b3300109e4566c85774e0c2742dec9b020ff7923c7928f438358f89c5f1e46d848ec4b98d6bfdeefe608a795da64cc14

data/README.md

@@ -17,6 +17,60 @@ moved to its own gem, that is, whatson.
 See the [whatson project for more »](https://github.com/textkit/whatson)
 
 
+## Format
+
+**Markdown**
+
+Option 1) Classic (Simple) Style
+
+~~~
+- [European Ruby Konference - EuRuKo](http://euruko.org)
+    - 2015 @ Salzburg, Austria; Oct/17+18
+~~~
+
+Option 2) Modern (New) Style
+
+~~~
+- **European Ruby Konference - EuRuKo** (web: [euruko.org](http://euruko.org))
+    - 2015 @ Salzburg, Austria; Oct/17+18
+~~~
+
+resulting in:
+
+~~~
+#<EventDb::Model::Event:0xa286a54
+  id:         1,
+  title:      "European Ruby Konference - EuRuKo",
+  link:       "http://euruko.org",
+  place:      "Salzburg, Austria › Europe",
+  start_date: Sat, 17 Oct 2015,
+  end_date:   Sun, 18 Oct 2015,
+  days:       2,
+  created_at: 2015-07-12 08:51:52 UTC,
+  updated_at: 2015-07-12 08:51:52 UTC>
+~~~
+
+Note: The headings hierarchy (starting w/ heading level 2) gets added to the place as a
+geo tree. Example:
+
+~~~
+## Europe
+
+### Central Europe
+
+#### Germany
+
+##### Bavaria
+
+###### Upper Franconia
+~~~
+
+resulting in:
+
+~~~
+Upper Franconia › Bavaria › Germany › Central Europe › Europe
+~~~
+
 
 ## Usage
 

data/lib/eventdb/database.rb

@@ -25,19 +25,38 @@ class DatabaseBase     ## fix: rename to Database (see below)
 
   def add( events )
     events.each do |ev|
-      
-      ## note: extract title from first (markdown) link
-      m = (ev.title =~ /^\[([^\]]+)\]/)
-      if m
+
+      ## 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 #{title} #{ev.start_date.year}, #{ev.date}"
+        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
+      
+
       Model::Event.create!(
           title:      title,
+          link:       link,
           text:       ev.title,   ### "full" title - incl. markdown links
           place:      ev.place,
           date:       ev.date,

data/lib/eventdb/schema.rb

@@ -9,6 +9,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*

data/lib/eventdb/version.rb

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

data/test/data/RUBY.md

@@ -81,9 +81,15 @@ NOTE: A calendar page ([CALENDAR.md](CALENDAR.md)) gets auto-generated from this
 
 ## Online
 
+
+<!-- try "old" classic format -->
+
 - [Rails Rumble](https://railsrumble.com)
     - 2014 @ Intertubes; Oct/18+19
-- [JekyllConf](http://jekyllconf.com)
+
+<!-- try "new" modern format -->
+
+- **JekyllConf** (web: [jekyllconf.com](http://jekyllconf.com))
     - 2015 @ Intertubes; May/2
 
 ## Europe

data/test/test_reader.rb

@@ -15,12 +15,20 @@ class TestReader < MiniTest::Test
     events = r.read
 
     ## pp events
-    ev = events[0]
-    
-    assert_equal '[Rails Rumble](https://railsrumble.com)', ev.title
-    assert_equal 'Intertubes › Online',                     ev.place
-    assert_equal 'Oct/18+19',                               ev.date
-    assert_equal Date.new(2014,10,18),                      ev.start_date
+    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
+
+    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
+
   end
 
 end # class TestReader

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventdb
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props