social_stream-events 0.12.0 → 0.12.1

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

@@ -1,4 +1,7 @@
+//= require jquery.boxy
 //= require jquery.watermark
+//= require fullcalendar
+//= require scheduler
 //
 //= require social_stream-base
 //

data/app/assets/javascripts/social_stream.event.js

@@ -11,6 +11,10 @@ SocialStream.Event = (function(SS, $, undefined) {
 		$.each(indexCallbacks, function(i, callback){ callback(); });
 	}
 
+	var color = function(){
+		SocialStream.Events.current.eventColor;
+	}
+
         var fixDates = function(){
           $(".event").each(function(){
             dateString = $(this).find("time").attr("datetime");
@@ -44,6 +48,7 @@ SocialStream.Event = (function(SS, $, undefined) {
 
 	return {
 		addIndexCallback: addIndexCallback,
+		color: color,
 		index: index
 	}
 

data/app/controllers/events_controller.rb

@@ -1,8 +1,6 @@
 class EventsController < ApplicationController
   include SocialStream::Controllers::Objects
 
-  belongs_to_subjects :optional => true
-
   before_filter :profile_subject!, :only => :index
 
   def index
@@ -31,7 +29,7 @@ class EventsController < ApplicationController
 
   def collection
     @activities =
-      profile_subject.wall(:profile,
+      (profile_subject || current_subject).wall(:profile,
                            :for => current_subject,
                            :object_type => :Event)
   end

data/app/models/event.rb

@@ -64,7 +64,7 @@ class Event < ActiveRecord::Base
   def room_belongs_to_receiver
     return if room_id.blank?
 
-    unless _contact.receiver.room_ids.include?(room_id)
+    unless owner.room_ids.include?(room_id)
       errors.add(:room_id, :invalid)
     end
   end

data/app/views/events/create.js.erb

@@ -5,7 +5,7 @@
 
   jQuery.each(<%= raw Array.wrap(@event.to_json).to_json  %>,
               function(index, ev) {
-    ev.color = SocialStream.Events.tools.eventColor(<%= @event.room_id %>);
+    ev.color = SocialStream.Event.color(<%= @event.room_id %>);
   
     cal.fullCalendar('renderEvent', ev,
                      true // make the event "stick"

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

@@ -78,7 +78,7 @@
             success: function(events) {
                 callback(
                   $.map(events, function(event) {
-                    event.color = SocialStream.Events.tools.eventColor(event.roomId);
+                    event.color = SocialStream.Event.color(event.roomId);
                     return event;
                         }
                   )

data/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.12.0".freeze
+    VERSION = "0.12.1".freeze
   end
 end

data/social_stream-events.gemspec

@@ -12,9 +12,8 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.20.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.20.1')
   s.add_runtime_dependency('rails-scheduler', '~> 0.0.8')
-  s.add_runtime_dependency('coffee-rails', '>= 3.1.0')
 
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-events
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000Z
+date: 2012-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &89675600 !ruby/object:Gem::Requirement
+  requirement: &83962560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.20.1
   type: :runtime
   prerelease: false
-  version_requirements: *89675600
+  version_requirements: *83962560
 - !ruby/object:Gem::Dependency
   name: rails-scheduler
-  requirement: &89675350 !ruby/object:Gem::Requirement
+  requirement: &83961770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,21 +33,10 @@ dependencies:
         version: 0.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *89675350
-- !ruby/object:Gem::Dependency
-  name: coffee-rails
-  requirement: &89675120 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *89675120
+  version_requirements: *83961770
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &89674930 !ruby/object:Gem::Requirement
+  requirement: &83961500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *89674930
+  version_requirements: *83961500
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.
 
@@ -77,7 +66,6 @@ files:
 - app/assets/javascripts/social_stream.event.js
 - app/assets/javascripts/social_stream.events.action.js
 - app/assets/javascripts/social_stream.events.poster.js
-- app/assets/javascripts/social_stream.events.tools.js.coffee
 - app/assets/stylesheets/events.css.scss
 - app/assets/stylesheets/social_stream-events.css
 - app/controllers/events_controller.rb
@@ -155,10 +143,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Scheduled events support for Social Stream, the core for building social
   network websites
 test_files: []
-has_rdoc: 

data/app/assets/javascripts/social_stream.events.tools.js.coffee

@@ -1,50 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
-#
-#= require fullcalendar
-#= require jquery.boxy
-#= require sprintf
-#= require scheduler
-
-SocialStream.Events.tools = {}
-
-SocialStream.Events.tools.currentRGB = () ->
-  [ parseInt(SocialStream.Events.current.eventColor[1..2], 16),
-  parseInt(SocialStream.Events.current.eventColor[3..4], 16),
-  parseInt(SocialStream.Events.current.eventColor[5..6], 16) ]
-
-SocialStream.Events.tools.colorRange = () ->
-  min = 0
-
-  for color in SocialStream.Events.tools.currentRGB()
-    if color < min
-      min = color
-  
-  parseInt 2 * (255 - min) / 3
-
-SocialStream.Events.tools.increaseColor = (delta) ->
-   (if (color + delta) > 255 then 255 else (color + delta)) for color in SocialStream.Events.tools.currentRGB()
-  
-
-SocialStream.Events.tools.eventColorScale = (index) ->
-  range = SocialStream.Events.tools.colorRange()
-
-  delta = range * (index + 1) / (SocialStream.Events.current.roomIndex.length + 1)
-
-  delta = parseInt(delta)
-
-  newColor = SocialStream.Events.tools.increaseColor(delta)
-
-  sprintf "#%02x%02x%02x", newColor[0], newColor[1], newColor[2]
-  
-
-SocialStream.Events.tools.eventColor = (roomId) ->
-  currentColor = SocialStream.Events.current.eventColor
-
-  if not roomId? or not SocialStream.Events.current.roomIndex? or SocialStream.Events.current.roomIndex.length == 0
-    return currentColor
-
-  currentRoomIndex = SocialStream.Events.current.roomIndex.indexOf(roomId)
-
-  SocialStream.Events.tools.eventColorScale(currentRoomIndex)