refinerycms 0.9.8.1 → 0.9.8.2

data/bin/refinerycms

@@ -53,7 +53,7 @@ module Refinery
           @options[:force] = true
         end
 
-        opts.on("-h [APP_NAME]", "--heroku [APP_NAME]", "Set up and deploy to Heroku") do |app_name|
+        opts.on("--heroku [APP_NAME]", "Set up and deploy to Heroku") do |app_name|
           @options[:heroku] = app_name || ''
         end
 
@@ -145,7 +145,7 @@ module Refinery
         Refinery.root.join('vendor', 'refinerycms', 'core', 'public', 'stylesheets', stylesheet)
       }.each do |stylesheet|
         FileUtils::cp stylesheet.to_s,
-                      @app_path.join('public', 'sylesheets').to_s,
+                      @app_path.join('public', 'stylesheets').to_s,
                       :verbose => false if stylesheet.file?
       end
 
@@ -172,10 +172,12 @@ module Refinery
       # Replace app constant with Refinery
       # TODO: Find a way around this
       camelized_app_name = @app_name.gsub(/\W/, '_').squeeze('_').gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+      camelized_app_name << "::Application" # We only want to replace occurances like App::Application.
       %w(Rakefile config.ru config/application.rb config/environment.rb
           config/environments/development.rb config/environments/production.rb config/environments/test.rb
           config/initializers/secret_token.rb config/initializers/session_store.rb).each do |hackable|
-        find_and_replace(hackable, camelized_app_name, "Refinery")
+        find_and_replace(hackable, camelized_app_name, 'Refinery::Application')
+        find_and_replace(hackable, "module #{camelized_app_name.split('::').first}", 'module Refinery')
       end
 
       # Remove development specific stuff from the .gitinore file

data/db/migrate/20100913234704_add_cached_slug_to_pages.rb

@@ -0,0 +1,12 @@
+class AddCachedSlugToPages < ActiveRecord::Migration
+  def self.up
+    add_column :pages, :cached_slug, :string
+    Page.all.each do |p|
+      p.save!
+    end
+  end
+
+  def self.down
+    remove_column :pages, :cached_slug
+  end
+end

data/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20100831122919) do
+ActiveRecord::Schema.define(:version => 20100913234704) do
 
   create_table "images", :force => true do |t|
     t.string   "image_mime_type"
@@ -77,6 +77,7 @@ ActiveRecord::Schema.define(:version => 20100831122919) do
     t.integer  "lft"
     t.integer  "rgt"
     t.integer  "depth"
+    t.string   "cached_slug"
   end
 
   add_index "pages", ["depth"], :name => "index_pages_on_depth"

data/readme.md

@@ -41,6 +41,7 @@ Mac OS 10.5+ users [this shell install script](http://github.com/maddox/magick-i
 * [IRC Channel](irc://irc.freenode.net/refinerycms)
 * [GitHub repository](http://github.com/resolve/refinerycms)
 * [Developer/API documentation](http://api.refinerycms.org)
+* Documentation about: [Pages](http://github.com/resolve/refinerycms/blob/master/vendor/refinerycms/pages/readme.md#readme), [Images](http://github.com/resolve/refinerycms/blob/master/vendor/refinerycms/images/readme.md#readme), [Files](http://github.com/resolve/refinerycms/blob/master/vendor/refinerycms/resources/readme.md#readme), [Inquiries](http://github.com/resolve/refinerycms-inquiries/blob/master/readme.md#readme), [Settings](http://github.com/resolve/refinerycms/blob/master/vendor/refinerycms/settings/readme.md#readme), [Dashboard](http://github.com/resolve/refinerycms/blob/master/vendor/refinerycms/dashboard/readme.md#readme), [Authentication & Users](http://github.com/resolve/refinerycms/blob/master/vendor/refinerycms/authentication/readme.md#readme), [Extending with Engines](http://github.com/resolve/refinerycms/blob/master/vendor/refinerycms/core/engines.md#readme).
 
 ## Features
 
@@ -56,13 +57,13 @@ Mac OS 10.5+ users [this shell install script](http://github.com/maddox/magick-i
 * Uses the popular [Dragonfly](http://github.com/markevans/dragonfly).
 * Supports storage on Amazon S3.
 
-### [Inquiries](http://github.com/resolve/refinerycms/blob/master/vendor/refinerycms/inquiries/readme.md#readme)
+### [Inquiries](http://github.com/resolve/refinerycms-inquiries/blob/master/readme.md#readme)
 
 * Collect inquiries from a contact form.
 * Manage your inquiries and be notified when new ones come in.
 * Checks new inquiries for spam.
 
-### [Settings](http://github.com/resolve/refinerycms/blob/master/vendor/refinerycms/refinery_settings/readme.md#readme)
+### [Settings](http://github.com/resolve/refinerycms/blob/master/vendor/refinerycms/settings/readme.md#readme)
 
 * Manage the behaviour of Refinery
 * Easily integrate with [Google Analytics](https://www.google.com/analytics/)
@@ -87,11 +88,17 @@ to get help on how to use that. Or read the full documentation on [writing engin
 
 ### Popular Engines
 
+* [Blog](http://github.com/resolve/refinerycms-blog) - A simple blogging engine that supports posts, categories and comments (with moderation support if you choose to enable it)
 * [Portfolio](http://github.com/resolve/refinerycms-portfolio) - manage groups of images like an image gallery.
 * [News](http://github.com/resolve/refinerycms-news) - post and manage news items.
+* [Theming](http://github.com/resolve/refinerycms-theming) - turn your views, stylesheets, javascripts and images into bundled themes that are reusable and interchangeable.
 
 [Full engine list here](http://github.com/resolve/refinerycms/wiki/engines)
 
+### Example Site Showcase
+
+[List here (add your link when you're done)](http://github.com/resolve/refinerycms/wiki/Example-Site-Showcase)
+
 ## License
 
 Refinery is released under the [MIT license](http://github.com/resolve/refinerycms/blob/master/license.md#readme) and is copyright (c) 2005-2010 [Resolve Digital Ltd.](http://www.resolvedigital.co.nz)

data/vendor/refinerycms/core/app/views/shared/_menu.html.erb

@@ -6,13 +6,14 @@
   cache_key << RefinerySetting.find_or_set(:refinery_menu_cache_action_suffix, "site_menu")
   cache_key << request.path
   cache(cache_key.join('_')) do
-    if (collection ||= @menu_pages).any?
-      sibling_count = collection.size - 1
+  roots = @menu_pages.select { |m| m.parent_id == nil } # Select top menu items
+    if roots.any?
+      sibling_count = roots.size - 1
 -%>
       <nav id='<%= dom_id %>' class='<%= %W(#{css} clearfix).join(' ') %>'>
         <ul>
           <%= render :partial => "/shared/menu_branch",
-                     :collection => collection,
+                     :collection => roots,
                      :locals => {
                        :hide_children => hide_children,
                        :sibling_count => sibling_count,

data/vendor/refinerycms/core/app/views/shared/_menu_branch.html.erb

@@ -4,12 +4,13 @@
     " class='#{classes.join(' ')}'"
   end
   dom_id = (" id='item_#{menu_branch_counter}'" if menu_branch.parent_id.nil? and menu_branch.title.present?)
+  @menu_pages.reject! { |branch| branch == menu_branch } # Remove page from the array, so that future searching will be faster.
+  children = @menu_pages.select { |p| p.parent_id == menu_branch.id && p.in_menu? }
 -%>
 <li<%= css -%><%= dom_id -%>>
   <%= link_to menu_branch.title, menu_branch.url %>
 
-  <% unless hide_children or
-            (children = menu_branch.children.reject{|c| !c.in_menu?}).empty? %>
+  <% unless hide_children or children.empty? %>
     <ul class='clearfix'>
       <%=
         render :partial => "/shared/menu_branch",

data/vendor/refinerycms/core/lib/refinery/application_controller.rb

@@ -79,7 +79,7 @@ module Refinery::ApplicationController
 
     # get all the pages to be displayed in the site menu.
     def find_pages_for_menu
-      @menu_pages = Page.top_level
+      @menu_pages = Page.where(:show_in_menu => true, :draft => false).order('lft ASC').includes(:parts)
     end
 
     # use a different model for the meta information.

data/vendor/refinerycms/pages/app/models/page.rb

@@ -16,7 +16,8 @@ class Page < ActiveRecord::Base
                                 :allow_destroy => true
 
   # Docs for acts_as_indexed http://github.com/dougal/acts_as_indexed
-  acts_as_indexed :fields => [:title, :meta_keywords, :meta_description, :custom_title, :browser_title, :all_page_part_content]
+  acts_as_indexed :fields => [:title, :meta_keywords, :meta_description,
+                              :custom_title, :browser_title, :all_page_part_content]
 
   before_destroy :deletable?
   after_save :reposition_parts!

data/vendor/refinerycms/refinery.rb

@@ -27,7 +27,7 @@ module Refinery
     @major = 0
     @minor = 9
     @tiny  = 8
-    @build = 1
+    @build = 2
 
     class << self
       attr_reader :major, :minor, :tiny, :build

data/vendor/refinerycms/resources/readme.md

@@ -1,4 +1,4 @@
-# Resources
+# Resources (Files)
 
 ## About
 
@@ -6,4 +6,4 @@ The Resources plugin allows you to upload files such as PDFs and other files you
 
 ## How it works
 
-The resources plugins is made up of [attachment_fu](http://github.com/technoweenie/attachment_fu) for handling the store and upload of the images and the [Crudfiy mixin](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/refinery/crud.md).
+The resources plugin uses [dragonfly](http://github.com/markevans/dragonfly) to handle the storage of files. This plugin is mainly comprised of the [Crudfiy mixin](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/refinery/crud.md).

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 35
   prerelease: false
   segments: 
   - 0
   - 9
   - 8
-  - 1
-  version: 0.9.8.1
+  - 2
+  version: 0.9.8.2
 platform: ruby
 authors: 
 - Resolve Digital
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-10 00:00:00 +12:00
+date: 2010-09-14 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -242,6 +242,7 @@ files:
 - db/migrate/20100729221735_remove_page_translations_if_present.rb
 - db/migrate/20100826232810_move_inquiry_settings_to_refinery_settings.rb
 - db/migrate/20100831122919_move_page_to_nested_set.rb
+- db/migrate/20100913234704_add_cached_slug_to_pages.rb
 - db/schema.rb
 - db/seeds.rb
 - db/seeds/inquiry_settings.rb