kalindar 0.1.1 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWYxYTRjNjhkOWMzMTEyMzUxMDQyMzc3ZjEyN2MyNGQ1ZjI2Nzg5Mw==
+    ODM4YWQ2ZWIxNzE4NjA1NmZlZmY0NDBhM2QwMTQ1ZWNmMzBlNTg2NQ==
   data.tar.gz: !binary |-
-    OTUyYTVhMTU2ZWU5MjkwMTYxMzk2YzA4YWQxZjFjNzVlYmVmYTkzNA==
+    Y2E2ZWNiYmI1YmU2NjNkZTdjNzFkZWI4NjEwNTRhNDBiMjBlODdjZA==
 SHA512:
   metadata.gz: !binary |-
-    OWVmOTY4ODFiNWE5Njc5YzVlYjhhZWFlMTc2MTk5OGJhMDVlOGY3NDBkNjc0
-    NTlmOGVmMGY0MjZjNzlkYmE0YjgxZjhlMjE4NTIzNWYyYWRiZGY5ZjE3NDRk
-    MWYwMTQ4YWU5YTJjNjBjNzU3OGFjZDhiMmY1Y2E5ODYwMzI3OTk=
+    N2JjZDQ1MWY1Mzk3OWVmODExYjNmMmU2NDEyMTNjNzFlYTFiYzA5YjRlNTQz
+    ODJmMDNiNzViYzNjZWRkNWU4OWYwYThjN2M3NDVmY2Q5YTQzN2VjMzljMmVm
+    OTFkMjg1YWFhZjNiMTZkOTcxNTYyY2Q5YmJjNjQ0OWJmOWZkYTA=
   data.tar.gz: !binary |-
-    ODA5YzI2MmM2ODEzZDcxODg2OThmY2UzNWU0ZjA1MTQyMTU2YzJjZjM4YWY0
-    ZWEyM2IyNzU1NGQ1YWM2OTk5YjM1OTVlNmE5Yzk1YTQxMjUzMzZjN2Q3OWNm
-    NjU0YTc3OTlmZmIwOTQ2ZmNjZmM3ZDc2YjA1YTZjYTBmOGIzMTM=
+    MjRkYmNhYjE2YTg2Nzc2MDAyNTUzM2ExYjlhYzRjYmEwZWY5NjM3NTBlODY1
+    M2U2ODVmZDRhNmU4Y2I0NjM3Y2VlZDdmNWVmNzc4Njk2ZjJiMTRmMDllOWIz
+    M2JlZjk4ZDI1OTk4ZTE5ZDNhNWJlYjI4YmI5OWJlMjFjOTA4ZTg=

data/Gemfile.lock

@@ -0,0 +1,57 @@
+PATH
+  remote: .
+  specs:
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+    kalindar (0.1.1)
+=======
+    kalindar (0.1.0)
+>>>>>>> Stashed changes
+=======
+    kalindar (0.1.0)
+>>>>>>> Stashed changes
+      i18n (~> 0.6)
+      ri_cal (~> 0.8)
+      sinatra (~> 1.4)
+      slim (~> 2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.2.5)
+    i18n (0.6.9)
+    rack (1.5.2)
+    rack-protection (1.5.3)
+      rack
+    rake (10.3.2)
+    ri_cal (0.8.8)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.3)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.3)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.3)
+    sinatra (1.4.5)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    slim (2.0.3)
+      temple (~> 0.6.6)
+      tilt (>= 1.3.3, < 2.1)
+    temple (0.6.8)
+    tilt (1.4.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.6)
+  kalindar!
+  rake
+  rspec

data/config.json

@@ -5,8 +5,10 @@
   // Specify one or more ics files.
   // You can skip the list (['one.ics', 'two.ics']) syntax for single ones.
   // The first calender is the one to be edited.
-  "calendar_files": "kalindar.ics",
+  "calendar_files": ["kalindar.ics", "spec/testcal.ics"],
 
   // Specify the locale (currently 'de' or 'en').
-  "locale": "de"
+  "locale": "de",
+
+  "preset_locations": ["Kneipe", "gr. Seminarraum"]
 }

data/config.ru

@@ -1,2 +1,4 @@
 require 'kalindar'
+require 'kalindar/app'
+
 run KalindarApp

data/kalindar.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sinatra", "~> 1.4"
   spec.add_dependency "slim", "~> 2.0"
   spec.add_dependency "i18n", "~> 0.6"
+  spec.add_dependency "listen"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

data/lib/kalindar/app.rb

@@ -5,17 +5,33 @@ require 'sinatra/base'
 require 'slim'
 require 'i18n'
 require 'i18n/backend/fallbacks'
+require 'listen'
 
 # Sinatra App for Kalindar, show ics files.
 class KalindarApp < Sinatra::Base
   $conf = JSON.load(File.new('config.json'))
-  $cal = EventCalendar.new($conf['calendar_files'])
+
+  # Read in calendar files, fill global cal var.
+  def load_global_cal
+    $cal = EventCalendar.new($conf['calendar_files'])
+  end
+
+  load_global_cal
 
   configure do
     I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
     I18n.load_path = Dir[File.join(settings.root, 'locales', '*.yml')]
     I18n.backend.load_translations
     I18n.default_locale = $conf['locale'].to_sym
+
+    # Watch for calendar file changes.
+    [*$conf['calendar_files']].each do |file|
+      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.start
+    end
   end
 
   # Will use http-verb PUT
@@ -69,11 +85,14 @@ class KalindarApp < Sinatra::Base
   get '/events/twoday' do
     @events = {}
     # events from today to in 30 days
-    (DateTime.now .. DateTime.now + 30).each do |day|
+    (DateTime.now .. DateTime.now + 2).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}
+    
+    #@events = @events.values.flatten.sort_by {|e| e.start_time}
+    @today = Date.today
+    @tomorrow = @today + 1
     slim :twoday_list
   end
 
@@ -85,7 +104,9 @@ class KalindarApp < Sinatra::Base
     end
     begin
       event = Event.create_from_params params
-    rescue
+    rescue Exception => e
+      puts e.inspect
+      puts e.backtrace
       return 502, "Eingabefehler"
     end
 
@@ -140,4 +161,16 @@ class KalindarApp < Sinatra::Base
     $cal.calendars.first.write_back!
     redirect '/'
   end
+
+  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
+    slim :event_list
+  end
 end

data/lib/kalindar/locales/de.yml

@@ -22,6 +22,8 @@ de:
   1w:           "eine Woche"
   save:         "speichern"
   cancel:       "abbrechen"
+  today:        "heute"
+  tomorrow:     "morgen"
   time:
     formats:
       short: "%d.%m.%Y"

data/lib/kalindar/locales/en.yml

@@ -22,6 +22,8 @@ en:
   1w:           "a week"
   save:         "save"
   cancel:       "cancel"
+  today:        "today"
+  tomorrow:     "tomorrow"
   time:
     formats:
       short: "%Y/%m/%d"

data/lib/kalindar/public/kalindar.css

@@ -6,6 +6,11 @@
   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;
@@ -23,6 +28,20 @@ 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 {
@@ -53,6 +72,18 @@ 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 {
@@ -86,3 +117,9 @@ ul.event_list li {
 #edit_event_link {
   margin-left: 1em;
 }
+
+ul.twoday_list {
+}
+
+ul.twoday_list {
+}

data/lib/kalindar/public/kalindar.js

@@ -18,6 +18,9 @@
 "#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('.hidden_new_event_mask').fade();
   return false;
 });

data/lib/kalindar/version.rb

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

data/lib/kalindar/views/edit_event.slim

@@ -28,10 +28,12 @@ form.pure-form.pure-form-stacked action="/event/edit/#{event.uid}" method="post"
       option value="60m"   = t '60m'
       option value="90m"   = t '90m'
       option value="120m"  = t '120m'
-      option value="whole" = t 'whole_day'
+      /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 name="submitbutton" type="submit" value="save" text= t 'save'
-    button.pure-button name="submitbutton" type="submit" value="cancel" text= t 'cancel'
+    button.pure-button name="submitbutton" type="submit" value="save"
+      = t 'save'
+    button.pure-button name="submitbutton" type="submit" value="cancel"
+      = t 'cancel'

data/lib/kalindar.rb

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

data/spec/kalindar_spec.rb

@@ -60,15 +60,13 @@ describe EventCalendar do
       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
+    # 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
@@ -124,6 +122,7 @@ describe "Event" do
       expect(multiday_event.time_f Date.new(2014, 7, 27)).to eq "..."
     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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kalindar
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Felix Wolfsteller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ri_cal
@@ -66,6 +66,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +133,7 @@ files:
 - .rspec
 - .travis.yml
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - Procfile
 - README.md
@@ -177,3 +192,4 @@ test_files:
 - spec/kalindar_spec.rb
 - spec/spec_helper.rb
 - spec/testcal.ics
+has_rdoc: