From 6e2960d1ba012c14badd873afa4aaf544b4c107c Mon Sep 17 00:00:00 2001 From: Saivann Date: Wed, 2 Apr 2014 12:09:20 -0400 Subject: [PATCH] Define events' date in YAML and continue displaying events 5 days after their start date (fixes #361) --- README.md | 1 + _events/2014-02-21-berlintexas.md | 1 + _events/2014-03-05-nybitcoinseminar.md | 1 + _events/2014-03-06-texasbitcoinconference.md | 1 + _events/2014-03-18-bitcoinference.md | 1 + _events/2014-03-20-commercism.md | 1 + _events/2014-03-21-moneylabcoiningalternatives.md | 1 + _events/2014-03-25-coinsummit.md | 1 + _events/2014-03-27-bitcoincryptoresearch.md | 1 + _events/2014-04-03-swedishbitcoinconference.md | 1 + _events/2014-04-07-insidebitcoinsnyc2014 | 1 + _events/2014-04-11-expo.md | 1 + _events/2014-04-23-conferencerussia.md | 1 + _events/2014-05-10-globalbitcoinsummit.md | 1 + _events/2014-05-15-bitcoin2014 | 1 + _events/2014-05-31-cebe.md | 1 + _events/2014-06-20-beltway.md | 1 + _events/2014-06-24-insidebitcoinshongkong2014 | 1 + _events/2014-07-09-insidebitcoinsmelbourne2014 | 1 + _events/2014-08-25-campbitcoin.md | 1 + _events/2014-09-01-worldbitcoinforum.md | 1 + _events/2014-09-15-insidebitcoinslondon.md | 1 + _events/2014-11-02-bitcoinworldatmoney2020.md | 1 + _plugins/events.rb | 11 +++-------- 24 files changed, 26 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 554ed82f..efa21360 100644 --- a/README.md +++ b/README.md @@ -104,6 +104,7 @@ Events should be placed in `_events/YYYY-MM-DD-SHORTTITLE.md` and adhere to this ``` --- +date: 2014-02-21 title: "2014 Texas Bitcoin Conference" venue: "Circuit of the Americas™ - Technology and Conference Center" address: "9201 Circuit of the Americas Blvd" diff --git a/_events/2014-02-21-berlintexas.md b/_events/2014-02-21-berlintexas.md index 3781932a..949f7ad5 100644 --- a/_events/2014-02-21-berlintexas.md +++ b/_events/2014-02-21-berlintexas.md @@ -1,4 +1,5 @@ --- +date: 2014-02-21 title: "Berlin, Texas: Bitcoin hackathon" venue: "c-base Raumstation" address: "Rungestraße 20, 10179" diff --git a/_events/2014-03-05-nybitcoinseminar.md b/_events/2014-03-05-nybitcoinseminar.md index d22bb239..cd07064d 100644 --- a/_events/2014-03-05-nybitcoinseminar.md +++ b/_events/2014-03-05-nybitcoinseminar.md @@ -1,4 +1,5 @@ --- +date: 2014-03-05 title: "Bitcoin and Virtual Money" venue: "NYSSA Conference Center" address: "1540 Broadway" diff --git a/_events/2014-03-06-texasbitcoinconference.md b/_events/2014-03-06-texasbitcoinconference.md index be046ff7..99f1bb40 100644 --- a/_events/2014-03-06-texasbitcoinconference.md +++ b/_events/2014-03-06-texasbitcoinconference.md @@ -1,4 +1,5 @@ --- +date: 2014-03-06 title: "2014 Texas Bitcoin Conference" venue: "Circuit of the Americas™ - Technology and Conference Center" address: "9201 Circuit of the Americas Blvd" diff --git a/_events/2014-03-18-bitcoinference.md b/_events/2014-03-18-bitcoinference.md index 0f34dd08..5a08b3fe 100644 --- a/_events/2014-03-18-bitcoinference.md +++ b/_events/2014-03-18-bitcoinference.md @@ -1,4 +1,5 @@ --- +date: 2014-03-18 title: "Bitcoinference 2014" venue: "Amsterdam Science Park 123" address: "1098 XG" diff --git a/_events/2014-03-20-commercism.md b/_events/2014-03-20-commercism.md index bff39b59..21d438ae 100644 --- a/_events/2014-03-20-commercism.md +++ b/_events/2014-03-20-commercism.md @@ -1,4 +1,5 @@ --- +date: 2014-03-20 title: "Commercism Bitcoinference" venue: "Microsoft Conference Center" address: "1065 La Avenida Street, Building 1" diff --git a/_events/2014-03-21-moneylabcoiningalternatives.md b/_events/2014-03-21-moneylabcoiningalternatives.md index a194b11f..0429cb57 100644 --- a/_events/2014-03-21-moneylabcoiningalternatives.md +++ b/_events/2014-03-21-moneylabcoiningalternatives.md @@ -1,4 +1,5 @@ --- +date: 2014-03-21 title: "Amsterdam MoneyLab: Coining Alternatives" venue: "Lab 111" address: "111 Arie Biemondstraat" diff --git a/_events/2014-03-25-coinsummit.md b/_events/2014-03-25-coinsummit.md index de3751e5..ff7a353a 100644 --- a/_events/2014-03-25-coinsummit.md +++ b/_events/2014-03-25-coinsummit.md @@ -1,4 +1,5 @@ --- +date: 2014-03-25 title: "CoinSummit" venue: "Yerba Buena Center for the Arts" address: "701 Mission Street" diff --git a/_events/2014-03-27-bitcoincryptoresearch.md b/_events/2014-03-27-bitcoincryptoresearch.md index 7d630a8c..42c79d6a 100644 --- a/_events/2014-03-27-bitcoincryptoresearch.md +++ b/_events/2014-03-27-bitcoincryptoresearch.md @@ -1,4 +1,5 @@ --- +date: 2014-03-27 title: "Bitcoin and Cryptocurrency Research Conference" venue: "Friend Center Convocation Room, Princeton University" address: "303 Sherrerd Hall" diff --git a/_events/2014-04-03-swedishbitcoinconference.md b/_events/2014-04-03-swedishbitcoinconference.md index 65d638ff..c569d914 100644 --- a/_events/2014-04-03-swedishbitcoinconference.md +++ b/_events/2014-04-03-swedishbitcoinconference.md @@ -1,4 +1,5 @@ --- +date: 2014-04-03 title: "Swedish Bitcoin Conference 2014" venue: "Finlandshuset Conference Center" address: "Snickarbacken 4" diff --git a/_events/2014-04-07-insidebitcoinsnyc2014 b/_events/2014-04-07-insidebitcoinsnyc2014 index c03b3275..20068890 100644 --- a/_events/2014-04-07-insidebitcoinsnyc2014 +++ b/_events/2014-04-07-insidebitcoinsnyc2014 @@ -1,4 +1,5 @@ --- +date: 2014-04-07 title: "Inside Bitcoins NYC" venue: "Javits Convention Center" address: "655 West 34th Street" diff --git a/_events/2014-04-11-expo.md b/_events/2014-04-11-expo.md index c90ce7d4..25da4393 100644 --- a/_events/2014-04-11-expo.md +++ b/_events/2014-04-11-expo.md @@ -1,4 +1,5 @@ --- +date: 2014-04-11 title: "Bitcoin Expo 2014" venue: "Metro Toronto Convention Centre" address: "255 Front St W" diff --git a/_events/2014-04-23-conferencerussia.md b/_events/2014-04-23-conferencerussia.md index acbed7ca..e115e8d1 100644 --- a/_events/2014-04-23-conferencerussia.md +++ b/_events/2014-04-23-conferencerussia.md @@ -1,4 +1,5 @@ --- +date: 2014-04-23 title: "Bitcoin Conference Russia" venue: "Business club Cabinet Lounge" address: "No. 6 Novaya Ploshad, 109012" diff --git a/_events/2014-05-10-globalbitcoinsummit.md b/_events/2014-05-10-globalbitcoinsummit.md index 3bd02566..5937c554 100644 --- a/_events/2014-05-10-globalbitcoinsummit.md +++ b/_events/2014-05-10-globalbitcoinsummit.md @@ -1,4 +1,5 @@ --- +date: 2014-05-10 title: "Global Bitcoin Summit 2014" venue: "China National Convention Center" address: "No.7 Tianchen East Road" diff --git a/_events/2014-05-15-bitcoin2014 b/_events/2014-05-15-bitcoin2014 index 7d42daf4..5043dd80 100644 --- a/_events/2014-05-15-bitcoin2014 +++ b/_events/2014-05-15-bitcoin2014 @@ -1,4 +1,5 @@ --- +date: 2014-05-15 title: "Bitcoin Foundation Bitcoin 2014" venue: "Passenger Terminal" address: "Piet Heinkade 271019 BR" diff --git a/_events/2014-05-31-cebe.md b/_events/2014-05-31-cebe.md index deb5cea3..947890b0 100644 --- a/_events/2014-05-31-cebe.md +++ b/_events/2014-05-31-cebe.md @@ -1,4 +1,5 @@ --- +date: 2014-05-31 title: "Central Europe Bitcoin Expo" venue: "Austria Center Vienna" address: "Bruno-Kreisky-Platz 1" diff --git a/_events/2014-06-20-beltway.md b/_events/2014-06-20-beltway.md index 013cd775..0210c862 100644 --- a/_events/2014-06-20-beltway.md +++ b/_events/2014-06-20-beltway.md @@ -1,4 +1,5 @@ --- +date: 2014-06-20 title: "Bitcoin in the Beltway" venue: "Marriott Renaissance Downtown" address: "999 9th St NW" diff --git a/_events/2014-06-24-insidebitcoinshongkong2014 b/_events/2014-06-24-insidebitcoinshongkong2014 index b8090f4a..28100476 100644 --- a/_events/2014-06-24-insidebitcoinshongkong2014 +++ b/_events/2014-06-24-insidebitcoinshongkong2014 @@ -1,4 +1,5 @@ --- +date: 2014-06-24 title: "Inside Bitcoins Conference & Expo" venue: "Hong Kong SkyCity Marriott Hotel" address: "1 Sky City Road East" diff --git a/_events/2014-07-09-insidebitcoinsmelbourne2014 b/_events/2014-07-09-insidebitcoinsmelbourne2014 index 52bb99d2..944c11e6 100644 --- a/_events/2014-07-09-insidebitcoinsmelbourne2014 +++ b/_events/2014-07-09-insidebitcoinsmelbourne2014 @@ -1,4 +1,5 @@ --- +date: 2014-07-09 title: "Inside Bitcoins Conference & Expo" venue: "Melbourne Convention and Exhibition Centre" address: "South Wharf VIC 3006" diff --git a/_events/2014-08-25-campbitcoin.md b/_events/2014-08-25-campbitcoin.md index 1250c481..969e6dd5 100644 --- a/_events/2014-08-25-campbitcoin.md +++ b/_events/2014-08-25-campbitcoin.md @@ -1,4 +1,5 @@ --- +date: 2014-08-25 title: "Camp Bitcoin" venue: "The Burning Man camp" address: "" diff --git a/_events/2014-09-01-worldbitcoinforum.md b/_events/2014-09-01-worldbitcoinforum.md index 5dd0fffd..d600f547 100644 --- a/_events/2014-09-01-worldbitcoinforum.md +++ b/_events/2014-09-01-worldbitcoinforum.md @@ -1,4 +1,5 @@ --- +date: 2014-09-01 title: "World Bitcoin Forum 2014" venue: "The Bundeshaus" address: "Platz der Vereinten Nationen 2" diff --git a/_events/2014-09-15-insidebitcoinslondon.md b/_events/2014-09-15-insidebitcoinslondon.md index c701bba0..d6a78cd3 100644 --- a/_events/2014-09-15-insidebitcoinslondon.md +++ b/_events/2014-09-15-insidebitcoinslondon.md @@ -1,4 +1,5 @@ --- +date: 2014-09-15 title: "Inside Bitcoins London" venue: "The Grange" address: "10 Godliman St" diff --git a/_events/2014-11-02-bitcoinworldatmoney2020.md b/_events/2014-11-02-bitcoinworldatmoney2020.md index 7e975d75..de61685f 100644 --- a/_events/2014-11-02-bitcoinworldatmoney2020.md +++ b/_events/2014-11-02-bitcoinworldatmoney2020.md @@ -1,4 +1,5 @@ --- +date: 2014-11-02 title: "Bitcoin World at Money2020" venue: "Aria" address: "3730 Las Vegas Blvd" diff --git a/_plugins/events.rb b/_plugins/events.rb index bd28baf0..88ccf215 100644 --- a/_plugins/events.rb +++ b/_plugins/events.rb @@ -94,16 +94,11 @@ module Jekyll Dir.foreach('_events') do |file| # Skip events with malformed name next if file == '.' or file == '..' - date = file.split('-') - next if date.length < 4 - next if !/^[0-9]{4}$/.match(date[0]) - next if !/^[0-9]{2}$/.match(date[1]) - next if !/^[0-9]{2}$/.match(date[2]) - # Skip event if not in the future - next if Time.new.to_i > Time.new(date[0].to_i,date[1].to_i,date[2].to_i).to_i # Assign variables data = YAML.load_file('_events/'+file) - data['date'] = date[0] + '-' + date[1] + '-' + date[2] + # Skip event if it has started more than five days ago + date = data['date'].to_s.split('-') + next if Time.new.to_i > (Time.new(date[0].to_i,date[1].to_i,date[2].to_i).to_i + 432000) # Get geolocalisation data from Google Maps begin geoloc = JSON.parse(open("https://maps.googleapis.com/maps/api/geocode/json?address=" + CGI::escape(data['address'] + ', ' + data['city'] + ', ' + data['country']) + "&sensor=false","User-Agent"=>"Ruby/#{RUBY_VERSION}").read)