kalindar 0.2.0 → 0.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODM4YWQ2ZWIxNzE4NjA1NmZlZmY0NDBhM2QwMTQ1ZWNmMzBlNTg2NQ==
+    ZWU3MDYxNDY1NDhmMjQ1MTcxZDgxNDgwNGY4NDcxNDJiYTk3NGM1MQ==
   data.tar.gz: !binary |-
-    Y2E2ZWNiYmI1YmU2NjNkZTdjNzFkZWI4NjEwNTRhNDBiMjBlODdjZA==
+    ZmMzMzNkNmMyOGMyYmEyYWU1MzQyY2EwYmQyZDQyMGQ5MmM1N2UzOA==
 SHA512:
   metadata.gz: !binary |-
-    N2JjZDQ1MWY1Mzk3OWVmODExYjNmMmU2NDEyMTNjNzFlYTFiYzA5YjRlNTQz
-    ODJmMDNiNzViYzNjZWRkNWU4OWYwYThjN2M3NDVmY2Q5YTQzN2VjMzljMmVm
-    OTFkMjg1YWFhZjNiMTZkOTcxNTYyY2Q5YmJjNjQ0OWJmOWZkYTA=
+    MzQ3M2Q5ZTFhZGNhMmExYTkzOTNjZmQ0NWVhMzkxZGY1OTdjZjNkYmNjYTY4
+    NDA1ZmM1YjkwZmVmNDY4ZmYxMzRmN2Y2MTk3NmFlYzVlMmQ1Nzk4NzliOWRj
+    ZjMzMjA3ZDFmNTkzZGM0M2VlZDI4ZjlhMTdkN2IxYTQ2NjZlZTg=
   data.tar.gz: !binary |-
-    MjRkYmNhYjE2YTg2Nzc2MDAyNTUzM2ExYjlhYzRjYmEwZWY5NjM3NTBlODY1
-    M2U2ODVmZDRhNmU4Y2I0NjM3Y2VlZDdmNWVmNzc4Njk2ZjJiMTRmMDllOWIz
-    M2JlZjk4ZDI1OTk4ZTE5ZDNhNWJlYjI4YmI5OWJlMjFjOTA4ZTg=
+    ZWI4OWM2NTZkNDY4YWQyZjk0OWU5ZGJkYjFkOGVjNTc0NTUzYjM5ODVkNzli
+    MzlkMjZlMzM0OGM2NDNhYzZjMDNiYjA5MmJjYmY4MjA3OWM1MDM1NjNkODVl
+    NTI3ZGI3MjQwMzgzMzQxZjIzOGU0NjZmZjY1MzRlYjJkNjQ0YWY=

data/README.md

@@ -4,6 +4,8 @@ Kalindar lets you view ics files via a webbrowser.
 
 It employs the ri_cal, sinatra, i18n ruby gems, the rightjs JavaScript framework and the Pure CSS framework.
 
+It shows recuring events and reloads on ics file changes.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -32,7 +34,7 @@ Be careful.  Kalindar might destroy, change or delete your ics file(s)!
 
 Kalindar does not care about timezones!
 
-Kalindar gets confused by re-occuring events!
+Kalindar gets confused by re-occuring events, they are shown, but better do not modify.
 
 ### Configuration
 

data/lib/kalindar.rb

@@ -1,4 +1,5 @@
 require "kalindar/version"
+require 'kalindar/timespan'
 require 'kalindar/event'
 require 'kalindar/calendar'
 require 'kalindar/event_calendar'

data/lib/kalindar/app.rb

@@ -7,16 +7,17 @@ require 'i18n'
 require 'i18n/backend/fallbacks'
 require 'listen'
 
+# Read in calendar files, fill global cal var.
+def cals
+  EventCalendar.new($conf['calendar_files'])
+end
+
+
 # Sinatra App for Kalindar, show ics files.
 class KalindarApp < Sinatra::Base
   $conf = JSON.load(File.new('config.json'))
 
-  # Read in calendar files, fill global cal var.
-  def load_global_cal
-    $cal = EventCalendar.new($conf['calendar_files'])
-  end
-
-  load_global_cal
+  $cal = cals
 
   configure do
     I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
@@ -29,7 +30,7 @@ class KalindarApp < Sinatra::Base
       path = Pathname.new(file).realpath
       dir  = path.dirname.to_s
       base = path.basename.to_s
-      listener = Listen.to(dir, only: /#{base}/) { load_global_cal }
+      listener = Listen.to(dir, only: /#{base}/) { $cal = cals }
       listener.start
     end
   end
@@ -62,37 +63,39 @@ class KalindarApp < Sinatra::Base
   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)
+
+    @events = $cal.events_in(date, date + 30)
+
+    # Pre-fill hash
     (date .. date + 30).each do |day|
-      #@events[d] = $cal.events_for(d)
-      @events[day] = $cal.find_events day.to_date
+      @events[day] ||= []
     end
+
     slim :event_list
   end
 
   get '/events' do
-    @events = {}
-    # events from today to in 30 days
+    # Events from today to in 30 days
+    @events = $cal.events_in(DateTime.now, DateTime.now + 30)
+
+    # Pre-fill hash
     (DateTime.now .. DateTime.now + 30).each do |day|
-      #@events[d] = $cal.events_for(d)
-      @events[day] = $cal.find_events day.to_date
+      @events[day] ||= []
     end
+
     slim :event_list
   end
 
   get '/events/twoday' do
-    @events = {}
     # events from today to in 30 days
-    (DateTime.now .. DateTime.now + 2).each do |day|
-      #@events[d] = $cal.events_for(d)
-      @events[day] = $cal.find_events day.to_date
-    end
+    @events[day] = $cal.events_in DateTime.now, DateTime.now + 2
     
     #@events = @events.values.flatten.sort_by {|e| e.start_time}
     @today = Date.today
     @tomorrow = @today + 1
+
     slim :twoday_list
   end
 

data/lib/kalindar/event.rb

@@ -1,110 +1,112 @@
 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}"
-    if dtstart.class == Date
-      # whole day
-      ""
-    elsif start_time.to_date == day.to_date
-      start_time.strftime('%H:%M')
-    else
-      "..."
+module Kalindar
+  # 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}"
+      if dtstart.class == Date
+        # whole day
+        ""
+      elsif start_time.to_date == day.to_date
+        start_time.strftime('%H:%M')
+      else
+        "..."
+      end
     end
-  end
-
-  # Time it finishes at day, or '...'
-  def finish_time_f day
-    if dtend.class == Date
-      # whole day
-      ""
-    elsif finish_time.to_date == day.to_date
-      finish_time.strftime('%H:%M')
-    else
-      return "..."
+  
+    # Time it finishes at day, or '...'
+    def finish_time_f day
+      if dtend.class == Date
+        # whole day
+        ""
+      elsif finish_time.to_date == day.to_date
+        finish_time.strftime('%H:%M')
+      else
+        return "..."
+      end
     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 == ""
-      # whole day
-      ""
-    elsif start == finish && start == "..."
-      "..."
-    else
-      "#{start_time_f day} - #{finish_time_f day}"
+  
+    # 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 == ""
+        # whole day
+        ""
+      elsif start == finish && start == "..."
+        "..."
+      else
+        "#{start_time_f day} - #{finish_time_f day}"
+      end
     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
+  
+    # 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
-
-    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]
+  
+    # 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)
-      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']
+  
+    def self.start_date_from params
+      Date.parse(params['start_day'])
     end
-    if params['description']
-      event.description = params['description']
+  
+  
+    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
-    if params['location']
-      event.location = params['location']
+  
+    # 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
-
-    # 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
+  
+    private
   end
-
-  private
 end
 
 module EventParamHelper

data/lib/kalindar/event_calendar.rb

@@ -43,61 +43,53 @@ class EventCalendar
     end.flatten
   end
 
-  def events_for_date date
-    events = @calendars.map &:events
-    events.select {|event| event_includes? event, date}.flatten
-    events.map {|event|
-      Event.new event
-    }
-  end
-
-  # Nother optimization potential
-  def events_per_day start_date, end_date
-    map = {}
-    (start_date .. end_date).each do |day|
-      (map[day] ||= []) << find_events(day)
+  # start_date and end_date are inclusive,
+  # start_date can be Timespan, too
+  def events_in start_date, end_date=nil
+    if end_date.nil? && !start_date.is_a?(Timespan)
+      timespan = Timespan.day_end start_date
+      end_date = timespan.finish
+      start_date = timespan.start
+    end
+    if start_date.is_a? Timespan
+      timespan = start_date
+      end_date = start_date.finish
+      start_date = start_date.start
     end
-    map
-  end
 
-  # Best optimization potential
-  def events_in start_date, end_date
-    events = []
-    (start_date .. end_date).each do |day|
-      events << find_events(day)
+    # All overlapping occurences.
+    occurrences = events.map do |e|
+      e.occurrences(:overlapping => [start_date, end_date])
     end
-    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|
-        # 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?
+    # Collect occurences by date.
+    hash = occurrences.inject({}) do |hsh, o|
+      o.each do |oc|
+        event = Kalindar::Event.new(oc)
+        (oc.dtstart.to_date .. oc.dtend.to_date).each do |day|
+          # Strip timerange and exclude one-and-whole-day events (they "end" next day).
+          if day >= start_date && day <= end_date && !(oc.dtstart != oc.dtend && oc.dtend.class == Date && oc.dtend == day)
+            (hsh[day] ||= []) << event
+          end
         end
-      }
-    end.flatten.map do |event|
-      Event.new event
+      end
+      hsh
     end
-    # check flat_map enumerable method
+    hash
   end
 
   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
+      return Kalindar::Event.new(event) if event.uid == uuid
     end
     nil
   end
 
+  def events
+    @calendars.map(&:events).flatten
+  end
+
   private
 
   def dtmonth_start year, month
@@ -124,5 +116,3 @@ class EventCalendar
     incl
   end
 end
-
-

data/lib/kalindar/public/kalindar.js

@@ -37,3 +37,9 @@
     onFailure: function(resp) {alert(resp.responseText);},
   });
 });
+
+/* Refresh every 5 minutes. */
+var refresh = function () {
+  location.reload();
+}
+refresh.periodical(1000 * 60 * 5);

data/lib/kalindar/timespan.rb

@@ -0,0 +1,22 @@
+require 'time'
+
+class Timespan
+  attr_accessor :start
+  attr_accessor :finish
+  def initialize start, finish
+    @start = start
+    @finish = finish
+  end
+
+  def self.from_day date
+    start = DateTime.new date.year, date.month, date.day, 0, 0
+    finish = DateTime.new date.year, date.month, date.day, 23, 59
+    Timsepan.new start, finish
+  end
+
+  # Return Timespan from start to end of start (day).
+  def self.day_end start
+    finish = DateTime.new start.year, start.month, start.day, 23, 59
+    Timespan.new start, finish
+  end
+end

data/lib/kalindar/version.rb

@@ -1,3 +1,3 @@
 module Kalindar
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/kalindar_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'ri_cal'
 
 describe Kalindar do
   it 'has a version number' do
@@ -24,52 +25,50 @@ describe EventCalendar do
     expect(cal.calendars.first.filename).to eql 'spec/testcal.ics'
   end
 
-  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
+
+  endjuly = Timespan.new(Date.new(2014, 07, 27), Date.new(2014, 07, 28)).freeze
+
+  latejuly = Date.new(2014, 07, 27).freeze
+
+  describe "#events_in" do
+    it 'finds recurring events' do
+      events = subject.events_in (Date.new(2014, 07, 28))
+      event_names = events.values.flatten.map(&:summary)
+      expect(event_names.include? "daily").to eq true
+    end
+    it 'finds multiday events that cover the given date' do
+      events = subject.events_in latejuly
+      expect(events.values.flatten.map(&:summary).include? "multidays").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)
+      events = subject.events_in (Date.new(2014, 07, 28))
+      event_names = events.values.flatten.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
+    it 'finds events given date (like find_events_simple)' do
+      events = subject.events_in latejuly
+      event_names = events.values.flatten.map(&:summary)
+      expect(event_names.include? "onehour").to eq true
+      expect(event_names.include? "allday").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
+    it 'finds normal recuring event.' do
+      events = subject.events_in (Date.new(2014, 07, 27))
+      expect(events.values.flatten.map(&:summary).include? "daily").to eq true
     end
-  end
-
-  it 'finds events that reocur' do
-    events = subject.find_events (Date.new(2014, 07, 27))
-    event_names = events.map(&:summary)
-    expect(event_names.include? "daily").to eq true
-  end
-
-  describe "#events_in" do
+    # multiday events should come up multiple times!
     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"]
+      events = subject.events_in endjuly
+      event_names = events.values.flatten.map(&:summary)
+      expect(event_names).to eq ["allday", "onehour", "multidays", "daily", "multidays", "daily"]
     end
     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)
+      events = subject.events_in endjuly
+      # And they come in a hash
+      expect(events.class).to eq({}.class)
     end
-    # multiday events!
     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
+      events = subject.events_in endjuly
+      expect(events.values.flatten.collect{|e| e.is_a? Kalindar::Event}.length).to eq events.values.flatten.length
     end
   end
 
@@ -80,16 +79,17 @@ describe EventCalendar do
     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
+      expect(event.is_a? Kalindar::Event).to eq true
     end
   end
 end
 
 describe "Event" do
   subject(:allday_event) {}
+  # This tests the calendar, not the event class
   subject(:events) {
     cal = EventCalendar.new 'spec/testcal.ics'
-    cal.events_in(Date.new(2014, 8, 27), Date.new(2014, 8, 28))
+    cal.events_in(Date.new(2014, 8, 27), Date.new(2014, 8, 28)).values.first
   }
   subject(:allday_event) {
     cal = EventCalendar.new 'spec/testcal.ics'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kalindar
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Felix Wolfsteller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ri_cal
@@ -155,6 +155,7 @@ files:
 - lib/kalindar/public/right-calendar.js
 - lib/kalindar/public/right-dialog.js
 - lib/kalindar/public/right.js
+- lib/kalindar/timespan.rb
 - lib/kalindar/version.rb
 - lib/kalindar/views/.layout.haml.swp
 - lib/kalindar/views/edit_event.slim