social_stream 0.24.1 → 0.25.0

data/base/lib/social_stream/models/subject.rb

@@ -22,6 +22,7 @@ module SocialStream
         subtype_of :actor,
                    :build => { :subject_type => to_s }
         
+        has_one :activity_object, :through => :actor
         has_one :profile, :through => :actor
         
         validates_presence_of :name
@@ -48,7 +49,7 @@ module SocialStream
 
         scope :followed, lambda { 
           joins(:actor).
-            order("actors.follower_count DESC")
+            merge(Actor.followed)
         }
 
         scope :liked, lambda { 

data/base/lib/social_stream/models/subtype.rb

@@ -53,7 +53,12 @@ module SocialStream #:nodoc:
         # the subtype. Example: user.foo should raise "foo is not defined in user"
         # and not "in actor"
         rescue NameError => supertype_error
-          raise subtype_error
+          if supertype_error.name == subtype_error.name &&
+               supertype_error.message =~ /#{ self.class.supertype_name.to_s.classify }/
+            raise subtype_error
+          else
+            raise supertype_error
+          end
         end
       end
 

data/base/spec/controllers/groups_controller_spec.rb

@@ -13,6 +13,12 @@ describe GroupsController do
       assert_response :success
     end
 
+    it "should render index with most followed" do
+      get :index, :most => 'followed'
+
+      response.should be_success
+    end
+
     it "should render show" do
       get :show, :id => Factory(:group).to_param
 

data/base/spec/factories/post.rb

@@ -9,3 +9,9 @@ Factory.define :public_post, :parent => :post do |p|
   p.owner_id  { |q| q.author_id }
   p._relation_ids { |q| Array(Relation::Public.instance.id) }
 end
+
+Factory.define :self_post, :parent => :post do |p|
+  p.author_id { Factory(:user).actor_id }
+  p.owner_id  { |q| q.author_id }
+  p.user_author_id { |q| q.author_id }
+end

data/base/spec/models/activity_action_spec.rb

@@ -22,5 +22,40 @@ describe ActivityAction do
 
       action.reload.should_not be_follow
     end
+
+    describe "where posting to other owner" do
+      before do
+        @post = Factory(:post)
+      end
+
+      it "should not be duplicated" do
+        @post.received_actions.count.should == 2
+      end
+    end
+
+    describe "where posting to self" do
+      before do
+        @post = Factory(:self_post)
+      end
+
+      it "should not be duplicated" do
+        @post.received_actions.count.should == 1
+      end
+    end
+
+    describe "where building the post" do
+      before do
+        user = Factory(:user)
+        @post = Post.new :text => "Testing",
+                         :author => user,
+                         :owner  => user,
+                         :user_author => user
+        @post.save!
+      end
+
+      it "should not be duplicated" do
+        @post.received_actions.count.should == 1
+      end
+    end
   end
 end

data/documents/app/assets/javascripts/social_stream.video.js.erb

@@ -8,11 +8,12 @@ SocialStream.Video = (function(SS, $, undefined){
           $(this).jPlayer("setMedia", {
             webmv: $(this).closest(".video").find(".video-webm").attr("href"), // Defines the webm url
             flv: $(this).closest(".video").find(".video-flv").attr("href") // Defines the flv url
+            mp4: $(this).closest(".video").find(".video-mp4").attr("href") // Defines the mp4 url
           });
         },
       solution:"flash, html",
       preload: "none",
-      supplied: "webmv, flv",
+      supplied: "webmv, flv, mp4",
       swfPath: "<%= asset_path "" %>",
       cssSelectorAncestor: "#" + $(this).closest(".video-full").attr("id")
       })

data/documents/app/controllers/documents_controller.rb

@@ -11,6 +11,7 @@ class DocumentsController < ApplicationController
   
   def index
     super do |format|
+      format.json { render :json => collection.map{|a| a.activity_objects.first.document.to_json} }
       if params[:no_layout].present?
         format.html { render :action => :index, :layout => false }      
       else  
@@ -21,6 +22,7 @@ class DocumentsController < ApplicationController
   
   def create
     super do |format|
+      format.json { render :json => resource }
       format.all {redirect_to request.referer || home_path}
     end
   end
@@ -34,8 +36,9 @@ class DocumentsController < ApplicationController
 
   def show
     respond_to do |format|
+      format.json {render :json => resource }
       format.html {render :action => :show}
-      format.all {
+      format.any {
         path = resource.file.path(params[:style] || params[:format])
 
         send_file path,

data/documents/app/models/document.rb

@@ -68,6 +68,16 @@ class Document < ActiveRecord::Base
       "#{ size.to_s }/default.png"
     end
   end
+
+ # JSON, generic version for most documents
+  def to_json me=self
+    {:id => activity_object_id,
+     :title => title,
+     :description => description,
+     :author => author.name,
+     :src => file.to_s
+    }.to_json
+  end
   
   protected
 

data/documents/app/models/video.rb

@@ -4,7 +4,9 @@ class Video < Document
                     :path => ':rails_root/documents/:class/:id_partition/:style',
                     :styles => {
                       :webm => {:format => 'webm'},
-                      :flv  => { :format => 'flv' },
+                      :flv  => {:format => 'flv'},
+                      :mp4  => {:format => 'mp4'},
+                      :poster  => {:format => 'png', :time => 5},
                       :thumb48sq  => {:geometry => "48x48" , :format => 'png', :time => 5},
                       :thumbwall => {:geometry => "130x97#", :format => 'png', :time => 5}
                     },
@@ -25,5 +27,19 @@ class Video < Document
   def thumb(size, helper)
       "#{ size.to_s }/video.png"
   end
+
+ # JSON, special edition for video files
+  def to_json me=self
+    {:id => activity_object_id,
+     :title => title,
+     :description => description,
+     :author => author.name,
+     :poster => file(:poster).to_s,
+     :sources => [ { :type => Mime::WEBM.to_s,  :src => file(:webm).to_s },
+                   { :type => Mime::MP4.to_s,   :src => file(:mp4).to_s },
+                   { :type => Mime::FLV.to_s, :src => file(:flv).to_s }
+                 ]
+    }.to_json
+  end
   
 end

data/documents/app/views/videos/_video_processed.html.erb

@@ -20,6 +20,7 @@
   <div class="video-format-links">
     <%= link_to "WebM", video_path(video, :format => :webm), :class => "video-webm" %>
     <%= link_to "FLV",  video_path(video, :format => :flv),  :class => "video-flv" %>
+    <%= link_to "MP4",  video_path(video, :format => :mp4),  :class => "video-mp4" %>
   </div>
 </div>
 

data/documents/app/views/videos/_video_show.html.erb

@@ -54,11 +54,12 @@
         $(this).jPlayer("setMedia", {
           webmv: "<%= video_url(video, :format => 'webm' ) %>", // Defines the webm url
           flv:   "<%= video_url(video, :format => 'flv') %>"
+          mp4:   "<%= video_url(video, :format => 'mp4') %>"
         });
       },
       solution:"flash, html",
       preload: "none",
-      supplied: "webmv, flv",
+      supplied: "webmv, flv, mp4",
       swfPath: "assets",
       cssSelectorAncestor: "#jp_interface_<%=video.id%>"
     });

data/documents/db/migrate/{20110615143707_create_social_stream_documents.rb → 20120109155431_create_social_stream_documents.rb}

@@ -1,6 +1,6 @@
 class CreateSocialStreamDocuments < ActiveRecord::Migration
-  
-  def self.up
+
+  def change
     create_table "documents", :force => true do |t|
       t.string   "type"
       t.integer  "activity_object_id"
@@ -9,16 +9,14 @@ class CreateSocialStreamDocuments < ActiveRecord::Migration
       t.string   "file_file_name"
       t.string   "file_content_type"
       t.string   "file_file_size"
+      t.boolean  "file_processing"
+      t.string   "title"
+      t.text     "description"
     end
-    
-    add_index "documents", "activity_object_id"
+
+    add_index "documents", ["activity_object_id"], :name => "index_documents_on_activity_object_id"
+
     add_foreign_key "documents", "activity_objects", :name => "documents_on_activity_object_id"
-    
+
   end
-  
-  def self.down
-    remove_foreign_key "documents", :name => "documents_on_activity_object_id"
-    drop_table :documents
-  end
-  
 end

data/documents/lib/social_stream/documents/engine.rb

@@ -51,6 +51,7 @@ module SocialStream
         # Video
         Mime::Type.register "video/x-flv", :flv
         Mime::Type.register "video/webm", :webm
+        Mime::Type.register "video/mp4", :mp4
       end
 
       initializer "social_stream-documents.views.toolbar" do

data/documents/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.12.1".freeze
+    VERSION = "0.13.0".freeze
   end
 end

data/documents/social_stream-documents.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('paperclip-ffmpeg', '~> 0.7.0')
   s.add_runtime_dependency('paperclip','= 2.4.5')
   s.add_runtime_dependency('delayed_paperclip','2.4.5.1')

data/events/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/events/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/events/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/events/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/events/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/events/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')
 

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.24.1".freeze
+  VERSION = "0.25.0".freeze
 end

data/lib/tasks/migrations.rake

@@ -2,6 +2,8 @@ namespace :social_stream do
   namespace :migrations do
     desc "Copy pending migrations from all the social_stream components"
     task "update" do
+      Rake::Task['railties:install:migrations'].reenable
+      Rake::Task['mailboxer_engine:install:migrations'].invoke
       File.read(File.expand_path("../../../social_stream.gemspec", __FILE__)).
            scan(/dependency.*social_stream-(\w*)/).
            flatten.