social_stream-events 0.13.1 → 0.13.2

data/app/assets/javascripts/social_stream.events.action.js

@@ -23,7 +23,7 @@ SocialStream.Events.Action = (function(SS, $, undefined){
 		}
 	}
 
-//	SocialStream.Action.addUpdateCallback(animateCalendar);
+	SocialStream.Action.addUpdateCallback(animateCalendar);
 
 	return {
 	}

data/app/controllers/events_controller.rb

@@ -27,22 +27,18 @@ class EventsController < ApplicationController
 
   private
 
-  def collection
-    @activities =
-      (profile_subject || current_subject).wall(:profile,
-                           :for => current_subject,
-                           :object_type => :Event)
-  end
-
   def events_with_start_and_end
     @start_time = Time.at(params[:start].to_i)
     @end_time   = Time.at(params[:end].to_i)
 
-    @activities =
-      collection.
-      joins(:activity_objects => :event).
-      merge(Event.between(@start_time, @end_time))
+    subject = profile_or_current_subject
+
+    @events = Event.followed_by(subject)
+
+    if subject != current_subject
+      @events = @events.shared_with(current_subject)
+    end
 
-    @events = @activities.map(&:direct_object)
+    @events = @events.between(@start_time, @end_time)
   end
 end

data/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.13.1".freeze
+    VERSION = "0.13.2".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.21.1')
+  s.add_runtime_dependency('social_stream-base', '~> 0.21.2')
   s.add_runtime_dependency('rails-scheduler', '~> 0.0.8')
 
   # Development Gem dependencies

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-events
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2012-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.21.1
+        version: 0.21.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.21.1
+        version: 0.21.2
 - !ruby/object:Gem::Dependency
   name: rails-scheduler
   requirement: !ruby/object:Gem::Requirement