social_stream-events 1.1.1 → 2.0.0.beta1

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

@@ -1,100 +1,32 @@
-<% content_for :headers do %>
-  <style type="text/css">
-    #sidebar {width: 0px;}
-    #center_body {width: 780px; max-width: 780px; border-right: 0px;}
-  </style>
-<% end %>
-
 <% content_for :title do %>
   <%= profile_subject.name + ": " + t('event.calendar') %>
 <% end %>
 
-<%= location(
-  link_to(profile_subject.name, polymorphic_path(profile_subject)),
-  link_to(t('event.calendar'), polymorphic_path([profile_subject, Event.new]))
-  ) %>
-
-<% toolbar :profile, :subject => profile_subject %>
-
-<div id="calendar"></div>
+<section id="events">
+  <%= render partial: 'toolbar/profile', locals: { subject: profile_subject } %>
+
+  <div id="calendar" class="table-striped" data-events_path="<%= polymorphic_path [profile_subject, Event.new] %>" data-date="<%= params[:date] %>" data-view="<%= params[:view] %>" <%= 'data-can-create="true"' if can?(:create, new_post(profile_subject)) %>></div>
+
+  <% if can? :create, new_post(profile_subject) %>
+    <div id="calendar_form" class="modal hide fade">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+          &times;
+        </button>
+        <h3>
+          <%= t('event.new.title') %>
+        </h3>
+      </div>
+
+      <div class="modal-body">
+        <%= render partial: 'new' %>
+      </div>
+    </div>
+  <% end %>
+</section>
 
 <%= javascript_tag do %>
   $(function(){
-
-    <% if profile_subject.respond_to? :rooms %>
-      SocialStream.Events.current.roomIndex = <%= raw profile_subject.rooms.map(&:id) %>;
-    <% end %>
-
-    SocialStream.Events.current.eventColor = '#58310E';
-
-    SocialStream.Events.current.calendar = $('#calendar').fullCalendar({
-      header: {
-        left: 'prev,next today',
-        center: 'title',
-        right: 'month,agendaWeek,agendaDay'
-      },
-      ignoreTimezone: false,
-      firstDay: 1,
-      eventColor: SocialStream.Events.current.eventColor,
-      <% if can? :create, new_post(profile_subject) %>
-      selectable: true,
-      selectHelper: true,
-      select: function(startDate, endDate, allDay, jsEvent){
-
-        SocialStream.Events.current.newForm = new Boxy(
-          "<%= escape_javascript render(:partial => 'events/new') %>",
-          {
-            title: "<%= t('event.new.title') %>",
-            closeable: true,
-            closeText: "<%= t('boxy.close_text') %>",
-            draggable: true
-          }
-        );
-
-
-        SocialStream.Events.current.newForm.moveTo(jsEvent.clientX, jsEvent.clientY);
-
-        var c = SocialStream.Events.current.newForm.getContent();
-
-        c.children('#event_start_at').val(startDate.toJSON());
-        c.children('#event_end_at').val(endDate.toJSON());
-        c.children('#event_all_day').val(allDay.toString());
-
-        // From rails-scheduler gem
-        Scheduler.form.init(c.find('.scheduler_form'), startDate);
-      },
-      <% end %>
-      // Implement event edition
-      // editable: true,
-      events: function(start, end, callback) {
-        $.ajax({
-            url: "<%= escape_javascript polymorphic_path([profile_subject, Event.new]) %>",
-            dataType: 'json',
-            data: {
-                // our hypothetical feed requires UNIX timestamps
-                start: Math.round(start.getTime() / 1000),
-                end: Math.round(end.getTime() / 1000)
-            },
-            success: function(events) {
-                callback(
-                  $.map(events, function(event) {
-                    event.color = SocialStream.Event.color(event.roomId);
-                    return event;
-                        }
-                  )
-                );
-            }
-        });
-      }
-    });
-
-    <% if params[:date] %>
-      // TODO: optimize this to save one index call
-      SocialStream.Events.current.calendar.fullCalendar('gotoDate', new Date(<%= escape_javascript params[:date] %> * 1000));
-    <% end %>
-
-    <% if params[:view] %>
-      SocialStream.Events.current.calendar.fullCalendar('changeView', "<%= escape_javascript params[:view] %>");
-    <% end %>
+    SocialStream.FullCalendar.show();
   });
 <% end %>

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

@@ -1,3 +1,3 @@
-$("#tipsy-<%= params[:tipsy] %>").html("<%= escape_javascript render(:partial => "event_sidebar", :collection => @events) %>");
+$("#modal-<%= params[:day] %> .modal-body").html("<%= escape_javascript render(:partial => "event_sidebar", :collection => @events) %>");
 
 SocialStream.Event.index();

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

@@ -3,29 +3,24 @@
 
   <% if f.object.errors.any? %>
     <div id="error_explanation">
-      <h2><%= pluralize(f.object.errors.count, "error") %> evitaron que se guardara este espacio:</h2>
-
+      <h2>
+        <%= pluralize(f.object.errors.count, "error") %> evitaron que se guardara este espacio:
+      </h2>
       <ul>
-      <% f.object.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
-      <% end %>
+        <% f.object.errors.full_messages.each do |msg| %>
+          <li>
+            <%= msg %>
+          </li>
+        <% end %>
       </ul>
     </div>
   <% end %>
-
-  <div class="row">
-    <div class="label">
-      <%= f.text_field :name %>
-    </div>
-
-    <div class="field">
-    <%= f.submit %>
-    </div>
-  </div>
+  <%= f.text_field :name %>
+  <%= f.submit %>
 <% end %>
 
 <%= javascript_tag do %>
   $(function(){
     $('#room_name').watermark("<%= escape_javascript t('room.watermark.name') %>");
   });
-<% end %>
+<% end %>

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

@@ -1,10 +1,6 @@
 <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>
+    <%= room.name %>
+    <%= 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 %>
   <% end %>
-</div>
+</div>

data/app/views/settings/_rooms.html.erb

@@ -0,0 +1,11 @@
+<div class="accordion-group" id="room_settings">
+  <header class="accordion-heading">
+    <%= link_to t('room.settings.title'),  "javascript:void(0);", class: 'accordion-toggle', "data-toggle" => 'collapse', "data-parent" => "#settings-accordion", "data-target" => "#room_settings_content" %>
+  </header>
+  
+  <div class="content settings_content collapse" id="room_settings_content">
+    <%= render :partial => 'rooms/index' %>
+  
+    <%= render :partial => 'rooms/form' %>
+  </div>
+</div>

data/app/views/sidebar/_calendar.html.erb

@@ -0,0 +1,48 @@
+<% bow = (Time.now - 6.days).beginning_of_week %>
+
+<div class="calendar" id="sidebar_calendar" data-path="<%= polymorphic_path([@current_subject, Event.new])%>" data-start="<%= bow.to_i %>" data-end="<%= (bow + 28.days).to_i %>">
+
+  <%= render partial: 'events/calendar_month',
+             locals: {
+               position: :top,
+               date: bow.to_date }
+  %>
+
+  <table id="days">
+
+    <% 28.times do |i| %>
+      <% day = bow + i.days %>
+      <%= raw cycle(*(Array.wrap("<tr>") + 6.times.map{""}) + Array.wrap(:name => "tr_start")) %>
+      <td id="day_<%= day.day %>_<%= day.month %>_<%= day.year %>">
+        <%= link_to day.day, polymorphic_path([profile_or_current_subject, Event.new], :date => day.to_i, :view => "agendaWeek") %>
+      </td>
+      <%= raw cycle(*(6.times.map{""} + Array.wrap('</tr>') + Array.wrap(:name => "tr_end"))) %>
+    <% end %>
+  </table>
+
+  <div id="modal-sidebar_calendar" class="modal hide fade" tabindex="-1" role="dialog">
+    <div class="modal-header">
+      <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+      <h3></h3>
+    </div>
+    <div class="modal-body">
+      <%= render partial: 'layouts/loading' %>
+    </div>
+    <div class="modal-footer">
+      <button class="view-calendar btn "><%= t 'event.modal.view_in_calendar' %></button>
+    </div>
+  </div>
+
+  <%= javascript_tag do %>
+    $(function(){
+      SocialStream.Calendar.show();
+    });
+  <% end %>
+
+  <%= render partial: 'events/calendar_month',
+             locals: {
+               position: :bottom,
+               date: (bow + 28.days).to_date
+             }
+  %>
+</div>

data/config/locales/en.yml

@@ -27,11 +27,17 @@ en:
       unfollow: "Unfollow"
     calendar: "Calendar"
     confirm_delete: "Delete event?"
+    modal:
+      view_in_calendar: "View in calendar"
     name: "event"
     new:
       title: "New event"
     one: "an event"
+    other: "events"
+    popover:
+      title: "Events on %{date}"
     poster:
+      button: "Upload"
       update: "Upload poster"
     title:
       one: "Event"

data/config/locales/es.yml

@@ -28,11 +28,17 @@ es:
       unfollow: "Desapuntar"
     calendar: "Calendario"
     confirm_delete: "¿Borrar evento?"
+    modal:
+      view_in_calendar: "Ver en el calendario"
     name: "evento"
     new:
       title: "Nuevo evento"
     one: "un evento"
+    other: "eventos"
+    popover:
+      title: "Eventos el %{date}"
     poster:
+      button: "Subir"
       update: "Subir cartel"
     title:
       one: "Evento"

data/lib/generators/social_stream/events/install_generator.rb

@@ -17,8 +17,7 @@ class SocialStream::Events::InstallGenerator < Rails::Generators::Base
   end
 
   def require_stylesheets
-    inject_into_file 'app/assets/stylesheets/application.css',
-                     " *= require social_stream-events\n",
-                     :before => ' *= require_tree .'
+    append_file 'app/assets/stylesheets/social_stream.css.sass',
+                "@import social_stream-events\n"
   end
 end

data/lib/social_stream/events/engine.rb

@@ -10,18 +10,6 @@ module SocialStream
       initializer "social_stream-events.models.register_activity_streams" do
         SocialStream::ActivityStreams.register :event
       end
-
-      initializer "social_stream-events.views.settings" do
-        SocialStream::Views::Settings.module_eval do
-          include SocialStream::Views::Settings::Events
-        end
-      end
-
-      initializer "social_stream-events.views.sidebar" do
-        SocialStream::Views::Sidebar.module_eval do
-          include SocialStream::Views::Sidebar::Events
-        end
-      end
     end
   end
 end

data/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "1.1.1".freeze
+    VERSION = "2.0.0.beta1".freeze
   end
 end

data/lib/social_stream-events.rb

@@ -3,25 +3,16 @@ require 'social_stream-base'
 require 'rails-scheduler'
 
 module SocialStream
-  module Views
-    module Settings
-      autoload :Events, 'social_stream/views/settings/events'
-    end
-
-    module Sidebar
-      autoload :Events, 'social_stream/views/sidebar/events'
-    end
-  end
-
   module Events
     autoload :Ability, 'social_stream/events/ability'
 
     module Models
       autoload  :Actor,    'social_stream/events/models/actor'
-      autoload  :Document, 'social_stream/events/models/document'
     end
 
-    SocialStream.objects.push(:event) unless SocialStream.objects.include?(:event)
+    %w( objects quick_search_models extended_search_models repository_models ).each do |m|
+      SocialStream.__send__(m).push(:event) unless SocialStream.__send__(m).include?(:event)
+    end
   end
 end
 

data/lib/tasks/db/populate.rake

@@ -0,0 +1,44 @@
+namespace :db do
+  namespace :populate do
+
+    desc "Create populate data with events"
+    task :create => 'create:events'
+
+    namespace :create do
+      desc "Add events to populate data"
+      task :events => :read_environment do
+        scope = 2.months
+
+        SocialStream::Population::ActivityObject.new Event do |l|
+          l.title = Forgery::LoremIpsum.words(1+rand(4),:random => true)
+          l.description = Forgery::LoremIpsum.sentences(1+rand(4), :random => true)
+
+          s = rand(scope)
+          s *= -1 if [ true, false ].sample
+
+          l.start_at = Time.at(Time.now.to_i + s)
+
+          if rand(1) > 0.25
+            l.start_at = l.start_at.begining_of_day
+            l.end_at   = l.start_at.end_of_day
+            l.all_day  = true
+          else
+            l.end_at = l.start_at + rand(3.days)
+          end
+
+          l.frequency = [ 0, 2, 3 ].sample
+
+          case l.frequency
+          when 2
+            l.interval = [ 1, 2, 3 ].sample
+            l.week_days = 7.times.map{ |i| i }.sample(rand(6).to_i + 1)
+          when 3
+            l.week_day_order = [ 1, 2, 3, -1 ].sample
+            l.week_day = 7.times.map{ |i| i }.sample
+            l.interval = rand(3).to_i + 1
+          end
+        end
+      end
+    end
+  end
+end

data/social_stream-events.gemspec

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

data/spec/controllers/events_controller_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe EventsController do
+  render_views
+
+  context "user's calendar" do
+    before do
+      @user = Factory(:user)
+    end
+
+    describe "when Anonymous" do
+      it "should render to login" do
+        get :index, user_id: @user.to_param
+
+        response.should be_success
+      end
+    end
+  end
+end
+

data/spec/views/settings_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe 'settings/_index' do
+  let(:user) { stub_model(User, { name: "Test User",
+                                  email: "test-user@test.com",
+                                  language: 'en' } ) }
+
+  let(:group) { stub_model(Group, { name: "Test Group",
+                                    to_param: "test-group" } ) }
+
+  before do
+    view.stub(:current_user).and_return(user)
+  end
+
+  describe "with user" do
+    before do
+      view.stub(:current_subject).and_return(user)
+    end
+
+    it "does not include room settings" do
+      render
+
+      rendered.should_not =~ /room_settings/
+    end
+  end
+
+  describe "with group" do
+    before do
+      view.stub(:current_subject).and_return(group)
+    end
+
+    it "includes room settings" do
+      render
+
+      rendered.should =~ /room_settings/
+    end
+  end
+
+end