social_stream 0.9.2 → 0.9.3

data/base/lib/social_stream-base.rb

@@ -45,7 +45,6 @@ module SocialStream
   autoload :Populate,  'social_stream/populate'
   autoload :Relations, 'social_stream/relations'
   autoload :TestHelpers, 'social_stream/test_helpers'
-  autoload :ToolbarConfig, 'social_stream/toolbar_config'
 
   module Controllers
     autoload :Helpers, 'social_stream/controllers/helpers'
@@ -61,6 +60,10 @@ module SocialStream
     autoload :Controllers, 'social_stream/test_helpers/controllers'
   end
 
+  module ToolbarConfig
+    autoload :Base, 'social_stream/toolbar_config/base'
+  end
+
   mattr_accessor :subjects
   @@subjects = [ :user, :group ]
 

data/base/lib/social_stream/base.rb

@@ -24,6 +24,12 @@ module SocialStream
         end
       end
 
+      initializer "social_stream-base.toolbar_config" do
+        SocialStream::ToolbarConfig.module_eval do
+          include SocialStream::ToolbarConfig::Base
+        end
+      end
+
       initializer "social_stream-base.avatars_for_rails" do
         AvatarsForRails.setup do |config|
           config.avatarable_model = :actor

data/base/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.6".freeze
+    VERSION = "0.9.7".freeze
   end
 end

data/base/lib/social_stream/toolbar_config/base.rb

@@ -0,0 +1,87 @@
+module SocialStream
+  module ToolbarConfig
+    module Base
+      # Base toolbar items
+      def home_toolbar_items
+        Array.new.tap do |items|
+          # Messages
+          items << {
+            :key => :messages,
+            :name => image_tag("btn/new.png")+t('message.other')+' (' + current_subject.mailbox.inbox(:unread => true).count.to_s + ')',
+            :url => "#",
+            :options => {:link => {:id => "messages_menu"}},
+            :items => [
+              { :key => :message_new,
+                :name => image_tag("btn/message_new.png")+ t('message.new'),
+                :url => new_message_path,
+                :options => {:link =>{:remote=> false}}},
+              { :key => :message_inbox,
+                :name => image_tag("btn/message_inbox.png")+t('message.inbox')+' (' + current_subject.mailbox.inbox(:unread => true).count.to_s + ')',
+                :url => conversations_path,
+                :options => {:link =>{:remote=> false}}},
+              { :key => :message_sentbox,
+                :name => image_tag("btn/message_sentbox.png")+t('message.sentbox'),
+                :url => conversations_path(:box => :sentbox),
+                :options => {:link =>{:remote=> false}}},
+              { :key => :message_trash,
+                :name => image_tag("btn/message_trash.png")+t('message.trash'),
+                :url => conversations_path(:box => :trash)}
+            ]
+          }
+
+          #Contacts
+          items << {
+            :key => :contacts,
+            :name => image_tag("btn/btn_friend.png")+t('contact.other'),
+            :url => "#",
+            :options => {:link => {:id => "contacts_menu"}},
+            :items => [
+              {:key => :invitations, :name => image_tag("btn/btn_friend.png")+t('contact.current'), :url => contacts_path},
+              {:key => :contacts_graph, :name => image_tag("btn/btn_friend.png")+t('contact.graph.one'), :url => ties_path},
+              {:key => :invitations, :name => image_tag("btn/btn_friend.png")+t('contact.pending.other'), :url => contacts_path(:pending=>true)},
+              {:key => :invitations, :name => image_tag("btn/btn_invitation.png")+t('invitation.toolbar'), :url => new_invitation_path}
+            ]
+          }
+        end
+      end
+
+      # Builds the default profile toolbar items
+      def profile_toolbar_items(subject = current_subject)
+        Array.new.tap do |items|
+          #Information button
+          items << {
+            :key => :subject_info,
+            :name => image_tag("btn/btn_edit.png")+t('menu.information'),
+            :url => [subject, :profile]
+          }
+
+          if subject != current_subject
+            #Like button
+            items << {
+              :key => :like_button,
+              :name => link_like_params(subject)[0],
+              :url => link_like_params(subject)[1],
+              :options => {:link => link_like_params(subject)[2]}
+            }
+
+            if user_signed_in?
+              #Relation button
+              items << {
+                :key => :subject_relation,
+                :name => image_tag("btn/btn_friend.png") + current_subject.contact_to!(subject).status,
+                :url => edit_contact_path(current_subject.contact_to!(subject))
+              }
+
+              #Send message button
+              items << {:key => :send_message,
+                :name => image_tag("btn/btn_send.png")+t('message.send'),
+                :url => new_message_path(:receiver => subject.slug)
+              }
+            end
+          end
+        end
+      end
+    end
+  end
+end
+

data/base/lib/tasks/workers.rake

@@ -0,0 +1,163 @@
+# Rake task to launch multiple Resque workers in development/production with simple management included
+
+require 'resque/tasks'    # Require Resque tasks
+
+namespace :workers do
+
+  # = $ rake workers:start
+  #
+  # Launch multiple Resque workers with the Rails environment loaded,
+  # so they have access to your models, etc.
+  #
+  # Each worker is being run in their own separate process (_not_ thread).
+  #
+  # On clean shutdown (SIGINT / Ctrl-C, SIGQUIT, SIGTERM), the task will clean
+  # after itself: kill its workers and delete PID files, when appropriate. It
+  # will deal fine with already dead workers.
+  #
+  #
+  # Default options like COUNT can and should be over-ridden when invoking, of course:
+  #
+  #    $ rake workers:start COUNT=10 QUEUE=my_queue
+  #
+  #
+  # To daemonize, simply run with nohup:
+  #
+  #    $ nohup rake workers:start > log/workers.log 2>&1 &
+  #
+  #
+  # You can and should set up your monitoring tool to watch for process with PID
+  # from `cat tmp/pids/resque/master.pid`.
+  #
+  # For proper monitoring of _individual_ workers, use provided examples for God or Monit:
+  # http://github.com/defunkt/resque/blob/master/examples/.
+  #
+  #
+  # A task for killing all workers on the machine (`rake workers:killall`) is also provided,
+  # for pruning orphaned workers etc.
+  #
+  desc "Run and manage group of Resque workers with some default options"
+  task :start => :environment do
+
+    # - CONFIGURATION ----
+    ENV['QUEUE']   ||= '*'
+    ENV['COUNT']   ||= '3'
+    # --------------------
+
+    def queue
+      ENV['QUEUE']
+    end
+
+    def count
+      ENV['COUNT']
+    end
+
+    def Process.exists?(pid)
+      kill(0, pid.to_i) rescue false
+    end
+
+    def pid_directory
+      @pid_directory ||= Rails.root.join('tmp', 'pids', "resque")
+    end
+
+    def pid_directory_for_group
+      @pid_directory_for_group ||= Rails.root.join('tmp', 'pids', "resque", queue)
+    end
+
+    def group_master_pid
+      File.read pid_directory.join("#{queue}.pid").to_s rescue nil
+    end
+
+    def group?
+      !group_master_pid || group_master_pid.to_s == Process.pid.to_s
+    end
+
+    def group_running?
+      Process.exists?(group_master_pid)
+    end
+
+    def kill_worker(pid)
+      Process.kill("QUIT", pid)
+      puts "Killed worker with PID #{pid}"
+      rescue Errno::ESRCH => e
+        puts " STALE worker with PID #{pid}"
+    end
+
+    def kill_workers
+      @pids.each { |pid| kill_worker(pid) }
+    end
+
+    def kill_workers_and_remove_pids_for_group
+      Dir.glob(pid_directory_for_group.join('worker_*.pid').to_s) do |pidfile|
+        begin
+          pid = pidfile[/(\d+)\.pid/, 1].to_i
+          kill_worker(pid)
+        ensure
+          FileUtils.rm pidfile, :force => true
+        end
+      end
+      if group_master_pid
+        FileUtils.rm    pid_directory.join("#{queue}.pid").to_s
+        FileUtils.rm_rf pid_directory_for_group.to_s
+      end
+    end
+
+    def shutdown
+      puts "\n*** Exiting"
+      if group?
+        kill_workers_and_remove_pids_for_group
+      else
+        kill_workers
+      end
+      exit(0)
+    end
+
+    # Clean up after dead group from before -- and become one
+    unless group_running?
+      puts "--- Cleaning up after previous group (PID: #{group_master_pid})"
+      kill_workers_and_remove_pids_for_group 
+    end
+
+    # Handle exit
+    trap('INT')  { shutdown }
+    trap('QUIT') { shutdown }
+    trap('TERM') { shutdown }
+    trap('KILL') { shutdown }
+    trap('SIGKILL') { shutdown }
+
+    puts "=== Launching #{ENV['COUNT']} worker(s) on '#{ENV['QUEUE']}' queue(s) with PID #{Process.pid}"
+
+    # Launch workers in separate processes, saving their PIDs
+    @pids = []
+    ENV['COUNT'].to_i.times do
+      @pids << Process.fork { Rake::Task['resque:work'].invoke }
+    end
+
+    if group?
+      # Make sure we have directory for pids
+      FileUtils.mkdir_p pid_directory.to_s
+      FileUtils.mkdir_p pid_directory_for_group.to_s
+      # Create PID files for workers
+      File.open( pid_directory.join("#{queue}.pid").to_s, 'w' ) do |f| f.write Process.pid end
+      @pids.each do |pid|
+        File.open( pid_directory_for_group.join("worker_#{pid}.pid").to_s, 'w' ) { |f| f.write pid }
+      end
+      # Stay in foreground, if any of our workers dies, we'll get killed so Monit/God etc can come to the resq^Hcue
+      Process.wait
+    else
+      # Stay in foreground, if any of our workers dies, continue running
+      Process.waitall
+    end
+  end
+
+  desc "Kill ALL workers on this machine"
+  task :kilall do
+    require 'resque'
+    Resque::Worker.all.each do |worker|
+      puts "Shutting down worker #{worker}"
+      host, pid, queues = worker.id.split(':')
+      Process.kill("QUIT", pid.to_i)
+    end
+  end
+
+end

data/documents/app/assets/stylesheets/documents.css

@@ -188,3 +188,8 @@
 	width: 0px;
 	height: 0px;
 }
+
+
+.processing_text{
+  padding: 10px 0px 10px 50px;
+}

data/documents/app/models/audio.rb

@@ -1,16 +1,11 @@
-class Audio < Document
-  after_save :audioprocess
-  
+class Audio < Document  
   has_attached_file :file, 
                     :url => '/:class/:id.:extension',
                     :path => ':rails_root/documents/:class/:id_partition/:style.:extension',
                     :styles => {:webma => {:format => 'webm'}                                
                     },:processors => [:ffmpeg]
   
-  def audioprocess
-    Resque.enqueue(Audioencoder, self.id)
-  end
-     
+  process_in_background :file     
               
   # Thumbnail file
   def thumb(size, helper)

data/documents/app/models/video.rb

@@ -1,6 +1,4 @@
-class Video < Document
-  after_save :videoprocess
-  
+class Video < Document  
   has_attached_file :file, 
                     :url => '/:class/:id.:extension',
                     :path => ':rails_root/documents/:class/:id_partition/:style.:extension',
@@ -10,10 +8,7 @@ class Video < Document
                                 :thumb0  => {:geometry => "130x80", :format => 'png', :time => 5}
                     },:processors => [:ffmpeg]
                     
-  def videoprocess
-    Resque.enqueue(Videoencoder, self.id)
-  end
-     
+  process_in_background :file
                       
   # Thumbnail file
   def thumb(size, helper)

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

@@ -16,47 +16,12 @@
 
 <%= div_for audio, :class => 'content_size' do %>
 
-  <div class="attachment_thumb">
-    <%= link_to thumb_for(audio, 16),
-        {:controller => "documents", :action => "download", :id => audio}, 
-        :class => "" %>
-  </div>
-  
-  <div class="attachment_content">
-	  <div class="attachment_text">
-	  	<%= t('audio.msg') %><%= link_to "\""+audio.file_file_name+"\"", 
-	    {:controller => "documents", :action => "download", :id => audio},  
-	    :class => "attachment_text_link" %>
-	  </div>
-	<div id="jpId<%=audio.id%>" class="jpId_size0"></div>
-	
-	<div class="jp-audio">
-    <div class="jp-type-single">
-      <div id="jp_interface_<%=audio.id%>" class="jp-interface">
-        <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_<%=audio.id%>" class="jp-playlist">
-        
-      </div>
-    </div>
-  </div>
-  
-  </div>
+
+  <% if audio.file_processing %>
+    <%= render :partial => 'audios/audio_processing', :locals => {:audio => audio}%>
+  <% else %>
+    <%= render :partial => 'audios/audio_processed', :locals => {:audio => audio}%>  
+  <% end %>
+
 
 <% end %>

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

@@ -0,0 +1,47 @@
+<div class="attachment_thumb">
+  <%= link_to thumb_for(audio, 16),
+  {:controller => "documents", :action => "download", :id => audio},
+  :class => "" %>
+</div>
+<div class="attachment_content">
+  <div class="attachment_text">
+    <%= t('audio.msg') %><%= link_to "\""+audio.file_file_name+"\"",
+    {:controller => "documents", :action => "download", :id => audio},
+    :class => "attachment_text_link" %>
+  </div>
+  <div id="jpId<%= audio.id%>" class="jpId_size0"></div>
+  <div class="jp-audio">
+    <div class="jp-type-single">
+      <div id="jp_interface_<%= audio.id%>" class="jp-interface">
+        <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_<%= audio.id%>" class="jp-playlist"></div>
+    </div>
+  </div>
+</div>