social_stream 0.9.3 → 0.9.4

data/base/config/routes.rb

@@ -1,6 +1,13 @@
 Rails.application.routes.draw do
   #Background tasks
-  mount Resque::Server, :at => "/resque"
+  resque_constraint = lambda do |request|
+    #request.env['warden'].authenticate? and request.env['warden'].user.admin?
+    true
+  end
+
+  constraints resque_constraint do
+    mount Resque::Server, :at => "/resque"
+  end
   
   root :to => "frontpage#index"
   

data/base/social_stream-base.gemspec

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require File.join(File.dirname(__FILE__), 'lib', 'social_stream', 'base', 'version')
 
 Gem::Specification.new do |s|

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

@@ -163,6 +163,9 @@
 	top:0px;
 	width: 180px;
 	z-index:1;
+  width: 180px;
+  height: 135px;
+  overflow: hidden;
 }
 
 .video_thumbnail_play_over {

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

@@ -3,45 +3,43 @@
   {: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 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 class="jp-current-time"></div>
-        <div class="jp-duration"></div>
       </div>
-      <div id="jp_playlist_<%= audio.id%>" class="jp-playlist"></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>

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

@@ -8,7 +8,7 @@
   {: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>
+    <%= image_tag(video_path(video)+"?style=thumb", :class => "video_thumbnail_image", :alt => "")%> <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">

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

@@ -0,0 +1,5 @@
+module SocialStream
+  module Documents
+    VERSION = "0.2.7".freeze
+  end
+end

data/documents/social_stream-documents.gemspec

@@ -1,7 +1,9 @@
 # encoding: UTF-8
+require File.join(File.dirname(__FILE__), 'lib', 'social_stream', 'documents', 'version')
+
 Gem::Specification.new do |s|
   s.name = "social_stream-documents"
-  s.version = "0.2.6"
+  s.version = SocialStream::Documents::VERSION.dup
   s.authors = ["Víctor Sánchez Belmar", "GING - DIT - UPM"]
   s.summary = "File capabilities for Social Stream, the core for building social network websites"
   s.description = "Social Stream is a Ruby on Rails engine providing your application with social networking features and activity streams.\n\nThis gem allow you upload almost any kind of file as new social stream activity."
@@ -10,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.9.2')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.7')
   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')

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

@@ -0,0 +1,5 @@
+module SocialStream
+  module Events
+    VERSION = "0.0.2".freeze
+  end
+end

data/events/social_stream-events.gemspec

@@ -1,6 +1,9 @@
+# encoding: UTF-8
+require File.join(File.dirname(__FILE__), 'lib', 'social_stream', 'events', 'version')
+
 Gem::Specification.new do |s|
   s.name = "social_stream-events"
-  s.version = "0.0.2"
+  s.version = SocialStream::Events::VERSION.dup
   s.authors = ["Diego Carrera", "Antonio Tapiador", "GING - DIT - UPM"]
   s.summary = "Events and Video conferences capabilities for Social Stream, the core for building social network websites"
   s.description = "Social Stream is a Ruby on Rails engine providing your application with social networking features and activity streams.\n\nThis gem allow you  to add events and videoconferences as new social stream activity."

data/lib/social_stream/release.rb

@@ -0,0 +1,26 @@
+module SocialStream
+  module Release
+    class << self
+      def create(*args)
+        dependencies = Global::Release.new.dependencies
+
+        components = args.map do |a|
+          name, version = a.split(":")
+
+          if dependencies.include?(name)
+            Component::Release.new(name, version).release!
+          else
+            @target = name
+          end
+        end
+
+        Global::Release.new(@target).release!
+      end
+    end
+  end
+end
+
+%w(dependency_update global/release global/version_file component/release component/version_file).each do |file|
+  require File.expand_path("../release/#{ file }", __FILE__)
+end
+

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

@@ -0,0 +1,29 @@
+module SocialStream
+  module Release
+    module Component
+      class Release < ::SocialStream::Release::Global::Release
+        attr_reader :name
+
+        def initialize(name, version)
+          @name, @target = name, version
+        end
+
+        def version_file
+          @version_file ||= Component::VersionFile.new(@name, @target)
+        end
+
+        def gemspec
+          "#{ name }/social_stream-#{ name }.gemspec"                                           
+        end
+
+        def commit_command
+          "git commit #{ commit_files } -m #{ @name }#{ @version }"
+        end
+
+        def rake_release_command
+          "cd #{ @name } && rake release"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module SocialStream
+  module Release
+    module Component
+      class VersionFile < Global::VersionFile
+        attr_reader :name
+
+        def initialize(name, target = nil)
+          @name = name
+          super(target)
+        end
+
+        def filename
+          "#{ name }/lib/social_stream/#{ name }/version.rb"
+        end
+      end
+    end
+  end
+end

data/lib/social_stream/release/dependency_update.rb

@@ -0,0 +1,14 @@
+module SocialStream
+  module Release
+    class DependencyUpdate < Thor
+      include Thor::Actions
+
+      desc :update, "Update gemfile's dependency with some version"
+      def update gemspec, dependency, version
+        gsub_file gemspec,
+                  /social_stream-#{ dependency }.*(\d+\.\d+\.\d+)/,
+                  "social_stream-#{ dependency }', '~> #{ version }"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,89 @@
+module SocialStream
+  module Release
+    module Global
+      class Release
+        include Thor::Actions
+
+        DEPENDENCY_REGEXP = /dependency.*social_stream-(\w*)/
+
+        attr_reader :name, :version
+
+        class << self
+          def create(*args)
+            dependencies = new.dependencies
+
+            components = args.map do |a|
+              name, version = a.split(":")
+
+              if dependencies.include?(name)
+                ComponentRelease.new(name, version).release!
+              else
+                target = name
+              end
+            end
+
+
+            new(target).release!
+          end
+        end
+
+        def initialize(target = nil)
+          @target = target
+        end
+        
+        def release!
+          bump_version
+
+          update_dependencies
+
+          commit
+
+          rake_release
+        end
+
+        def bump_version
+          @version = version_file.bump!
+        end
+
+        def version_file
+          @version_file ||= VersionFile.new(@target)
+        end
+
+        def dependencies
+          @dependencies ||=
+            File.read(gemspec).scan(DEPENDENCY_REGEXP).flatten
+        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 commit
+          system(commit_command) || raise(RuntimeError.new)
+        end
+
+        def commit_command
+          "git commit #{ commit_files } -m #{ @version }"
+        end
+
+        def commit_files
+          "#{ @version_file.filename } #{ gemspec }"
+        end
+
+        def rake_release
+          system(rake_release_command) || raise(RuntimeError.new)
+        end
+
+        def rake_release_command
+          "rake release"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,68 @@
+module SocialStream
+  module Release
+    module Global
+      # 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 :target
+
+        def initialize(target)
+          @target = target || :patch
+        end
+
+        def bump!
+          # Must load content before writing to it
+          content
+
+          File.open(filename, 'w+') { |f| f.write(bumped_content) }
+
+          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
+          "lib/social_stream/version.rb"
+        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
+    end
+  end
+end
+

data/lib/social_stream/version.rb

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

data/social_stream.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   # Gem dependencies
   s.add_runtime_dependency('social_stream-base', '~> 0.9.7')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.2.6')
+  s.add_runtime_dependency('social_stream-documents', '~> 0.2.7')
  
   # Development Gem dependencies
   #

data/social_stream.thor

@@ -1,110 +1,10 @@
+require File.expand_path('../lib/social_stream/release', __FILE__)
+
 # 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
+  def release(*args)
+    ::SocialStream::Release.create *args
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-23 00:00:00 +02:00
+date: 2011-09-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,12 +43,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 25
         segments: 
         - 0
         - 2
-        - 6
-        version: 0.2.6
+        - 7
+        version: 0.2.7
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -861,6 +861,7 @@ files:
 - documents/lib/generators/social_stream/documents/install_generator.rb
 - documents/lib/social_stream-documents.rb
 - documents/lib/social_stream/documents/engine.rb
+- documents/lib/social_stream/documents/version.rb
 - documents/lib/social_stream/migrations/documents.rb
 - documents/lib/social_stream/toolbar_config/documents.rb
 - documents/social_stream-documents.gemspec
@@ -1058,6 +1059,7 @@ files:
 - events/lib/generators/social_stream/events/install_generator.rb
 - events/lib/social_stream-events.rb
 - events/lib/social_stream/events/engine.rb
+- events/lib/social_stream/events/version.rb
 - events/lib/social_stream/migrations/events.rb
 - events/lib/social_stream/toolbar_config/events.rb
 - events/social_stream-events.gemspec
@@ -1066,6 +1068,12 @@ files:
 - lib/generators/social_stream/USAGE
 - lib/generators/social_stream/install_generator.rb
 - lib/social_stream.rb
+- lib/social_stream/release.rb
+- lib/social_stream/release/component/release.rb
+- lib/social_stream/release/component/version_file.rb
+- lib/social_stream/release/dependency_update.rb
+- lib/social_stream/release/global/release.rb
+- lib/social_stream/release/global/version_file.rb
 - lib/social_stream/version.rb
 - social_stream.gemspec
 - social_stream.thor