social_stream 0.9.7 → 0.10.0

data/social_stream.gemspec

@@ -11,8 +11,9 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.9.10')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.11')
   s.add_runtime_dependency('social_stream-documents', '~> 0.2.8')
+  s.add_runtime_dependency('social_stream-events', '~> 0.0.4')
  
   # Development Gem dependencies
   #

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 55
   prerelease: 
   segments: 
   - 0
-  - 9
-  - 7
-  version: 0.9.7
+  - 10
+  - 0
+  version: 0.10.0
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-28 00:00:00 +02:00
+date: 2011-09-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 45
         segments: 
         - 0
         - 9
-        - 10
-        version: 0.9.10
+        - 11
+        version: 0.9.11
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -52,9 +52,25 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: capybara
+  name: social_stream-events
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 0
+        - 4
+        version: 0.0.4
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: capybara
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -66,11 +82,11 @@ dependencies:
         - 9
         version: 0.3.9
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -80,11 +96,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -96,11 +112,11 @@ dependencies:
         - 3
         version: 0.10.3
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -112,11 +128,11 @@ dependencies:
         - 0
         version: 2.5.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: factory_girl
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -128,11 +144,11 @@ dependencies:
         - 2
         version: 1.3.2
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: forgery
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -144,11 +160,11 @@ dependencies:
         - 6
         version: 0.3.6
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: ci_reporter
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -160,7 +176,7 @@ dependencies:
         - 4
         version: 1.6.4
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 description: Ruby on Rails engine supporting social networking features and activity streams.
 email: 
 executables: []
@@ -447,6 +463,7 @@ files:
 - base/app/views/activities/_activity.html.erb
 - base/app/views/activities/_child.html.erb
 - base/app/views/activities/_comments.html.erb
+- base/app/views/activities/_filter.html.erb
 - base/app/views/activities/_index.html.erb
 - base/app/views/activities/_new.html.erb
 - base/app/views/activities/_options.html.erb
@@ -587,6 +604,7 @@ files:
 - base/app/views/search/index.html.erb
 - base/app/views/search/index.js.erb
 - base/app/views/settings/_api_key.html.erb
+- base/app/views/settings/_contacts.html.erb
 - base/app/views/settings/_index.html.erb
 - base/app/views/settings/_notifications.html.erb
 - base/app/views/settings/index.html.erb
@@ -643,7 +661,6 @@ files:
 - base/lib/social_stream/test_helpers/controllers.rb
 - base/lib/social_stream/toolbar_config/base.rb
 - base/lib/tasks/db/populate.rake
-- base/lib/tasks/resque.rake
 - base/lib/tasks/workers.rake
 - base/social_stream-base.gemspec
 - base/spec/controllers/comments_controller_spec.rb
@@ -956,35 +973,17 @@ files:
 - events/app/assets/images/logos/representation/event.png
 - events/app/assets/images/tab_bottom.png
 - events/app/assets/javascripts/schedule.js
-- events/app/assets/javascripts/settings.js
 - events/app/assets/javascripts/social_stream-events.js
-- events/app/assets/stylesheets/activities.css
 - events/app/assets/stylesheets/fullcalendar.css
 - events/app/assets/stylesheets/fullcalendar.print.css
-- events/app/assets/stylesheets/settings.css
 - events/app/assets/stylesheets/social_stream-events.css
-- events/app/assets/stylesheets/tie.css
-- events/app/assets/stylesheets/users.css
-- events/app/controllers/activities_controller.rb
 - events/app/controllers/agendas_controller.rb
-- events/app/controllers/calendar_events_controller.rb
 - events/app/controllers/events_controller.rb
 - events/app/controllers/sessions_controller.rb
-- events/app/controllers/settings_controller.rb
 - events/app/helpers/event_helper.rb
 - events/app/models/agenda.rb
 - events/app/models/event.rb
 - events/app/models/session.rb
-- events/app/views/activities/_activity.html.erb
-- events/app/views/activities/_child.html.erb
-- events/app/views/activities/_comments.html.erb
-- events/app/views/activities/_index.html.erb
-- events/app/views/activities/_options.html.erb
-- events/app/views/activities/_root.html.erb
-- events/app/views/activities/_wall.html.erb
-- events/app/views/activities/_walls.html.erb
-- events/app/views/activities/documents.js.erb
-- events/app/views/activities/index.js.erb
 - events/app/views/agendas/_agenda.html.erb
 - events/app/views/agendas/_edit.html.erb
 - events/app/views/agendas/_schedule.html.erb
@@ -994,17 +993,6 @@ files:
 - events/app/views/agendas/event.html.erb
 - events/app/views/agendas/index.html.erb
 - events/app/views/agendas/show.html.erb
-- events/app/views/calendar_events/_calendar.html.erb
-- events/app/views/calendar_events/_edit_form.html.erb
-- events/app/views/calendar_events/_form.html.erb
-- events/app/views/calendar_events/available.html.erb
-- events/app/views/calendar_events/create.js.erb
-- events/app/views/calendar_events/edit.js.erb
-- events/app/views/calendar_events/index.html.erb
-- events/app/views/calendar_events/move.js.erb
-- events/app/views/calendar_events/new.js.erb
-- events/app/views/calendar_events/resize.js.erb
-- events/app/views/calendar_events/schedule.html.erb
 - events/app/views/documents/_mediawall.html.erb
 - events/app/views/events/_event.html.erb
 - events/app/views/events/_event_with_details.html.erb
@@ -1023,15 +1011,7 @@ files:
 - events/app/views/events/manage.html.erb
 - events/app/views/events/manage.js.erb
 - events/app/views/events/show.html.erb
-- events/app/views/kaminari/_first_page.html.erb
-- events/app/views/kaminari/_gap.html.erb
-- events/app/views/kaminari/_last_page.html.erb
-- events/app/views/kaminari/_next_page.html.erb
-- events/app/views/kaminari/_page.html.erb
-- events/app/views/kaminari/_paginator.html.erb
-- events/app/views/kaminari/_prev_page.html.erb
 - events/app/views/profiles/_outline.html.erb
-- events/app/views/profiles/_profile.html.erb
 - events/app/views/sessions/_form.html.erb
 - events/app/views/sessions/_new.html.erb
 - events/app/views/sessions/_session.html.erb
@@ -1043,20 +1023,7 @@ files:
 - events/app/views/sessions/index.html.erb
 - events/app/views/sessions/index.js.erb
 - events/app/views/sessions/new.html.erb
-- events/app/views/settings/_contacto.html.erb
-- events/app/views/settings/_header.html.erb
-- events/app/views/settings/_index.html.erb
-- events/app/views/settings/_manage.html.erb
-- events/app/views/settings/_settings.html.erb
-- events/app/views/settings/delete_relation.js.erb
-- events/app/views/settings/index.html.erb
-- events/app/views/settings/manage.html.erb
-- events/app/views/settings/show.html.erb
-- events/app/views/settings/update_relation.js.erb
-- events/app/views/toolbar/_home.html.erb
-- events/app/views/toolbar/_logo.html.erb
 - events/app/views/toolbar/_organizer.html.erb
-- events/app/views/toolbar/_profile.html.erb
 - events/app/views/toolbar/_sponsor.html.erb
 - events/app/views/toolbar/_suscribed.html.erb
 - events/config/locales/en.yml

data/base/lib/tasks/resque.rake

@@ -1,3 +0,0 @@
-require "resque/tasks"
-
-task "resque:setup" => :environment

data/events/app/assets/javascripts/settings.js

@@ -1,20 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.
-var contact_manage_open = false;
-closeSettings = function() {
-    $("#contact_settings_content").hide("slow");
-    $("#contact_settings_briefing").show("slow");
-    contact_manage_open = false;
-}
-showContactSettings = function() {
-    if (contact_manage_open) {
-        $("#contact_settings_content").hide("slow");
-        $("#contact_settings_briefing").show("slow");
-        contact_manage_open = false;
-    } else {
-        closeAllSettings();
-        $("#contact_settings_content").show("slow");
-        $("#contact_settings_briefing").hide("slow");
-        contact_manage_open = true;
-    }
-}

data/events/app/assets/stylesheets/activities.css

@@ -1,4 +0,0 @@
-/*
-  Place all the styles related to the matching controller here.
-  They will automatically be included in application.css.
-*/

data/events/app/assets/stylesheets/settings.css

@@ -1,4 +0,0 @@
-/*
-  Place all the styles related to the matching controller here.
-  They will automatically be included in application.css.
-*/

data/events/app/assets/stylesheets/tie.css

@@ -1,4 +0,0 @@
-/*
-  Place all the styles related to the matching controller here.
-  They will automatically be included in application.css.
-*/

data/events/app/assets/stylesheets/users.css

@@ -1,4 +0,0 @@
-/*
-  Place all the styles related to the matching controller here.
-  They will automatically be included in application.css.
-*/

data/events/app/controllers/activities_controller.rb

@@ -1,42 +0,0 @@
-class ActivitiesController < InheritedResources::Base
-  belongs_to_subjects
-  actions :index
-
-  respond_to :js
-
-  def documents
-    object_types = params[:types]
-    if object_types.nil? || object_types == "all"
-#    @activities=ActivityObject.where("object_type in :list",:list=> object_types).order("updated_at DESC").
-     logger.debug("es nil u all")
-#     @activities=ActivityObject.
-#                          page(params[:page]).
-#                          per(params[:per])    
-      @activities=current_subject.wall(:home).page(params[:page])
-    else
-     logger.debug("tiene valores el arreglo")
-#     @activities=ActivityObject.where(:object_type => object_types).order("updated_at DESC").
-#                          page(params[:page]).
-#                          per(params[:per])    
-      @activities=current_subject.wall(:home).joins(:activity_objects).where(:activity_objects=>{:object_type => object_types}).order("updated_at DESC").page(params[:page])
-    end
-    #@activities = profile_subject.wall(:profile,
-    #                       :for => current_subject,
-    #                       :object_type => object_types).#Array(self.class.index_object_type)).
-    #                      page(params[:page]).
-    #                      per(params[:per])    
-  end
-
-  protected
-
-  def collection
-    rel = params[:section].to_i if params[:section].present?
-
-    # should be activities.page(params[:page], :count => { :select => 'activity.id', :distinct => true }) but it is not working in Rails 3.0.3 
-    @activities ||= association_chain[-1].
-                      wall(:profile,
-                           :for => current_subject,
-                           :relation => rel).
-                      page(params[:page])
-  end
-end

data/events/app/controllers/calendar_events_controller.rb

@@ -1,157 +0,0 @@
-class CalendarEventsController < InheritedResources::Base
-   
-    def new
-      starttime = params[:start]
-      endtime = params[:end]
-      allDay = params[:allDay]
-      @room = Room.find(params[:room_id])
-      logger.error "starttime => #{starttime}, endtime => #{endtime}, all_day => #{allDay}"
-      @event = CalendarEvent.new(:starttime => starttime ? starttime[0,20].strip : "", :endtime => endtime ? endtime[0,20].strip : "", :all_day => allDay, :period => "Does not repeat")
-    end
-    
-    def create
-      if params[:calendar_event][:period] == "Does not repeat"
-        @event = CalendarEvent.new(params[:calendar_event])
-      else
-        #@event_series = EventSeries.new(:frequency => params[:event][:frequency], :period => params[:event][:repeats], :starttime => params[:event][:starttime], :endtime => params[:event][:endtime], :all_day => params[:event][:all_day])
-        @event_series = CalendarEventSeries.new(params[:calendar_event])
-        if (params[:repeat_until][:year] != "" && params[:repeat_until][:month] != "" && params[:repeat_until][:day] != "")
-          @event_series.repeat_until = Date.civil(params[:repeat_until][:year].to_i, params[:repeat_until][:month].to_i, params[:repeat_until][:day].to_i)
-          @event_series.save
-        end
-      end
-    end
-    
-    def index
-
-    end
-
-    def get_calendar_events
-      events = []
-      # Current reservations
-      if params[:calendar_events] != nil
-        calendar_events_ids = params[:calendar_events].strip().split(' ')
-        @calendar_events = CalendarEvent.find(calendar_events_ids)
-        @calendar_events.each do |event|
-        events << {:id => event.id, :title => event.title, 
-                   :description => event.description || "Some cool description here...", 
-                   :start => event.starttime.in_time_zone(Time.zone).to_s[0,20].strip, 
-                   :end => event.endtime.in_time_zone(Time.zone).to_s[0,20].strip, 
-                     :allDay => event.all_day, 
-                     :editable => true,
-                     :recurring => (event.calendar_event_series_id)? true: false}
-        end
-      end
-
-      render :text => events.to_json
-    end
-
-    def get_events
-      @events = CalendarEvent.find(:all, :conditions => ["starttime >= '#{Time.at(params['start'].to_i).to_formatted_s(:db)}' and endtime <= '#{Time.at(params['end'].to_i).to_formatted_s(:db)}'"] )
-      events = [] 
-      @events.each do |event|
-        events << {:id => event.id, :title => event.title, :description => event.description || "Some cool description here...", :start => "#{event.starttime.iso8601}", :end => "#{event.endtime.iso8601}", :allDay => event.all_day, :recurring => (event.calendar_event_series_id)? true: false}
-      end
-      render :text => events.to_json
-    end
-    
-
-    def move
-      @event = CalendarEvent.find_by_id params[:id]
-      if @event
-        @event.starttime = (params[:minute_delta].to_i).minutes.from_now((params[:day_delta].to_i).days.from_now(@event.starttime))
-        @event.endtime = (params[:minute_delta].to_i).minutes.from_now((params[:day_delta].to_i).days.from_now(@event.endtime))
-        @event.all_day = params[:all_day]
-        @event.save
-      end
-    end
-
-    def resize
-      @event = CalendarEvent.find_by_id params[:id]
-      if @event
-        @event.endtime = (params[:minute_delta].to_i).minutes.from_now((params[:day_delta].to_i).days.from_now(@event.endtime))
-        @event.save
-      end    
-    end
-    
-    def edit
-      @event = CalendarEvent.find_by_id(params[:id])
-    end
-    
-    def update
-      @event = CalendarEvent.find_by_id(params[:calendar_event][:id])
-      if params[:calendar_event][:commit_button] == "Actualizar todas las instancias"
-        @events = @event.calendar_event_series.calendar_events #.find(:all, :conditions => ["starttime > '#{@event.starttime.to_formatted_s(:db)}' "])
-        @event.update_calendar_events(@events, params[:calendar_event])
-      elsif params[:calendar_event][:commit_button] == "Actualizar todas las instancias siguientes"
-        @events = @event.calendar_event_series.calendar_events.find(:all, :conditions => ["starttime > '#{@event.starttime.to_formatted_s(:db)}' "])
-        @event.update_calendar_events(@events, params[:calendar_event])
-      else
-        @event.attributes = params[:calendar_event]
-        if params[:calendar_event][:period] != "Does not repeat"
-          @event_series = CalendarEventSeries.new(params[:calendar_event])
-          @event_series.repeat_until = Date.civil(params[:repeat_until][:year].to_i, params[:repeat_until][:month].to_i, params[:repeat_until][:day].to_i)
-          @event_series.object_type = @event.object_type
-          @event_series.object_id = @event.object_id
-          @event_series.save
-
-          @event.calendar_event_series = @event_series
-        end
-        @event.save
-      end
-  
-      render :update do |page|
-        page<<"$('#calendar').fullCalendar( 'refetchEvents' )"
-        page<<"$('#desc_dialog').dialog('destroy')" 
-      end
-      
-    end  
-    
-    def destroy
-      @event = CalendarEvent.find_by_id(params[:id])
-      if params[:delete_all] == 'true'
-        @event.calendar_event_series.destroy
-      elsif params[:delete_all] == 'future'
-        @events = @event.calendar_event_series.calendar_events.find(:all, :conditions => ["starttime > '#{@event.starttime.to_formatted_s(:db)}' "])
-        @event.calendar_event_series.calendar_events.delete(@events)
-      else
-        @event.destroy
-      end
-      
-      render :update do |page|
-        page<<"if (parent.$('#reservation_calendar_events').val()) { parent.$('#reservation_calendar_events').val(parent.$('#reservation_calendar_events').val().replace('#{@event.id}','')) };"
-        page<<"$('#calendar').fullCalendar( 'refetchEvents' )"
-        page<<"$('#desc_dialog').dialog('destroy')" 
-      end
-      
-    end
-
- def show
-      calendar_events_ids = params[:calendar_events].strip().split(' ')
-      calendar_events = CalendarEvent.find(calendar_events_ids)
-      @schedules = ""
-
-      calendar_events.sort {|a,b| a.starttime <=> b.starttime}.each do |calendar_event|
-        @schedules += "<li id='calendar_schedule_#{calendar_event.id}' class='bit-box' rel='#{calendar_event.id}'>" +
-          "#{calendar_event}"+
-          "<a class='closebutton' href='#' "+
-          "onclick='$.ajax({url: \\\"/calendar_events/delete?id=#{calendar_event.id}\\\"});'>" +
-          "</a></li>"
-      end 
-      render :update do |page|
-        page << "$('#holder_schedules').html(\""+@schedules+"\");"
-      end
-    end
-    
-  def delete
-    calendar_event = CalendarEvent.find_by_id(params[:id])
-    calendar_event.destroy
-  
-    render :update do |page|
-      page << "if ($('#reservation_calendar_events').val()) { $('#reservation_calendar_events').val($('#reservation_calendar_events').val().replace('#{calendar_event.id}','')); }"
-      page << "$.ajax({url: '/calendar_events/show?calendar_events='+$('#reservation_calendar_events').val()})" 
-    end  
-  end
-
-
-end