social_stream-events 0.10.1 → 0.11.0

data/app/assets/javascripts/social_stream.calendar.js.erb

@@ -1,15 +1,19 @@
 //= require jquery.tipsy
 
 SocialStream.Calendar = (function(SS, $, undefined){
-  var elementRegExp = new RegExp('sidebar_day_(..?)_(..?)_(..?.?.?)');
   var eventsPath;
 
-  var elementMatch = function(el){
-    return elementRegExp.exec(el.id);
+  var element = function(){
+    return $("#sidebar_calendar");
   }
+  var eventElementRegExp = new RegExp('sidebar_day_(..?)_(..?)_(..?.?.?)');
 
-  var elementDate = function(el) {
-    var m = elementMatch(el);
+  var eventElementMatch = function(el){
+    return eventElementRegExp.exec(el.id);
+  }
+
+  var eventElementDate = function(el) {
+    var m = eventElementMatch(el);
 
     if(m == null) return;
 
@@ -29,7 +33,7 @@ SocialStream.Calendar = (function(SS, $, undefined){
 
 
     $('#sidebar_calendar td').each(function(index, domEl){
-      var d = elementDate(domEl)
+      var d = eventElementDate(domEl)
 
       if(d < now) $(domEl).addClass('past');
       if(d.getMonth() != now.getMonth() && d > now) $(domEl).addClass('next_month');
@@ -71,11 +75,11 @@ SocialStream.Calendar = (function(SS, $, undefined){
   }
 
   var busyTipsy = function(){
-    var startDate = elementDate(this)
+    var startDate = eventElementDate(this)
     startDate.setHours(0);
     startDate.setMinutes(0);
     startDate.setSeconds(0);
-    var endDate   = elementDate(this)
+    var endDate   = eventElementDate(this)
 
     $.ajax({
       dataType: "script",
@@ -92,7 +96,9 @@ SocialStream.Calendar = (function(SS, $, undefined){
   }
 
   return {
-    init: init
+    init: init,
+    element: element,
+    eventElement: eventElement
   }
 
 })(SocialStream, jQuery);

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

@@ -0,0 +1,31 @@
+//= require social_stream.action
+
+SocialStream.Events.Action = (function(SS, $, undefined){
+	var animateCalendar = function(action) {
+		if (action.activity_object.type != "Event") {
+			return;
+		}
+
+		if (!action.follow) {
+			return;
+		}
+
+		var fromEl = SS.Action.followForms(action).closest(".event").find("time");
+		var fromDate = new Date(fromEl.attr('datetime'));
+
+		var toEl = SS.Calendar.eventElement(fromDate) || SS.Calendar.element;
+
+		if (action.follow.following) {
+			fromEl.effect("transfer", {to: toEl}, 1000);
+			toEl.addClass("busy");
+		} else {
+			toEl.effect("pulsate");
+		}
+	}
+
+//	SocialStream.Action.addUpdateCallback(animateCalendar);
+
+	return {
+	}
+
+})(SocialStream, jQuery);

data/db/migrate/20111218203314_create_events.rb

@@ -0,0 +1,33 @@
+class CreateEvents < ActiveRecord::Migration
+  def change
+    create_table "events", :force => true do |t|
+      t.integer  "activity_object_id"
+      t.string   "title"
+      t.datetime "start_at"
+      t.datetime "end_at"
+      t.boolean  "all_day"
+      t.datetime "created_at",                        :null => false
+      t.datetime "updated_at",                        :null => false
+      t.integer  "room_id"
+      t.date     "start_date"
+      t.date     "end_date"
+      t.integer  "frequency",          :default => 0
+      t.integer  "interval"
+      t.integer  "days",               :default => 0
+      t.integer  "interval_flag",      :default => 0
+    end
+
+    add_index "events", ["room_id"], :name => "index_events_on_room_id"
+
+    create_table "rooms", :force => true do |t|
+      t.integer  "actor_id"
+      t.string   "name"
+      t.datetime "created_at", :null => false
+      t.datetime "updated_at", :null => false
+    end
+
+    add_index "rooms", ["actor_id"], :name => "index_rooms_on_actor_id"
+
+    add_foreign_key "events", "rooms", :name => "index_events_on_room_id"
+  end
+end

data/db/migrate/20120330131859_create_social_stream_events.rb

@@ -0,0 +1,10 @@
+# SocialStream migrations live at least 10 minor versions.
+# Then they are merged.
+# This is a placeholder migration to merge SocialStreamEvents' migrations
+class CreateSocialStreamEvents < ActiveRecord::Migration
+  def up
+  end
+
+  def down
+  end
+end

data/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.10.1".freeze
+    VERSION = "0.11.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.18.1')
+  s.add_runtime_dependency('social_stream-base', '~> 0.19.0')
   s.add_runtime_dependency('rails-scheduler', '~> 0.0.8')
   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.10.1
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-27 00:00:00.000000000Z
+date: 2012-04-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &69051840 !ruby/object:Gem::Requirement
+  requirement: &80493450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :runtime
   prerelease: false
-  version_requirements: *69051840
+  version_requirements: *80493450
 - !ruby/object:Gem::Dependency
   name: rails-scheduler
-  requirement: &69051300 !ruby/object:Gem::Requirement
+  requirement: &80491870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *69051300
+  version_requirements: *80491870
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: &69050730 !ruby/object:Gem::Requirement
+  requirement: &80491310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *69050730
+  version_requirements: *80491310
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &69050180 !ruby/object:Gem::Requirement
+  requirement: &80490670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69050180
+  version_requirements: *80490670
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.
 
@@ -75,6 +75,7 @@ files:
 - app/assets/javascripts/social_stream-events.js
 - app/assets/javascripts/social_stream.calendar.js.erb
 - 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
@@ -108,12 +109,10 @@ files:
 - config/locales/en.yml
 - config/locales/es.yml
 - config/routes.rb
-- db/migrate/20111101193523_create_events.rb
-- db/migrate/20111120104349_create_rooms.rb
-- db/migrate/20111204155637_add_scheduler.rb
-- db/migrate/20111218203314_change_scheduler.rb
+- db/migrate/20111218203314_create_events.rb
 - db/migrate/20120208143756_events_group_title_and_description_in_activity_object.rb
 - db/migrate/20120208144948_add_events_foreign_key.rb
+- db/migrate/20120330131859_create_social_stream_events.rb
 - lib/generators/social_stream/events/install_generator.rb
 - lib/social_stream-events.rb
 - lib/social_stream/events/ability.rb

data/db/migrate/20111101193523_create_events.rb

@@ -1,13 +0,0 @@
-class CreateEvents < ActiveRecord::Migration
-  def change
-    create_table :events do |t|
-      t.integer  :activity_object_id
-      t.string   :title
-      t.datetime :start_at
-      t.datetime :end_at
-      t.boolean  :all_day
-
-      t.timestamps
-    end
-  end
-end

data/db/migrate/20111120104349_create_rooms.rb

@@ -1,26 +0,0 @@
-class CreateRooms < ActiveRecord::Migration
-  def up
-    create_table :rooms do |t|
-      t.references :actor
-      t.string :name
-
-      t.timestamps
-    end
-
-    change_table :events do |t|
-      t.references :room
-    end
-
-    add_index :rooms, :actor_id
-    add_index :events, :room_id
-    add_foreign_key :rooms, :actors, :name => "index_rooms_on_actor_id"
-    add_foreign_key :events, :rooms, :name => "index_events_on_room_id"
-  end
-
-  def down
-    remove_foreign_key :rooms, :name => "index_rooms_on_actor_id"
-    remove_foreign_key :events, :name => "index_events_on_room_id"
-
-    drop_table :rooms
-  end
-end

data/db/migrate/20111204155637_add_scheduler.rb

@@ -1,33 +0,0 @@
-class AddScheduler < ActiveRecord::Migration
-
-  class EventSchedulerMigration < ActiveRecord::Base
-    self.record_timestamps = false
-    set_table_name "events"
-  end
-
-  def up
-    change_table :events do |t|
-      t.date     :start_date
-      t.date     :end_date
-      t.integer  :frequency, :default => 0
-      t.integer  :interval
-      t.integer  :interval_flag, :default => 0
-    end
-
-    EventSchedulerMigration.all.each do |e|
-      e.start_date = e.start_at
-      e.end_date   = e.end_at
-      e.save!
-    end
-  end
-
-  def down
-    change_table :events do |t|
-      t.remove :start_date
-      t.remove :end_date
-      t.remove :frequency
-      t.remove :interval
-      t.remove :interval_flag
-    end
-  end
-end

data/db/migrate/20111218203314_change_scheduler.rb

@@ -1,11 +0,0 @@
-class ChangeScheduler < ActiveRecord::Migration
-  def up
-    rename_column :events, :interval_flag, :days
-    add_column :events, :interval_flag, :integer, :default => 0
-  end
-
-  def down
-    rename_column :events, :days, :interval_flag
-    remove_column :events, :interval_flag
-  end
-end