eventdb 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5581ae0b83f990cdd56b947c0b504fdf973435aa
-  data.tar.gz: 71d16f477128f028f6db5a0703b1e656d2c20cce
+  metadata.gz: e654b4516eb35c7b99b568fc10b10fa9236d9886
+  data.tar.gz: 8e2b5920e684344fd7177f484783482efce0c859
 SHA512:
-  metadata.gz: 153c35ffef9355d7624b7a4e828ea8f60abb4f44b9a899478806191ea75f71e1793ff86a25b777e5de7feaedb2a00ddfdf1c82efbcfe2226e51fdad91b86275e
-  data.tar.gz: 2bc79006fcb71edb6301c686a1716aa5ee0dfca9b7c16a7365f6135fb64daa85891eccbf454971faa1b99cfc675a682be5361b6e6c577bfcb2fffe591e26c8f9
+  metadata.gz: e2055488d9f4f913557b59f6b01ecb28e5e84c88b24933443eb19c8148e46a9599b9f8ea5605baebdb308293ccff282817ec1c474a80438fc198ef5a990e77d0
+  data.tar.gz: afaeae0de077a297795e27e2ed19d8924caf2c1358ff4c1559c496609332da95db606ffc2227246dc7942f320b8eae8db23d54fadba42691b16bf83cc0e75289

data/Manifest.txt

@@ -9,9 +9,9 @@ lib/eventdb/models.rb
 lib/eventdb/reader.rb
 lib/eventdb/schema.rb
 lib/eventdb/version.rb
-templates/CALENDAR.md.erb
 test/data/RUBY.md
 test/helper.rb
+test/templates/RUBY.md.erb
 test/test_calendar.rb
 test/test_database.rb
 test/test_reader.rb

data/README.md

@@ -21,10 +21,12 @@ See the [whatson project for more »](https://github.com/textkit/whatson)
 ## Usage
 
 ~~~
-r = EventDb::EventReader.from_url( "https://github.com/planetruby/awesome-events/raw/master/README.md" )
+url = "https://github.com/planetruby/awesome-events/raw/master/README.md"
+
+r = EventDb::EventReader.from_url( url )
 events = r.read
 
-db = EventDb::Database.new    # note: by default uses in-memory SQLite database
+db = EventDb::MemDatabase.new    # note: use in-memory SQLite database
 db.add( events )
 
 
@@ -57,7 +59,7 @@ Upcoming Ruby Conferences:
 
   in 18d   Brighton Ruby Conference, Mon Jul/20 (1d) @ Brighton, East Sussex › England (en) › Western Europe › Europe
   in 27d   European Ruby Camp - eurucamp, Fri-Sun Jul/31-Aug/2 (3d) @ Berlin (Potsdam), Germany › Europe
-  in 27d   JRuby Conference Europe - JRubyConf EU, Fri Jul/31 (1d) @ Berlin (Potdam), Germany › Europe
+  in 27d   JRuby Conference Europe - JRubyConf EU, Fri Jul/31 (1d) @ Berlin (Potsdam), Germany › Europe
   in 28d   Burlington Ruby Conference, Sat+Sun Aug/1+2 (2d) @ Burlington, Vermont › New England › United States (us) › North America › America
   in 50d   Madison+ Ruby, Fri+Sat Aug/21+22 (2d) @ Madison, Wisconsin › Great Lakes › United States (us) › North America › America
   in 61d   Full Stack Fest - Barcelona Ruby Conference (BaRuCo) + Barcelona Future JS, Tue-Sat Sep/1-5 (5d) @ Barcelona, Catalonia › Spain / España (es) › Southern Europe › Europe

data/lib/eventdb.rb

@@ -20,10 +20,10 @@ require 'logutils/activerecord'
 require 'eventdb/version'      ## let version always go first
 
 require 'eventdb/schema'
-require 'eventdb/reader'
-require 'eventdb/calendar'
-
 require 'eventdb/models'
+
+require 'eventdb/reader'
+require 'eventdb/calendar'   # note: depends (requires) models (first)
 require 'eventdb/database'
 
 

data/lib/eventdb/calendar.rb

@@ -49,9 +49,10 @@ end # class EventCursor
 
 class EventCalendar
 
-  def initialize( events )
-    @events = events.sort { |l,r| r.start_date <=> l.start_date }   ## sort events by date (newest first)
-    @tmpl = File.read_utf8( "#{EventDb.root}/templates/CALENDAR.md.erb" )
+  include Models   # e.g. lets you use Event instead of (EventDb::)Model::Event
+
+  def initialize( opts={} )
+    @events    = opts[:events] || Event.order('start_date DESC')   ## sort events by date (newest first)
   end
 
   def events
@@ -59,15 +60,19 @@ class EventCalendar
     EventCursor.new( @events )
   end
 
-  def render
-    ERB.new( @tmpl, nil, '<>' ).result( binding )   # <> omit newline for lines starting with <% and ending in %>
-  end
+  def render( opts={} )
+    tmpl_path  = opts[:template] || './templates/CALENDAR.md.erb'
+    tmpl       = File.read_utf8( tmpl_path )
 
-  def save( path = './CALENDAR.md' )   ## use (rename to) save_as - why? why not?? 
-    File.open( path, 'w' ) do |f|
-      f.write( render )
-    end
+    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?? 
+#    File.open( path, 'w' ) do |f|
+#      f.write( render )
+#    end
+#  end
+
 end # class EventCalendar
 
 end # module EventDb

data/lib/eventdb/database.rb

@@ -2,21 +2,26 @@
 
 module EventDb
 
-class Database
 
-  def initialize
-    ## connect
+class DatabaseBase     ## fix: rename to Database (see below)
+  def initialize( config={} )
+    @config = config
+  end
 
-    ActiveRecord::Base.establish_connection( adapter:  'sqlite3', 
-                                             database: ':memory:' )
+  def connect
+    ActiveRecord::Base.establish_connection( @config )
+  end
 
-    LogDb.create # add logs table
-    ConfDb.create 
-   
+  def create
     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 
+    create
+  end
 
   def add( events )
     events.each do |ev|
@@ -27,12 +32,13 @@ class Database
         title = $1
         puts "  adding #{title} #{ev.start_date.year}, #{ev.date}"
       else
-        puts "warn: cannot find event title in #{ev.title}"
+        puts "*** warn: cannot find event title in #{ev.title}"
         next   # skip record; todo: issue error
       end
 
       Model::Event.create!(
           title:      title,
+          text:       ev.title,   ### "full" title - incl. markdown links
           place:      ev.place,
           date:       ev.date,
           start_date: ev.start_date,
@@ -45,7 +51,27 @@ class Database
     end
   end
 
+end  ## class DatabaseBase
+
+
+## convenience class for in-memory (SQLite3) database
+
+class Database < DatabaseBase  ## fix: rename to MemDatabase or MemoryDatabase
+
+  def initialize
+    ## -- default to sqlite3 in-memory database
+    super( adapter:  'sqlite3',
+           database: ':memory:' )
+
+    ## step 1) (auto-)connect
+    connect
+    ## step 2) (auto-)migrate, that is, create tables, etc.
+    create_all    # -- incl. props, logs tables etc.
+  end
+
 end # class Database
 
+MemDatabase = Database    ## note: start using MemDatabase today (will get renamed!)
+
 end # module EventDb
 

data/lib/eventdb/models.rb

@@ -63,5 +63,7 @@ class Event < ActiveRecord::Base
 end # class Event
 
   end # module Model
+  
+  Models = Model   ## note: add conveniene shortcut for models
 end # module EventDb
 

data/lib/eventdb/schema.rb

@@ -8,7 +8,8 @@ def up
   ActiveRecord::Schema.define do
 
 create_table :events do |t|
-  t.string  :title,      null: false
+  t.string  :title,      null: false   ##  title (just the first link text)
+  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?

data/lib/eventdb/version.rb

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

data/test/data/RUBY.md

@@ -127,7 +127,7 @@ NOTE: A calendar page ([CALENDAR.md](CALENDAR.md)) gets auto-generated from this
 #### Germany / Deutschland (de)
 
 - @ Berlin
-    - [Ruby User Group Berlin (RUG::B)](http://berlin.onruby.de)
+    - [Ruby User Group Berlin (RUG::B)](http://rug-b.de)
     - [Rails Girls Berlin](http://railsgirlsberlin.de)
 - @ Hamburg
     - [Hamburg on Ruby](http://hamburg.onruby.de)

data/{templates/CALENDAR.md.erb → test/templates/RUBY.md.erb}

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

data/test/test_calendar.rb

@@ -10,14 +10,17 @@ require 'helper'
 class TestCalendar < MiniTest::Test
 
   def test_ruby
-    
+
     r = EventDb::EventReader.from_file( "#{EventDb.root}/test/data/RUBY.md" )
     events = r.read
 
-    cal = EventDb::EventCalendar.new( events )
-    buf = cal.render
+    db = EventDb::Database.new
+    db.add( events )
+
+    cal = EventDb::EventCalendar.new
+    buf = cal.render( template: "#{EventDb.root}/test/templates/RUBY.md.erb" )
     pp buf
-    
+
     start_buf =<<EOS
 # Ruby Conference Calendar
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventdb
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
@@ -143,9 +143,9 @@ files:
 - lib/eventdb/reader.rb
 - lib/eventdb/schema.rb
 - lib/eventdb/version.rb
-- templates/CALENDAR.md.erb
 - test/data/RUBY.md
 - test/helper.rb
+- test/templates/RUBY.md.erb
 - test/test_calendar.rb
 - test/test_database.rb
 - test/test_reader.rb