refinerycms 0.9.6.34 → 0.9.7

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

@@ -1,30 +1,30 @@
 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']
+  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',
+               '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

data/vendor/plugins/refinery/plugins.md

@@ -38,7 +38,7 @@ A new database migration has been added to add the products table in so run:
 
 Start up your app by running ``ruby script/server`` go to [http://localhost:3000](http://localhost:3000) and you'll see instantly a new menu item called "products". Click on that and you'll see there are no products yet.
 
-Now go to the backend of your site by visiting [http://localhost:3000/admin](http://localhost:3000/admin) and logging in. You'll see a new tab called "Products", click on that and then click "Add a new product", fill the form and add an example product. Now go back to the front end and you'll see your product is showing up in the products part of your site.
+Now go to the backend of your site by visiting [http://localhost:3000/refinery](http://localhost:3000/refinery) and logging in. You'll see a new tab called "Products", click on that and then click "Add a new product", fill the form and add an example product. Now go back to the front end and you'll see your product is showing up in the products part of your site.
 
 Now you have a fully managed products section in Refinery, nice.
 
@@ -111,7 +111,7 @@ This file runs when your site is started up. All is does is registers this plugi
       plugin.title = "Pages"
       plugin.description = "Manage content pages"
       plugin.version = 1.0
-      plugin.menu_match = /admin\/page(_dialog|part)?s$/
+      plugin.menu_match = /(refinery|admin)\/page(_dialog|part)?s$/
       plugin.activity = {
         :class => Page,
         :url_prefix => "edit_",
@@ -131,7 +131,7 @@ In our example above we showed the use of ``plugin.activity`` for the pages plug
       plugin.title = "Pages"
       plugin.description = "Manage content pages"
       plugin.version = 1.0
-      plugin.menu_match = /admin\/page(_dialog|part)?s$/
+      plugin.menu_match = /(refinery|admin)\/page(_dialog|part)?s$/
       plugin.activity = {
         :class => Page,
         :url_prefix => "edit_",
@@ -151,7 +151,7 @@ Here's what the different activity options mean:
     :url_prefix
     # Just use "_edit" if you're not sure how this works.
     #
-    # When it says "'About Us' page was updated about 4 hours ago", the page title "About Us"
+    # When it says "'About' page was updated about 4 hours ago", the page title "About"
     # is linked to that page in a way we specify.  So by setting "_edit" as a :url_prefix what
     # we're doing is making it link to the page that allows us to edit this page.
     # So the next result is edit_admin_page_url(page)
@@ -190,7 +190,7 @@ Refinery uses a standards compliant visual editor called [WYMeditor](http://www.
 
 _Note: When using the Refinery generator, if you apply a field type of "text" to any of your fields, they automatically load as a WYMEditor._
 
-The WYSIWYG editor can only be applied to a ``textarea``. All you need to do is add a class of "wymeditor" to a ``textarea`` in your form and a WYSIWYG WYMEditor will load right in place.
+The WYSIWYG editor can only be applied to a ``textarea``. All you need to do is add a class of "wymeditor widest" to a ``textarea`` in your form and a WYSIWYG WYMEditor will load right in place.
 
 ### Example
 
@@ -200,6 +200,6 @@ Again going back to our product plugin example if you had this in your ``vendor/
 
 Just change that to:
 
-    <%= f.text_area :description, :class => "wymeditor" %>
+    <%= f.text_area :description, :class => "wymeditor widest" %>
 
 Refresh and you're done.

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

@@ -1,10 +1,13 @@
 Refinery::Plugin.register do |plugin|
   plugin.title = "Refinery"
+  plugin.name = "refinery_core"
   plugin.description = "Core refinery plugin"
   plugin.version = 1.0
   plugin.hide_from_menu = true
   plugin.always_allow_access = true
-  plugin.menu_match = /admin\/(refinery_core|base)$/
+  plugin.menu_match = /(refinery|admin)\/(refinery_core|base)$/
+  # this tells refinery where this plugin is located on the filesystem and helps with urls.
+  plugin.directory = directory
 end
 require_dependency 'refinery/form_helpers'
 require_dependency 'refinery/base_presenter'
@@ -18,3 +21,7 @@ require_dependency 'refinery/base_presenter'
     ::ActiveSupport::Dependencies.load_paths << presenters_path
   end
 end
+
+if (aai_config_file = Rails.root.join('config', 'acts_as_indexed_config.rb')).exist?
+  require aai_config_file.to_s
+end

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

@@ -24,4 +24,8 @@ class Admin::DialogsController < Admin::BaseController
     end
   end
 
+  def from_dialog?
+    true
+  end
+
 end

data/vendor/plugins/refinery_dialogs/app/views/admin/dialogs/show.html.erb

@@ -1,20 +1,19 @@
-<form class='wym_dialog wym_dialog_<%= @dialog_type %>'>
+<form id='wym_dialog_form' class='wym_dialog wym_dialog_<%= @dialog_type %>'>
   <input type='hidden' id='wym_dialog_type' class='wym_dialog_type' value='<%= @dialog_type %>' />
   <iframe src='<%= @iframe_src %>' id='dialog_frame' frameborder='0'></iframe>
   <div class='wym_hideables'>
   <% if @dialog_type == "image" %>
-    <input type='text' id='wym_src' class='wym_src' value='' size='40' />
-    <input type='text' id='wym_alt' class='wym_alt' value='' size='40' />
-    <input type='text' id='wym_title' class='wym_title' value='' size='40' />
+    <input type='hidden' id='wym_src' class='wym_src' value='' />
+    <input type='hidden' id='wym_alt' class='wym_alt' value='' />
+    <input type='hidden' id='wym_title' class='wym_title' value='' />
+    <input type='hidden' id='wym_size' class='wym_size' value='' />
   <% elsif @dialog_type == "link" %>
-    <input type='text' id='wym_href' class='wym_href' value='' size='40' />
-    <input type='text' id='wym_title' class='wym_title' value='' size='40' />
-    <input type='text' id='wym_target' class='wym_target' value='' size='40' />
+    <input type='hidden' id='wym_href' class='wym_href' value='' />
+    <input type='hidden' id='wym_title' class='wym_title' value='' />
+    <input type='hidden' id='wym_target' class='wym_target' value='' />
   <% end %>
-  </div>
-  <div id='dialog-form-actions' class='form-actions'>
-    <input class='wym_submit submit_dialog' type='button' value='<%= @submit_button_text ||= 'Save' %>' />
-    or
-    <a href='' class='wym_cancel close_dialog'><%= @cancel_button_text ||= 'Cancel' %></a>
+
+    <input id='wym_dialog_submit' class='wym_submit submit_dialog button' type='button' value='<%= @submit_button_text ||= 'Save' %>' />
+    <a id='wym_dialog_cancel' href='' class='wym_cancel close_dialog button'><%= @cancel_button_text ||= 'Cancel' %></a>
   </div>
 </form>

data/vendor/plugins/refinery_dialogs/app/views/layouts/admin_dialog.html.erb

@@ -5,6 +5,8 @@
     <div id="flash_container">
       <%= render :partial => '/shared/message' %>
     </div>
-    <%= yield %>
+    <div id='content' class='clearfix'>
+      <%= yield %>
+    </div>
   </body>
-</html>
+</html>

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

@@ -1,5 +1,5 @@
 ActionController::Routing::Routes.draw do |map|
-  map.namespace(:admin) do |admin|
+  map.namespace(:admin, :path_prefix => 'refinery') do |admin|
     admin.resources :dialogs, :only => [:show]
   end
 end

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

@@ -1,7 +1,11 @@
 Refinery::Plugin.register do |plugin|
   plugin.title = "Dialogs"
+  plugin.name = "refinery_dialogs"
   plugin.description = "Refinery Dialogs plugin"
   plugin.version = 1.0
   plugin.hide_from_menu = true
   plugin.always_allow_access = true
+  # this tells refinery where this plugin is located on the filesystem and helps with urls.
+  plugin.menu_match = /(refinery|admin)\/(refinery_)?dialogs$/
+  plugin.directory = directory
 end

data/vendor/plugins/refinery_settings/app/controllers/admin/refinery_settings_controller.rb

@@ -2,4 +2,43 @@ class Admin::RefinerySettingsController < Admin::BaseController
 
   crudify :refinery_setting, :title_attribute => :title, :order => "name ASC", :searchable => false
 
+  before_filter :sanitise_params, :only => [:create, :update]
+  after_filter :fire_setting_callback, :only => [:update]
+
+  def edit
+    @refinery_setting = RefinerySetting.find(params[:id])
+
+    render :layout => false if request.xhr?
+  end
+
+  def find_all_refinery_settings
+    @refinery_settings = RefinerySetting.find :all,
+                                              :order => "name ASC",
+                                              :conditions => current_user.has_role?(:superuser) ? nil : {:restricted => false}
+  end
+
+  def paginate_all_refinery_settings
+    @refinery_settings = RefinerySetting.paginate :page => params[:page],
+                                                  :order => "name ASC",
+                                                  :conditions => current_user.has_role?(:superuser) ? nil : {:restricted => false}
+  end
+
+private
+  # this fires before an update or create to remove any attempts to pass sensitive arguments.
+  def sanitise_params
+    params.delete(:callback_proc_as_string)
+    params.delete(:scoping)
+  end
+
+  def fire_setting_callback
+    begin
+      @refinery_setting.callback_proc.call
+    rescue
+      logger.warn('Could not fire callback proc. Details:')
+      logger.warn(@refinery_setting.inspect)
+      logger.warn($!.message)
+      logger.warn($!.backtrace)
+    end unless @refinery_setting.callback_proc.nil?
+  end
+
 end

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

@@ -3,12 +3,33 @@ class RefinerySetting < ActiveRecord::Base
   validates_presence_of :name
 
   serialize :value # stores into YAML format
+  serialize :callback_proc_as_string
 
   # Number of settings to show per page when using will_paginate
   def self.per_page
     12
   end
 
+  after_save do |setting|
+    if self.column_names.include?('scoping')
+      cache_write(setting.name, setting.scoping.presence, setting.value)
+    else
+      cache_write(setting.name, nil, setting.value)
+    end
+  end
+
+  def self.cache_key(name, scoping)
+    "#{Refinery.base_cache_key}_refinery_setting_#{name}#{"_with_scoping_#{scoping}" if scoping.present?}"
+  end
+
+  def self.cache_read(name, scoping)
+    Rails.cache.read(cache_key(name, scoping))
+  end
+
+  def self.cache_write(name, scoping, value)
+    Rails.cache.write(cache_key(name, scoping), value)
+  end
+
   # prettier version of the name.
   # site_name becomes Site Name
   def title
@@ -30,30 +51,62 @@ class RefinerySetting < ActiveRecord::Base
     end
   end
 
-  def self.find_or_set(name, the_value)
-    find_or_create_by_name(:name => name.to_s, :value => the_value).value
+  def self.find_or_set(name, the_value, options={})
+    # Try to get the value from cache first.
+    scoping = options[:scoping]
+    restricted = options[:restricted]
+    callback_proc_as_string = options[:callback_proc_as_string]
+    if (value = cache_read(name, scoping)).nil?
+      setting = find_or_create_by_name(:name => name.to_s, :value => the_value)
+
+      # if the database is not up to date yet then it won't know about certain fields.
+      setting.scoping = scoping if self.column_names.include?('scoping')
+      setting.restricted = restricted if self.column_names.include?('restricted')
+      setting.callback_proc_as_string = callback_proc_as_string if callback_proc_as_string.is_a?(String) && self.column_names.include?('callback_proc_as_string')
+
+      setting.save
+
+      # cache whatever we found including its scope in the name, even if it's nil.
+      cache_write(name, scoping, (value = setting.try(:value)))
+    end
+
+    # Return what we found.
+    value
   end
 
   def self.[](name)
-    setting = self.find_by_name(name.to_s)
-    setting.value unless setting.nil?
+    # Try to get the value from cache first.
+    if (value = cache_read(name, (scoping = nil))).nil?
+      # Not found in cache, try to find the record itself and cache whatever we find.
+      value = cache_write(name, scoping, self.find_by_name(name.to_s).try(:value))
+    end
+
+    # Return what we found.
+    value
   end
 
   def self.[]=(name, value)
     setting = find_or_create_by_name(name.to_s)
-    setting.value = value
+
+    # you could also pass in {:value => 'something', :scoping => 'somewhere'}
+    unless value.is_a?(Hash) and value.has_key?(:value)
+      setting.value = value
+    else
+      setting.value = value[:value]
+      setting.scoping = value[:scoping] if value.has_key?(:scoping) and setting.class.column_names.include?('scoping')
+      setting.callback_proc_as_string = value[:callback_proc_as_string] if value.has_key?(:callback_proc_as_string) and setting.class.column_names.include?('callback_proc_as_string')
+    end
+
     setting.save
   end
 
   # Below is not very nice, but seems to be required
-  # The problem is when Rails serialises a fields like booleans
-  # it doesn't retreieve it back out as a boolean
-  # it just returns a string. This code maps the two boolean
-  # values correctly so a boolean is returned
+  # The problem is when Rails serialises a fields like booleans it doesn't retrieve it back out as a boolean
+  # it just returns a string. This code maps the two boolean values correctly so a boolean is returned
   REPLACEMENTS = {"true" => true, "false" => false}
 
   def value
-    if (current_value = self[:value]).present?
+    unless (current_value = self[:value]).nil?
       # This bit handles true and false so that true and false are actually returned
       # not "0" and "1"
       REPLACEMENTS.each do |current, new_value|
@@ -80,4 +133,8 @@ class RefinerySetting < ActiveRecord::Base
     self[:value] = new_value
   end
 
+  def callback_proc
+    eval "Proc.new{#{self.callback_proc_as_string} }" if RefinerySetting.column_names.include?('callback_proc_as_string') && self.callback_proc_as_string.present?
+  end
+
 end

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

@@ -1,17 +1,41 @@
-<%= error_messages_for :refinery_setting %>
 <% form_for [:admin, @refinery_setting] do |f| %>
+  <%= f.error_messages %>
   <div class='field'>
   <% if action_name =~ /(new)|(create)/ %>
     <%= f.label :name %>
-    <%= f.text_field :name, :class => "larger", :size => 67 %>
+    <%= f.text_field :name, :class => "larger", :size => from_dialog? ? 50 : 67 %>
   <% else %>
-    <label>Name</label>
-    <%= h(@refinery_setting.name).titleize %> <span class="preview">- (<%= h @refinery_setting.name %>)</span>
+    <label for='refinery_setting_value'>Name</label>
+    <label class='stripped' for='refinery_setting_value'>
+      <%= h(@refinery_setting.name).titleize %>
+    </label>
+    <span class="preview">- (<%= h @refinery_setting.name %>)</span>
+  <% end %>
+  <% unless action_name =~ /(new)|(create)/ or (help = I18n.translate("admin.refinery_settings.help.#{@refinery_setting.name}", :default => '')).blank?  %>
+    <p>
+      <span><%= help %></span>
+    </p>
+  <% end %>
+  <% if current_user.has_role?(:superuser) %>
+    <span class='label_with_help'>
+      <%= f.label :restricted %>
+      <%= refinery_help_tag t('.help.restricted') %>
+    </span>
+    <%= f.check_box :restricted %>
+    <%= f.label :restricted, t('.yes_make_this_setting_restricted'), :class => 'stripped' %>
   <% end %>
   </div>
   <div class='field'>
     <%= f.label :value %>
-    <%= f.text_area :value, :rows => 5, :cols => 100 %>
+    <%= f.text_area :value, :rows => 5, :class => 'widest' %>
   </div>
-  <%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false} %>
+  <input type='hidden' name='modal' value='<%= from_dialog? %>' />
+  <input type='hidden' name='dialog' value='<%= from_dialog? %>' />
+  <%= render :partial => "/shared/admin/form_actions",
+             :locals => {
+               :f => f,
+               :continue_editing => false,
+               :hide_cancel => from_dialog?,
+               :submit_button_title => t('.restart_may_be_in_order')
+              } %>
 <% end -%>

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

@@ -1,16 +1,15 @@
 <li class='clearfix record <%= cycle("on", "on-hover") %>'>
   <span class='title'>
-    <%=h refinery_setting.name.titleize %>
+    <%= t(refinery_setting.name, :default => h(refinery_setting.name.titleize)) %>
     <span class="preview">- <%=h truncate(refinery_setting.value.to_s, :length => 40) %></span>
-
-    <span class='actions'>
-      <%= 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),
-                  :class => "cancel confirm-delete",
-                  :title => 'Remove this setting forever' if refinery_setting.destroyable %>
-    </span>
+  </span>
+  <span class='actions'>
+    <%= link_to refinery_icon_tag("application_edit.png"),
+                edit_admin_refinery_setting_path(refinery_setting, :dialog => true, :width => 725, :height => 525),
+                :title => t('.edit') %>
+    <%= link_to refinery_icon_tag("delete.png"),
+                admin_refinery_setting_path(refinery_setting),
+                :class => "cancel confirm-delete",
+                :title => t('.remove') if refinery_setting.destroyable %>
   </span>
 </li>

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

@@ -1,4 +1 @@
 <%= render :partial => "form" %>
-<div style='margin-top: 12px'>
-    <strong>Please note</strong> that you may need to restart the website for this setting to take effect.
-</div>