refinerycms 0.9.8.3 → 0.9.8.4

data/Gemfile

@@ -42,7 +42,7 @@ gem 'refinerycms-inquiries',    '~> 0.9.8.7'
 # gem 'refinerycms-theming',    '~> 0.9.8'
 
 # Add i18n support (optional, you can remove this if you really want to).
-gem 'refinerycms-i18n',         '~> 0.9.8.6', :require => 'refinery/i18n'
+gem 'refinerycms-i18n',         '~> 0.9.8.7'
 
 # Figure out how to get RMagick:
 rmagick_options = {:require => false}

data/bin/refinerycms

@@ -14,7 +14,6 @@ end
 require 'pathname'
 require 'fileutils'
 require 'optparse'
-require 'rbconfig'
 
 # Load refinerycms
 require Pathname.new(File.expand_path(File.dirname(__FILE__) << "/..")).join('vendor', 'refinerycms', 'refinery.rb')
@@ -241,7 +240,7 @@ module Refinery
       to_run << "cd \"#{@app_path}\" &&" if options[:cd]
       to_run << command
 
-      if RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)!
+      if Refinery::WINDOWS
         to_run = %w(cmd /c) | to_run.map{|c| c.gsub(/\//m, '\\')}
       end
 

data/changelog.md

@@ -1,8 +1,56 @@
+## 0.9.8.4 [17 September 2010]
+* Recursive deletion of page parts. [primerano](http://github.com/primerano)
+* Move around the default pages. [Philip Arndt](http://github.com/parndt)
+* Extraction of windows check to ``Refinery::WINDOWS``. [Steven Heidel](http://github.com/stevenheidel)
+* Updated the changelog for several previous releases. [Steven Heidel](http://github.com/stevenheidel)
+* Made the menu more flexible so that it can be used in many places in your layout without caching over the top of itself. [Philip Arndt](http://github.com/parndt)
+* Added search feature to Refinery Settings. [Matt McMahand](http://github.com/invalidusrname)
+* Ensure that in ``crudify`` that we use ``:per_page`` properly for ``will_paginate``. [Philip Arndt](http://github.com/parndt)
+* Reduce the number of routes that we respond to in the ``pages`` engine as they were unused. [Philip Arndt](http://github.com/parndt)
+* Fixed a case where page links weren't generating properly when inside an engine such as the news engine which made use of ``params[:id]``. Took a lot of perserverance on the part of Hez - thank you very much Hez! [Hez Ronningen](http://github.com/hez) and [Philip Arndt](http://github.com/parndt)
+* [See full list](http://github.com/resolve/refinerycms/compare/0.9.8.3...0.9.8.4)
+
+## 0.9.8.3 [14 September 2010]
+* German translation improvements. [Andre Lohan](http://github.com/dc5ala)
+* Fix bug with ``bin/refinerycms`` and windows commands. [Philip Arndt](http://github.com/parndt)
+* DRY up ``crudify`` and also switch to ARel. [Philip Arndt](http://github.com/parndt)
+* Several fixes to make things much easier on windows. [Philip Arndt](http://github.com/parndt)
+* [See full list](http://github.com/resolve/refinerycms/compare/0.9.8.2...0.9.8.3)
+
+## 0.9.8.2 [13 September 2010]
+* Update ``readme.md`` [David Jones](http://github.com/djones)
+* Speed improvements to menu with nested_set. [Maarten Hoogendoorn](http://github.com/moretea)
+* More speed improvements by optimising slugs. [Philip Arndt](http://github.com/parndt)
+* Fix ``-h`` flag on ``bin/refinerycms`` to display the help. [Steven Heidel](http://github.com/stevenheidel)
+* [See full list](http://github.com/resolve/refinerycms/compare/0.9.8.1...0.9.8.2)
+
+## 0.9.8.1 [9 September 2010]
+* Convert to ``awesome_nested_set``. [Maarten Hoogendoorn](http://github.com/moretea) and [Philip Arndt](http://github.com/parndt)
+* Allow passing ``-g`` to the bin task for extra gems. [Tomás Senart](http://github.com/tsenart)
+* Update documentation for engines, not plugins. [David Jones](http://github.com/djones)
+* Several more documentation fixes. [Steven Heidel](http://github.com/stevenheidel)
+* Better use of dragonfly resizing. [Philip Arndt](http://github.com/parndt)
+* Partial Latvian translation. [Uģis Ozols](http://github.com/ugisozols)
+* Review Portugese translation. [Kivanio Barbosa](http://github.com/kivanio)
+* Bugfix with wymeditor in the engine generator. [Karmen Blake]
+* Split ``application_helper`` into smaller, more usable files. [Philip Arndt](http://github.com/parndt)
+* Move features and specs to each engine directory. [Philip Arndt](http://github.com/parndt)
+* Bugfixes to ensure that reordering works under ``awesome_nested_set``. [Maarten Hoogendoorn](http://github.com/moretea) and [Philip Arndt](http://github.com/parndt)
+* Update engines to not have a special :require in the Gemfile. [Johan Bruning](http://github.com/GidoGeek)
+* Make cache sweepers work. [Philip Arndt](http://github.com/parndt)
+* [See full list](http://github.com/resolve/refinerycms/compare/0.9.8...0.9.8.1)
+
 ## 0.9.8 [30 August 2010]
 
-* Rails 3 support.
-* [See full list](http://github.com/resolve/refinerycms/compare/0.9.7.13...0.9.8)
+* Rails 3 support!
+  - [Philip Arndt](http://github.com/parndt)
+  - [Alex Coles](http://github.com/myabc)
+  - [Steven Heidel](http://github.com/stevenheidel)
+  - [David Jones](http://github.com/djones)
+  - [Uģis Ozols](http://github.com/ugisozols)
+  - [Maarten Hoogendoorn](http://github.com/moretea)
 * [See our blog post](http://refinerycms.com/blog/refinery-cms-supports-rails-3)
+* [See full list](http://github.com/resolve/refinerycms/compare/0.9.7.13...0.9.8)
 
 ## 0.9.7.13 [23 August 2010]
 

data/db/seeds/pages.rb

@@ -16,6 +16,18 @@ home_page.parts.create({
               :position => 1
             })
 
+home_page_position = -1
+page_not_found_page = home_page.children.create(:title => "Page not found",
+            :menu_match => "^/404$",
+            :show_in_menu => false,
+            :deletable => false,
+            :position => (home_page_position += 1))
+page_not_found_page.parts.create({
+              :title => "Body",
+              :body => "<h2>Sorry, there was a problem...</h2><p>The page you requested was not found.</p><p><a href='/'>Return to the home page</a></p>",
+              :position => 0
+            })
+
 about_us_page = Page.create(:title => "About",
             :deletable => true,
             :position => (page_position += 1))
@@ -59,23 +71,12 @@ thank_you_page.parts.create({
               :position => 0
             })
 
-privacy_policy_page = Page.create(:title => "Privacy Policy",
+privacy_policy_page = contact_us_page.children.create(:title => "Privacy Policy",
             :deletable => true,
             :show_in_menu => false,
-            :position => (page_position += 1))
+            :position => (contact_us_page_position += 1))
 privacy_policy_page.parts.create({
               :title => "Body",
               :body => "<p>We respect your privacy. We do not market, rent or sell our email list to any outside parties.</p><p>We need your e-mail address so that we can ensure that the people using our forms are bona fide. It also allows us to send you e-mail newsletters and other communications, if you opt-in. Your postal address is required in order to send you information and pricing, if you request it.</p><p>Please call us at 123 456 7890 if you have any questions or concerns.</p>",
               :position => 0
             })
-
-page_not_found_page = Page.create(:title => "Page not found",
-            :menu_match => "^/404$",
-            :show_in_menu => false,
-            :deletable => false,
-            :position => (page_position += 1))
-page_not_found_page.parts.create({
-              :title => "Body",
-              :body => "<h2>Sorry, there was a problem...</h2><p>The page you requested was not found.</p><p><a href='/'>Return to the home page</a></p>",
-              :position => 0
-            })

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

@@ -3,10 +3,13 @@
   css ||= 'menu'
   hide_children = RefinerySetting.find_or_set(:menu_hide_children, false) unless defined?(hide_children)
   cache_key = [Refinery.base_cache_key]
-  cache_key << RefinerySetting.find_or_set(:refinery_menu_cache_action_suffix, "site_menu")
+  cache_key << (action_suffix ||= RefinerySetting.find_or_set(:refinery_menu_cache_action_suffix, "site_menu"))
+  cache_key << extra_suffix if defined?(extra_suffix) and extra_suffix.present?
   cache_key << request.path
-  cache(cache_key.join('_')) do
-  roots = @menu_pages.select { |m| m.parent_id == nil } # Select top menu items
+  cache(cache_key.compact.join('_')) do
+    # Select top menu items unless 'roots' is passed in.
+    collection ||= @menu_pages
+    roots ||= collection.select { |m| m.parent_id == nil }
     if roots.any?
       sibling_count = roots.size - 1
 -%>
@@ -17,6 +20,7 @@
                      :locals => {
                        :hide_children => hide_children,
                        :sibling_count => sibling_count,
+                       :collection => collection,
                        :apply_css => true #if you don't care about class='first' class='last' or class='selected' set apply_css to false for speed.
                      }
           -%>

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

@@ -4,9 +4,9 @@
     "class='#{classes.join(' ')}'"
   end
   dom_id = ("id='item_#{menu_branch_counter}'" if menu_branch.parent_id.nil? and menu_branch.title.present?)
-  
+
   hide_children = (defined?(hide_children) && hide_children)
-  children = hide_children ? [] : @menu_pages.select { |p| p.parent_id == menu_branch.id && p.in_menu? }
+  children = hide_children ? [] : collection.select { |p| p.parent_id == menu_branch.id && p.in_menu? }
 -%>
 <li<%= ['', css, dom_id].join(' ').gsub(/\ *$/, '') %>>
   <%= link_to menu_branch.title, menu_branch.url %>
@@ -18,6 +18,7 @@
                :collection => children,
                :locals => {
                  :hide_children => hide_children,
+                 :collection => collection,
                  :sibling_count => children.size - 1
                } -%>
     </ul>

data/vendor/refinerycms/core/features/search.feature

@@ -20,6 +20,7 @@ Feature: Search
       |page    |testitem|pages         |
       |inquiry |testitem|inquiries     |
       |inquiry |testitem|spam inquiries|
+      |refinery setting|Test Item|refinery settings|
 
   # This will only run when resources engine is installed.
   @search-file

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

@@ -149,7 +149,14 @@ module Refinery
             # If we have already found a set then we don't need to again
             find_all_#{plural_name} if @#{plural_name}.nil?
 
-            @#{plural_name} = @#{plural_name}.paginate(:page => params[:page])
+            paging_options = {:page => params[:page]}
+
+            # Seems will_paginate doesn't always use the implicit method.
+            if #{class_name}.methods.map(&:to_sym).include?(:per_page)
+              paging_options.update({:per_page => #{class_name}.per_page})
+            end
+
+            @#{plural_name} = @#{plural_name}.paginate(paging_options)
           end
 
           # Returns a weighted set of results based on the query specified by the user.

data/vendor/refinerycms/core/public/javascripts/wymeditor/jquery.refinery.wymeditor.js

@@ -1212,6 +1212,7 @@ WYMeditor.editor.prototype.update = function() {
  * @description Opens a dialog box
  */
 WYMeditor.editor.prototype.dialog = function( dialogType ) {
+  this.update();
   var path = this._wym._options.dialogPath + dialogType;
 
   this._current_unique_stamp = this.uniqueStamp();

data/vendor/refinerycms/core/public/stylesheets/refinery/refinery.css

@@ -543,12 +543,12 @@ header p {
   font-style: normal;
   padding: 0px 6px;
 }
-.pagination a, #content .pagination a, .pagination .current, .disabled  {
+.pagination a, #content .pagination a, .pagination .current, .disabled, .pagination em  {
   padding: 7px;
   line-height: 20px;
   border-bottom: 0px none;
 }
-.pagination .current, .pagination a:hover {
+.pagination .current, .pagination a:hover, .pagination em {
   background: #A8B9C1;
 }
 #dialog-form-actions .pagination {

data/vendor/refinerycms/images/app/controllers/admin/images_controller.rb

@@ -11,7 +11,7 @@ class Admin::ImagesController < Admin::BaseController
   def index
     search_all_images if searching?
     paginate_all_images
-    
+
     if RefinerySetting.find_or_set(:group_images_by_date_uploaded, true)
       @grouped_images = group_by_date(@images)
     end

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

@@ -10,7 +10,8 @@ class Page < ActiveRecord::Base
   has_many :parts,
            :class_name => "PagePart",
            :order => "position ASC",
-           :inverse_of => :page
+           :inverse_of => :page,
+           :dependent => :destroy
 
   accepts_nested_attributes_for :parts,
                                 :allow_destroy => true
@@ -117,7 +118,8 @@ class Page < ActiveRecord::Base
   end
 
   def url_marketable
-    {:controller => "/pages", :action => "show", :path => self.nested_url}
+    # :id => nil is important to prevent any other params[:id] from interfering with this route.
+    {:controller => "/pages", :action => "show", :path => self.nested_url, :id => nil}
   end
 
   def url_normal

data/vendor/refinerycms/pages/app/views/admin/pages/_form.html.erb

@@ -11,6 +11,12 @@
     <%= f.label :title %>
     <%= f.text_field :title, :class => "larger widest" %>
   </div>
+
+  <%= render :partial => "form_fields_after_title",
+             :locals => {
+               :f => f
+             } %>
+
   <div class='field'>
     <%= render :partial => "form_page_parts",
                :locals => {

data/vendor/refinerycms/pages/app/views/admin/pages/_form_fields_after_title.html.erb

@@ -0,0 +1 @@
+<%# Intentionally empty, useful override point to add extra fields. %>

data/vendor/refinerycms/pages/config/routes.rb

@@ -1,5 +1,5 @@
 Refinery::Application.routes.draw do
-  resources :pages
+  get '/pages/:id', :to => 'pages#show', :as => :page
 
   scope(:path => 'refinery', :as => 'admin', :module => 'admin') do
     resources :pages do
@@ -8,17 +8,14 @@ Refinery::Application.routes.draw do
       end
     end
 
-    resources :page_parts
-
-    resource :pages do
-      resources :dialogs, :controller => :pages_dialogs do
-        collection do
-          get :link_to
-          get :test_url
-          get :test_email
-        end
+    resources :pages_dialogs, :only => [] do
+      collection do
+        get :link_to
+        get :test_url
+        get :test_email
       end
     end
 
+    resources :page_parts, :only => [:new, :create, :destroy]
   end
 end

data/vendor/refinerycms/pages/features/manage_pages.feature

@@ -39,7 +39,9 @@ Feature: Manage Pages
     And I should have a page at /about--2
 
   Scenario: Delete Page
-    Given I have a page titled "test"
+    Given I only have a page titled "test"
     When I go to the list of pages
     And I follow "Remove this page forever"
     Then I should see "'test' was successfully destroyed."
+    And I should have 0 pages
+    And I should have 0 page_parts

data/vendor/refinerycms/pages/features/step_definitions/page_steps.rb

@@ -16,8 +16,11 @@ Given /^I have no pages$/ do
   Page.delete_all
 end
 
-Given /^I have a page titled "([^"]*)"$/ do |title|
-  Page.create(:title => title)
+Given /^I (only )?have a page titled "([^"]*)"$/ do |only, title|
+  Page.delete_all if only
+  page = Page.create(:title => title)
+  page.parts << PagePart.new(:title => 'testing', :position => 0)
+  page
 end
 
 Then /^I should have ([0-9]+) pages?$/ do |count|
@@ -27,3 +30,7 @@ end
 Then /^I should have a page at \/(.+)$/ do |url|
   Page.all.count{|page| page.url[:path].to_s.include?(url)}.should == 1
 end
+
+Then /^I should have (\d+) page_parts$/ do |count|
+  PagePart.count.should == count.to_i
+end

data/vendor/refinerycms/refinery.rb

@@ -1,10 +1,11 @@
+require 'rbconfig'
+
 module Refinery
 
+  WINDOWS = !!(RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)!)
+
   class << self
-    attr_accessor :is_a_gem, :root, :s3_backend, :base_cache_key
-    def is_a_gem
-      @is_a_gem ||= false
-    end
+    attr_accessor :root, :s3_backend, :base_cache_key
 
     def root
       @root ||= Pathname.new(File.expand_path(__FILE__).split('vendor').first.to_s)
@@ -27,7 +28,7 @@ module Refinery
     @major = 0
     @minor = 9
     @tiny  = 8
-    @build = 3
+    @build = 4
 
     class << self
       attr_reader :major, :minor, :tiny, :build

data/vendor/refinerycms/settings/app/controllers/admin/refinery_settings_controller.rb

@@ -3,7 +3,8 @@ class Admin::RefinerySettingsController < Admin::BaseController
   crudify :refinery_setting,
           :title_attribute => :title,
           :order => "name ASC",
-          :searchable => false,
+          :searchable => true,
+          :paging => true,
           :redirect_to_url => :redirect_to_where?
 
   before_filter :sanitise_params, :only => [:create, :update]
@@ -15,20 +16,23 @@ class Admin::RefinerySettingsController < Admin::BaseController
     render :layout => false if request.xhr?
   end
 
+protected
   def find_all_refinery_settings
-    @refinery_settings = RefinerySetting.find(:all,
-    {
-      :order => "name ASC",
-      :conditions => (["restricted <> ?", true] unless current_user.has_role?(:superuser))
-    })
+    @refinery_settings = RefinerySetting.order('name ASC')
+
+    unless current_user.has_role?(:superuser)
+      @refinery_settings = @refinery_settings.where("restricted <> ? ", true)
+    end
+
+    @refinery_settings
   end
 
-  def paginate_all_refinery_settings
-    @refinery_settings = RefinerySetting.paginate({
-      :page => params[:page],
-      :order => "name ASC",
-      :conditions => (["restricted <> ?", true] unless current_user.has_role?(:superuser))
-    })
+  def search_all_refinery_settings
+    # search for settings that begin with keyword
+    term = "^" + params[:search].to_s.downcase.gsub(' ', '_')
+
+    # First find normal results, then weight them with the query.
+     @refinery_settings = find_all_refinery_settings.with_query(term)
   end
 
 private

data/vendor/refinerycms/settings/app/models/refinery_setting.rb

@@ -5,6 +5,9 @@ class RefinerySetting < ActiveRecord::Base
   serialize :value # stores into YAML format
   serialize :callback_proc_as_string
 
+  # Docs for acts_as_indexed http://github.com/dougal/acts_as_indexed
+  acts_as_indexed :fields => [:name]
+
   before_save do |setting|
     setting.restricted = false if setting.restricted.nil?
   end

data/vendor/refinerycms/settings/app/views/admin/refinery_settings/index.html.erb

@@ -1,26 +1,49 @@
-<div id='actions'>
-  <ul>
-    <li>
-      <%= link_to t('.new'), new_admin_refinery_setting_url(:dialog => true, :width => 725, :height => 475), :class => "add_icon" %>
-    </li>
-  </ul>
-</div>
 <div id='records'>
+  <% if searching? %>
+    <h2>
+      <%= t('shared.admin.search.results_for',
+           :query => params[:search]) %>
+    </h2>
+  <% end %>
   <% if @refinery_settings.any? %>
-    <%= will_paginate @refinery_settings, :previous_label => '&laquo;', :next_label => '&raquo;' %>
+    <%= will_paginate @refinery_settings, :previous_label => '&laquo;',
+                                          :next_label => '&raquo;' %>
     <ul>
-      <%= render :partial => 'refinery_setting', :collection => @refinery_settings %>
+      <%= render :partial => 'refinery_setting',
+                 :collection => @refinery_settings %>
     </ul>
-    <%= will_paginate @refinery_settings, :previous_label => '&laquo;', :next_label => '&raquo;' %>
+    <%= will_paginate @refinery_settings, :previous_label => '&laquo;',
+                                          :next_label => '&raquo;' %>
   <% else %>
     <p>
-      <strong>
-        <%= t('.empty_set') %>
-        <%= t('.create_first', :link => t('.new')) %>
-      </strong>
+      <% if searching? %>
+        <%= t('shared.admin.search.no_results') %>
+      <% else %>
+        <strong>
+          <%= t('.empty_set') %>
+          <%= t('.create_first', :link => t('.new')) %>
+        </strong>
+      <% end %>
     </p>
   <% end %>
 </div>
+<div id='actions'>
+  <ul>
+    <li>
+      <%= render :partial => "/shared/admin/search",
+                 :locals => {
+                   :url => admin_refinery_settings_url
+                 } %>
+    </li>
+    <li>
+      <%= link_to t('.new'), new_admin_refinery_setting_url({
+                               :dialog => true,
+                               :width => 725,
+                               :height => 475
+                             }), :class => "add_icon" %>
+    </li>
+  </ul>
+</div>
 <% content_for :head do %>
   <script type='text/javascript'>
     $(document).ready(function() {

data/vendor/refinerycms/settings/features/step_definitions/setting_steps.rb

@@ -0,0 +1,9 @@
+Given /^I have no (refinery )?settings$/ do
+  RefinerySetting.delete_all
+end
+
+Given /^I (only )?have a (refinery )?setting titled "([^"]*)"$/ do |only, refinery, title|
+  RefinerySetting.delete_all if only
+
+  RefinerySetting.set(title.to_s.gsub(' ', '').underscore.to_sym, nil)
+end

data/vendor/refinerycms/settings/features/support/paths.rb

@@ -0,0 +1,14 @@
+module NavigationHelpers
+  module Refinery
+    module Settings
+      def path_to(page_name)
+        case page_name
+        when /the list of (refinery )?settings/
+          admin_refinery_settings_path
+        else
+          nil
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  hash: 33
+  hash: 47
   prerelease: false
   segments: 
   - 0
   - 9
   - 8
-  - 3
-  version: 0.9.8.3
+  - 4
+  version: 0.9.8.4
 platform: ruby
 authors: 
 - Resolve Digital
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-15 00:00:00 +12:00
+date: 2010-09-17 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -903,6 +903,7 @@ files:
 - vendor/refinerycms/pages/app/views/admin/pages/_form.html.erb
 - vendor/refinerycms/pages/app/views/admin/pages/_form_advanced_options.html.erb
 - vendor/refinerycms/pages/app/views/admin/pages/_form_advanced_options_seo.html.erb
+- vendor/refinerycms/pages/app/views/admin/pages/_form_fields_after_title.html.erb
 - vendor/refinerycms/pages/app/views/admin/pages/_form_new_page_parts.html.erb
 - vendor/refinerycms/pages/app/views/admin/pages/_form_page_parts.html.erb
 - vendor/refinerycms/pages/app/views/admin/pages/_page.html.erb
@@ -990,6 +991,8 @@ files:
 - vendor/refinerycms/settings/config/locales/zh-CN.yml
 - vendor/refinerycms/settings/config/routes.rb
 - vendor/refinerycms/settings/features/manage_refinery_settings.feature
+- vendor/refinerycms/settings/features/step_definitions/setting_steps.rb
+- vendor/refinerycms/settings/features/support/paths.rb
 - vendor/refinerycms/settings/lib/settings.rb
 - vendor/refinerycms/settings/readme.md
 has_rdoc: true