refinerycms 0.9.6.5 → 0.9.6.6

data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/index.html.erb

@@ -17,13 +17,13 @@
 <div id='records'>
   <%% if searching? %>
     <h2>Search Results for "<%%= params[:search] %>"</h2>
-    <%% if @<%= plural_name %>.size > 0 %>
+    <%% unless @<%= plural_name %>.empty? %>
       <%%= render :partial => "<%= singular_name %>", :collection => @<%= plural_name %> %>
     <%% else %>
       <p>Sorry, no results found.</p>
     <%% end %>
   <%% else %>
-    <%% if @<%= plural_name %>.size > 0 %>
+    <%% unless @<%= plural_name %>.empty? %>
       <%%= will_paginate @<%= plural_name %>, :previous_label => '&laquo;', :next_label => '&raquo;' %>
        <ul id='sortable_list'>
         <%%= render :partial => "sortable_list" %>

data/vendor/plugins/refinery/lib/generators/refinery/templates/views/index.html.erb

@@ -8,4 +8,4 @@
   </ul>
 <%% end %>
 
-<%%= render :partial => "/shared/content_page" %>
+<%%= render :partial => "/shared/content_page" %>

data/vendor/plugins/refinery/lib/generators/refinery/templates/views/show.html.erb

@@ -22,4 +22,4 @@
   </ul>
 <%% end %>
 
-<%%= render :partial => "/shared/content_page" %>
+<%%= render :partial => "/shared/content_page" %>

data/vendor/plugins/refinery/lib/refinery/activity.rb

@@ -34,4 +34,4 @@ module Refinery
     end
 
   end
-end
+end

data/vendor/plugins/refinery/lib/refinery/application_controller.rb

@@ -43,9 +43,9 @@ class Refinery::ApplicationController < ActionController::Base
 
 protected
 
-	def setup_theme
-	  self.view_paths = ::ActionController::Base.view_paths.dup.unshift(Rails.root.join("themes", RefinerySetting[:theme], "views").to_s)
-	end
+  def setup_theme
+    self.view_paths = ::ActionController::Base.view_paths.dup.unshift(Rails.root.join("themes", RefinerySetting[:theme], "views").to_s)
+  end
 
   def take_down_for_maintenance?
     if RefinerySetting.find_or_set(:down_for_maintenance, false)
@@ -78,4 +78,4 @@ protected
     super
   end
 
-end
+end

data/vendor/plugins/refinery/lib/refinery/application_helper.rb

@@ -122,4 +122,4 @@ module Refinery::ApplicationHelper
     logger.warn("*** Refinery::ApplicationHelper::setup has now been deprecated from the Refinery API. ***")
   end
 
-end
+end

data/vendor/plugins/refinery/lib/refinery/base_presenter.rb

@@ -24,4 +24,4 @@ class Refinery::BasePresenter
     end
   end
 
-end
+end

data/vendor/plugins/refinery/lib/refinery/initializer.rb

@@ -45,4 +45,4 @@ module Refinery
     end
   end
 
-end
+end

data/vendor/plugins/refinery_dialogs/app/controllers/admin/dialogs_controller.rb

@@ -4,7 +4,7 @@ class Admin::DialogsController < Admin::BaseController
 
   def show
     @dialog_type = params[:id].try(:downcase)
-    
+
     if @dialog_type
       @submit_button_text = "Insert"
 

data/vendor/plugins/resources/app/models/resource.rb

@@ -1,6 +1,6 @@
 class Resource < ActiveRecord::Base
 
-	# Docs for attachment_fu http://github.com/technoweenie/attachment_fu
+  # Docs for attachment_fu http://github.com/technoweenie/attachment_fu
   has_attachment :storage => (USE_S3_BACKEND ? :s3 : :file_system),
                  :size => 0.kilobytes..50.megabytes,
                  :path_prefix => (USE_S3_BACKEND ? nil : 'public/system/resources')
@@ -11,13 +11,13 @@ class Resource < ActiveRecord::Base
   acts_as_indexed :fields => [:title, :type_of_content],
                   :index_file => [Rails.root.to_s, "tmp", "index"]
 
-	# when a dialog pops up with images, how many images per page should there be
-	PAGES_PER_DIALOG = 12
+  # when a dialog pops up with images, how many images per page should there be
+  PAGES_PER_DIALOG = 12
 
-	# when listing images out in the admin area, how many images should show per page
-	PAGES_PER_ADMIN_INDEX = 20
+  # when listing images out in the admin area, how many images should show per page
+  PAGES_PER_ADMIN_INDEX = 20
 
-	# How many images per page should be displayed?
+  # How many images per page should be displayed?
   def self.per_page(dialog = false)
     dialog ? PAGES_PER_DIALOG : PAGES_PER_ADMIN_INDEX
   end
@@ -28,9 +28,9 @@ class Resource < ActiveRecord::Base
   end
 
   # Returns a titleized version of the filename
-	# my_file.pdf returns My File
+  # my_file.pdf returns My File
   def title
-    self.filename.gsub(/\.\w+$/, '').titleize
+    CGI::unescape(self.filename).gsub(/\.\w+$/, '').titleize
   end
 
 end

data/vendor/plugins/resources/app/views/admin/resources/_form.html.erb

@@ -30,4 +30,4 @@
       link_dialog.init();
     });
   </script>
-<% end if from_dialog? %>
+<% end if from_dialog? %>

data/vendor/plugins/resources/app/views/admin/resources/index.html.erb

@@ -38,4 +38,4 @@
       </p>
     <% end -%>
   <% end %>
-</div>
+</div>

data/vendor/plugins/resources/app/views/admin/resources/insert.html.erb

@@ -60,4 +60,4 @@
       resource_picker.init(<%= @callback.present? ? "self.parent.#{@callback}" : "null" %>);
     });
   </script>
-<% end %>
+<% end %>

data/vendor/plugins/resources/config/routes.rb

@@ -1,9 +1,9 @@
 ActionController::Routing::Routes.draw do |map|
-	
+
   map.resources :resources
 
   map.namespace(:admin) do |admin|
     admin.resources :resources, :collection => {:insert => :get}
   end
 
-end
+end

data/vendor/plugins/resources/rails/init.rb

@@ -9,4 +9,4 @@ Refinery::Plugin.register do |plugin|
     :created_image => "page_white_put.png",
     :updated_image => "page_white_edit.png"
   }
-end
+end

data/vendor/plugins/themes/app/controllers/admin/themes_controller.rb

@@ -2,24 +2,24 @@ class Admin::ThemesController < Admin::BaseController
 
   crudify :theme, :order => "updated_at DESC"
 
-	before_filter :find_theme, :only => [:update, :destroy, :edit, :preview_image, :activate]
+  before_filter :find_theme, :only => [:update, :destroy, :edit, :preview_image, :activate]
 
-	# accessor method for theme preview image
-	def preview_image
-		if File.exists? @theme.preview_image
-	  	send_file(@theme.preview_image, :type => 'image/png',
-																		  :disposition => 'inline',
-																		  :stream => true)
-		else
-			return error_404
-		end
-	end
+  # accessor method for theme preview image
+  def preview_image
+    if File.exists? @theme.preview_image
+      send_file(@theme.preview_image, :type => 'image/png',
+                                      :disposition => 'inline',
+                                      :stream => true)
+    else
+      return error_404
+    end
+  end
 
-	def activate
-		RefinerySetting[:theme] = @theme.folder_title
+  def activate
+    RefinerySetting[:theme] = @theme.folder_title
 
-		flash[:notice] = "'#{@theme.title}' applied to live site."
-		redirect_to admin_themes_url
-	end
+    flash[:notice] = "'#{@theme.title}' applied to live site."
+    redirect_to admin_themes_url
+  end
 
-end
+end

data/vendor/plugins/themes/app/models/theme.rb

@@ -11,46 +11,46 @@ class Theme < ActiveRecord::Base
   before_save :read_theme
 
   has_attachment :storage => (USE_S3_BACKEND ? :s3 : :file_system),
-          			 :size => 0.kilobytes..25.megabytes,
-								 :path_prefix => (USE_S3_BACKEND ? nil : 'public/system/themes'),
-								 :content_type => 'application/zip'
-
-	# Once a zip is uploaded it unzips it into the themes directory if writable
-	def after_attachment_saved
-		if Theme::directory_is_writable?
-			# make the folder for the them
-			FileUtils.mkdir(self.theme_path) unless File.directory? self.theme_path
-
-			# extracts the contents of the zip file into the theme directory
-		 	Zip::ZipFile.foreach(self.full_filename) do |entry|
-				FileUtils.mkdir_p(File.dirname("#{theme_path}/#{entry}"))
-				entry.extract("#{theme_path}/#{entry}") { true }
-		  end
-		else
-			raise "Theme directory not writable"
-		end
-	end
-
-	def folder_title
-		File.basename(self.full_filename).split(".").first
-	end
-
-	def theme_path
-		Rails.root.join("themes", folder_title).to_s
-	end
-
-	def preview_image
-		File.join(theme_path, "preview.png")
-	end
-
-	def read_theme
-		self.title = File.basename(self.full_filename).split(".").first.titleize
-		self.license = File.open(File.join(theme_path, "LICENSE")).read if File.exists? File.join(theme_path, "LICENSE")
+                 :size => 0.kilobytes..25.megabytes,
+                 :path_prefix => (USE_S3_BACKEND ? nil : 'public/system/themes'),
+                 :content_type => 'application/zip'
+
+  # Once a zip is uploaded it unzips it into the themes directory if writable
+  def after_attachment_saved
+    if Theme::directory_is_writable?
+      # make the folder for the them
+      FileUtils.mkdir(self.theme_path) unless File.directory? self.theme_path
+
+      # extracts the contents of the zip file into the theme directory
+       Zip::ZipFile.foreach(self.full_filename) do |entry|
+        FileUtils.mkdir_p(File.dirname("#{theme_path}/#{entry}"))
+        entry.extract("#{theme_path}/#{entry}") { true }
+      end
+    else
+      raise "Theme directory not writable"
+    end
+  end
+
+  def folder_title
+    File.basename(self.full_filename).split(".").first
+  end
+
+  def theme_path
+    Rails.root.join("themes", folder_title).to_s
+  end
+
+  def preview_image
+    File.join(theme_path, "preview.png")
+  end
+
+  def read_theme
+    self.title = File.basename(self.full_filename).split(".").first.titleize
+    self.license = File.open(File.join(theme_path, "LICENSE")).read if File.exists? File.join(theme_path, "LICENSE")
     self.description = File.open(File.join(theme_path, "README")).read if File.exists? File.join(theme_path, "README")
-	end
+  end
 
-	def self.directory_is_writable?
-		Rails.root.join("themes").writable? # Heroku users (or users with read-only filesystem) will receive false here
-	end
+  def self.directory_is_writable?
+    Rails.root.join("themes").writable? # Heroku users (or users with read-only filesystem) will receive false here
+  end
 
-end
+end

data/vendor/plugins/themes/app/views/admin/themes/_form.html.erb

@@ -8,4 +8,4 @@
   </div>
 
   <%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false} %>
-<% end -%>
+<% end -%>

data/vendor/plugins/themes/config/routes.rb

@@ -4,9 +4,9 @@ ActionController::Routing::Routes.draw do |map|
     admin.resources :themes, :member => {:preview_image => :get, :activate => :get}
   end
 
-	# allows theme files that are not in the Rails public directory to be served back to the client
+  # allows theme files that are not in the Rails public directory to be served back to the client
   map.connect 'theme/stylesheets/*filepath', :controller => 'themes', :action => 'stylesheets'
   map.connect 'theme/javascripts/*filepath', :controller => 'themes', :action => 'javascripts'
   map.connect 'theme/images/*filepath', :controller => 'themes', :action => 'images'
 
-end
+end

data/vendor/plugins/themes/lib/theme_server.rb

@@ -0,0 +1,26 @@
+# Allow the metal piece to run in isolation
+require(File.dirname(__FILE__) + "/../../config/environment") unless defined?(Rails)
+
+# Servers theme files from the them directory without touching Rails too much
+class ThemeServer
+
+  def initialize(app)
+    @app = app
+  end
+  
+  def call(env)
+    if env["PATH_INFO"] =~ /^\/theme/
+      relative_path = env["PATH_INFO"].gsub(/^\/theme\//, '')
+
+      if (file_path = Rails.root.join "themes", RefinerySetting[:theme], relative_path).exist?
+        [200, {"Content-Type" => Rack::Mime.mime_type(File.extname file_path)}, file_path.open]
+      else
+        [404, {"Content-Type" => "text/html"}, ["404 file not found."]]
+      end
+    else
+      status, headers, response = @app.call(env)
+      [status, headers, response]
+    end
+  end
+  
+end

data/vendor/plugins/themes/rails/init.rb

@@ -9,4 +9,6 @@ Refinery::Plugin.register do |plugin|
     :created_image => "layout_add.png",
     :updated_image => "layout_edit.png"
   }
-end
+end
+
+config.middleware.use "ThemeServer"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  version: 0.9.6.5
+  version: 0.9.6.6
 platform: ruby
 authors: 
 - Resolve Digital
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-09 00:00:00 +13:00
+date: 2010-02-11 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -212,6 +212,9 @@ files:
 - script/process/spawner
 - script/runner
 - script/server
+- test/files/The world!.gif
+- test/files/car-wallpapers19.jpg
+- test/fixtures/images.yml
 - test/fixtures/page_parts.yml
 - test/fixtures/pages.yml
 - test/performance/browsing_test.rb
@@ -516,7 +519,6 @@ files:
 - vendor/plugins/resources/rails/init.rb
 - vendor/plugins/resources/resources.md
 - vendor/plugins/themes/app/controllers/admin/themes_controller.rb
-- vendor/plugins/themes/app/controllers/themes_controller.rb
 - vendor/plugins/themes/app/models/theme.rb
 - vendor/plugins/themes/app/views/admin/themes/_form.html.erb
 - vendor/plugins/themes/app/views/admin/themes/_theme.html.erb
@@ -524,6 +526,7 @@ files:
 - vendor/plugins/themes/app/views/admin/themes/index.html.erb
 - vendor/plugins/themes/app/views/admin/themes/new.html.erb
 - vendor/plugins/themes/config/routes.rb
+- vendor/plugins/themes/lib/theme_server.rb
 - vendor/plugins/themes/rails/init.rb
 - vendor/plugins/themes/themes.md
 has_rdoc: true

data/vendor/plugins/themes/app/controllers/themes_controller.rb

@@ -1,45 +0,0 @@
-class ThemesController < ApplicationController
-
-  def stylesheets
-    render_theme_item(:stylesheets, params[:filepath])
-  end
-
-  def javascripts
-    render_theme_item(:javascripts, params[:filepath])
-  end
-
-  def images
-    render_theme_item(:images, params[:filepath])
-  end
-
-protected
-
-  def render_theme_item(type, relative_path)
-    if File.exist?(file_path = File.join(Rails.root, "themes", RefinerySetting[:theme], type.to_s, relative_path))
-    	send_file(file_path, :type => mime_for(relative_path), :disposition => 'inline', :stream => true)
-		else
-			return error_404
-		end
-  end
-
-  def mime_for(filename)
-		# could we use the built in Rails mime types to work this out?
-    case filename.last.downcase
-    when /\.js$/
-      'text/javascript; charset=utf-8'
-    when /\.css$/
-      'text/css; charset=utf-8'
-    when /\.gif$/
-      'image/gif'
-    when /(\.jpg|\.jpeg)$/
-      'image/jpeg'
-    when /\.png$/
-      'image/png'
-    when /\.swf$/
-      'application/x-shockwave-flash'
-    else
-      'application/binary'
-    end
-  end
-
-end