RubyGems - refinerycms - Versions diffs - 0.9.6.12 → 0.9.6.13 - Mend

refinerycms 0.9.6.12 → 0.9.6.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (71) hide show

data/.gitignore +0 -1
data/Gemfile +2 -3
data/Rakefile +22 -8
data/VERSION +1 -1
data/bin/refinery +2 -2
data/config/application.rb +5 -6
data/config/preinitializer.rb +3 -5
data/db/migrate/20100223211536_remove_themes_table.rb +17 -0
data/db/schema.rb +1 -12
data/db/seeds.rb +2 -10
data/lib/refinery_initializer.rb +14 -10
data/public/javascripts/refinery/admin.js +20 -13
data/readme.md +15 -9
data/test/fixtures/users.yml +16 -0
data/test/functional/dashboard_controller_test.rb +24 -0
data/test/test_helper.rb +5 -0
data/themes/demolicious/LICENSE +21 -0
data/themes/demolicious/README +1 -0
data/themes/demolicious/images/footer_background.png +0 -0
data/themes/demolicious/images/header_background.png +0 -0
data/themes/demolicious/stylesheets/application.css +94 -0
data/themes/demolicious/stylesheets/formatting.css +36 -0
data/themes/demolicious/stylesheets/home.css +8 -0
data/themes/demolicious/stylesheets/ie6.css +0 -0
data/themes/demolicious/stylesheets/ie7.css +0 -0
data/themes/demolicious/views/layouts/application.html.erb +20 -0
data/themes/demolicious/views/pages/home.html.erb +1 -0
data/themes/demolicious/views/pages/show.html.erb +1 -0
data/themes/hemingway/LICENSE +7 -0
data/themes/hemingway/README +3 -0
data/themes/hemingway/images/archives.gif +0 -0
data/themes/hemingway/images/footer_black.gif +0 -0
data/themes/hemingway/images/kyle-header.jpg +0 -0
data/themes/hemingway/images/readon_black.gif +0 -0
data/themes/hemingway/images/search.gif +0 -0
data/themes/hemingway/images/spinner.gif +0 -0
data/themes/hemingway/images/trackback_pingback.gif +0 -0
data/themes/hemingway/stylesheets/application.css +713 -0
data/themes/hemingway/stylesheets/formatting.css +1 -0
data/themes/hemingway/stylesheets/home.css +1 -0
data/themes/hemingway/views/layouts/application.html.erb +55 -0
data/todo.md +3 -1
data/vendor/plugins/authentication/app/controllers/users_controller.rb +3 -5
data/vendor/plugins/dashboard/app/controllers/admin/dashboard_controller.rb +1 -0
data/vendor/plugins/dashboard/app/helpers/admin/dashboard_helper.rb +1 -1
data/vendor/plugins/images/app/models/image.rb +2 -2
data/vendor/plugins/pages/rails/init.rb +1 -1
data/vendor/plugins/refinery/app/views/shared/_menu_branch.html.erb +1 -1
data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_singular_name.html.erb +0 -1
data/vendor/plugins/refinery/lib/refinery.rb +1 -0
data/vendor/plugins/refinery/lib/refinery/admin_base_controller.rb +4 -3
data/vendor/plugins/refinery/lib/refinery/application_controller.rb +0 -1
data/vendor/plugins/refinery/lib/refinery/application_helper.rb +0 -27
data/vendor/plugins/refinery/lib/refinery/initializer.rb +10 -5
data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/_refinery_setting.html.erb +0 -1
data/vendor/plugins/resources/app/models/resource.rb +2 -2
data/vendor/plugins/themes/app/helpers/themes_helper.rb +25 -0
data/vendor/plugins/themes/lib/theme_server.rb +11 -7
data/vendor/plugins/themes/rails/init.rb +18 -19
data/vendor/plugins/themes/themes.md +1 -23
metadata +43 -18
data/test/fixtures/themes.yml +0 -5
data/test/unit/theme_test.rb +0 -19
data/vendor/plugins/themes/app/controllers/admin/themes_controller.rb +0 -25
data/vendor/plugins/themes/app/models/theme.rb +0 -56
data/vendor/plugins/themes/app/views/admin/themes/_form.html.erb +0 -11
data/vendor/plugins/themes/app/views/admin/themes/_theme.html.erb +0 -18
data/vendor/plugins/themes/app/views/admin/themes/edit.html.erb +0 -1
data/vendor/plugins/themes/app/views/admin/themes/index.html.erb +0 -34
data/vendor/plugins/themes/app/views/admin/themes/new.html.erb +0 -1
data/vendor/plugins/themes/config/routes.rb +0 -12

data/themes/hemingway/stylesheets/formatting.css ADDED

	@@ -0,0 +1 @@
1	+ @import url('/stylesheets/refinery/formatting.css');

data/themes/hemingway/stylesheets/home.css ADDED

	@@ -0,0 +1 @@
1	+ @import url('/stylesheets/refinery/home.css');

data/themes/hemingway/views/layouts/application.html.erb ADDED

@@ -0,0 +1,55 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <%= render :partial => "/shared/head", :locals => {:theme => true} %>
+  <body>
+    <div id="header">
+      <div class="inside">
+        <h2>
+          <%= link_to RefinerySetting.find_or_set(:site_name, "Company Name"), root_url %>
+        </h2>
+        <p class="description">
+          <%= link_to "Home", root_url %>
+        </p>
+      </div>
+    </div>
+    <div id='primary'>
+      <div class='inside clearfix'>
+        <%= yield %>
+      </div>
+    </div>
+    <div id="ancillary">
+      <div class="inside">
+        <div class="block first" style='margin: 0;'>
+          <h2>Recent Posts</h2>
+          <% if NewsItem.latest.empty? %>
+            <p>No news posts yet</p>
+          <% else %>
+            <ul>
+              <% NewsItem.latest.each do |item| %>
+                <li>
+                  <%= link_to item.title, news_item_url(item) %>
+                </li>
+              <% end %>
+            </ul>
+          <% end %>
+        </div>
+        <div class="block pages">
+          <h2>
+            Pages
+          </h2>
+          <%= render :partial => 'shared/menu' %>
+          <div class="clear"></div>
+        </div>
+      </div>
+      <hr class="hide" />
+      <div id="footer">
+        <div class="inside">
+          <p style='clear: both; text-align: center;'>
+             Copyright &copy; <%= Time.now.year %>
+             <%= RefinerySetting.find_or_set(:site_name, "Company Name") %>
+          </p>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>

data/todo.md CHANGED

@@ -18,4 +18,6 @@ We need to have support for build in Refinery field types like "image". So I cou
   ./script/generate refinery staff name:string bio:text mugshot:image
-And it will automatically create a form field that pops open the image picker on the staff form.
+And it will automatically create a form field that pops open the image picker on the staff form.
+There is now a partial to easily call an image picker.

data/vendor/plugins/authentication/app/controllers/users_controller.rb CHANGED

@@ -57,19 +57,17 @@ class UsersController < ApplicationController
   def forgot
     if request.post?
-      user = User.find_by_email(params[:user][:email])
-      if user
+      if (user = User.find_by_email(params[:user][:email])).present?
         user.create_reset_code
         begin
           flash[:notice] = "An email has been sent to #{user.email} with a link to reset your password."
           UserMailer.deliver_reset_notification(user, request)
         rescue
-          info.logger "error: email could not be sent for user password reset"
+          logger.info "Error: email could not be sent for user password reset for user #{user.id} with email #{user.email}"
         end
       else
-        flash[:notice] = "Sorry, #{params[:user][:email]} isn't associated with any acounts. Are you sure you typed the correct email address?"
+        flash[:notice] = "Sorry, #{params[:user][:email]} isn't associated with any accounts. Are you sure you typed the correct email address?"
       end
       redirect_back_or_default(forgot_url)

data/vendor/plugins/dashboard/app/controllers/admin/dashboard_controller.rb CHANGED

@@ -2,6 +2,7 @@ class Admin::DashboardController < Admin::BaseController
   def index
     @recent_activity = []
     Refinery::Plugins.active.each do |plugin|
       begin
         plugin.activity.each do |activity|

data/vendor/plugins/dashboard/app/helpers/admin/dashboard_helper.rb CHANGED

@@ -3,7 +3,7 @@ module Admin::DashboardHelper
   def activity_message_for(record)
     if (activity = Refinery::Plugins.active.find_activity_by_model(record.class)).present? and activity.title.present?
       title = record.send activity.title
-      link = link_to  truncate(title, :length => 45),
+      link = link_to  truncate(title.to_s, :length => 45),
                       eval("#{activity.url}(#{activity.nesting("record")}record)"),
                       :title => "See '#{title}'"

data/vendor/plugins/images/app/models/image.rb CHANGED

@@ -13,8 +13,8 @@ class Image < ActiveRecord::Base
   # we could use validates_as_attachment but it produces 4 odd errors like
   # "size is not in list". So we basically here enforce the same validation
-  # rules here accept display the error messages we want
-  # This is a known bug in attachment_fu
+  # rules here except display the error messages we want
+  # This is a known problem when using attachment_fu
   def validate
     if self.filename.nil?
       errors.add_to_base("You must choose an image to upload")

data/vendor/plugins/pages/rails/init.rb CHANGED

@@ -2,7 +2,7 @@ Refinery::Plugin.register do |plugin|
   plugin.title = "Pages"
   plugin.description = "Manage content pages"
   plugin.version = 1.0
-  plugin.menu_match = /admin\/page(_dialog|part)?s$/
+  plugin.menu_match = /admin\/page(_dialog|_part)?s$/
   plugin.activity = {
     :class => Page,
     :url_prefix => "edit",

data/vendor/plugins/refinery/app/views/shared/_menu_branch.html.erb CHANGED

@@ -11,7 +11,7 @@
     <%
       unless hide_children or
         menu_branch.parent_id.present? or
-        (children = Page.find(:all, :conditions => "parent_id = #{menu_branch.id}").collect{|c| c if c.in_menu? }.compact).empty?
+        (children = menu_branch.children.collect{|c| c if c.in_menu?}.compact).empty?
     -%>
       <ul class='clearfix'>
         <%= render :partial => "/shared/menu_branch",

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

@@ -7,7 +7,6 @@
       <%%= link_to refinery_icon_tag("application_edit.png"), edit_admin_<%= singular_name %>_path(<%= singular_name %>),
            :title => 'Edit this <%= $title_name.downcase %>' %>
       <%%= link_to refinery_icon_tag("delete.png"), admin_<%= singular_name %>_path(<%= singular_name %>),
-          :confirm => 'Are you sure you want to remove this <%= $title_name.downcase %> forever?',
           :class => "cancel confirm-delete",
           :title => 'Remove this <%= $title_name.downcase %> forever' %>
     </span>

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

@@ -2,6 +2,7 @@ module Refinery
   class << self
     attr_accessor :root
+    attr_accessor :is_a_gem
   end
 end

data/vendor/plugins/refinery/lib/refinery/admin_base_controller.rb CHANGED

@@ -11,7 +11,7 @@ class Refinery::AdminBaseController < ApplicationController
   end
   def searching?
-    not params[:search].blank?
+    params[:search].present?
   end
 protected
@@ -31,8 +31,9 @@ protected
   def restrict_controller
     if Refinery::Plugins.active.reject {|plugin| params[:controller] !~ Regexp.new(plugin.menu_match) }.empty?
-      flash.now[:error] = "You do not have permission to access the #{params[:controller]} controller on this plugin."
-      logger.warn "'#{current_user.login}' tried to access '#{params[:controller]}'"
+      flash[:error] = "You do not have permission to access this feature."
+      logger.warn "'#{current_user.login}' tried to access '#{params[:controller]}' but was rejected."
+      redirect_back_or_default(admin_root_url)
     end
   end

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

@@ -1,7 +1,6 @@
 class Refinery::ApplicationController < ActionController::Base
   helper_method :home_page?, :local_request?, :just_installed?, :from_dialog?, :admin?
   protect_from_forgery # See ActionController::RequestForgeryProtection
   include Crud # basic create, read, update and delete methods

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

@@ -34,24 +34,6 @@ module Refinery::ApplicationHelper
     end
   end
-  def image_tag(source, options={})
-    theme = (options.delete(:theme) == true)
-    tag = super
-    # inject /theme/ into the image tag src if this is themed.
-    tag.gsub!(/src=[\"|\']/) { |m| "#{m}/theme/" }.gsub!("//", "/") if theme
-    tag
-  end
-  def javascript_include_tag(*sources)
-    theme = (arguments = sources.dup).extract_options![:theme] == true # don't ruin the current sources object
-    tag = super
-    # inject /theme/ into the javascript include tag src if this is themed.
-    tag.gsub!(/\/javascripts\//, "/theme/javascripts/").gsub!(/theme=(.+?)\ /, '') if theme
-    tag
-  end
   def jquery_include_tags(use_caching=RefinerySetting.find_or_set(:use_resource_caching, false))
     if !local_request? and RefinerySetting.find_or_set(:use_google_ajax_libraries, true)
       "#{javascript_include_tag("http://www.google.com/jsapi").gsub(".js", "")}
@@ -123,15 +105,6 @@ module Refinery::ApplicationHelper
     selected = current_page?(page) or (request.path =~ Regexp.new(page.menu_match) unless page.menu_match.blank?) or (request.path == page.link_url)
   end
-  def stylesheet_link_tag(*sources)
-    theme = (arguments = sources.dup).extract_options![:theme] == true # don't ruin the current sources object
-    tag = super
-    # inject /theme/ into the stylesheet link tag href if this is themed.
-    tag.gsub!(/\/stylesheets\//, "/theme/stylesheets/").gsub!(/theme=(.+?)\ /, '') if theme
-    tag
-  end
   def setup
     logger.warn("*** Refinery::ApplicationHelper::setup has now been deprecated from the Refinery API. ***")
   end

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

@@ -1,7 +1,11 @@
-begin
-  # Try to include the rails initializer. If this isn't in a gem, this will fail.
-  require 'initializer' unless Refinery.root.to_s == RAILS_ROOT # A Refinery gem install's Rails.root is not the Refinery.root.
-rescue LoadError => load_error
+if Refinery.is_a_gem
+  begin
+    # Try to include the rails initializer. If this isn't in a gem, this will fail.
+    require 'initializer'
+  rescue LoadError => load_error
+    # we don't need to do anything.
+    puts "*** RefineryCMS gem load failed, attempting to load traditionally... ***"
+  end
 end
 module Refinery
@@ -21,7 +25,8 @@ module Refinery
         # add plugin lib paths to the $LOAD_PATH so that rake tasks etc. can be run when using a gem for refinery or gems for plugins.
         search_for = Regexp.new(File.join(%W(\( #{Refinery.root.join("vendor", "plugins")} \)? .+? lib)))
         paths = plugins.collect{ |plugin| plugin.load_paths }.flatten.reject{|path| path.scan(search_for).empty? or path.include?('/rails-') }
-        paths = paths.reject{ |path| path.include?(Refinery.root.to_s) } if Refinery.root == Rails.root # superfluous when not in gem.
+        paths = paths.reject{ |path| path.include?(Refinery.root.to_s) } unless Refinery.is_a_gem
+        paths.uniq!
         ($refinery_gem_plugin_lib_paths = paths).each do |path|
           $LOAD_PATH.unshift path
         end

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

@@ -4,7 +4,6 @@
       <%= link_to refinery_icon_tag("application_edit.png"), edit_admin_refinery_setting_path(refinery_setting),
            :title => 'Edit this setting' %>
       <%= link_to refinery_icon_tag("delete.png"), admin_refinery_setting_path(refinery_setting),
-          :confirm => 'Are you sure you want to remove this setting forever?',
           :class => "cancel confirm-delete",
           :title => 'Remove this setting forever' if refinery_setting.destroyable %>
     </span>

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

@@ -10,8 +10,8 @@ class Resource < ActiveRecord::Base
   # we could use validates_as_attachment but it produces 4 odd errors like
   # "size is not in list". So we basically here enforce the same validation
-  # rules here accept display the error messages we want
-  # This is a known bug in attachment_fu
+  # rules here except display the error messages we want
+  # This is a known problem when using attachment_fu
   def validate
     if self.filename.nil?
       errors.add_to_base("You must choose a file to upload")

data/vendor/plugins/themes/app/helpers/themes_helper.rb ADDED

@@ -0,0 +1,25 @@
+module ThemesHelper
+  def image_tag(source, options={})
+    theme = (options.delete(:theme) == true)
+    tag = super
+    # inject /theme/ into the image tag src if this is themed.
+    tag.gsub!(/src=[\"|\']/) { |m| "#{m}/theme/" }.gsub!("//", "/") if theme
+    tag.gsub(/theme=(.+?)\ /, '') # we need to remove any addition of theme='false' etc.
+  end
+  def javascript_include_tag(*sources)
+    theme = (arguments = sources.dup).extract_options![:theme] == true # don't ruin the current sources object
+    tag = super
+    # inject /theme/ into the javascript include tag src if this is themed.
+    tag.gsub!(/\/javascripts\//, "/theme/javascripts/") if theme
+    tag.gsub(/theme=(.+?)\ /, '') # we need to remove any addition of theme='false' etc.
+  end
+  def stylesheet_link_tag(*sources)
+    theme = (arguments = sources.dup).extract_options![:theme] == true # don't ruin the current sources object
+    tag = super
+    # inject /theme/ into the stylesheet link tag href if this is themed.
+    tag.gsub!(/\/stylesheets\//, "/theme/stylesheets/") if theme
+    tag.gsub(/theme=(.+?)\ /, '') # we need to remove any addition of theme='false' etc.
+  end
+end

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

@@ -9,14 +9,18 @@ class ThemeServer
   end
   def call(env)
-    relative_path = env["PATH_INFO"].gsub(/^\/theme\//, '')
-    if (env["PATH_INFO"]) =~ /^\/theme/ and (file_path=Rails.root.join("themes", RefinerySetting[:theme], relative_path)).exist?
-      unless ((etag = Digest::MD5.hexdigest("#{file_path.to_s}#{file_path.mtime}")) == env["HTTP_IF_NONE_MATCH"])
-        env["PATH_INFO"] = relative_path
-        status, headers, body = Rack::File.new(Rails.root.join("themes", RefinerySetting[:theme])).call(env)
-        [status, headers.update({"ETag" => etag}), body]
+    if env["PATH_INFO"] =~ /^\/theme/
+      env["PATH_INFO"].gsub!(/^\/theme\//, '')
+      if (file_path = (dir=Rails.root.join("themes", RefinerySetting[:theme])).join(env["PATH_INFO"])).exist?
+        etag = Digest::MD5.hexdigest("#{file_path.to_s}#{file_path.mtime}")
+        unless (etag == env["HTTP_IF_NONE_MATCH"])
+          status, headers, body = Rack::File.new(dir).call(env)
+          [status, headers.update({"ETag" => etag}), body]
+        else
+          [304, {"ETag" => etag}, []]
+        end
       else
-        [304, {"ETag" => etag}, []]
+        [404, {}, []]
       end
     else
       @app.call(env)

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

@@ -1,25 +1,24 @@
-Refinery::Plugin.register do |plugin|
-  plugin.title = "Themes"
-  plugin.description = "Upload and manage themes"
-  plugin.version = 1.0
-  plugin.activity = {
-    :class => Theme,
-    :title => 'title',
-    :url_prefix => 'edit',
-    :created_image => "layout_add.png",
-    :updated_image => "layout_edit.png"
-  }
-end
+# Set up middleware to serve theme files
 config.middleware.use "ThemeServer"
-::ActionController::Base.module_eval %(
-  view_paths.unshift Rails.root.join("themes", RefinerySetting[:theme], "views").to_s if RefinerySetting[:theme].present?
+# Add or remove theme paths to/from Refinery application
+::Refinery::ApplicationController.module_eval %(
+  before_filter do |controller|
+    controller.view_paths.reject! { |v| v.to_s =~ %r{^themes/} }
+    if (theme = RefinerySetting[:theme]).present?
+      # Set up view path again for the current theme.
+      controller.view_paths.unshift Rails.root.join("themes", theme, "views").to_s
+    end
+  end
 )
-# set up controller paths.
-if RefinerySetting[:theme].present?
-  controller_path = Rails.root.join("themes", RefinerySetting[:theme], "controllers").to_s
+if (theme = RefinerySetting[:theme]).present?
+  # Set up controller paths, which can only be brought in with a server restart, sorry. (But for good reason)
+  controller_path = Rails.root.join("themes", theme, "controllers").to_s
   ::ActiveSupport::Dependencies.load_paths.unshift controller_path
   config.controller_paths.unshift controller_path
-end
+end
+# Include theme functions into application helper.
+Refinery::ApplicationHelper.send :include, ThemesHelper

data/vendor/plugins/themes/themes.md CHANGED

@@ -35,7 +35,6 @@ Let's take the ``mytheme`` example theme shown above. This is how the theme is s
        |- javascripts
        |    |- whatever.js
        |- LICENSE
-       |- preview.png
        |- README
        |- stylesheets/
        |    |- application.css
@@ -63,10 +62,6 @@ The ``README`` file is just a description of your theme.
 This is exactly the same as how you lay your views out in ``app/views/`` just instead of putting them in ``app/views/`` you put them into ``themes/mytheme/views/``
-### Preview Image
-The ``preview.png`` image is used when selecting the theme in the backend. It must be a png file and is ideally 135 x 135 pixels.
 ## How do I make my own Theme?
 Create a folder with the name if your theme inside ``/themes`` e.g. ``/themes/mytheme`` and follow the directory structure outlined in 'The structure of a Theme'.
@@ -81,26 +76,9 @@ Set the value of that setting to the name of your themes folder. For example, if
 set it to ``my_theme`` and hit save.
-## How do I zip my theme to use it on other sites
-If you want to share a theme and install it on another site you have to zip it first.
-It's important to note you don't zip the theme's directory itself, just the contents.
-If I had a theme sitting in:
-    themes/mytheme/[theme files here]
-The zip file would look like this
-    mytheme.zip
-      |- [theme files here]
-Read 'How do I install someone else's Theme?' to take that zip file and install the theme.
 ## How do I install someone else's Theme?
-If you have the themes plugin added to your admin user, you should see in the admin area of Refinery a "Themes" tab in the main navigation. Click on that, then click "Upload new theme". Upload the theme zip file and then click on the "star" below the preview image for the theme to activate that theme as the one to use right now.
+Just copy their theme directory into your themes folder and Refinery will see it.
 ## How can I Convert my Current Views into a Theme?

metadata CHANGED

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms
 version: !ruby/object:Gem::Version
-  version: 0.9.6.12
+  prerelease: false
+  segments:
+  - 0
+  - 9
+  - 6
+  - 13
+  version: 0.9.6.13
 platform: ruby
 authors:
 - Resolve Digital
@@ -11,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-02-17 00:00:00 +13:00
+date: 2010-02-25 00:00:00 +13:00
 default_executable:
 dependencies: []
@@ -64,6 +70,7 @@ files:
 - db/migrate/20100127004649_add_reset_code_to_users.rb
 - db/migrate/20100202034802_remove_custom_title_image_id_and_image_id_from_pages.rb
 - db/migrate/20100204011654_change_part_titles_to_titleized_version_for_new_format.rb
+- db/migrate/20100223211536_remove_themes_table.rb
 - db/schema.rb
 - db/seeds.rb
 - doc/.yardoc/checksums
@@ -224,7 +231,8 @@ files:
 - test/fixtures/pages.yml
 - test/fixtures/refinery_settings.yml
 - test/fixtures/resources.yml
-- test/fixtures/themes.yml
+- test/fixtures/users.yml
+- test/functional/dashboard_controller_test.rb
 - test/performance/browsing_test.rb
 - test/test_helper.rb
 - test/unit/image_test.rb
@@ -234,9 +242,31 @@ files:
 - test/unit/page_test.rb
 - test/unit/refinery_setting_test.rb
 - test/unit/resource_test.rb
-- test/unit/theme_test.rb
-- themes/demolicious.zip
-- themes/hemingway.zip
+- themes/demolicious/LICENSE
+- themes/demolicious/README
+- themes/demolicious/images/footer_background.png
+- themes/demolicious/images/header_background.png
+- themes/demolicious/stylesheets/application.css
+- themes/demolicious/stylesheets/formatting.css
+- themes/demolicious/stylesheets/home.css
+- themes/demolicious/stylesheets/ie6.css
+- themes/demolicious/stylesheets/ie7.css
+- themes/demolicious/views/layouts/application.html.erb
+- themes/demolicious/views/pages/home.html.erb
+- themes/demolicious/views/pages/show.html.erb
+- themes/hemingway/LICENSE
+- themes/hemingway/README
+- themes/hemingway/images/archives.gif
+- themes/hemingway/images/footer_black.gif
+- themes/hemingway/images/kyle-header.jpg
+- themes/hemingway/images/readon_black.gif
+- themes/hemingway/images/search.gif
+- themes/hemingway/images/spinner.gif
+- themes/hemingway/images/trackback_pingback.gif
+- themes/hemingway/stylesheets/application.css
+- themes/hemingway/stylesheets/formatting.css
+- themes/hemingway/stylesheets/home.css
+- themes/hemingway/views/layouts/application.html.erb
 - todo.md
 - vendor/cache/aasm-2.1.3.gem
 - vendor/cache/actionmailer-2.3.5.gem
@@ -547,14 +577,7 @@ files:
 - vendor/plugins/resources/config/routes.rb
 - vendor/plugins/resources/rails/init.rb
 - vendor/plugins/resources/resources.md
-- vendor/plugins/themes/app/controllers/admin/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
-- vendor/plugins/themes/app/views/admin/themes/edit.html.erb
-- 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/app/helpers/themes_helper.rb
 - vendor/plugins/themes/lib/theme_server.rb
 - vendor/plugins/themes/rails/init.rb
 - vendor/plugins/themes/themes.md
@@ -572,22 +595,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
+      segments:
+      - 0
       version: "0"
-  version:
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
+      segments:
+      - 0
       version: "0"
-  version:
 requirements: []
 rubyforge_project:
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key:
 specification_version: 3
 summary: A beautiful open source Ruby on Rails content manager for small business.
 test_files:
+- test/functional/dashboard_controller_test.rb
 - test/performance/browsing_test.rb
 - test/test_helper.rb
 - test/unit/image_test.rb
@@ -597,4 +623,3 @@ test_files:
 - test/unit/page_test.rb
 - test/unit/refinery_setting_test.rb
 - test/unit/resource_test.rb
-- test/unit/theme_test.rb