social_stream-events 0.13.1 → 0.13.2

Sign up to get free protection for your applications and to get access to all the features.
@@ -23,7 +23,7 @@ SocialStream.Events.Action = (function(SS, $, undefined){
23
23
  }
24
24
  }
25
25
 
26
- // SocialStream.Action.addUpdateCallback(animateCalendar);
26
+ SocialStream.Action.addUpdateCallback(animateCalendar);
27
27
 
28
28
  return {
29
29
  }
@@ -27,22 +27,18 @@ class EventsController < ApplicationController
27
27
 
28
28
  private
29
29
 
30
- def collection
31
- @activities =
32
- (profile_subject || current_subject).wall(:profile,
33
- :for => current_subject,
34
- :object_type => :Event)
35
- end
36
-
37
30
  def events_with_start_and_end
38
31
  @start_time = Time.at(params[:start].to_i)
39
32
  @end_time = Time.at(params[:end].to_i)
40
33
 
41
- @activities =
42
- collection.
43
- joins(:activity_objects => :event).
44
- merge(Event.between(@start_time, @end_time))
34
+ subject = profile_or_current_subject
35
+
36
+ @events = Event.followed_by(subject)
37
+
38
+ if subject != current_subject
39
+ @events = @events.shared_with(current_subject)
40
+ end
45
41
 
46
- @events = @activities.map(&:direct_object)
42
+ @events = @events.between(@start_time, @end_time)
47
43
  end
48
44
  end
@@ -1,5 +1,5 @@
1
1
  module SocialStream
2
2
  module Events
3
- VERSION = "0.13.1".freeze
3
+ VERSION = "0.13.2".freeze
4
4
  end
5
5
  end
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
12
12
  s.files = `git ls-files`.split("\n")
13
13
 
14
14
  # Gem dependencies
15
- s.add_runtime_dependency('social_stream-base', '~> 0.21.1')
15
+ s.add_runtime_dependency('social_stream-base', '~> 0.21.2')
16
16
  s.add_runtime_dependency('rails-scheduler', '~> 0.0.8')
17
17
 
18
18
  # Development Gem dependencies
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: social_stream-events
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.13.1
4
+ version: 0.13.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2012-06-06 00:00:00.000000000 Z
13
+ date: 2012-06-15 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: social_stream-base
@@ -19,7 +19,7 @@ dependencies:
19
19
  requirements:
20
20
  - - ~>
21
21
  - !ruby/object:Gem::Version
22
- version: 0.21.1
22
+ version: 0.21.2
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
27
27
  requirements:
28
28
  - - ~>
29
29
  - !ruby/object:Gem::Version
30
- version: 0.21.1
30
+ version: 0.21.2
31
31
  - !ruby/object:Gem::Dependency
32
32
  name: rails-scheduler
33
33
  requirement: !ruby/object:Gem::Requirement