chili_presentations 0.1.0 → 0.1.1

data/History.txt

@@ -1,4 +1,10 @@
-== 0.1.0 2012-09-24
+=== 0.1.1 / 2012-09-25
+
+* 1 bug fix:
+
+  * Fixed incorrect X-Accel-Redirect header path
+
+=== 0.1.0 2012-09-24
 
 * 1 major enhancement:
   * Initial release

data/README.md

@@ -58,6 +58,23 @@ of that project's presentations.
 
 ## INSTALL:
 
+### In nginx
+
+Add the following block to your ChiliProject nginx config (inside your `server`
+block):
+
+```
+location ~ /contents/ {
+  # NOTE: Below, `root` is NOT set to `RAILS_ROOT/public`!
+  root RAILS_ROOT/uploaded_presentations;
+  internal;
+}
+```
+
+Cycle `nginx`.
+
+### In ChiliProject
+
 ```
 gem install chili_presentations
 ```

data/app/controllers/presentations_controller.rb

@@ -28,7 +28,7 @@ class PresentationsController < ApplicationController
       redirect_to(project_presentations_path(@project))
     end
 
-    head :x_accel_redirect => presentation.path_to(params[:static_asset_path]), :content_type => requested_content_type
+    head :x_accel_redirect => presentation.x_accel_redirect_path_to(params[:static_asset_path]), :content_type => requested_content_type
   end
 
   def destroy
@@ -68,7 +68,7 @@ class PresentationsController < ApplicationController
     end
 
     def requested_content_type
-      case presentation.path_to(params[:static_asset_path])
+      case presentation.x_accel_redirect_path_to(params[:static_asset_path])
       when /\.css$/ then "text/css"
       when /\.js$/ then "text/javascript"
       else "text/html"

data/app/models/presentation.rb

@@ -1,4 +1,5 @@
 class Presentation < ActiveRecord::Base
+  UPLOAD_BASE_DIR = File.join(Rails.root, "uploaded_presentations")
   INDEX_FILENAME = "index.html"
   UNPACKED_DIRNAME = "unpacked"
 
@@ -8,7 +9,7 @@ class Presentation < ActiveRecord::Base
 
   has_friendly_id :title, :use_slug => true
   has_attached_file :contents,
-                    :path => ":rails_root/uploaded_presentations/:attachment/:id_partition/:style/:filename"
+                    :path => "#{UPLOAD_BASE_DIR}/:attachment/:id_partition/:style/:filename"
 
   has_attached_file :alternative_format
 
@@ -20,11 +21,11 @@ class Presentation < ActiveRecord::Base
 
 
   def index_path
-    File.join(UNPACKED_DIRNAME, INDEX_FILENAME)
+    File.join(path_without_upload_base_dir, UNPACKED_DIRNAME, INDEX_FILENAME)
   end
 
-  def path_to(some_asset)
-    some_asset.blank? ? index_path : File.join(UNPACKED_DIRNAME, *some_asset)
+  def x_accel_redirect_path_to(some_asset)
+    some_asset.blank? ? index_path : File.join(path_without_upload_base_dir, UNPACKED_DIRNAME, *some_asset)
   end
 
   def permalink
@@ -34,4 +35,9 @@ class Presentation < ActiveRecord::Base
   def to_s
     title
   end
+
+  def path_without_upload_base_dir
+    File.dirname(contents.path.sub(/#{UPLOAD_BASE_DIR}/, ''))
+  end
+  private :path_without_upload_base_dir
 end

data/lib/chili_presentations/version.rb

@@ -1,4 +1,4 @@
 module ChiliPresentations
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end
 

data/lib/tasks/contributor_tasks.rb

@@ -32,7 +32,7 @@ class ContributorTasks < Rake::TaskLib
       puts "#####################"
       puts "For the twitters"
       puts "#####################"
-      puts "[ANN] chili_presentations v#{ChiliPresentations::VERSION} released. Changes: [link], Repo: [link] #chiliproject"
+      puts "[ANN] chili_presentations v#{ChiliPresentations::VERSION} released. Changes: http://bit.ly/chili_presentation_changes, Repo: http://bit.ly/chili_presentations #chiliproject"
       puts "#####################"
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chili_presentations
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors: