kalindar 0.0.1 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjgyYTE3M2NkOTJiODk5NTcxNTkyZjFkODA4NTMyNDlkZmQ3NGFmMw==
+    NDY4ODFlYzA2NjAxZjdjZGU1YzdjM2Q1ZDA0OTZkNTA1NTRmMTFlYw==
   data.tar.gz: !binary |-
-    YzMyYzI1NTVmNWMyODUxZjljMWRmZjU0NmM5MWFlZTg3ZjM1NzVlMQ==
+    NzkxNTk3ODk1ZjI4NDQ2ODJiMzJiNTI3OTE5YTA5NGQ5NDZhMzUwNQ==
 SHA512:
   metadata.gz: !binary |-
-    MzNjNDFkNzYzM2EyOTgyODIwMTk5MTkzNDEyNzBhNDc2NWYxODQzZWQ4YTE1
-    ZjgxNjQ2YTk2OTRkN2M3MjZmNjFiNzI0NGMxNDhjYzM3YjY1Zjk4ZjNmYzY0
-    YTQwNjQxYTU3YjIzNDA5MzMzZjRhNmJkOTkxZDNmYWM4NTY2M2U=
+    ZGZjMTJkYTZjMzY2ZWMzMjlkZjU2ZGQyMmQ1NGU3NGZlZDQ1ZDI4YmQ2MGVl
+    ZDVlZmE4YmY2ZTgyODgwNmE0NDczODgzOGNkNDlkY2M4ZDIzMTc1MTdmNjNj
+    YmE5NDgyMzc1MWNhNGJmMDlmNjQ4NjM4ZDlmNWExYzE5YzJiZGY=
   data.tar.gz: !binary |-
-    OTI4MjAyYzYwOWQ3ZTgzMGZkZGZjNzBjMzQzNzk2MzY4ZTM1OWFiNTNjNzA0
-    ZDc4Y2E4N2ZhZTc0OWMzMDcyOWUzYWYzYTMxMzkwZWM0OTJkNTZmNDBiNzlj
-    MTVlNGVkZmVkZDhhYTA2Zjg5NWQ5YTNiYzFmMDdkMjFlOTBhMWU=
+    Njk3YzdhMmFhYjNiYjNjNTc3OWU0ZjU2NDcwYTJlOGUzZTU3ODM3MTY0MWE3
+    MzdkOTMyY2RmYTk2OWY3NDQxNjViNjYzZjQyOWI3MGYyMGQzOTRmYWJlZDQ0
+    YzkyNjI1ZjExMjg4MjIyMTFjZTRlZDI5OTFiMWI0YmM2NTBiNTI=

data/Procfile

@@ -0,0 +1 @@
+web: bundle exec rackup config.ru -p $PORT

data/kalindar.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["felix.wolfsteller@gmail.com"]
   spec.summary       = %q{Web-Interface to ics files}
   spec.description   = %q{Web-Interface to ics files with sinatra}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/fwolfst/kalindar"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/lib/kalindar.rb

@@ -1,7 +1,8 @@
 require "kalindar/version"
+require 'kalindar/event'
+require 'kalindar/calendar'
 require 'kalindar/event_calendar'
 require 'kalindar/app'
-require 'kalindar/event'
 
 module Kalindar
   # Your code goes here...

data/lib/kalindar/app.rb

@@ -1,10 +1,12 @@
-require 'sinatra/base'
-require 'slim'
 require 'time'
 require 'json'
+require 'securerandom'
+require 'sinatra/base'
+require 'slim'
 require 'i18n'
 require 'i18n/backend/fallbacks'
 
+# Sinatra App for Kalindar, show ics files.
 class KalindarApp < Sinatra::Base
   $conf = JSON.load(File.new('config.json'))
   $cal = EventCalendar.new($conf['calendar_files'])
@@ -22,6 +24,9 @@ class KalindarApp < Sinatra::Base
   # We like pretty html indentation
   set :slim, :pretty => true
 
+  # Allow inclusion in iframe.
+  set :protection, :except => :frame_options
+
   helpers do
     def li_day_class day
       return "sunday" if day.sunday?
@@ -40,6 +45,17 @@ class KalindarApp < Sinatra::Base
     redirect '/events'
   end
 
+  get '/events/:year/:month' do
+    @events = {}
+    # Events from start time to 31 days later
+    date = Date.new(params[:year].to_i, params[:month].to_i, 1)
+    (date .. date + 30).each do |day|
+      #@events[d] = $cal.events_for(d)
+      @events[day] = $cal.find_events day.to_date
+    end
+    slim :event_list
+  end
+
   get '/events' do
     @events = {}
     # events from today to in 30 days
@@ -50,51 +66,75 @@ class KalindarApp < Sinatra::Base
     slim :event_list
   end
 
-  # Create DateTime from yyyymmdd + h + m .
-  def start_time_from_params params
-    hour = params['start_time'][/\d\d/].to_i
-    minute = params['start_time'][/:\d\d/][1,2].to_i
-    start_day = Date.parse(params['start_day'])
-    start_time = DateTime.new(start_day.year,
-      start_day.month, start_day.day, hour, minute)
-  end
-
-  # Adds minutes to start_time.
-  def end_time_from_params params, start_time
-    minutes = case params['duration']
-             when '15m' then 15
-             when '30m' then 30
-             when '60m' then 60
-             when '90m' then 90
-             when '120m' then 120
-             when '1d' then 24 * 60
-             when '2d' then 24 * 2 * 60
-             when '5d' then 24 * 5 * 60
-             when '1w' then 24 * 7 * 60
-             end
-    start_time + Rational(minutes, 1440) 
+  get '/events/twoday' do
+    @events = {}
+    # events from today to in 30 days
+    (DateTime.now .. DateTime.now + 30).each do |day|
+      #@events[d] = $cal.events_for(d)
+      @events[day] = $cal.find_events day.to_date
+    end
+    @events = @events.values.flatten.sort_by {|e| e.start_time}
+    slim :twoday_list
   end
 
-  # Add event, save ics file.
+  # Add new event, save ics file.
   put '/event' do
-    event = RiCal::Component::Event.new($cal.calendars.first)
-    start_time = start_time_from_params params
-    event.dtstart = start_time
-    event.dtend = end_time_from_params params, start_time
-    event.summary = params['summary']
-    event.description = params['description']
-    event.location = params['location']
-
-    # Motivate Calendar Delegate
+    errors = EventParamHelper.check_params params
+    if !errors.empty?
+      slim :new_event, :locals => {'start_date' => Date.parse(params[:start_day])}
+    end
+    begin
+      event = Event.create_from_params params
+    rescue
+      return 502, "Eingabefehler"
+    end
+
     $cal.calendars.first.events << event
-    io = File.open($cal.filename_of($cal.calendars.first), 'w')
-    $cal.calendars.first.export_to io
-    io.close
+    $cal.calendars.first.write_back!
 
-    redirect back
+    if request.xhr?
+      @events = {}
+      # Events from today to in 30 days
+      (DateTime.now .. DateTime.now + 30).each do |day|
+        @events[day] = $cal.find_events day.to_date
+      end
+      slim :event_list, :layout => false
+    else
+      redirect '/'
+    end
   end
 
+  # Show new event template.
   get '/event/new/:day' do
-    slim :new_event, :locals => {'start_date' => nil}
+    # Aim is to get a new event in every case
+    #@event = Event.create_from_params params
+    @event = Event.new(RiCal::Component::Event.new($cal.calendars.first))
+    @event.dtstart = Date.parse(params[:day])
+    slim :new_event, :locals => {'start_date' => Date.parse(params[:day])}
+  end
+
+  # Yet empty route.
+  get '/event/delete/:uuid' do
+    redirect back
+  end
+
+  # Show edit view.
+  get '/event/edit/:uuid' do
+    event = $cal.find_by_uid params[:uuid]
+    if event.nil?
+      redirect back
+    else
+      slim :edit_event, :locals => {'event' => event}
+    end
+  end
+
+  # Edit/save an event.
+  put '/event/edit/:uuid' do
+    # validate_params
+    puts params
+    event = $cal.find_by_uid(params[:uuid])
+    event.update params
+    $cal.calendars.first.write_back!
+    redirect '/'
   end
 end

data/lib/kalindar/calendar.rb

@@ -0,0 +1,12 @@
+require 'delegate'
+
+# Delegator with some handy shortcuts
+class Calendar < SimpleDelegator
+  attr_accessor :filename
+  # Write 'back' to file.
+  def write_back!
+    File.open(@filename, 'w') do |file|
+      export_to file
+    end
+  end
+end

data/lib/kalindar/event.rb

@@ -1,24 +1,139 @@
+require 'delegate'
+
 # Delegator with some handy shortcuts
 class Event < SimpleDelegator
+  # Time it starts at day, or '...'
   def start_time_f day
-    puts "start #{start_time} : #{start_time.class} #{start_time.to_date} #{day}"
-    return start_time.strftime('%H:%M') if start_time.to_date == day.to_date
-    return "..."
+    #puts "start #{start_time} : #{start_time.class} #{start_time.to_date} #{day}"
+    if dtstart.class == Date
+      # whole day
+      ""
+    elsif start_time.to_date == day.to_date
+      start_time.strftime('%H:%M')
+    else
+      "..."
+    end
   end
+
+  # Time it finishes at day, or '...'
   def finish_time_f day
-    return finish_time.strftime('%H:%M') if finish_time.to_date == day.to_date
-    return "..."
+    if dtend.class == Date
+      # whole day
+      ""
+    elsif finish_time.to_date == day.to_date
+      finish_time.strftime('%H:%M')
+    else
+      return "..."
+    end
   end
+
+  # Time it finishes and or starts at day, or '...'
   def time_f day
     start = start_time_f day
     finish = finish_time_f day
-    if start == finish && start == "..."
+    if start == finish && start == ""
+      # whole day
+      ""
+    elsif start == finish && start == "..."
       "..."
     else
       "#{start_time_f day} - #{finish_time_f day}"
     end
   end
+
+  # Date and time from and to
   def from_to_f
     return "#{dtstart.to_datetime.strftime("%d.%m. %H:%M")} - #{dtend.to_datetime.strftime("%d.%m. %H:%M")}"
   end
+
+  # Create DateTime from yyyymmdd + h + m .
+  def self.start_time_from_params params
+    start_day = Date.parse(params['start_day'])
+    if !params[:start_time]
+      return start_day
+    end
+
+    hour, minute = params[:start_time].match(/(\d\d):(\d\d)/)[1,2]
+    start_time = DateTime.new(start_day.year,
+      start_day.month, start_day.day, hour.to_i, minute.to_i)
+  end
+
+  def self.start_date_from params
+    Date.parse(params['start_day'])
+  end
+
+
+  def update params
+    begin
+      hour, minute = params['start_time'].match(/(\d\d):(\d\d)/)[1,2]
+      start_day = Date.parse(params['start_day'])
+      start_time = DateTime.new(start_day.year,
+        start_day.month, start_day.day, hour.to_i, minute.to_i)
+      self.dtstart = start_time
+      minutes = EventParamHelper.duration params['duration']
+      self.dtend = start_time + Rational(minutes, 1440)
+    rescue => e
+      STDERR.puts "event#update params: problems with (up)date #{e.message}"
+    end
+    
+    self.summary     = params['summary']     if params['summary']
+    self.description = params['description'] if params['description']
+    self.location    = params['location']    if params['location']
+  end
+
+  # Create a new event from params as given by new_event form of kalindar.
+  # this should eventually go somewhere else, but its better here than in app already.
+  def self.create_from_params params
+    event = RiCal::Component::Event.new($cal.calendars.first)
+    event.uid = SecureRandom.uuid
+    if params['summary']
+      event.summary = params['summary']
+    end
+    if params['description']
+      event.description = params['description']
+    end
+    if params['location']
+      event.location = params['location']
+    end
+
+    # Access should be made failsafe.
+    start_time = start_time_from_params(params)
+    event.dtstart = start_time
+    minutes = EventParamHelper.duration params['duration']
+    event.dtend = start_time + Rational(minutes, 1440)
+    Event.new event
+  end
+
+  private
+end
+
+module EventParamHelper
+  
+  # minutes for abbrevations
+  @@duration_param = {
+    '15m' => 15,
+    '30m' => 30,
+    '60m' => 60,
+    '90m' => 90,
+    '120m' => 120,
+    '1d'  => 24 * 60,
+    '2d'  => 24 * 2 * 60,
+    '5d'  => 24 * 5 * 60,
+    '1w'  => 24 * 7 * 60
+  }
+  def self.duration duration_p
+    # throw
+    @@duration_param[duration_p]
+  end
+
+  def self.check_params params
+    errors = {}
+    if not(params[:start_time] =~ /\d\d:\d\d/)
+      errors[:start_time] = ''
+    end
+    if not(duration params[:duration])
+      errors[:duration] = ''
+    end
+    errors
+  end
 end

data/lib/kalindar/event_calendar.rb

@@ -1,26 +1,36 @@
 require 'ri_cal'
+require 'kalindar/calendar'
 
+# Public facing methods should return Event Decorators,
+# private methods can return "raw" RiCal::Component::Event s.
 class EventCalendar
   attr_accessor :calendars
-  attr_accessor :filenames # decorator?
-  # also decoreate event for access to calendar?
 
+  # Given filename or array of filenames, initialize the calendar.
   def initialize filename
     @calendars = []
-    @filenames = []
     if filename.class == Array
-      filename.each {|file| read_file file}
+      filename.each {|file| read_file file, true}
     else
-      read_file filename
+      read_file filename, true
     end
   end
 
-  def read_file filename
+  # Opens calendar
+  # param: create if true, create empty calendar file if not existant.
+  def read_file filename, create
+    if create && !File.exist?(filename)
+      File.open(filename, 'w') do |file|
+        (RiCal::Component::Calendar.new).export_to file
+      end
+    end
     @calendars << File.open(filename, 'r') do |file|
       RiCal.parse file
-    end.flatten
-    # attention if more than one calendar in file!
-    @filenames << filename
+    end.flatten.map do |calendar|
+      c = Calendar.new calendar
+      c.filename = filename
+      c
+    end
     @calendars.flatten!
   end
 
@@ -59,19 +69,33 @@ class EventCalendar
     events.flatten
   end
 
+  # Find (non-recuring) events that begin, end or cover the given day.
   def find_events date
     #events = @calendars.map &:events
     @calendars.map do |calendar|
       calendar.events.select { |event|
-        event.dtstart.to_date == date || event.dtend.to_date == date ||!event.occurrences(:overlapping => [date, date +1]).empty?
+        # If end-date is a Date (vs DateTime) let it be
+        # All day/multiple day events
+        if event.dtstart.class == Date && event.dtend.class == Date
+          event.dtstart.to_date == date || (event.dtstart < date && event.dtend > date)
+        else
+          event.dtstart.to_date == date || event.dtend.to_date == date || (event.dtstart < date && event.dtend > date)
+          # occurrences need to be re-enabled
+          #||!event.occurrences(:overlapping => [date, date +1]).empty?
+        end
       }
     end.flatten.map do |event|
       Event.new event
     end
+    # check flat_map enumerable method
   end
 
-  def filename_of calendar
-    @filenames[@calendars.index calendar]
+  def find_by_uid uuid
+    # we want to pick only the first! whats the method? detect is one, find another
+    @calendars.map(&:events).flatten.each do |event|
+      return Event.new(event) if event.uid == uuid
+    end
+    nil
   end
 
   private
@@ -81,13 +105,13 @@ class EventCalendar
   end
 
   def dtmonth_end year, month
-    puts "last date for #{year} - #{month}"
+    #puts "last date for #{year} - #{month}"
     last_day = Date.civil(year, month, -1)
     Icalendar::Values::Date.new('20120102')#"#{year}#{month}#{last_day}")
   end
 
   def date_between? date, start_date, end_date
-    puts "d #{date}  st #{start_date} e #{end_date}"
+    #puts "d #{date}  st #{start_date} e #{end_date}"
     date > start_date && date < end_date
   end
 
@@ -96,7 +120,8 @@ class EventCalendar
   end
 
   def event_includes? event, date
-    event.dtstart.class == event.dtend.class && event.dtstart.class ==  Icalendar::Values::DateTime && (date_between?(date, event.dtstart, event.dtend))
+    incl = event.dtstart.class == event.dtend.class && event.dtstart.class ==  Icalendar::Values::DateTime && (date_between?(date, event.dtstart, event.dtend))
+    incl
   end
 end
 

data/lib/kalindar/locales/de.yml

@@ -1,6 +1,8 @@
 de:
   create_event: "Neuer Termin"
   new_event:    "Neuer Termin"
+  edit:         "ändern"
+  edit_event:   "Termin ändern"
   start_date:   "Anfangsdatum"
   when:         "Uhrzeit"
   summary:      "Titel"
@@ -19,6 +21,22 @@ de:
   5d:           "5 Tage"
   1w:           "eine Woche"
   save:         "speichern"
+  cancel:       "abbrechen"
   time:
     formats:
       short: "%d.%m.%Y"
+      hm: "%H:%M"
+  # Seems better option for names (with e.g. %a)
+  # http://blog.lingohub.com/developers/2013/08/internationalization-for-ruby-i18n-gem/
+  date:
+    day:
+      day_names:
+        - Montag
+        - Dienstag
+        - Mittwoch
+        - Donnerstag
+        - Freitag
+        - Samstag
+        - Sonntag
+    formats:
+      short: "%d.%m.%Y"

data/lib/kalindar/locales/en.yml

@@ -1,6 +1,8 @@
 en:
   create_event: "New Event"
   new_event:    "New Event"
+  edit:         "edit"
+  edit_event:   "edit event"
   start_date:   "Start Date"
   when:         "Time"
   summary:      "Summary"
@@ -19,6 +21,20 @@ en:
   5d:           "5 days"
   1w:           "a week"
   save:         "save"
+  cancel:       "cancel"
   time:
     formats:
       short: "%Y/%m/%d"
+      hm: "%H:%M"
+  date:
+    day:
+      day_names:
+        - Monday
+        - Tuesday
+        - Wednesday
+        - Thursday
+        - Friday
+        - Saturday
+        - Sunday
+    formats:
+      short: "%Y/%m/%d"

data/lib/kalindar/public/kalindar.css

@@ -1,46 +1,56 @@
+#main a{
+  font-size: smaller;
+}
+.dayname {
+  font-size: larger;
+  margin: 0 0 0 0;
+  padding: 0 0 0 0;
+  border-bottom: solid 1px black;
+}
 ul.day_list {
   list-style: none;
-  border-top: solid 1px;
-  border-left: solid 1px;
-  border-right: solid 1px;
-  background-color: #FEEEFE;
   padding-left: 0em;
   margin-left: 0.3em;
   width: 18em;
+  margin-top: 0.1em;
+  margin-bottom: 0.1em;
 }
 
 li.day {
   border-top: solid 1px;
+  border-bottom: solid 1px;
   border-left: solid 1px;
-  background-color: #EEEEEE;
+  border-right: solid 1px;
+  background-color: #F4F4F4;
+  margin-bottom: 0.5em;
 }
 
 li.saturday {
   border-top: solid 1px;
-  border-left: solid 1px;
+  border-bottom: solid 1px;
   background-color: #DADAEE;
+  margin-bottom: 1em;
 }
 
 li.sunday {
   border-top: solid 1px;
-  border-left: solid 1px;
+  border-bottom: solid 1px;
   background-color: #BBBBEE;
+  margin-bottom: 3em;
 }
 
 ul.event_list {
   list-style: none;
-  border-top: solid 1px;
-  border-bottom: solid 1px;
   background-color: #FEFEFE;
-  margin-left: 0.5em;
   padding-left: 0.5em;
-  padding-right: 0em;
+  padding-right: 0.5em;
   padding-top: 0em;
   padding-bottom: 0em;
+  margin-top: 0.1em;
+  margin-bottom: 0.1em;
 }
 
 ul.event_list li {
-  border-bottom: solid 1px;
   margin-left: 0.1em;
   clear: both;
 }
@@ -51,11 +61,15 @@ ul.event_list li {
 
 #time {
   float: left;
+  font-size: smaller;
+  /*
   width: 6.8em;
+  */
 }
 
 #summary {
   font-weight: bold;
+  text-align: center;
 }
 
 .hidden_new_event_mask {
@@ -68,3 +82,7 @@ ul.event_list li {
   margin-left: 0.5em;
   font-size: 80%;
 }
+
+#edit_event_link {
+  margin-left: 1em;
+}

data/lib/kalindar/public/kalindar.js

@@ -1,7 +1,7 @@
 "a#new_event_link".onClick(function () {
   console.log(this);
   //$('hidden_new_event_mask').fade();
-  this.parent().parent().first('.hidden_new_event_mask').fade();
+  this.parent().first('.hidden_new_event_mask').fade();
   // Do not follow link.
   return false;
 });
@@ -10,3 +10,28 @@
   console.log(this.parent());
   this.first("#hidden_description").fade();
 });
+
+"#cancel".onClick(function() {
+  this.parent.parent().fade();
+});
+
+"#show_new_event_link".onClick(function() {
+  console.log(this.parent().first('#day_hidden_input').value());
+  day = this.parent().first('#day_hidden_input').value();
+  this.parent().first('.new_event_mask').load('/event/new/' + day);
+  this.parent().first('.new_event_mask').fade();
+  return false;
+});
+
+"#new_event_form".onSubmit(function(event) {
+  event.stop();
+  var me = this;
+  this.send({
+    /*onComplete: function() {alert("complete");}*/
+    onSuccess: function(resp) {
+      console.log(resp);
+      $('main').html(resp.responseText);
+    },
+    onFailure: function(resp) {alert(resp.responseText);},
+  });
+});

data/lib/kalindar/version.rb

@@ -1,3 +1,3 @@
 module Kalindar
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/lib/kalindar/views/edit_event.slim

@@ -0,0 +1,37 @@
+form.pure-form.pure-form-stacked action="/event/edit/#{event.uid}" method="post"
+  input type="hidden" name="_method" value="put"
+  input type="hidden" name="uid" value=event.uid
+
+  fieldset
+    legend = t 'edit_event'
+
+    label for="start_day" = t 'start_date'
+    input type="text" readonly=true name="start_day" value="#{l event.start_time, :format => :short}" 
+
+    label for="start_time" = t 'when'
+    input type="text" name="start_time" placeholder="HH:MM" value="#{l event.start_time, :format => :hm}"
+
+    label for="start" = t 'summary'
+    input type="text" name="summary" placeholder="summary" value=event.summary
+
+    label for="location" = t 'location'
+    input type="text" name="location" placeholder="place" value=event.location
+
+    label for="description" = t 'description'
+    textarea name="description" rows=3 width=40
+      = event.description
+
+    label for="duration" = t 'duration'
+    select name="duration"
+      option value="15m"   = t '15m'
+      option value="30m"   = t '30m'
+      option value="60m"   = t '60m'
+      option value="90m"   = t '90m'
+      option value="120m"  = t '120m'
+      option value="whole" = t 'whole_day'
+      option value="1d"    = t '1d'
+      option value="2d"    = t '2d'
+      option value="5d"    = t '5d'
+      option value="1w"    = t '1w'
+    button.pure-button type="submit" value="save" = t 'save'
+    button.pure-button type="submit" value="cancel" = t 'cancel'

data/lib/kalindar/views/event_list.slim

@@ -1,10 +1,11 @@
 ul.day_list
   - @events.each do |day, evs|
     li class=li_day_class(day)
-      center
-        | #{l day, :format => :short}
-        br
-        a#new_event_link href="/event/new/#{day.strftime('%Y%m%d')}" #{t 'create_event'}
+      .dayname
+        | #{t(:"date.day.day_names")[day.wday-1]} #{l day, :format => :short}
+      input#day_hidden_input type="hidden" name="day" value="#{day.strftime('%Y%m%d')}"
+      a#show_new_event_link href="/event/new/#{day.strftime('%Y%m%d')}" #{t 'create_event'}
+      .new_event_mask style="display: none;"
       .hidden_new_event_mask
         == slim :new_event, :layout => false, :locals => {'start_date' => day.strftime("%Y%m%d")}
       ul.event_list
@@ -13,11 +14,16 @@ ul.day_list
             #event
               #time
                 | #{ev.time_f day}
+                - if ev.location && !ev.location.empty?
+                  |  [#{ev.location}]
+              br
               #summary
-                | #{ev.summary}
-              - if ev.location
-                | [#{ev.location}]
+              | #{ev.summary}
+              a#edit_event_link href="/event/edit/#{ev.uid}" = t 'edit'
               #hidden_description
                 | (#{ev.from_to_f})
                 br
                 | #{ev.description}
+            hr(width="20%")
+#nav
+

data/lib/kalindar/views/layout.slim

@@ -9,4 +9,5 @@ html
     link   type="text/css" rel="stylesheet" href="/kalindar.css"
     link   type="text/css" rel="stylesheet" href="/pure.css"
   body
-    ==yield
+    #main
+      ==yield

data/lib/kalindar/views/new_event.slim

@@ -1,4 +1,4 @@
-form.pure-form.pure-form-stacked action="/event" method="post"
+form.pure-form.pure-form-stacked#new_event_form action="/event" method="post"
   input type="hidden" name="_method" value="put"
   fieldset
     legend = t 'new_event'
@@ -8,7 +8,7 @@ form.pure-form.pure-form-stacked action="/event" method="post"
       input type="text" readonly=true name="start_day" value="#{start_date}" 
     - else
       label for="start_day" = t 'start_date'
-      input type="text" name="start_day" value="" placeholder="YYYYMMDD")
+      input type="text" name="start_day" value=event.start_date placeholder="YYYYMMDD")
   
     label for="start_time" = t 'when'
     input type="text" name="start_time" value="" placeholder="HH:MM"
@@ -35,3 +35,4 @@ form.pure-form.pure-form-stacked action="/event" method="post"
       option value="5d"    = t '5d'
       option value="1w"    = t '1w'
     button.pure-button type="submit" value="save" = t 'save'
+    button.pure-button#cancel type="submit" value="save" = t 'cancel'

data/spec/kalindar_spec.rb

@@ -7,80 +7,144 @@ describe Kalindar do
 end
 
 describe EventCalendar do
-  it 'parses an ics file' do
-    cal = EventCalendar.new 'spec/testcal.ics'
-  end
+  subject { EventCalendar.new 'spec/testcal.ics' }
 
-  it 'initializes alternatively with a list of ics files' do
-    cal = EventCalendar.new ['spec/testcal.ics', 'spec/testcal2.ics']
-    expect(cal.calendars.length).to eql 2
+  describe "#new" do
+    it 'parses an ics file' do
+      cal = EventCalendar.new 'spec/testcal.ics'
+    end
+    it 'initializes alternatively with a list of ics files' do
+      cal = EventCalendar.new ['spec/testcal.ics', 'spec/testcal2.ics']
+      expect(cal.calendars.length).to eql 2
+    end
   end
 
   it 'exposes filename of parsed calendar' do
     cal = EventCalendar.new ['spec/testcal.ics', 'spec/testcal2.ics']
-    expect(cal.filename_of cal.calendars.first).to eql 'spec/testcal.ics'
+    expect(cal.calendars.first.filename).to eql 'spec/testcal.ics'
   end
 
-  it 'finds events given date' do
-    cal = EventCalendar.new 'spec/testcal.ics'
-    events = cal.find_events (Date.new(2014, 07, 27))
-    event_names = events.map(&:summary)
-    expect(event_names.include? "onehour").to eq true
-    expect(event_names.include? "allday").to eq true
+  describe "#find_events" do
+    it 'finds events given date' do
+      events = subject.find_events (Date.new(2014, 07, 27))
+      event_names = events.map(&:summary)
+      expect(event_names.include? "onehour").to eq true
+      expect(event_names.include? "allday").to eq true
+    end
+    it 'handles whole day endtime correctly (ends next day)' do
+      events = subject.find_events (Date.new(2014, 07, 28))
+      event_names = events.map(&:summary)
+      expect(event_names.include? "allday").to eq false
+    end
+    it 'finds multiday events that cover the given date' do
+      events = subject.find_events (Date.new(2014, 07, 27))
+      expect(events.map(&:summary).include? "multidays").to eq true
+    end
+    it 'wraps events as Event delegates' do
+      events = subject.find_events (Date.new(2014, 07, 27))
+      events.each do |event|
+        expect(event.is_a? Event).to eq true
+      end
+    end
   end
 
   it 'finds events that reocur' do
-    cal = EventCalendar.new 'spec/testcal.ics'
-    events = cal.find_events (Date.new(2014, 07, 27))
+    events = subject.find_events (Date.new(2014, 07, 27))
     event_names = events.map(&:summary)
     expect(event_names.include? "daily").to eq true
   end
 
-  it '#events_in' do
-    cal = EventCalendar.new 'spec/testcal.ics'
-    events = cal.events_in(Date.new(2014, 07, 27), Date.new(2014, 07, 28))
-    event_names = events.map(&:summary)
-    expect(event_names).to eq ["allday", "onehour", "daily", "allday", "daily"]
+  describe "#events_in" do
+    it 'accesses events between two dates' do
+      events = subject.events_in(Date.new(2014, 07, 27), Date.new(2014, 07, 28))
+      event_names = events.map(&:summary)
+      expect(event_names).to eq ["allday", "onehour", "daily", "daily"]
+    end
+  end
+
+  describe "#events_in" do
+    it '#events_in by day' do
+      events = subject.events_in(Date.new(2014, 7, 27), Date.new(2014, 7, 28))
+      event_names = events.map(&:summary)
+      expect(event_names).to eq ["allday", "onehour", "daily", "allday", "daily"]
+      expect(event_names.class).to eq({}.class)
+    end
+    it 'wraps in Event Delegate' do
+      events = subject.events_in(Date.new(2014, 7, 27), Date.new(2014, 7, 28))
+      expect(events.collect{|e| e.is_a? Event}.length).to eq events.length
+    end
+  end
+
+  describe "#find_by_uid" do
+    it 'finds by uuid' do
+      event = subject.find_by_uid 'cb523dc2-eab8-49c9-a99f-ed69ac3b65d0'
+      expect(event.summary).to eq 'allday'
+    end
+    it 'wraps in Event Delegate' do
+      event = subject.find_by_uid 'cb523dc2-eab8-49c9-a99f-ed69ac3b65d0'
+      expect(event.is_a? Event).to eq true
+    end
   end
+end
 
-  it '#events_in by day' do
+describe "Event" do
+  subject(:allday_event) {}
+  subject(:events) {
     cal = EventCalendar.new 'spec/testcal.ics'
-    events = cal.events_in(Date.new(2014, 7, 27), Date.new(2014, 7, 28))
-    event_names = events.map(&:summary)
-    expect(event_names).to eq ["allday", "onehour", "daily", "allday", "daily"]
-    expect(event_names.class).to eq({}.class)
+    cal.events_in(Date.new(2014, 8, 27), Date.new(2014, 8, 28))
+  }
+  subject(:allday_event) {
+    cal = EventCalendar.new 'spec/testcal.ics'
+    cal.find_by_uid("cb523dc2-eab8-49c9-a99f-ed69ac3b65d0")
+  }
+  subject(:multiday_event) {
+    cal = EventCalendar.new 'spec/testcal.ics'
+    cal.find_by_uid("4a129461-cd74-4b3a-a307-faa1e8846cc2")
+  }
+
+  describe "#start_time_f" do
+    it "returns the time if given day is start day" do
+      expect(events[0].start_time_f Date.new(2014, 8, 27)).to eq "12:00"
+      expect(events[0].start_time_f Date.new(2014, 8, 28)).to eq "..."
+    end
   end
 
-  describe "Event" do
-    describe "#start_time_f" do
-      it "returns the time if given day is start day" do
-        cal = EventCalendar.new 'spec/testcal.ics'
-        events = cal.events_in(Date.new(2014, 8, 27), Date.new(2014, 8, 28))
-        expect(Event.new(events[0]).start_time_f Date.new(2014, 8, 27)).to eq "12:00"
-        expect(Event.new(events[0]).start_time_f Date.new(2014, 8, 28)).to eq ""
-      end
+  describe "#finish_time_f" do
+    it "returns the time if given day is end day" do
+      expect(events[0].finish_time_f Date.new(2014, 8, 27)).to eq "..."
+      expect(events[0].finish_time_f Date.new(2014, 8, 28)).to eq "13:00"
     end
-    describe "#finish_time_f" do
-      it "returns the time if given day is end day" do
-        cal = EventCalendar.new 'spec/testcal.ics'
-        events = cal.events_in(Date.new(2014, 8, 27), Date.new(2014, 8, 28))
-        expect(Event.new(events[0]).finish_time_f Date.new(2014, 8, 27)).to eq ""
-        expect(Event.new(events[0]).finish_time_f Date.new(2014, 8, 28)).to eq "13:00"
-      end
+  end
+
+  describe "#time_f" do
+    it "returns the from to time for given day" do
+      expect(allday_event.time_f Date.new(2014, 7, 27)).to eq ""
     end
-    describe "#time_f" do
-      it "returns the from to time for given day" do
-        cal = EventCalendar.new 'spec/testcal.ics'
-        events = cal.events_in(Date.new(2014, 8, 27), Date.new(2014, 8, 28))
-        expect(Event.new(events[0]).time_f Date.new(2014, 8, 27)).to eq "12:00 - "
-      end
+    it "renders multiday in between with ... " do
+      expect(multiday_event.time_f Date.new(2014, 7, 27)).to eq "..."
     end
-    describe "#time_f" do
-      it "returns the from to time" do
-        cal = EventCalendar.new 'spec/testcal.ics'
-        events = cal.events_in(Date.new(2014, 8, 27), Date.new(2014, 8, 28))
-        expect(Event.new(events[0]).from_to_f).to eq "27.08. 12:00 - 28.08. 13:00"
-      end
+  end
+  describe "#from_to_f" do
+    it "returns the from to time" do
+      expect(events[0].from_to_f).to eq "27.08. 12:00 - 28.08. 13:00"
+    end
+  end
+
+  describe "#update" do
+    it "updates from params" do
+      # should be fail safe, too
+      cal = EventCalendar.new 'spec/testcal.ics'
+      event = cal.find_by_uid("aea8d217-8025-4d9b-88e6-3df9e6abd33c")
+
+      params = {'location' => 'a place', 'description' => 'exact description', 'summary'=> 'synopsis', 'duration' => '15m', 'start_day' => '20140808', 'start_time' => '10:10'}
+      event.update params
+
+      event_fetched = cal.find_by_uid("aea8d217-8025-4d9b-88e6-3df9e6abd33c")
+      expect(event_fetched.location).to eql 'a place'
+      expect(event_fetched.description).to eql 'exact description'
+      expect(event_fetched.summary).to eql 'synopsis'
+      expect(event_fetched.dtstart).to eq DateTime.new(2014, 8, 8, 10, 10)
+      expect(event_fetched.dtend).to eq DateTime.new(2014, 8, 8, 10, 25)
     end
   end
 end

data/spec/testcal.ics

@@ -51,6 +51,17 @@ UID:aea8d217-8025-4d9b-88e6-3df9e6abd33c
 SUMMARY:2days
 DTSTART;TZID=Europe/Berlin:20140827T120000
 DTEND;TZID=Europe/Berlin:20140828T130000
+CLASS:PUBLIC
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20140814T060630Z
+LAST-MODIFIED:20140814T060654Z
+DTSTAMP:20140814T060654Z
+UID:4a129461-cd74-4b3a-a307-faa1e8846cc2
+SUMMARY:multidays
+DTSTART;TZID=Europe/Berlin:20140726T090000
+DTEND;TZID=Europe/Berlin:20140729T100000
 TRANSP:OPAQUE
 CLASS:PUBLIC
 END:VEVENT

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kalindar
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Felix Wolfsteller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ri_cal
@@ -119,7 +119,9 @@ files:
 - .rspec
 - .travis.yml
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
+- Procfile
 - README.md
 - Rakefile
 - config.json
@@ -127,6 +129,7 @@ files:
 - kalindar.gemspec
 - lib/kalindar.rb
 - lib/kalindar/app.rb
+- lib/kalindar/calendar.rb
 - lib/kalindar/event.rb
 - lib/kalindar/event_calendar.rb
 - lib/kalindar/locales/de.yml
@@ -140,13 +143,14 @@ files:
 - lib/kalindar/public/right.js
 - lib/kalindar/version.rb
 - lib/kalindar/views/.layout.haml.swp
+- lib/kalindar/views/edit_event.slim
 - lib/kalindar/views/event_list.slim
 - lib/kalindar/views/layout.slim
 - lib/kalindar/views/new_event.slim
 - spec/kalindar_spec.rb
 - spec/spec_helper.rb
 - spec/testcal.ics
-homepage: ''
+homepage: https://github.com/fwolfst/kalindar
 licenses:
 - MIT
 metadata: {}