social_stream-events 0.3.2 → 0.4.0

data/app/assets/stylesheets/events.css.scss

@@ -44,6 +44,9 @@
   background-color: #F2F2F2;
 }
 
+#sidebar_calendar td.busy {
+  font-weight: bold;
+}
 .sidebar_calendar_month {
   text-align: center;
   padding: 5px;

data/app/helpers/events_helper.rb

@@ -1,5 +1,13 @@
 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
@@ -10,7 +18,9 @@ module EventsHelper
           "next_month"
         end
 
-      #TODO: event ocurrence
+
+      css << "busy" if busy_dates.include?(day)
+
     }.join(" ")
   end
 end

data/app/models/event.rb

@@ -9,12 +9,23 @@ 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
 
-      recurrence.events(:starts => st, :until  => en).map do |d|
+      ocurrences(st, en).map do |d|
 
         start_diff = d - start_at.to_date
         end_diff   = d - end_at.to_date

data/lib/social_stream/events/models/actor.rb

@@ -7,6 +7,12 @@ module SocialStream
         included do
           has_many :rooms
         end
+
+        module InstanceMethods
+          def events
+            Event.authored_by(self)
+          end
+        end
       end
     end
   end

data/lib/social_stream/events/version.rb

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

data/lib/social_stream/views/sidebar/events.rb

@@ -4,8 +4,10 @@ module SocialStream
       module Events
         def sidebar_items type
           super.tap do |items|
-            items.unshift :key => 'calendar',
-                          :html => render(:partial => 'events/sidebar_calendar')
+            if profile_or_current_subject
+              items.unshift :key => 'calendar',
+                            :html => render(:partial => 'events/sidebar_calendar')
+            end
           end
         end
       end

data/social_stream-events.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-events
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,33 +10,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-23 00:00:00.000000000Z
+date: 2012-01-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &70335200 !ruby/object:Gem::Requirement
+  requirement: &83181790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70335200
+  version_requirements: *83181790
 - !ruby/object:Gem::Dependency
   name: rails-scheduler
-  requirement: &70334950 !ruby/object:Gem::Requirement
+  requirement: &83181320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70334950
+  version_requirements: *83181320
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: &70334710 !ruby/object:Gem::Requirement
+  requirement: &83164280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -44,10 +44,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70334710
+  version_requirements: *83164280
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70334500 !ruby/object:Gem::Requirement
+  requirement: &83163630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334500
+  version_requirements: *83163630
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.