social_stream 0.26.0 → 0.26.1

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

@@ -1 +1 @@
-<%=render(:partial => 'common_documents/index') %>
+<%= render :partial => 'common_documents/index', :locals => { :documents => @videos } %>

data/documents/config/routes.rb

@@ -4,6 +4,7 @@ Rails.application.routes.draw do
   resources :videos
 
   resources :documents do
+    get "search",   :on => :collection
     get "download", :on => :member
   end
   
@@ -15,6 +16,7 @@ Rails.application.routes.draw do
       resources :videos
 
       resources :documents do
+        get "search",   :on => :collection
         get "download", :on => :member
       end
     end

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.14.0".freeze
+    VERSION = "0.14.1".freeze
   end
 end

data/documents/lib/tasks/db/populate_documents.rake

@@ -6,31 +6,14 @@ namespace :db do
 
     desc "Add documents to populate data"
     task :create_documents => :read_environment do
-      puts 'Documents population'
-      docs_start = Time.now
+      SS_DOCS_PATH=Gem::Specification.find_by_name('social_stream-documents').full_gem_path
+      doc_files = Forgery::Extensions::Array.new(Dir.glob(File.join(SS_DOCS_PATH, 'lib', 'samples', "*")))
 
-      doc_files = Forgery::Extensions::Array.new(Dir.glob(File.join(Rails.root, 'lib', 'documents', "*")))
-
-      50.times do
-        updated = Time.at(rand(Time.now.to_i))
-        author = Actor.all[rand(Actor.all.size)]
-        owner  = author
-        user_author =  ( author.subject_type == "User" ? author : author.user_author )
-
-        d = Document.create! :file => File.open(doc_files.random, "r"),
-                             :title => Forgery::LoremIpsum.words(1+rand(4),:random => true),
-                             :created_at => Time.at(rand(updated.to_i)),
-                             :updated_at => updated,
-                             :author_id  => author.id,
-                             :owner_id   => owner.id,
-                             :user_author_id => user_author.id,
-                             :relation_ids => [Relation::Public.instance.id]
-        d.save!
+      SocialStream::Population::ActivityObject.new Document do |d|
+        d.file  = File.open(doc_files.random, "r")
+        d.title = Forgery::LoremIpsum.words(rand(4), :random => true)
+        d.description = Forgery::LoremIpsum.sentences(rand(4), :random => true)
       end
-
-      docs_end = Time.now
-      puts '   -> ' +  (docs_end - docs_start).round(4).to_s + 's'
     end
   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.20.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.20.1')
   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-events.js

@@ -1,4 +1,7 @@
+//= require jquery.boxy
 //= require jquery.watermark
+//= require fullcalendar
+//= require scheduler
 //
 //= require social_stream-base
 //

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

@@ -11,6 +11,10 @@ SocialStream.Event = (function(SS, $, undefined) {
 		$.each(indexCallbacks, function(i, callback){ callback(); });
 	}
 
+	var color = function(){
+		SocialStream.Events.current.eventColor;
+	}
+
         var fixDates = function(){
           $(".event").each(function(){
             dateString = $(this).find("time").attr("datetime");
@@ -44,6 +48,7 @@ SocialStream.Event = (function(SS, $, undefined) {
 
 	return {
 		addIndexCallback: addIndexCallback,
+		color: color,
 		index: index
 	}
 

data/events/app/controllers/events_controller.rb

@@ -1,8 +1,6 @@
 class EventsController < ApplicationController
   include SocialStream::Controllers::Objects
 
-  belongs_to_subjects :optional => true
-
   before_filter :profile_subject!, :only => :index
 
   def index
@@ -31,7 +29,7 @@ class EventsController < ApplicationController
 
   def collection
     @activities =
-      profile_subject.wall(:profile,
+      (profile_subject || current_subject).wall(:profile,
                            :for => current_subject,
                            :object_type => :Event)
   end

data/events/app/models/event.rb

@@ -64,7 +64,7 @@ class Event < ActiveRecord::Base
   def room_belongs_to_receiver
     return if room_id.blank?
 
-    unless _contact.receiver.room_ids.include?(room_id)
+    unless owner.room_ids.include?(room_id)
       errors.add(:room_id, :invalid)
     end
   end

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

@@ -5,7 +5,7 @@
 
   jQuery.each(<%= raw Array.wrap(@event.to_json).to_json  %>,
               function(index, ev) {
-    ev.color = SocialStream.Events.tools.eventColor(<%= @event.room_id %>);
+    ev.color = SocialStream.Event.color(<%= @event.room_id %>);
   
     cal.fullCalendar('renderEvent', ev,
                      true // make the event "stick"

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

@@ -78,7 +78,7 @@
             success: function(events) {
                 callback(
                   $.map(events, function(event) {
-                    event.color = SocialStream.Events.tools.eventColor(event.roomId);
+                    event.color = SocialStream.Event.color(event.roomId);
                     return event;
                         }
                   )

data/events/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.12.0".freeze
+    VERSION = "0.12.1".freeze
   end
 end

data/events/social_stream-events.gemspec

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

data/lib/social_stream.rb

@@ -1,10 +1,6 @@
-require 'social_stream-base'
-require 'social_stream-documents'
-require 'social_stream-events'
-require 'social_stream-linkser'
-require 'social_stream-presence'
-
 module SocialStream
+  Components = %w{ base documents events linkser presence }
+
   class Engine < ::Rails::Engine #:nodoc:
     config.app_generators.base      'social_stream:base'
     config.app_generators.documents 'social_stream:documents'
@@ -13,3 +9,7 @@ module SocialStream
     config.app_generators.chat      'social_stream:presence'
   end
 end
+
+SocialStream::Components.each do |component|
+  require "social_stream-#{ component }" # require "social_stream-base"
+end

data/lib/social_stream/release/component.rb

@@ -0,0 +1,29 @@
+require File.expand_path('../global', __FILE__)
+
+module SocialStream
+  module Release
+    class Component < Global
+      attr_reader :name
+
+      def initialize(name, options = {})
+        @name, @options = name, options
+      end
+
+      protected
+
+      def version_file
+        @version_file ||= VersionFile.new(@name, @options[:version])
+      end
+
+      def gemspec
+        "#{ name }/social_stream-#{ name }.gemspec"                                           
+      end
+
+      def rake_release_command
+        "cd #{ @name } && rake release"
+      end
+    end
+  end
+end
+
+require File.expand_path('../component/version_file', __FILE__)

data/lib/social_stream/release/component/version_file.rb

@@ -1,6 +1,6 @@
 module SocialStream
   module Release
-    module Component
+    class Component
       class VersionFile < Global::VersionFile
         attr_reader :name
 

data/lib/social_stream/release/global.rb

@@ -0,0 +1,65 @@
+require File.expand_path('../dependency_update', __FILE__)
+require File.expand_path('../global/version_file', __FILE__)
+
+module SocialStream
+  module Release
+    class Global
+      include Thor::Actions
+
+      DEPENDENCY_REGEXP = /dependency.*social_stream-(\w*)/
+
+      attr_reader :name, :version
+
+      def initialize(target = nil, options = {})
+        @target, @options = target, options
+      end
+      
+      def bump
+        bump_version
+
+        update_dependencies
+      end
+
+      def publish
+        if @options[:test]
+          puts rake_release_command
+        else
+          system(rake_release_command) || raise(RuntimeError.new)
+        end
+      end
+
+      def dependencies
+        @dependencies ||=
+          File.read(gemspec).scan(DEPENDENCY_REGEXP).flatten
+      end
+
+      def commit_files
+        "#{ @version_file.filename } #{ gemspec }"
+      end
+
+      protected
+
+      def bump_version
+        @version = version_file.bump!
+      end
+
+      def version_file
+        @version_file ||= VersionFile.new(@target)
+      end
+
+      def update_dependencies
+        dependencies.each do |d|
+          DependencyUpdate.new.invoke(:update, [ gemspec, d, Component::VersionFile.new(d).old_number ])
+        end
+      end
+
+      def gemspec
+        "social_stream.gemspec"
+      end
+
+      def rake_release_command
+        "rake release"
+      end
+    end
+  end
+end

data/lib/social_stream/release/global/version_file.rb

@@ -1,6 +1,6 @@
 module SocialStream
   module Release
-    module Global
+    class Global
       # Manage component's version files
       #
       # This code is based on gem_release's version_file.rb

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.26.0".freeze
+  VERSION = "0.26.1".freeze
 end

data/linkser/lib/social_stream/linkser/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Linkser
-    VERSION = "0.11.0".freeze
+    VERSION = "0.11.1".freeze
   end
 end

data/linkser/lib/tasks/db/populate_links.rake

@@ -6,30 +6,11 @@ namespace :db do
 
     desc "Add links to populate data"
     task :create_links => :read_environment do
-      puts 'Links population'
-      links_start = Time.now
-
-      50.times do
-        updated = Time.at(rand(Time.now.to_i))
-        author = Actor.all[rand(Actor.all.size)]
-        owner  = author
-        user_author =  ( author.subject_type == "User" ? author : author.user_author )
-
-        d = Link.create! :title => Forgery::LoremIpsum.words(1+rand(4),:random => true),
-                         :description => Forgery::LoremIpsum.sentences(1+rand(4), :random => true),
-                         :url => "http://#{ Forgery::Internet.domain_name }",
-                         :created_at => Time.at(rand(updated.to_i)),
-                         :updated_at => updated,
-                         :author_id  => author.id,
-                         :owner_id   => owner.id,
-                         :user_author_id => user_author.id,
-                         :_relation_ids => [Relation::Public.instance.id]
-        d.save!
+      SocialStream::Population::ActivityObject.new Link do |l|
+        l.title = Forgery::LoremIpsum.words(1+rand(4),:random => true)
+        l.description = Forgery::LoremIpsum.sentences(1+rand(4), :random => true)
+        l.url = "http://#{ Forgery::Internet.domain_name }"
       end
-
-      links_end = Time.now
-      puts '   -> ' +  (links_end - links_start).round(4).to_s + 's'
     end
   end
 end
-

data/linkser/social_stream-linkser.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', '~> 0.20.0')
-  s.add_runtime_dependency('linkser', '~> 0.0.10')
+  s.add_runtime_dependency('social_stream-base', '~> 0.20.1')
+  s.add_runtime_dependency('linkser', '~> 0.0.12')
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')
   if RUBY_VERSION < '1.9'

data/presence/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Presence
-    VERSION = "0.13.0"
+    VERSION = "0.13.1"
   end
 end

data/presence/social_stream-presence.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.20.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.20.1')
   
   s.add_runtime_dependency "xmpp4r"
 
@@ -27,6 +27,6 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "net-sftp"
   
-  s.add_development_dependency "ruby-debug19"
+  s.add_development_dependency "debugger"
   
 end

data/release.thor

@@ -0,0 +1,69 @@
+require File.expand_path("../lib/social_stream/release/component", __FILE__)
+
+# SocialStream release tasks
+class Release < Thor
+
+  default_task :bump_and_publish
+
+  method_option :test => false,
+                :desc => "Do nothing",
+                :aliases => "-t"
+
+  desc "bump_and_publish", "Bump gem versions and release them"
+  def bump_and_publish(*args)
+    bump *args
+    publish *args
+  end
+
+  desc "bump", "Bump gem versions and set SocialStream's dependencies"
+  def bump(*args)
+    # First of all, update gems
+    system "bundle"
+
+    parse_args(args)
+
+    all.each(&:bump)
+
+    system("git commit #{ all.map(&:commit_files).join(" ") } -m #{ @global.version }") ||
+      raise(RuntimeError.new)
+  end
+
+  desc "publish", "push SocialStream's gems to rubygems and create git tags"
+  def publish(*args)
+    parse_args(args)
+
+    all.each(&:publish)
+  end
+
+  private
+
+  def parse_args(args)
+    if args.empty?
+      args = global_dependencies
+    end
+
+    @components = []
+
+    args.each do |a|
+      name, version = a.split(":")
+
+      if global_dependencies.include?(name)
+        @components << ::SocialStream::Release::Component.new(name, options.merge(:version => version))
+      else
+        @target = name
+      end
+    end
+
+    @global = ::SocialStream::Release::Global.new(@target, options)
+  end
+
+  def global_dependencies
+    @global_dependencies ||=
+      ::SocialStream::Release::Global.new.dependencies
+  end
+
+  def all
+    @all ||=
+      @components + [@global]
+  end
+end