social_stream-events 0.4.0 → 0.5.0

data/app/models/event.rb

@@ -9,23 +9,12 @@ class Event < ActiveRecord::Base
 
   validate :room_belongs_to_receiver
 
-  class << self
-    def ocurrences(start_date, end_date)
-      between(start_date, end_date).
-      map { |e|
-        e.ocurrences(start_date, end_date)
-      }.
-      flatten.
-      uniq
-    end
-  end
-
   def to_json(options = {})
     if recurrence
       st = options[:start].try(:to_date)
       en = (options[:end] || end_at.end_of_month + 7.days).to_date
 
-      ocurrences(st, en).map do |d|
+      recurrence.events(:starts => st, :until  => en).map do |d|
 
         start_diff = d - start_at.to_date
         end_diff   = d - end_at.to_date

data/app/views/events/_sidebar_calendar.html.erb

@@ -3,20 +3,21 @@
 <div class="block">
   <div class="content">
 
+    <% bow = (Time.now - 1.days).beginning_of_week %>
+
     <%= render :partial => 'events/calendar_month',
                :locals  => {
                  :position => :top,
-                 :date => Date.today.beginning_of_week 
+                 :date => bow.to_date
                 } %>
 
   <table id="sidebar_calendar">
-    <% bow = Time.now.beginning_of_week %>
 
     <% 28.times do |i| %>
       <% day = bow + i.days %>
 
       <%= raw cycle(*(Array.wrap("<tr>") + 6.times.map{""}) + Array.wrap(:name => "tr_start")) %>
-      <td class="<%= event_class(day.to_date) %>">
+      <td id="sidebar_day_<%= day.day %>_<%= day.month %>_<%= day.year %>" class="sidebar_day">
         <%= link_to day.day, polymorphic_path([profile_or_current_subject, Event.new], :date => day.to_i, :view => "agendaDay") %>
       </td>
 
@@ -24,10 +25,42 @@
     <% end %>
   </table>
 
+  <%= javascript_tag do %>
+    var now = new Date();
+    $('#sidebar_day_' + now.getDate() + '_' + (now.getMonth()+1) + '_' + now.getFullYear()).addClass('today');
+    var re = new RegExp('sidebar_day_(..?)_(..?)_(..?.?.?)');
+    $('.sidebar_day').each(function(index, domEl){
+      var m = re.exec(domEl.id);
+      if(m == null) return;
+      var d = new Date(m[3], (m[2]-1), m[1], 23, 59, 59);
+      if(d < now) $(domEl).addClass('past');
+      if(m[2] != (now.getMonth()+1)) $(domEl).addClass('next_month');
+    });
+    $.ajax({
+      dataType: 'json',
+      cache: false,
+      url: "<%= escape_javascript polymorphic_path([@current_subject, Event.new]) %>",
+      data: {
+        start: <%= bow.to_i %>,
+	end: <%= (bow + 28.days).to_i %>
+      },
+      success: function(events) {
+        $.map(events, function(event) {
+	  var start = new Date(event.start); // This applies TZ
+	  var end = new Date(event.end);
+	  for(loopTime=start.getTime(); loopTime <= end.getTime(); loopTime+=86400000) {
+	    var d = new Date(loopTime);
+	    $('#sidebar_day_'+ d.getDate() + '_' + (d.getMonth()+1) + '_' + d.getFullYear()).addClass("busy");
+	  }
+	})
+      }
+    });
+  <% end %>
+
     <%= render :partial => 'events/calendar_month',
                :locals  => {
                  :position => :bottom,
-                 :date => Date.today.beginning_of_week + 28
+                 :date => (bow + 28.days).to_date
                 } %>
 
   </div>

data/app/views/events/index.html.erb

@@ -33,6 +33,7 @@
         center: 'title',
         right: 'month,agendaWeek,agendaDay'
       },
+      ignoreTimezone: false,
       firstDay: 1,
       eventColor: SocialStream.Events.current.eventColor,
       <% if can? :create, new_post(profile_subject) %>

data/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.4.0".freeze
+    VERSION = "0.5.0".freeze
   end
 end

data/social_stream-events.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.12.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.13.0')
   s.add_runtime_dependency('rails-scheduler', '~> 0.0.5')
   s.add_runtime_dependency('coffee-rails', '> 3.1.0')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-events
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-11 00:00:00.000000000Z
+date: 2012-01-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &83181790 !ruby/object:Gem::Requirement
+  requirement: &72729050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *83181790
+  version_requirements: *72729050
 - !ruby/object:Gem::Dependency
   name: rails-scheduler
-  requirement: &83181320 !ruby/object:Gem::Requirement
+  requirement: &72728510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *83181320
+  version_requirements: *72728510
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: &83164280 !ruby/object:Gem::Requirement
+  requirement: &72727880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -44,10 +44,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *83164280
+  version_requirements: *72727880
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &83163630 !ruby/object:Gem::Requirement
+  requirement: &72726860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83163630
+  version_requirements: *72726860
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.
 
@@ -78,7 +78,6 @@ files:
 - app/assets/stylesheets/social_stream-events.css
 - app/controllers/events_controller.rb
 - app/controllers/rooms_controller.rb
-- app/helpers/events_helper.rb
 - app/models/event.rb
 - app/models/room.rb
 - app/views/events/_calendar_month.erb

data/app/helpers/events_helper.rb

@@ -1,26 +0,0 @@
-module EventsHelper
-  def event_class(day)
-    begin_date = Time.now.beginning_of_week.to_date
-    end_date   = begin_date + 28
-
-    busy_dates =
-      profile_or_current_subject.
-        events.
-        ocurrences(begin_date, end_date)
-
-    [].tap { |css|
-      css <<
-        if day < Date.today
-          "past"
-        elsif day == Date.today
-          "today"
-        elsif day.month != Date.today.month
-          "next_month"
-        end
-
-
-      css << "busy" if busy_dates.include?(day)
-
-    }.join(" ")
-  end
-end