social_stream 0.9.2 → 0.9.3

data/documents/app/views/audios/_audio_processing.html.erb

@@ -0,0 +1,7 @@
+<div class="attachment_thumb">
+  <%= thumb_for(audio, 16) %>
+</div>
+<div class="attachment_text">
+  <%= t('audio.msg') %><%= "\""+audio.file_file_name+"\"" %>
+  <div class="processing_text"><%= t('audio.processing')%></div>
+</div>

data/documents/app/views/common-documents/_index.html.erb

@@ -8,13 +8,13 @@
 
 <%if profile_subject_is_current?%>
   <%= location(
-    link_to(image_tag(("btn/btn_#{controller.controller_name.singularize}.png"), :class => "menu_icon")+t(controller.controller_name.singularize + '.title'), polymorphic_path(controller.controller_name),:remote => true)
+    link_to(t(controller.controller_name.singularize + '.title'), polymorphic_path(controller.controller_name),:remote => true)
     ) %>
   <% toolbar %>
 <%else%>
   <%= location(
-    link_to(image_tag("btn/btn_profile.png", :class => "menu_icon")+ profile_subject.name, polymorphic_path(profile_subject),:remote => true),
-    link_to(image_tag(("btn/btn_#{controller.controller_name.singularize}.png"), :class => "menu_icon")+t(controller.controller_name.singularize + '.title'), polymorphic_path([profile_subject, controller.controller_name]),:remote => true)
+    link_to(profile_subject.name, polymorphic_path(profile_subject),:remote => true),
+    link_to(t(controller.controller_name.singularize + '.title'), polymorphic_path([profile_subject, controller.controller_name]),:remote => true)
     ) %>
   <% toolbar :profile => profile_subject %>
 <%end%>

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

@@ -20,51 +20,10 @@
 
 <%= div_for video, :class => 'content_size' do %>
 
-  <div class="attachment_thumb">
-    <%= link_to thumb_for(video, 16),
-        {:controller => "documents", :action => "download", :id => video}, 
-        :class => "" %>
-  </div>
-  
-  <div class="attachment_text">
-  	<%= t('video.msg') %><%= link_to "\""+video.file_file_name+"\"", 
-    {:controller => "documents", :action => "download", :id => video},  
-    :class => "attachment_text_link" %>
-
-  <div id="video_thumbnail_<%=video.id%>" class="video_thumbnail_class">
-    <%=image_tag(video_path(video)+"?style=thumb", :class => "video_thumbnail_image")%>
-	<div id="<%=video.id%>" class="video_thumbnail_play_over"></div>
-  </div>
-
-
-  <div id="full_video_<%=video.id%>" class="jp-video jp-video-270p">
-    <div class="jp-type-single">
-      <div id="jpId<%=video.id%>" class="jp-jplayer"></div>
-      <div id="jp_interface_<%=video.id%>" class="jp-interface">
-        <div class="jp-video-play"></div>
-        <ul class="jp-controls">
-          <li><a href="#" class="jp-play" tabindex="1">play</a></li>
-          <li><a href="#" class="jp-pause" tabindex="1">pause</a></li>
-          <li><a href="#" class="jp-stop" tabindex="1">stop</a></li>
-          <li><a href="#" class="jp-mute" tabindex="1">mute</a></li>
-          <li><a href="#" class="jp-unmute" tabindex="1">unmute</a></li>
-        </ul>
-        <div class="jp-progress">
-          <div class="jp-seek-bar">
-            <div class="jp-play-bar"></div>
-          </div>
-        </div>
-        <div class="jp-volume-bar">
-          <div class="jp-volume-bar-value"></div>
-        </div>
-        <div class="jp-current-time"></div>
-        <div class="jp-duration"></div>
-      </div>
-      <div id="jp_playlist_<%=video.id%>" class="jp-playlist">
-      </div>
-    </div>
-  </div>
-	
-  </div>
+  <% if video.file_processing %>
+    <%= render :partial => 'videos/video_processing', :locals => {:video => video}%>
+  <% else %>
+    <%= render :partial => 'videos/video_processed', :locals => {:video => video}%>  
+  <% end %>
 
 <% end %>

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

@@ -0,0 +1,49 @@
+<div class="attachment_thumb">
+  <%= link_to thumb_for(video, 16),
+  {:controller => "documents", :action => "download", :id => video},
+  :class => "" %>
+</div>
+<div class="attachment_text">
+  <%= t('video.msg') %><%= link_to "\""+video.file_file_name+"\"",
+  {:controller => "documents", :action => "download", :id => video},
+  :class => "attachment_text_link" %>
+  <div id="video_thumbnail_<%= video.id%>" class="video_thumbnail_class">
+    <%= image_tag(video_path(video)+"?style=thumb", :class => "video_thumbnail_image")%> <div id="<%= video.id%>" class="video_thumbnail_play_over"></div>
+  </div>
+  <div id="full_video_<%= video.id%>" class="jp-video jp-video-270p">
+    <div class="jp-type-single">
+      <div id="jpId<%= video.id%>" class="jp-jplayer"></div>
+      <div id="jp_interface_<%= video.id%>" class="jp-interface">
+        <div class="jp-video-play"></div>
+        <ul class="jp-controls">
+          <li>
+            <a href="#" class="jp-play" tabindex="1">play</a>
+          </li>
+          <li>
+            <a href="#" class="jp-pause" tabindex="1">pause</a>
+          </li>
+          <li>
+            <a href="#" class="jp-stop" tabindex="1">stop</a>
+          </li>
+          <li>
+            <a href="#" class="jp-mute" tabindex="1">mute</a>
+          </li>
+          <li>
+            <a href="#" class="jp-unmute" tabindex="1">unmute</a>
+          </li>
+        </ul>
+        <div class="jp-progress">
+          <div class="jp-seek-bar">
+            <div class="jp-play-bar"></div>
+          </div>
+        </div>
+        <div class="jp-volume-bar">
+          <div class="jp-volume-bar-value"></div>
+        </div>
+        <div class="jp-current-time"></div>
+        <div class="jp-duration"></div>
+      </div>
+      <div id="jp_playlist_<%= video.id%>" class="jp-playlist"></div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,7 @@
+<div class="attachment_thumb">
+  <%= thumb_for(video, 16) %>
+</div>
+<div class="attachment_text">
+  <%= t('video.msg') %><%= "\""+video.file_file_name+"\"" %>
+  <div class="processing_text"><%= t('video.processing')%></div>
+</div>

data/documents/config/locales/en.yml

@@ -5,6 +5,7 @@ en:
     mine: "My audios"
     msg: "Uploaded an audio:"
     not_mine: "Audios"
+    processing: "Processing audio clip"
   conference:
     all: "All conferences"
     confirm_delete: "Delete conference?"
@@ -41,3 +42,4 @@ en:
     mine: "My videos"  
     msg: "Uploaded a video:" 
     not_mine: "Videos"
+    processing: "Processing video"

data/documents/db/migrate/20110922173707_add_file_processing_to_document.rb

@@ -0,0 +1,9 @@
+class AddFileProcessingToDocument < ActiveRecord::Migration
+    def self.up
+      add_column :documents, :file_processing, :boolean
+    end
+    
+    def self.down
+      remove_column :documents, :file_processing
+    end
+end

data/documents/lib/social_stream-documents.rb

@@ -1,6 +1,11 @@
 require 'social_stream-base'
+require 'delayed_paperclip'
 
 module SocialStream
+  module ToolbarConfig
+    autoload :Documents, 'social_stream/toolbar_config/documents'
+  end
+
   module Documents
     # Add :document to SocialStream.objects and SocialStream.activity_forms by default
     # It can be configured by users at application's config/initializers/social_stream.rb

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

@@ -34,6 +34,11 @@ module SocialStream
         Mime::Type.register "video/x-flv", :flv
       end
 
+      initializer "social_stream-documents.toolbar_config" do
+        SocialStream::ToolbarConfig.module_eval do
+          include SocialStream::ToolbarConfig::Documents
+        end
+      end
     end
   end
 end

data/documents/lib/social_stream/toolbar_config/documents.rb

@@ -0,0 +1,40 @@
+module SocialStream
+  module ToolbarConfig
+    module Documents
+      def home_toolbar_items
+        items = super
+
+        # FIXME: insert
+        items << {
+          :key => :resources,
+          :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t('resource.mine'),
+          :url => "#",
+          :options => {:link => {:id => "resources_menu"}},
+          :items => [
+            {:key => :resources_documents,:name => image_tag("btn/btn_document.png")+t('document.title'),:url => documents_path},
+            {:key => :resources_pictures,:name => image_tag("btn/btn_gallery.png")+t('picture.title'),:url => pictures_path},
+            {:key => :resources_videos,:name => image_tag("btn/btn_video.png")+t('video.title'),:url => videos_path},
+            {:key => :resources_audios,:name => image_tag("btn/btn_audio.png")+t('audio.title'),:url => audios_path}
+          ]
+        }
+      end
+
+      def profile_toolbar_items(subject = current_subject)
+        items = super
+
+        items << {
+          :key => :resources,
+          :name => image_tag("btn/btn_resource.png",:class =>"menu_icon")+t("resource.#{ subject == current_subject ? 'mine' : 'title' }"),
+          :url => "#",
+          :options => {:link => {:id => "resources_menu"}},
+          :items => [
+            {:key => :resources_documents,:name => image_tag("btn/btn_document.png")+t('document.title'),:url => polymorphic_path([subject, Document.new])},
+            {:key => :resources_pictures,:name => image_tag("btn/btn_gallery.png")+t('picture.title'),:url => polymorphic_path([subject, Picture.new])},
+            {:key => :resources_videos,:name => image_tag("btn/btn_video.png")+t('video.title'),:url => polymorphic_path([subject, Video.new])},
+            {:key => :resources_audios,:name => image_tag("btn/btn_audio.png")+t('audio.title'),:url => polymorphic_path([subject, Audio.new])}
+            ]
+        }
+      end
+    end
+  end
+end

data/documents/social_stream-documents.gemspec

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 Gem::Specification.new do |s|
   s.name = "social_stream-documents"
   s.version = "0.2.6"
@@ -12,6 +13,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('social_stream-base','>= 0.9.2')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
   s.add_runtime_dependency('paperclip','2.3.11')
+  s.add_runtime_dependency('delayed_paperclip','>= 0.7.2')
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')
   if RUBY_VERSION < '1.9'

data/events/lib/social_stream-events.rb

@@ -1,8 +1,13 @@
 require 'social_stream-base'
 
 module SocialStream
+  module ToolbarConfig
+    autoload :Events, 'social_stream/toolbar_config/events'
+  end
+
   module Events
-    # Add :document to SocialStream.objects and SocialStream.activity_forms by default
+    # Add :event, :agenda, :session to SocialStream.objects and SocialStream.activity_forms
+    # by default
     # It can be configured by users at application's config/initializers/social_stream.rb
     [:event, :agenda, :session].each do |o|
       SocialStream.objects.push(o) unless SocialStream.objects.include?(o)

data/events/lib/social_stream/events/engine.rb

@@ -1,8 +1,11 @@
 module SocialStream
   module Events
     class Engine < Rails::Engine
-    
-      
+      initializer "social_stream-events.toolbar_config" do
+        SocialStream::ToolbarConfig.module_eval do
+          include SocialStream::ToolbarConfig::Events
+        end
+      end
     end
   end
 end

data/events/lib/social_stream/toolbar_config/events.rb

@@ -0,0 +1,40 @@
+module SocialStream
+  module ToolbarConfig
+    module Events
+      def home_toolbar_items
+        items = super
+
+        items.find{ |i| i[:key] == :resources }[:items].unshift({
+          :key => :resources_events,
+          :name => image_tag("btn/btn_event.png")+t('conference.title'),
+          :url => events_path
+        })
+
+        items
+      end
+
+      def profile_toolbar_items(subject = current_subject)
+        items = super
+
+        items.find{ |i| i[:key] == :resources }[:items].unshift({
+          :key => :resources_events,
+          :name => image_tag("btn/btn_event.png")+t('conference.title'),
+          :url => polymorphic_path([subject, Event.new])
+        })
+
+        if SocialStream.activity_forms.include?(:event) &&
+           subject.is_a?(Event) &&
+           subject.agenda.present?
+
+           items.insert(1, {
+             :key => :outline_info,
+             :name => image_tag("btn/btn_outline.png")+t('menu.outline'),
+             :url =>  agenda_path(subject)
+           })
+        end
+
+        items
+      end
+    end
+  end
+end

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.9.2".freeze
+  VERSION = "0.9.3".freeze
 end

data/social_stream.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.9.3')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.7')
   s.add_runtime_dependency('social_stream-documents', '~> 0.2.6')
  
   # Development Gem dependencies

data/social_stream.thor

@@ -0,0 +1,110 @@
+# SocialStream release tasks
+class SocialStream < Thor
+  include Thor::Actions
+
+  # Manage component's version files
+  #
+  # This code is based on gem_release's version_file.rb
+  # https://github.com/svenfuchs/gem-release
+  #
+  # Copyright (c) 2010 Sven Fuchs <svenfuchs@artweb-design.de>
+  class VersionFile
+    VERSION_PATTERN = /(VERSION\s*=\s*(?:"|'))(\d+\.\d+\.\d+)("|')/
+    NUMBER_PATTERN = /(\d+)\.(\d+)\.(\d+)/
+
+    attr_reader :component, :target
+
+    def initialize(arg = "")
+      @component, @target = arg.split(":")
+      @target ||= :patch
+    end
+
+    def bump!
+      # Must load content before writing to it
+      content
+
+      File.open(filename, 'w+') { |f| f.write(bumped_content) }
+
+      commit
+
+      [ component, new_number ]
+    end
+
+    def new_number
+      @new_number ||= old_number.sub(NUMBER_PATTERN) do
+        respond_to?(target) ? send(target, $1, $2, $3) : target
+      end
+    end
+
+    def old_number
+      @old_number ||= content =~ VERSION_PATTERN && $2
+    end
+
+    def filename
+      component ?
+        "#{ component }/lib/social_stream/#{ component }/version.rb" :
+        "lib/social_stream/version.rb"
+    end
+
+    def commit
+      files = filename
+      files += " social_stream.gemspec" if component.nil?
+
+      system "git commit #{ files } -m #{ component }#{ new_number }"
+    end
+
+    protected
+
+    def major(major, minor, patch)
+      "#{major.to_i + 1}.0.0"
+    end
+
+    def minor(major, minor, patch)
+      "#{major}.#{minor.to_i + 1}.0"
+    end
+
+    def patch(major, minor, patch)
+      "#{major}.#{minor}.#{patch.to_i + 1}"
+    end
+
+    def content
+      @content ||= File.read(filename)
+    end
+
+    def bumped_content
+      content.sub(VERSION_PATTERN) { "#{$1}#{new_number}#{$3}" }
+    end
+  end
+
+
+  desc "release", "release SocialStream's gems"
+  def release(*components)
+    component_releases = components.map{ |c| release_component(c) }
+
+    update_components(component_releases)
+
+    VersionFile.new.bump!
+
+    system "rake release"
+  end
+
+  private
+
+  def release_component(component)
+    component, version = VersionFile.new(component).bump!
+
+    system "cd #{ component } && rake release"
+
+    [ component, version ]
+  end
+
+  def update_components(releases)
+    releases.each do |r|
+      component, version = r
+
+      gsub_file 'social_stream.gemspec',
+                /social_stream-#{ component }.*(\d+\.\d+\.\d+)/,
+                "social_stream-#{ component }', '~> #{ version }"
+    end
+  end
+end