social_stream-events 0.2.0 → 0.3.0

data/app/views/rooms/_index.html.erb

@@ -0,0 +1,10 @@
+<div id="rooms">
+  <% current_subject.rooms.each do |room| %>
+    <div class="row">
+      <div class="label"><%= room.name %></div>
+      <div class="field">
+        <%= link_to image_tag("btn/delete.png", :class => "menu_icon", :title => t('room.delete')), room, :class => "room_delete_link", :method => :delete, :confirm => t('room.confirm_delete'), :remote => true %>
+      </div>
+    </div>
+  <% end %>
+</div>

data/app/views/rooms/_settings.html.erb

@@ -0,0 +1,23 @@
+<div class="block" id="room_settings">
+  <div class="header">
+    <div class="header_text">
+      <%= t 'room.settings.title' %>
+    </div>
+    <div class="header_icon_right">
+      <%= link_to image_tag('btn/edit.png'),  "javascript:showSettings(\"room_settings\");" %>
+    </div>
+  </div>
+  <div id="room_settings_briefing" class="settings_briefing content">        
+    <div class="form_row">
+      <%= t 'room.settings.description' %>
+    </div>
+  </div>
+  <div class="content settings_content" id="room_settings_content" style="display:none;">
+    <div class="sub-block">
+      <%= render :partial => 'rooms/index' %>
+    </div>
+    <div class="sub-block">
+      <%= render :partial => 'rooms/form' %>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,7 @@
+<% if @room.valid? %>
+  $('#rooms').replaceWith("<%= escape_javascript render(:partial => 'index') %>");
+  $('#room_name').val("");
+  $('#room_name').Watermark("<%= escape_javascript t('room.watermark.name') %>");
+<% else %>
+  $('#new_room').replaceWith("<%= escape_javascript render(:partial => 'form') %>");
+<% end %>

data/app/views/rooms/destroy.js.erb

@@ -0,0 +1 @@
+$('#rooms').replaceWith("<%= escape_javascript render(:partial => 'index') %>");

data/config/locales/en.yml

@@ -1,5 +1,35 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
 en:
-
+  activerecord:
+    attributes:
+      event:
+        title: "Title"
+        room: "Room"
+        frequency: "Frequency"
+      room:
+        name: "Name"
+    errors:
+      models:
+        room:
+          attributes:
+            name:
+              taken: "is taken"
+    models:
+      event: "event"
+      room: "room"
+  boxy:
+    close_text: "[close]"
+  event:
+    confirm_delete: "Delete event?"
+    new:
+      title: "New event"
+    one: "an event"
+    title: "Calendar"
+    wall_post: "Published an event: %{title}"
+  room:
+    confirm_delete: "Delete room?"
+    delete: "Delete"
+    settings:
+      title: "Rooms"
+      description: "Rooms available for event celebration"
+    watermark:
+      name: "New room"

data/config/locales/es.yml

@@ -1,5 +1,35 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
 es:
-
+  activerecord:
+    attributes:
+      event:
+        title: "Título"
+        room: "Espacio"
+        frequency: "Repetición"
+      room:
+        name: "Nombre"
+    errors:
+      models:
+        room:
+          attributes:
+            name:
+              taken: "está repetido"
+    models:
+      event: "evento"
+      room: "espacio"
+  boxy:
+    close_text: "[cerrar]"
+  event:
+    confirm_delete: "¿Borrar evento?"
+    new:
+      title: "Nuevo evento"
+    one: "un evento"
+    title: "Calendario"
+    wall_post: "Publicó un evento: %{title}"
+  room:
+    confirm_delete: "¿Borrar espacio?"
+    delete: "Borrar"
+    settings:
+      title: "Espacios"
+      description: "Salas disponibles para la realización de eventos"
+    watermark:
+      name: "Nuevo espacio"

data/config/routes.rb

@@ -1,2 +1,3 @@
 Rails.application.routes.draw do
+  resources :rooms
 end

data/db/migrate/20111101193523_create_events.rb

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,26 @@
+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

@@ -0,0 +1,33 @@
+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

@@ -0,0 +1,11 @@
+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

data/lib/social_stream-events.rb

@@ -1,7 +1,22 @@
 require 'social_stream-base'
 
+require 'rails-scheduler'
+
 module SocialStream
+  module Views
+    module Settings
+      autoload :Events, 'social_stream/views/settings/events'
+    end
+  end
+
   module Events
+    autoload :Ability, 'social_stream/events/ability'
+
+    module Models
+      autoload  :Actor, 'social_stream/events/models/actor'
+    end
+
+    SocialStream.objects.push(:event) unless SocialStream.objects.include?(:event)
   end
 end
 

data/lib/social_stream/events/ability.rb

@@ -0,0 +1,13 @@
+module SocialStream
+  module Events
+    module Ability
+      def initialize(subject)
+        super
+
+        can [:create, :destroy], Room do |r|
+          r.actor_id == Actor.normalize_id(subject)
+        end
+      end
+    end
+  end
+end

data/lib/social_stream/events/engine.rb

@@ -1,6 +1,23 @@
 module SocialStream
   module Events
     class Engine < Rails::Engine
+      initializer "social_stream-events.ability" do
+        SocialStream::Ability.class_eval do
+          include SocialStream::Events::Ability
+        end
+      end
+
+      initializer "social_stream-events.actor" do
+        ActiveSupport.on_load(:actor) do
+          include SocialStream::Events::Models::Actor
+        end
+      end
+
+      initializer "social_stream-events.views.settings" do
+        SocialStream::Views::Settings.module_eval do
+          include SocialStream::Views::Settings::Events
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,13 @@
+module SocialStream
+  module Events
+    module Models
+      module Actor
+        extend ActiveSupport::Concern
+
+        included do
+          has_many :rooms
+        end
+      end
+    end
+  end
+end

data/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.2.0".freeze
+    VERSION = "0.3.0".freeze
   end
 end

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

@@ -0,0 +1,18 @@
+module SocialStream
+  module Views
+    module Settings
+      module Events
+        def settings_items
+          super.tap do |items|
+            if current_subject.is_a?(Group)
+              items.insert_before 'notifications', {
+                :key  => 'rooms',
+                :html => render(:partial => 'rooms/settings')
+              }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/social_stream-events.gemspec

@@ -4,24 +4,20 @@ require File.join(File.dirname(__FILE__), 'lib', 'social_stream', 'events', 'ver
 Gem::Specification.new do |s|
   s.name = "social_stream-events"
   s.version = SocialStream::Events::VERSION.dup
-  s.authors = ["Diego Carrera", "Antonio Tapiador", "GING - DIT - UPM"]
-  s.summary = "Events and Video conferences capabilities for Social Stream, the core for building social network websites"
-  s.description = "Social Stream is a Ruby on Rails engine providing your application with social networking features and activity streams.\n\nThis gem allow you  to add events and videoconferences as new social stream activity."
-  s.email = "social-stream.dit.upm.es"
+  s.authors = ["Antonio Tapiador", "GING - DIT - UPM"]
+  s.summary = "Scheduled events support for Social Stream, the core for building social network websites"
+  s.description = "Social Stream is a Ruby on Rails engine providing your application with social networking features and activity streams.\n\nThis gem allow you to add events as a new social stream activity, with a calendar-supported management"
+  s.email = "social-stream@dit.upm.es"
   s.homepage = "http://github.com/ging/social_stream-events"
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.10.6')
-  s.add_runtime_dependency('conference_manager-ruby', '~> 0.0.3')
+  s.add_runtime_dependency('social_stream-base', '~> 0.11.0')
+  s.add_runtime_dependency('rails-scheduler', '~> 0.0.4')
 
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')
   if RUBY_VERSION < '1.9'
     s.add_development_dependency('ruby-debug', '~> 0.10.3')
   end
-  s.add_development_dependency('rspec-rails', '~> 2.6.0')
-  s.add_development_dependency('factory_girl', '~> 1.3.2')
-  s.add_development_dependency('forgery', '~> 0.3.6')
-  s.add_development_dependency('capybara', '~> 0.3.9')
 end

data/vendor/assets/javascripts/fullcalendar.js

@@ -1,6 +1,6 @@
 /**
  * @preserve
- * FullCalendar v1.5.1
+ * FullCalendar v1.5.2
  * http://arshaw.com/fullcalendar/
  *
  * Use fullcalendar.css for basic styling.
@@ -11,7 +11,7 @@
  * Dual licensed under the MIT and GPL licenses, located in
  * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
  *
- * Date: Sat Apr 9 14:09:51 2011 -0700
+ * Date: Sun Aug 21 22:06:09 2011 -0700
  *
  */
  
@@ -111,7 +111,7 @@ var rtlDefaults = {
 
 
 
-var fc = $.fullCalendar = { version: "1.5.1" };
+var fc = $.fullCalendar = { version: "1.5.2" };
 var fcViews = fc.views = {};
 
 
@@ -698,7 +698,7 @@ function Header(calendar, options) {
 		tm = options.theme ? 'ui' : 'fc';
 		var sections = options.header;
 		if (sections) {
-			element = $("<table class='fc-header' id='header-calendar' style='width:90%'/>")
+			element = $("<table class='fc-header' style='width:100%'/>")
 				.append(
 					$("<tr/>")
 						.append(renderSection('left'))
@@ -1395,7 +1395,7 @@ function parseISO8601(s, ignoreTimezone) { // ignoreTimezone defaults to false
 		return null;
 	}
 	var date = new Date(m[1], 0, 1);
-	if (ignoreTimezone || !m[14]) {
+	if (ignoreTimezone || !m[13]) {
 		var check = new Date(m[1], 0, 1, 9, 0);
 		if (m[3]) {
 			date.setMonth(m[3] - 1);
@@ -1431,9 +1431,11 @@ function parseISO8601(s, ignoreTimezone) { // ignoreTimezone defaults to false
 			m[10] || 0,
 			m[12] ? Number("0." + m[12]) * 1000 : 0
 		);
-		var offset = Number(m[16]) * 60 + (m[18] ? Number(m[18]) : 0);
-		offset *= m[15] == '-' ? 1 : -1;
-		date = new Date(+date + (offset * 60 * 1000));
+		if (m[14]) {
+			var offset = Number(m[16]) * 60 + (m[18] ? Number(m[18]) : 0);
+			offset *= m[15] == '-' ? 1 : -1;
+			date = new Date(+date + (offset * 60 * 1000));
+		}
 	}
 	return date;
 }
@@ -5204,5 +5206,5 @@ function HorizontalPositionCache(getElement) {
 	};
 	
 }
-
-})(jQuery);
+
+})(jQuery);

data/vendor/assets/javascripts/gcal.js

@@ -1,11 +1,11 @@
 /*
- * FullCalendar v1.5.1 Google Calendar Plugin
+ * FullCalendar v1.5.2 Google Calendar Plugin
  *
  * Copyright (c) 2011 Adam Shaw
  * Dual licensed under the MIT and GPL licenses, located in
  * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
  *
- * Date: Sat Apr 9 14:09:51 2011 -0700
+ * Date: Sun Aug 21 22:06:09 2011 -0700
  *
  */