refinerycms 0.9.5.29 → 0.9.5.30

data/vendor/plugins/refinery/lib/generators/refinery/templates/migration.rb

@@ -32,7 +32,8 @@ class <%= migration_name %> < ActiveRecord::Migration
     UserPlugin.destroy_all({:title => "<%= class_name.pluralize.underscore.titleize %>"})
 
     Page.find_all_by_link_url("/<%= plural_name %>").each do |page|
-      page.link_url, page.menu_match, page.deletable = nil
+      page.link_url, page.menu_match = nil
+      page.deletable = true
       page.destroy
     end
     Page.destroy_all({:link_url => "/<%= plural_name %>"})

data/vendor/plugins/refinery/lib/generators/refinery/templates/model.rb

@@ -1,6 +1,7 @@
 class <%= class_name %> < ActiveRecord::Base
 
-  acts_as_indexed :fields => [:<%= attributes.collect{ |attribute| attribute.name if attribute.type.to_s =~ /string|text/ }.compact.uniq.join(", :") %>]
+  acts_as_indexed :fields => [:<%= attributes.collect{ |attribute| attribute.name if attribute.type.to_s =~ /string|text/ }.compact.uniq.join(", :") %>],
+          :index_file => [RAILS_ROOT,"tmp","index"]
 
   validates_presence_of :<%= attributes.first.name %>
   validates_uniqueness_of :<%= attributes.first.name %>

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

@@ -7,7 +7,7 @@ class Refinery::ApplicationController < ActionController::Base
   include Crud # basic create, read, update and delete methods
   include AuthenticatedSystem
 
-  before_filter :find_pages_for_menu, :show_welcome_page, :take_down_for_maintenance?
+  before_filter :find_pages_for_menu, :setup_theme, :show_welcome_page, :take_down_for_maintenance?
   rescue_from ActiveRecord::RecordNotFound, :with => :error_404
   rescue_from ActionController::UnknownAction, :with => :error_404
 
@@ -42,6 +42,10 @@ class Refinery::ApplicationController < ActionController::Base
 
 protected
 
+	def setup_theme
+	  self.view_paths = ::ActionController::Base.view_paths.dup.unshift("#{RAILS_ROOT}/themes/#{RefinerySetting[:theme]}/views")
+	end
+
   def take_down_for_maintenance?
     if RefinerySetting.find_or_set(:down_for_maintenance, false)
       @page = Page.find_by_menu_match("^/maintenance$", :include => [:parts, :slugs])

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

@@ -45,7 +45,6 @@ module Refinery::HtmlTruncationHelper
         word_length = actual_length - (truncated_doc.inner_html.mb_chars.length - truncated_doc.inner_html.rindex(' '))
         truncated_doc = doc.truncate(word_length)
       end
-
       if (last_child = truncated_doc.children.last).inner_html.nil?
         "#{truncated_doc.inner_html}#{omission}#{options[:link]}" if options[:link]
       else
@@ -77,7 +76,8 @@ module HpricotTruncator
       truncated_node = if self.is_a?(Hpricot::Doc)
         self.dup
       else
-        self.class.send(:new, self.name, self.attributes)
+        # only pass self.attributes if it's able to use map, otherwise nil works. (Fix for Hpricot 0.8.2)
+        self.class.send(:new, self.name, self.attributes.respond_to?("map") ? self.attributes : nil)
       end
       truncated_node.children = []
       each_child do |node|

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

@@ -31,7 +31,7 @@ module Refinery
     class Initializer < Rails::Initializer
       def self.run(command = :process, configuration = Configuration.new)
         Rails.configuration = configuration
-        configuration.reload_plugins = true if RAILS_ENV =~ /development/ and REFINERY_ROOT == RAILS_ROOT # seems to work, don't in gem.
+        #configuration.reload_plugins = true if RAILS_ENV =~ /development/ and REFINERY_ROOT == RAILS_ROOT # seems to work, don't in gem.
         configuration.plugin_loader = Refinery::PluginLoader
         super
       end

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

@@ -28,7 +28,7 @@ module Refinery
     end
 
     def url
-      @url ||= "/admin/#{self.directory.blank? ? self.title.downcase : self.directory.split('/').pop}"
+      @url ||= "/admin/#{self.directory.blank? ? self.title.gsub(" ", "_").downcase : self.directory.split('/').pop}"
     end
 
     def menu_match

data/vendor/plugins/refinery/lib/tasks/doc.rake

@@ -0,0 +1,29 @@
+namespace :doc do
+	
+	task :app => [:refinery]
+	
+	desc "Generate documentation for the application"
+	Rake::RDocTask.new(:refinery) { |rdoc|
+	  rdoc.title    = "Refinery CMS Documentation"
+	  rdoc.main = "README.rdoc"
+	  rdoc.options = ['--inline-source']
+	  rdoc.rdoc_files.include('lib/**/*.rb',
+	              						 'lib/*',
+	              						 'app/**/*.rb',
+	              						 'db/seeds.rb',
+	              						 'config/preinitializer.rb',
+	              						 'vendor/plugins/images/**/*.rb',
+	              						 'vendor/plugins/authentication/**/*.rb',
+	              						 'vendor/plugins/dashboard/**/*.rb',
+	              						 'vendor/plugins/inquiries/**/*.rb',
+	              						 'vendor/plugins/news/**/*.rb',
+	              						 'vendor/plugins/pages/**/*.rb',
+	              						 'vendor/plugins/refinery/**/*.rb',
+	              						 'vendor/plugins/refinery_dialogs/**/*.rb',
+	              						 'vendor/plugins/refinery_settings/**/*.rb',
+	              						 'vendor/plugins/resources/**/*.rb',
+	              						 'vendor/plugins/themes/**/*.rb',
+														 'README.rdoc', 'LICENSE', 'CONTRIBUTORS', 'vendor/plugins/themes/themes.rdoc')
+	}
+
+end

data/vendor/plugins/refinery/lib/tasks/refinery.rake

@@ -31,5 +31,4 @@ namespace :refinery do
     end
   end
 
-end
-
+end

data/vendor/plugins/refinery/lib/tasks/yard.rake

@@ -0,0 +1,32 @@
+begin
+	
+  require 'yard'
+
+	YARD::Rake::YardocTask.new do |t|
+		t.files   = ['lib/**/*.rb',
+							 'lib/*',
+							 'app/**/*.rb',
+							 'db/seeds.rb',
+							 'config/preinitializer.rb',
+							 'vendor/plugins/images/**/*.rb',
+							 'vendor/plugins/authentication/**/*.rb',
+							 'vendor/plugins/dashboard/**/*.rb',
+							 'vendor/plugins/inquiries/**/*.rb',
+							 'vendor/plugins/news/**/*.rb',
+							 'vendor/plugins/pages/**/*.rb',
+							 'vendor/plugins/refinery/**/*.rb',
+							 'vendor/plugins/refinery_dialogs/**/*.rb',
+							 'vendor/plugins/refinery_settings/**/*.rb',
+							 'vendor/plugins/resources/**/*.rb',
+							 'vendor/plugins/themes/**/*.rb',
+							 '-', 'License', 'Contributors',
+							 'vendor/plugins/themes/Themes.rdoc']
+  end
+  
+rescue LoadError
+	
+  task :yard do
+    abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
+  end
+
+end

data/vendor/plugins/refinery_settings/app/models/refinery_setting.rb

@@ -59,4 +59,8 @@ class RefinerySetting < ActiveRecord::Base
     self[:value] = new_value
   end
 
+  def self.per_page
+    10
+  end
+
 end

data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/_refinery_setting.html.erb

@@ -8,6 +8,6 @@
           :class => "cancel", :method => :delete,
           :title => 'Remove this setting forever' if refinery_setting.destroyable %>
     </span>
-    <%=h refinery_setting.name.titleize %> <span class="preview">- <%=h truncate(refinery_setting.value.to_s, :length =>  40) %></span>
+    <%=h refinery_setting.name.titleize %> <span class="preview">- <%=h truncate(refinery_setting.value.to_s, :length => 40) %></span>
   </span>
 </li>

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

@@ -6,28 +6,22 @@
   </ul>
 </div>
 <div id='records'>
-  <% if searching? %>
-    <% if @refinery_settings.size > 0 %>
-      <ul>
-        <%= render :partial => 'refinery_setting', :collection => @refinery_settings %>
-      </ul>
-    <% else %>
-      <p>Sorry, no results found</p>
-    <% end %>
+  <% unless @refinery_settings.empty? %>
+    <%= will_paginate @refinery_settings, :previous_label => '&laquo;', :next_label => '&raquo;' unless searching? %>
+    <ul>
+      <%= render :partial => 'refinery_setting', :collection => @refinery_settings %>
+    </ul>
+    <%= will_paginate @refinery_settings, :previous_label => '&laquo;', :next_label => '&raquo;' unless searching? %>
   <% else %>
-    <% if @refinery_settings.size > 0 %>
-      <%= will_paginate @refinery_settings, :previous_label => '&laquo;', :next_label => '&raquo;' %>
-      <ul>
-        <%= render :partial => 'refinery_setting', :collection => @refinery_settings %>
-      </ul>
-      <%= will_paginate @refinery_settings, :previous_label => '&laquo;', :next_label => '&raquo;' %>
-    <% else %>
-      <p>
+    <p>
+      <% if searching? %>
+        Sorry, no results found
+      <% else %>
         <strong>
           There are no settings yet.
           Click "Create New Setting" to add your first setting.
         </strong>
-      </p>
-    <% end %>
+      <% end %>
+    </p>
   <% end %>
 </div>

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

@@ -1,10 +1,11 @@
 class Resource < ActiveRecord::Base
 
-  has_attachment :storage => :file_system,
-          :size => 0.kilobytes..50.megabytes,
-          :path_prefix => 'public/system/resources'
+  has_attachment :storage => (USE_S3_BACKEND ? :s3 : :file_system),
+                 :size => 0.kilobytes..50.megabytes,
+                 :path_prefix => (USE_S3_BACKEND ? nil : 'public/system/resources')
 
-  acts_as_indexed :fields => [:title, :type_of_content]
+  acts_as_indexed :fields => [:title, :type_of_content],
+          :index_file => [RAILS_ROOT,"tmp","index"]
 
   def validate
     errors.add_to_base("You must choose a file to upload") unless self.filename

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

@@ -1,7 +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/themes/app/controllers/admin/themes_controller.rb

@@ -0,0 +1,25 @@
+class Admin::ThemesController < Admin::BaseController
+
+  crudify :theme, :order => "updated_at DESC"
+	
+	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
+	
+	def activate
+		RefinerySetting[:theme] = @theme.title
+		
+		flash[:notice] = "'#{@theme.title}' applied to live site."
+		redirect_to admin_themes_url
+	end
+	
+end

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

@@ -0,0 +1,49 @@
+class ThemesController < ApplicationController
+ 
+  def stylesheets
+    render_theme_item(:stylesheets, params[:filename], 'text/css; charset=utf-8')
+  end
+ 
+  def javascripts
+    render_theme_item(:javascript, params[:filename], 'text/javascript; charset=utf-8')
+  end
+ 
+  def images
+    render_theme_item(:images, params[:filename])
+  end
+ 
+protected
+ 
+  def render_theme_item(type, file, mime = nil)
+    mime ||= mime_for(file)
+
+    file_path = File.join(RAILS_ROOT, "themes", RefinerySetting[:theme], "#{type}/#{file}#{params[:extension]}")
+
+ 		if File.exists? file_path
+    	send_file(file_path, :type => mime, :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.downcase
+    when /\.js$/
+      'text/javascript'
+    when /\.css$/
+      'text/css'
+    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

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

@@ -0,0 +1,62 @@
+begin
+  require 'zip/zip'
+  require 'zip/zipfilesystem'
+rescue LoadError => load_error
+  # Otherwise, this will stop rake tasks running
+  "*** rubyzip gem needs to be installed to use themes. ***"
+end
+
+class Theme < ActiveRecord::Base
+
+	before_save :read_theme
+
+  has_attachment :storage => (USE_S3_BACKEND ? :s3 : :file_system),
+          			 :size => 0.kilobytes..15.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.exists? self.theme_path
+
+			# extracts the contents of the zip file into the theme directory
+		 	Zip::ZipFile.foreach(self.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 theme_folder_title
+		File.basename(self.filename).split(".").first
+	end
+
+	def theme_path
+		File.join(RAILS_ROOT, "themes", theme_folder_title)
+	end
+
+	def preview_image
+		File.join(theme_path, "preview.png")
+	end
+
+	def read_theme
+		self.title = File.basename(self.filename).split(".").first.titleize
+
+		if File.exists? File.join(theme_path, "LICENSE")
+			self.license =  File.open(File.join(theme_path, "LICENSE")).read
+		end
+
+		if File.exists? File.join(theme_path, "README")
+			self.description =  File.open(File.join(theme_path, "README")).read
+		end
+	end
+
+	def self.directory_is_writable?
+		File.writable? File.join(RAILS_ROOT, "themes") # Heroku users will receive false here
+	end
+
+end

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

@@ -0,0 +1,11 @@
+<%= error_messages_for :theme -%>
+
+<% form_for [:admin, @theme], :url => @url_override || @url,
+                              :html => {:multipart => true} do |f| -%>
+  <div class='field'>
+    <%= f.label :uploaded_data, 'Theme' -%>
+    <%= f.file_field :uploaded_data -%>
+  </div>
+
+  <%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false} %>
+<% end -%>

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

@@ -0,0 +1,24 @@
+<li class=''>
+
+    <p>
+      <%=h theme.title %>
+    </p>
+    <%= image_tag(preview_image_admin_theme_url(theme), :width => 135, :height => 135) %>
+    <p>
+
+      <span class='actions'>
+        <%= link_to refinery_icon_tag('star.png'), activate_admin_theme_url(theme) %>
+        <%= link_to refinery_icon_tag('page_white_put.png'),  theme.public_filename,
+                            :title => "Download this theme (#{number_to_human_size(theme.size)})" %>
+        <% if Theme::directory_is_writable? %>
+          <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_theme_url(theme),
+                              :title => "Edit this theme" %>
+        <% end %>
+        <%= link_to refinery_icon_tag('delete.png'), admin_theme_path(theme),
+                            :confirm => "Are you sure you want to delete '#{theme.title}'?",
+                            :class => "cancel",  :method => :delete,
+                            :title => "Remove this theme forever" %>
+      </span>
+    </p>
+
+</li>

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

@@ -0,0 +1 @@
+<%= render :partial => "form" -%>

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

@@ -0,0 +1,35 @@
+<div id='actions'>
+  <ul>
+    <li>
+      <%= render :partial => "/shared/admin/search", :locals => {:url => admin_themes_url} %>
+    </li>
+    <% if Theme::directory_is_writable? %>
+      <li>
+        <%= link_to "Upload New Theme", new_admin_theme_url, :class => "add_icon" %>
+      </li>
+    <% end %>
+  </ul>
+</div>
+<div id='records'>
+  <% if searching? %>
+    <h2>Search Results for "<%= params[:search] %>"</h2>
+    <% if @themes.size > 0 %>
+        <%= render :partial => "theme", :collection => @themes %>
+    <% else %>
+      <p>Sorry, no results found.</p>
+    <% end %>
+  <% else %>
+    <% if @themes.size > 0 -%>
+      <%= will_paginate @themes, :previous_label => '&laquo;', :next_label => '&raquo;' %>
+      <ul id='image_grid'>
+        <%= render :partial => "theme", :collection => @themes %>
+      </ul>
+
+      <%= will_paginate @themes, :previous_label => '&laquo;', :next_label => '&raquo;' %>
+    <% else -%>
+      <p>
+        <strong>There are no themes yet. Click "Upload New Theme" to add your first theme.</strong>
+      </p>
+    <% end -%>
+  <% end %>
+</div>