kalindar 0.2.1 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWU3MDYxNDY1NDhmMjQ1MTcxZDgxNDgwNGY4NDcxNDJiYTk3NGM1MQ==
+    YWY4OWRmOTQ0N2YwYWQzM2U1YjMwYjQ0NGY0Y2FlYjE5MTk4Yjg2NQ==
   data.tar.gz: !binary |-
-    ZmMzMzNkNmMyOGMyYmEyYWU1MzQyY2EwYmQyZDQyMGQ5MmM1N2UzOA==
+    MjJhYzQwYTA5MDUxYzU5NGVkM2FkM2NkZjBlMDQ2YzhjNjZiMjk1Yg==
 SHA512:
   metadata.gz: !binary |-
-    MzQ3M2Q5ZTFhZGNhMmExYTkzOTNjZmQ0NWVhMzkxZGY1OTdjZjNkYmNjYTY4
-    NDA1ZmM1YjkwZmVmNDY4ZmYxMzRmN2Y2MTk3NmFlYzVlMmQ1Nzk4NzliOWRj
-    ZjMzMjA3ZDFmNTkzZGM0M2VlZDI4ZjlhMTdkN2IxYTQ2NjZlZTg=
+    ODdiMTExNTk1YzQyOTM3MTQ1ZWNjOTM5MmZlMDg1MDZjMjU3M2Y0ZGY4MWE4
+    ZmE1NTY2OGRkMjNkNWJhOGFiOTQ4NjQ5ZjdlNjJjNjc4NDk3NzYxZWEwNWYz
+    OWNjNjNkYjBjMjdjNjA1YTIwYzJhNTQ2ODY5MDZlZDgzNjMzM2Q=
   data.tar.gz: !binary |-
-    ZWI4OWM2NTZkNDY4YWQyZjk0OWU5ZGJkYjFkOGVjNTc0NTUzYjM5ODVkNzli
-    MzlkMjZlMzM0OGM2NDNhYzZjMDNiYjA5MmJjYmY4MjA3OWM1MDM1NjNkODVl
-    NTI3ZGI3MjQwMzgzMzQxZjIzOGU0NjZmZjY1MzRlYjJkNjQ0YWY=
+    Zjk0OWE5YjlhNmJjNzU4YzNhOTM0M2E0OTZkMjViMjYxYTUwZDIzNDg1MTAx
+    MTgzZDY5NmU5NTA1NTgzZjNkY2E3OWE1MWM1NDUyMTRiM2E2Nzg3YzliNGE4
+    ZDU4MDRlZmNhY2RkNGYxZmNmM2ViZWQ2NDI2YjQ3ZTU0MmFmNGQ=

data/README.md

@@ -6,6 +6,8 @@ It employs the ri_cal, sinatra, i18n ruby gems, the rightjs JavaScript framework
 
 It shows recuring events and reloads on ics file changes.
 
+Contact me if you need help!
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -34,11 +36,11 @@ 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, they are shown, but better do not modify.
+Kalindar does not let you edit recuring events.
 
 ### Configuration
 
-Configuration is done in config.json .  There one or many calendar (ics) files and the locale can be set.
+Configuration is done in config.json .  There one or many calendar (ics) files and the locale can be set.  Note that only the first calendar defined here can be edited.
 
 ## Contributing
 

data/lib/kalindar/app.rb

@@ -58,6 +58,15 @@ class KalindarApp < Sinatra::Base
     end
   end
 
+  # Add empty list for each day in date to date + number_days,
+  # if no value set for given key
+  def register_days hash, date, number_days
+    (date.to_date .. (date.to_date + number_days)).each do |day|
+      hash[day] ||= []
+    end
+    hash
+  end
+
   get '/' do
     redirect '/events'
   end
@@ -68,29 +77,23 @@ class KalindarApp < Sinatra::Base
 
     @events = $cal.events_in(date, date + 30)
 
-    # Pre-fill hash
-    (date .. date + 30).each do |day|
-      @events[day] ||= []
-    end
+    register_days @events, date, 30
 
     slim :event_list
   end
 
   get '/events' do
     # Events from today to in 30 days
-    @events = $cal.events_in(DateTime.now, DateTime.now + 30)
+    @events = $cal.events_in(Date.today, Date.today + 30)
 
-    # Pre-fill hash
-    (DateTime.now .. DateTime.now + 30).each do |day|
-      @events[day] ||= []
-    end
+    register_days @events, Date.today, 30
 
     slim :event_list
   end
 
   get '/events/twoday' do
     # events from today to in 30 days
-    @events[day] = $cal.events_in DateTime.now, DateTime.now + 2
+    @events[day] = $cal.events_in Date.today, Date.today + 2
     
     #@events = @events.values.flatten.sort_by {|e| e.start_time}
     @today = Date.today
@@ -106,7 +109,7 @@ class KalindarApp < Sinatra::Base
       slim :new_event, :locals => {'start_date' => Date.parse(params[:start_day])}
     end
     begin
-      event = Event.create_from_params params
+      event = Kalindar::Event.create_from_params params
     rescue Exception => e
       puts e.inspect
       puts e.backtrace
@@ -117,11 +120,12 @@ class KalindarApp < Sinatra::Base
     $cal.calendars.first.write_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
+      date = Date.today
+      @events = $cal.events_in date, date + 30
+
+      register_days @events, date, 30
+
       slim :event_list, :layout => false
     else
       redirect '/'
@@ -132,7 +136,7 @@ class KalindarApp < Sinatra::Base
   get '/event/new/:day' do
     # 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 = Kalindar::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
@@ -154,6 +158,9 @@ class KalindarApp < Sinatra::Base
 
   # Edit/save an event.
   put '/event/edit/:uuid' do
+
+    # TODO: Make sure this is not an recuring event or in a not modifiable calendar.
+
     # validate_params
     if params[:submitbutton] == 'cancel'
       redirect '/'
@@ -167,13 +174,12 @@ class KalindarApp < Sinatra::Base
 
   post '/events/full' do
     params[:calendars]
-    @events = {}
     # events from today to in 30 days
-    (DateTime.now .. DateTime.now + 30).each do |day|
-      #@events[d] = $cal.events_for(d)
-      # bring chosen calendars into equation
-      @events[day] = $cal.find_events day.to_date
-    end
+    date = Date.today
+    @events = $cal.events_in date .. date + 30
+
+    register_days @events, date, 30
+
     slim :event_list
   end
 end

data/lib/kalindar/event.rb

@@ -3,6 +3,19 @@ require 'delegate'
 module Kalindar
   # Delegator with some handy shortcuts
   class Event < SimpleDelegator
+
+    attr_accessor :calendar
+    attr_accessor :modifiable
+    
+    def recurs?
+      !recurrence_id.nil?
+    end
+
+    # is modifiable? if recuring event, its not
+    def modifiable?
+      @modifiable == true && !recurs?
+    end
+
     # Time it starts at day, or '...'
     def start_time_f day
       #puts "start #{start_time} : #{start_time.class} #{start_time.to_date} #{day}"

data/lib/kalindar/event_calendar.rb

@@ -34,48 +34,37 @@ class EventCalendar
     @calendars.flatten!
   end
 
-  # Catches only certain events
-  def singular_events_for_month year, month
-    @calendar.map do |calendar|
-      calendar.events.select { |event|
-        event_between? event, dtmonth_start(year, month), dtmonth_end(year, month)
-      }
-    end.flatten
-  end
-
+  # Find events during date(s)/timespan.
   # 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
-
-    # All overlapping occurences.
-    occurrences = events.map do |e|
-      e.occurrences(:overlapping => [start_date, end_date])
+    if start_date && end_date
+      timespan = Timespan.new start_date, end_date
     end
 
-    # 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
+    events_in_time = @calendars.map.with_index do |calendar, idx|
+      # Collect Kalindar::Events in that time
+      events = calendar.events.map do |event|
+        occurrences_in(event, timespan).map {|e| Kalindar::Event.new e }
+      end.flatten
+
+      # Set modification and calendar field.
+      is_first = idx == 0
+      events.each do |e|
+        e.modifiable = is_first
+        e.calendar = calendar
       end
-      hsh
-    end
-    hash
+      events
+    end.flatten
+
+    # Collect occurences by date.
+    unfold_dates events_in_time, timespan
   end
 
   def find_by_uid uuid
@@ -115,4 +104,21 @@ class EventCalendar
     incl = event.dtstart.class == event.dtend.class && event.dtstart.class ==  Icalendar::Values::DateTime && (date_between?(date, event.dtstart, event.dtend))
     incl
   end
+
+  # List occurrences in timespan
+  def occurrences_in event, timespan
+    event.occurrences(:overlapping => [timespan.start, timespan.finish])
+  end
+
+  # Make hash with one entry per day and event that lies in timespan
+  def unfold_dates events, timespan
+    events.inject({}) do |hash, event|
+      (event.dtstart.to_date .. event.dtend.to_date).each do |day|
+        if timespan.spans?(day) && !(event.dtstart != event.dtend && event.dtend.class == Date && event.dtend == day)
+          (hash[day] ||= []) << event
+        end
+      end
+      hash
+    end
+  end
 end

data/lib/kalindar/public/kalindar.css

@@ -1,22 +1,18 @@
 #main a{
   font-size: smaller;
+  width: 100%;
 }
 .dayname {
   font-size: larger;
   margin: 0 0 0 0;
   padding: 0 0 0 0;
   border-bottom: solid 1px black;
-  background-image: -moz-linear-gradient(
-      center top,
-      rgb(180,180,180) 0%,
-      rgb(220,220,220) 100%
-  );
 }
 ul.day_list {
   list-style: none;
   padding-left: 0em;
   margin-left: 0.3em;
-  width: 18em;
+  width: 100%;
   margin-top: 0.1em;
   margin-bottom: 0.1em;
 }
@@ -28,27 +24,17 @@ li.day {
   border-right: solid 1px;
   background-color: #F4F4F4;
   margin-bottom: 0.5em;
-  background-image: -webkit-gradient(
-      linear,
-      left top,
-      left bottom,
-      color-stop(0.5, rgb(221,221,221)),
-      color-stop(0.5, rgb(255,255,255))
-  );
-  background-image: -moz-linear-gradient(
-      center top,
-      rgb(221,221,221) 50%,
-      rgb(255,255,255) 50%
-  );
-  -moz-box-shadow:    inset 0 0 10px #000000;
-  box-shadow:         inset 0 0 10px #000000;
 }
 
 li.saturday {
   border-top: solid 1px;
   border-bottom: solid 1px;
   background-color: #DADAEE;
-  margin-bottom: 1em;
+  margin-bottom: 0.5em;
+  /*
+  margin-left: 0.5em;    
+  margin-right: 0.5em;      
+  */
 }
 
 li.sunday {
@@ -56,6 +42,10 @@ li.sunday {
   border-bottom: solid 1px;
   background-color: #BBBBEE;
   margin-bottom: 3em;
+  /*
+  margin-left: 0.5em;    
+  margin-right: 0.5em;      
+  */
 }
 
 ul.event_list {
@@ -72,35 +62,29 @@ ul.event_list {
 ul.event_list li {
   margin-left: 0.1em;
   clear: both;
-  background-image: -webkit-gradient(
-      linear,
-      left top,
-      left bottom,
-      color-stop(0.5, rgb(000,221,221)),
-      color-stop(0.5, rgb(255,255,255))
-  );
-  background-image: -moz-linear-gradient(
-      center top,
-      rgb(180,180,180) 0%,
-      rgb(220,220,220) 100%
-  );
 }
 
 #event {
-  margin-left: 0.4em;
+  margin-left: 0.2em;
 }
 
 #time {
   float: left;
   font-size: smaller;
-  /*
-  width: 6.8em;
-  */
+  margin-right: 0.2em;
 }
 
 #summary {
+  margin-left: 0.2em;
   font-weight: bold;
+  font-size: 90%;
+  /*
   text-align: center;
+  */
+}
+
+.new_event_mask {
+  margin-left: 1.5em;      
 }
 
 .hidden_new_event_mask {
@@ -114,6 +98,12 @@ ul.event_list li {
   font-size: 80%;
 }
 
+#show_new_event_link {
+  text-align: left;
+  width: 80%;
+  margin-left: 0.2em;
+}
+
 #edit_event_link {
   margin-left: 1em;
 }

data/lib/kalindar/timespan.rb

@@ -3,11 +3,16 @@ require 'time'
 class Timespan
   attr_accessor :start
   attr_accessor :finish
+
   def initialize start, finish
     @start = start
     @finish = finish
   end
 
+  def spans? date
+    @start <= date && @finish >= date
+  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

data/lib/kalindar/version.rb

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

data/lib/kalindar/views/event_list.slim

@@ -1,29 +1,31 @@
 ul.day_list
-  - @events.each do |day, evs|
+  - @events.keys.sort.each do |day|
+    - evs = @events[day]
     li class=li_day_class(day)
       .dayname
         | #{t(:"date.day.day_names")[day.wday-1]} #{l day, :format => :short}
+        small
+          a#show_new_event_link href="/event/new/#{day.strftime('%Y%m%d')}" #{t 'create_event'}
       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
-        - evs.each do |ev|
+        - evs.sort_by{|e|e.start_time}.each do |ev|
           li#event_day
             #event
               #time
                 | #{ev.time_f day}
                 - if ev.location && !ev.location.empty?
                   |  [#{ev.location}]
-              br
               #summary
-              | #{ev.summary}
-              a#edit_event_link href="/event/edit/#{ev.uid}" = t 'edit'
+                | #{ev.summary}
+                - if ev.modifiable?
+                  a#edit_event_link href="/event/edit/#{ev.uid}" = t 'edit'
               #hidden_description
                 | (#{ev.from_to_f})
                 br
                 | #{ev.description}
-            hr(width="20%")
+            /hr(width="20%")
 #nav
 

data/spec/kalindar_spec.rb

@@ -69,6 +69,8 @@ describe EventCalendar do
     it 'wraps in Event Delegate' do
       events = subject.events_in endjuly
       expect(events.values.flatten.collect{|e| e.is_a? Kalindar::Event}.length).to eq events.values.flatten.length
+      expect(events.values.flatten[0].modifiable?).to eql true
+      expect(events.values.flatten[0].calendar.class).to eql Calendar
     end
   end
 
@@ -99,6 +101,10 @@ describe "Event" do
     cal = EventCalendar.new 'spec/testcal.ics'
     cal.find_by_uid("4a129461-cd74-4b3a-a307-faa1e8846cc2")
   }
+  subject(:daily_event) {
+    cal = EventCalendar.new 'spec/testcal.ics'
+    cal.find_by_uid("d7844d09-75d9-4a8b-a1de-453fe63d6415")
+  }
 
   describe "#start_time_f" do
     it "returns the time if given day is start day" do
@@ -107,6 +113,12 @@ describe "Event" do
     end
   end
 
+  describe "#modifiable?" do
+    it 'makes non-recuring events modifiable' do
+      expect(multiday_event.modifiable?).to eql false
+    end
+  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 "..."
@@ -147,3 +159,12 @@ describe "Event" do
     end
   end
 end
+
+describe Timespan do
+  describe "#spans?" do
+    it 'works with dates' do
+      today = Date.today
+      expect(Timespan.new(today, today + 4).spans? today + 3).to eql true
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kalindar
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Felix Wolfsteller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ri_cal