chili_videos 0.1.0 → 0.2.0

data/Gemfile

@@ -6,6 +6,9 @@ gem 'hashie', '~> 1.0.0'
 gem 'friendly_id', '~> 3.2.1'
 
 group :development do
+  gem 'cucumber'
+  gem 'rspec-rails'
+  gem 'redmine_plugin_support'
   gem 'autotest-rails', '~> 4.1.0'
   gem 'fakeweb'
   gem 'hoe', '~> 2.8.0'

data/Gemfile.lock

@@ -5,19 +5,44 @@ GEM
     autotest-rails (4.1.0)
       ZenTest
     babosa (0.3.2)
+    builder (3.0.0)
     crack (0.1.8)
+    cucumber (0.10.0)
+      builder (>= 2.1.2)
+      diff-lcs (~> 1.1.2)
+      gherkin (~> 2.3.2)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
     daemons (1.1.0)
     delayed_job (2.0.4)
       daemons
+    diff-lcs (1.1.2)
     fakeweb (1.3.0)
     friendly_id (3.2.1.1)
       babosa (~> 0.3.0)
+    gherkin (2.3.3)
+      json (~> 1.4.6)
     hashie (1.0.0)
     hoe (2.8.0)
       rake (>= 0.8.7)
     httparty (0.7.4)
       crack (= 0.1.8)
+    json (1.4.6)
+    rack (1.1.2)
     rake (0.8.7)
+    redmine_plugin_support (0.0.4)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+    rspec-rails (1.3.2)
+      rack (>= 1.0.0)
+      rspec (>= 1.3.0)
+    term-ansicolor (1.0.5)
 
 PLATFORMS
   ruby
@@ -25,9 +50,12 @@ PLATFORMS
 DEPENDENCIES
   ZenTest
   autotest-rails (~> 4.1.0)
+  cucumber
   delayed_job (~> 2.0.4)
   fakeweb
   friendly_id (~> 3.2.1)
   hashie (~> 1.0.0)
   hoe (~> 2.8.0)
   httparty (~> 0.7.4)
+  redmine_plugin_support
+  rspec-rails

data/History.txt

@@ -1,3 +1,22 @@
+== 0.2.0 2011-08-18
+
+Minor enhancements:
+
+* Removed 'Add one...' link on vidoes/index when you don't
+  have permissions to add a video (when no videos present)
+* Updated default pemissions in plugin settings
+  * Set so non-members are not able to even be permitted to modify,
+    delete, or add videos to a project
+* Added a 'video_link' wiki macro which can be used to generate a
+  hyperlink to a specific video.
+* Added a 'version_video_thumbnails' wiki macro which accepts a version
+  name and will generate a list of videos associated with the version.
+
+Bugfixes:
+
+* Fixed bug which caused the "Edit" link for videos to be hidden
+* Cleaned up a few CSS bugs
+
 == 0.1.0 2011-04-21
 
 * 1 major enhancement:

data/README.md

@@ -7,7 +7,8 @@
 ChiliProject/Redmine plugin which integrates with [Transload.it](http://transload.it)
 to offer a private "YouTube-like" setup to your project site.
 
-Notable items to consider before installing:
+
+## NOTABLE ITEMS TO CONSIDER
 
 1. This plugin is distributed as a gem, but does
    ship with migrations and asset files (stylesheets, etc). Therefore,
@@ -87,7 +88,7 @@ In your 'Rakefile', add:
 ``` ruby
 require 'chili_videos'
 require 'tasks/chili_videos_tasks'
-ChiliVideosTasks.new"
+ChiliVideosTasks.new
 ```
 
 Run the installation rake task (runs migrations & installs assets)

data/app/helpers/videos_helper.rb

@@ -1,4 +1,7 @@
 module VideosHelper
+  include ActionView::Helpers::TextHelper
+  include ActionView::Helpers::UrlHelper
+  include ActionView::Helpers::TagHelper
   extend self
 
   def video_embed_macro_markup(video)
@@ -23,6 +26,32 @@ module VideosHelper
     "</script>\n"
   end
 
+  def link_to_video_macro_markup(video)
+    "{{video_link(#{video.permalink})}}"
+  end
+
+  def link_to_video(video)
+    return "[Video not provided]" unless video.instance_of?(Video)
+    "<a href='#{prjct_video_path(video.project, video)}' class='video-link'>#{video.title}</a>"
+  end
+
+  def video_thumbnail_list(videos)
+    "<ul class='videos' style='list-style-type: none; float: left; margin-right: 25px; width: 95%;'>\n" + \
+      videos.map do |video|
+        "<li class='video' id='#{video.to_param}' style='padding-bottom: 30px; display: inline-block;'>\n" + \
+        "  <a href='#{prjct_video_path(video.project, video)}' class='video-cell small' style='float: left; margin-right: 20px; background-color:#000; text-align: right; display: block; width:128px; height:96px;'>\n" + \
+        "    <span style='position:relative; top: 81px; padding-right: 3px; color: #CCC; display: block;'>#{video.length}</span>\n" + \
+        "  </a>\n" + \
+        "<h3 style='border-bottom: none; font-size: 12px; width: 128px; padding: 5px 0 0 0; margin: 0;'>#{link_to(truncate(video.title, :length => 24), prjct_video_path(video.project, video), :title => video.title)}</h3>\n" + \
+        "<dl style='margin-top: 0;'>\n" + \
+        "  <dt style='float: left; padding-right: 3px;'>by:</dt>\n" \
+        "  <dd style='margin: 3px; clear: after; display: block;'>#{link_to(truncate(video.user.name, :length => 17), usr_path(video.user))}</dd>\n" + \
+        "</dl>\n" + \
+        "</li>\n"
+      end.join("\n") + \
+    "</ul><div style='clear:both;'></div>"
+  end
+
   private
     def swf_object_file_url
       "/plugin_assets/chili_videos/swfobject.js"
@@ -31,4 +60,12 @@ module VideosHelper
     def swf_player_file_url
       "/plugin_assets/chili_videos/player.swf"
     end
+
+    def prjct_video_path(project, video)
+      "/projects/#{project.to_param}/videos/#{video.to_param}"
+    end
+
+    def usr_path(user)
+      "/users/#{user.to_param}"
+    end
 end

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

@@ -11,27 +11,8 @@
 <%- if @videos.empty? %>
   <p class="nodata">
     No videos uploaded yet!
-    <%= link_to "Add one...", new_project_video_path(@project) %>
+    <%= link_to "Add one...", new_project_video_path(@project) if User.current.allowed_to?(:add_video, nil, :global => true) %>
   <p>
 <%- else %>
-  <ul class="videos">
-    <%- @videos.each do |video| %>
-      <li class="video" id="<%= video.to_param %>">
-        <a href="<%= project_video_path(@project, video) %>" class="video-cell small">
-          <span>
-              <%= video.length %>
-          </span>
-        </a>
-      <h3>
-        <%= link_to(truncate(video.title, :length => 24), project_video_path(@project, video), :title => video.title) %>
-      </h3>
-      <dl>
-        <dt>by:</dt>
-        <dd>
-          <%= link_to(truncate(video.user.name, :length => 17), user_path(video.user)) %>
-        </dd>
-      </dl>
-      </li>
-    <%- end %>
-  </ul>
+  <%= video_thumbnail_list(@videos) %>
 <%- end %>

data/app/views/videos/show.html.erb

@@ -4,7 +4,7 @@
 
 <div class="contextual">
   <%= link_to(l(:new_video_label), new_project_video_path(@project), :class => 'icon icon-add') if User.current.allowed_to?(:add_video, nil, :global => true) %>
-  <%= link_to(l(:edit_video_label), edit_project_video_path(@project), :class => 'icon icon-edit video-edit') if User.current.allowed_to?(:edit_video, nil, :global => true) %>
+  <%= link_to(l(:edit_video_label), edit_project_video_path(@project), :class => 'icon icon-edit video-edit') if User.current.allowed_to?(:modify_video, nil, :global => true) %>
   <%= link_to(l(:delete_video_label), project_video_path(@project), :class => 'icon icon-del video-del', :confirm => l(:confirm_video_deletion), :method => :delete) if User.current.allowed_to?(:delete_video, nil, :global => true) %>
 </div>
 
@@ -32,8 +32,10 @@
       <dd><%= link_to @video.version, project_version_path(@project, @video.version) %></dd>
     <%- end %>
 
-    <dt><label for="<%= @video.title %>">Embed:</label></dt>
+    <dt><label for="<%= @video.title %>">Embed video:</label></dt>
     <dd><input type="text" id="<%= @video.title %>" class="embed standard" value="<%= video_embed_macro_markup(@video) %>" /></dd>
+    <dt><label for="<%= @video.title %>_link">Video Link:</label></dt>
+    <dd><input type="text" id="<%= @video.title %>_link" class="embed standard" value="<%= link_to_video_macro_markup(@video) %>" /></dd>
   </dl>
 </div>
 

data/assets/stylesheets/videos.css

@@ -28,6 +28,7 @@ ul.videos li {
 .video.single dt {
   font-weight: bold;
   display: block;
+  width: 100px;
 }
 
 .video input {

data/init.rb

@@ -1,11 +1,12 @@
 require 'redmine'
 require 'chili_videos'
+require 'action_view/helpers/text_helper'
 
 # Patches to the Redmine core.
 require 'dispatcher'
 require 'videos_helper'
 
-Dispatcher.to_prepare :question_plugin do
+Dispatcher.to_prepare :chili_vidoes do
   require_dependency 'project'
   Project.send(:include, VideoProjectPatch) unless Project.included_modules.include? VideoProjectPatch
 
@@ -22,15 +23,15 @@ Redmine::Plugin.register :chili_videos do
   author 'Tom Kersten'
   description 'Adds support for using the Transload.it service to transcode videos and associate them with projects.'
   version ChiliVideos::VERSION
-  url 'http://example.com/path/to/plugin'
+  url 'https://github.com/tomkersten/chili_videos'
   author_url 'http://tomkersten.com/'
 
   project_module :videos do
-    permission :view_video_list, :videos => :index
-    permission :view_specific_video, :videos => :show
-    permission :modify_videos, :videos => [:edit,:update]
-    permission :delete_video, :videos => :destroy
-    permission :add_video, :videos => [:new, :create, :upload_complete]
+    permission :view_video_list, {:videos => [:index]}
+    permission :view_specific_video, {:videos => [:show]}
+    permission :modify_videos, {:videos => [:edit,:update]}, {:require => :member}
+    permission :delete_video, {:videos => [:destroy]}, {:require => :member}
+    permission :add_video, {:videos => [:new, :create, :upload_complete]}, {:require => :member}
   end
 
   settings :default => {:transloadit_api_key => '', :transloadit_workflow => ''}, :partial => 'settings/settings'
@@ -61,3 +62,29 @@ Redmine::WikiFormatting::Macros.register do
 END
   end
 end
+
+Redmine::WikiFormatting::Macros.register do
+  desc "Provides a link to a video with the title of the video as the link text.\n" +
+       "Usage examples:\n\n" +
+       "  !{{video_link(id)}}\n"
+  macro :video_link do |o, args|
+    video_id = args[0]
+    video = Video.find(video_id)
+    VideosHelper.link_to_video(video)
+  end
+end
+
+Redmine::WikiFormatting::Macros.register do
+  desc "Creates a horizontal list of videos associated with the specified verison.\n" +
+       "Usage examples:\n\n" +
+       "  !{{version_video_thumbnails(version_id)}}\n"
+  macro :version_video_thumbnails do |o, args|
+    version_id = args[0]
+    version = Version.find_by_name(version_id) || Version.find_by_id(version_id)
+    if version.blank?
+      "'#{version_id}' version not found"
+    else
+      "#{VideosHelper.video_thumbnail_list(version.videos)}"
+    end
+  end
+end

data/lib/chili_videos.rb

@@ -10,7 +10,7 @@ require 'chili_videos/config'
 module ChiliVideos
   extend self
 
-  VERSION = '0.1.0' unless defined?(ChiliVideos::VERSION)
+  VERSION = '0.2.0' unless defined?(ChiliVideos::VERSION)
 
   def configured?
     !Config.api_key.blank? && !Config.workflow.blank?

data/lib/tasks/chili_videos_tasks.rb

@@ -25,7 +25,7 @@ class ChiliVideosTasks < Rake::TaskLib
       end
 
       desc "Manage delayed_job...requires argument [ACTION=(#{VALID_DJ_ACTIONS.join('|')})]"
-      task :delayed_job, :action, :needs => [:environment] do |task, args|
+      task :delayed_job, 'action' => [:environment] do |task, args|
         unless(args[:action] && VALID_DJ_ACTIONS.include?(args[:action]))
           puts "'ACTION' is a required parameter. Valid values are: #{VALID_DJ_ACTIONS.join(', ')}"
           exit(1)
@@ -110,3 +110,5 @@ class ChiliVideosTasks < Rake::TaskLib
       ].join("\n")
     end
 end
+
+ChiliVideosTasks.new

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chili_videos
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Tom Kersten
@@ -36,8 +36,7 @@ cert_chain:
   NVADJA==
   -----END CERTIFICATE-----
 
-date: 2011-04-21 00:00:00 -05:00
-default_executable: 
+date: 2011-08-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httparty
@@ -155,16 +154,6 @@ dependencies:
 description: |-
   ChiliProject/Redmine plugin which integrates with [Transload.it](http://transload.it)
   to offer a private "YouTube-like" setup to your project site.
-  
-  Notable items to consider before installing:
-  
-  1. This plugin is distributed as a gem, but does
-     ship with migrations and asset files (stylesheets, etc). Therefore,
-     the installation procedure is not the standard process.
-  1. The processing of "Assemblies" from the Transload.it service is
-     handled in the background (via `delayed_job`), so there is an
-     additional daemon process which you will have to monitor and/or
-     manage with your installation.
 email: 
 - tom@whitespur.com
 executables: 
@@ -240,7 +229,6 @@ files:
 - test/unit/chili_video_plugin/config_test.rb
 - test/unit/chili_video_plugin_test.rb
 - test/unit/video_test.rb
-has_rdoc: true
 homepage: http://github.com/tomkersten/chili_videos
 licenses: []
 
@@ -271,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: chili_videos
-rubygems_version: 1.3.7
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: ChiliProject (/Redmine) plugin which adds self-hosted videos transcoded using the Transload.it service. The plugin a 'Video' tab to a project site which contains any associated videos.