refinerycms 0.9.6.7 → 0.9.6.8

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

@@ -85,9 +85,9 @@ class Page < ActiveRecord::Base
   # to "/inquiries/new"
   def url
     if self.link_url.present?
-      self.link_url
+      self.link_url =~ /^\// ? {:controller => self.link_url} : self.link_url
     elsif self.to_param.present?
-      "/pages/#{self.to_param}"
+      {:controller => "pages", :action => "show", :id => self.to_param}
     end
   end
 

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

@@ -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\/((pages)|(page_dialogs)|(page_parts))$/
+  plugin.menu_match = /admin\/page(_dialog|part)?s$/
   plugin.activity = {
     :class => Page,
     :url_prefix => "edit",

data/vendor/plugins/refinery/app/views/admin/_head.html.erb

@@ -4,15 +4,8 @@
   <title><%= RefinerySetting.find_or_set(:site_name, 'Company Name').titleize %> - Refinery</title>
   <%= stylesheet_link_tag 'refinery/thickbox', 'refinery/refinery', 'refinery/tooltips', :cache => (use_caching ? "cache/refinery" : false) %>
   <%= render :partial => "/shared/admin/head_before_javascript_libraries" -%>
-  <% if (using_google_libs = RefinerySetting.find_or_set(:use_google_ajax_libraries, true)) and !local_request? -%>
-    <script type='text/javascript' src="http://www.google.com/jsapi"></script>
-    <script type='text/javascript'>
-      google.load("jquery", "1.4");
-      google.load("jqueryui", "1.8");
-    </script>
-  <% end %>
-  <%= javascript_include_tag 'jquery', 'jquery-ui-1.8rc1.min.js', :cache => (use_caching ? "cache/libraries" : nil) if !using_google_libs or local_request? %>
+  <%= jquery_include_tags(use_caching) %>
   <%= javascript_include_tag 'admin', 'thickbox', 'wymeditor/jquery.refinery.wymeditor.js', 'refinery/boot_wym', 'refinery/admin', :cache => (use_caching ? "cache/admin" : false) %>
   <%= javascript_include_tag "http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js" if RefinerySetting.find_or_set(:show_firebug_lite, false) -%>
   <%= yield :head %>
-</head>
+</head>

data/vendor/plugins/refinery/app/views/shared/_content_page.html.erb

@@ -1,7 +1,8 @@
 <%
-  body_content_title = (title = yield :body_content_title).blank? ? page_title : title
-  body_content_left = (body_content_left = yield :body_content_left).blank? ? @page[:body] : body_content_left
-  body_content_right = (body_content_right = yield :body_content_right).blank? ? @page[:side_body] : body_content_right
+  hide_empty_sections ||= !(show_empty_sections ||= false)
+  body_content_title = ((title = yield :body_content_title).present? or hide_empty_sections) ? title : page_title
+  body_content_left = ((body_content_left = yield :body_content_left).present? or hide_empty_sections) ? body_content_left : @page[:body]
+  body_content_right = ((body_content_right = yield :body_content_right).present? or hide_empty_sections) ? body_content_right : @page[:side_body]
   extra_body_content_classes = []
   extra_body_content_classes << "no_title" if body_content_title.blank?
   extra_body_content_classes << "no_left" if body_content_left.blank?
@@ -9,17 +10,17 @@
 -%>
 <%= render :partial => "/shared/submenu" if !admin? and (show_submenu ||= true) and RefinerySetting.find_or_set(:show_submenu_on_content_pages, true) %>
 <div id='body_content' class='clearfix<%= " #{extra_body_content_classes.join(" ")}" if extra_body_content_classes.any? %>'>
-<% unless body_content_title.blank? and !(show_empty_sections ||= false) -%>
+<% unless body_content_title.blank? and hide_empty_sections -%>
   <h1 id='body_content_page_title'>
     <%= body_content_title %>
   </h1>
 <% end -%>
-<% unless body_content_left.blank? and !(show_empty_sections ||= false) -%>
+<% unless body_content_left.blank? and hide_empty_sections  -%>
   <div id='body_content_left' class='clearfix'>
     <%= body_content_left %>
   </div>
 <% end -%>
-<% unless body_content_right.blank? and !(show_empty_sections ||= false) -%>
+<% unless body_content_right.blank? and hide_empty_sections  -%>
   <div id='body_content_right' class='clearfix'>
     <%= body_content_right %>
   </div>

data/vendor/plugins/refinery/app/views/shared/_head.html.erb

@@ -11,5 +11,6 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <%= "<meta name=\"keywords\" content=\"#{@meta.meta_keywords}\" />" if @meta.meta_keywords.present? %>
   <%= "<meta name=\"description\" content=\"#{@meta.meta_description}\" />" if @meta.meta_description.present? -%>
+  <%= yield :head_libraries %>
   <%= yield :head %>
 </head>

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

@@ -20,4 +20,4 @@
       </ul>
     <% end -%>
   </li>
-<% end -%>
+<% end -%>

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

@@ -189,8 +189,8 @@ module Crud
 
           def update_positions
             unless params[:tree] == "true"
-              params[:sortable_list].each do |i|
-                #{class_name}.find(i).update_attribute(:position, params[:sortable_list].index(i))
+              params[:sortable_list].each_with_index do |i, index|
+                #{class_name}.find(i).update_attribute(:position, index)
               end
             else
               params[:sortable_list].each do |position, id_hash|

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

@@ -7,26 +7,30 @@ class Refinery::ApplicationController < ActionController::Base
   include Crud # basic create, read, update and delete methods
   include AuthenticatedSystem
 
-  before_filter :take_down_for_maintenance?, :setup_theme, :find_pages_for_menu, :show_welcome_page
+  before_filter :take_down_for_maintenance?, :find_pages_for_menu, :show_welcome_page
 
-  rescue_from ActiveRecord::RecordNotFound, :with => :error_404
-  rescue_from ActionController::UnknownAction, :with => :error_404
+  rescue_from ActiveRecord::RecordNotFound, ActionController::UnknownAction, :with => :error_404
 
   def error_404
-    @page = Page.find_by_menu_match("^/404$", :include => [:parts, :slugs])
-    render :template => "/pages/show", :status => 404
+    if (@page = Page.find_by_menu_match("^/404$", :include => [:parts, :slugs])).present?
+      # render the application's custom 404 page with layout.
+      render :template => "/pages/show", :status => 404
+    else
+      # fallback to the default 404.html page.
+      render :file => Rails.root.join("public", "404.html"), :layout => false, :status => 404
+    end
   end
 
   def home_page?
-    params[:action] == "home" and params[:controller] == "pages"
+    action_name == "home" and controller_name == "pages"
   end
 
   def local_request?
-    request.remote_ip =~ /(::1)|(127.0.0.1)|((192.168).*)/ or ENV["RAILS_ENV"] == "development"
+    ENV["RAILS_ENV"] == "development" or request.remote_ip =~ /(::1)|(127.0.0.1)|((192.168).*)/
   end
 
   def just_installed?
-    User.count == 0
+    !User.exists?
   end
 
   def from_dialog?
@@ -34,7 +38,7 @@ class Refinery::ApplicationController < ActionController::Base
   end
 
   def admin?
-    params[:controller] =~ /admin\/(.*)/
+    controller_name =~ /^admin\//
   end
 
   def wymiframe
@@ -43,10 +47,6 @@ class Refinery::ApplicationController < ActionController::Base
 
 protected
 
-  def setup_theme
-    self.view_paths = ::ActionController::Base.view_paths.dup.unshift(Rails.root.join("themes", RefinerySetting[:theme], "views").to_s)
-  end
-
   def take_down_for_maintenance?
     if RefinerySetting.find_or_set(:down_for_maintenance, false)
       if (@page = Page.find_by_menu_match("^/maintenance$", :include => [:parts, :slugs])).present?
@@ -58,7 +58,7 @@ protected
   end
 
   def show_welcome_page
-    render :template => "/welcome", :layout => "admin" if just_installed? and params[:controller] != "users"
+    render :template => "/welcome", :layout => "admin" if just_installed? and controller_name != "users"
   end
 
   # get all the pages to be displayed in the site menu.
@@ -78,4 +78,4 @@ protected
     super
   end
 
-end
+end

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

@@ -52,6 +52,18 @@ module Refinery::ApplicationHelper
     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"}
+      <script type='text/javascript'>
+        google.load('jquery', '1.4');
+        google.load('jqueryui', '1.8');
+      </script>"
+    else
+      javascript_include_tag 'jquery', 'jquery-ui-1.8rc1.min.js', :cache => (use_caching ? "cache/libraries" : nil)
+    end
+  end
+
   # you can override the object used for the title by supplying options[:object]
   # this object must support custom_title_type if you want custom titles.
   def page_title(options = {})

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

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

data/vendor/plugins/refinery/plugins.md

@@ -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\/((pages)|(page_dialogs)|(page_parts))$/
+      plugin.menu_match = /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\/((pages)|(page_dialogs)|(page_parts))$/
+      plugin.menu_match = /admin\/page(_dialog|part)?s$/
       plugin.activity = {
         :class => Page,
         :url_prefix => "edit_",

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

@@ -1,17 +1,24 @@
 class RefinerySetting < ActiveRecord::Base
-  class SettingNotFound < RuntimeError; end
 
   validates_presence_of :name
   validates_uniqueness_of :name
 
-  serialize :value
-
+  serialize :value # stores into YAML format
+  
+  # Number of settings to show per page when using will_paginate
+  def self.per_page
+    10
+  end
+  
+  # prettier version of the name.
+  # site_name becomes Site Name
   def title
     self.name.titleize
   end
 
-  # internals
-
+  # Access method that allows dot notation to work.
+  # say you had a setting called "site_name". You could access that by going RefinerySetting[:site_name]
+  # but with this you can also access that by going RefinerySettting.site_name
   def self.method_missing(method, *args)
     method_name = method.to_s
     super(method, *args)
@@ -24,8 +31,9 @@ class RefinerySetting < ActiveRecord::Base
     end
   end
 
-  def self.find_or_set(name, or_this_value)
-    setting_value = find_or_create_by_name(:name => name.to_s, :value => or_this_value).value
+  def self.find_or_set(name, the_value)
+    setting = find_or_create_by_name(:name => name.to_s, :value => the_value)
+    setting.value
   end
 
   def self.[](name)
@@ -38,19 +46,37 @@ class RefinerySetting < ActiveRecord::Base
     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
   REPLACEMENTS = {"true" => true, "false" => false}
 
   def value
-    _value = self[:value]
+    current_value = self[:value]
 
-   unless _value.nil?
-      REPLACEMENTS.each do |current_value, new_value|
-        _value = new_value if _value == current_value
+    unless current_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|
+        current_value = new_value if current_value == current
+      end
+
+      # converts the serialised value back to an integer
+      # if the value is an integer
+      begin
+        if current_value.to_i.to_s == current_value
+          current_value = current_value.to_i  
+        end
+      rescue
+        current_value
       end
-      _value = _value.to_i if _value.to_i.to_s == _value rescue _value
     end
 
-    return _value
+    return current_value
   end
 
   def value=(new_value)
@@ -59,8 +85,4 @@ class RefinerySetting < ActiveRecord::Base
     self[:value] = new_value
   end
 
-  def self.per_page
-    10
-  end
-
-end
+end

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

@@ -2,8 +2,7 @@ Refinery::Plugin.register do |plugin|
   plugin.title = "Settings"
   plugin.description = "Manage Refinery settings"
   plugin.version = 1.0
-  plugin.url = "/admin/settings"
-  plugin.menu_match = /admin\/((refinery_settings)|(settings))$/
+  plugin.menu_match = /admin\/(refinery_)?settings$/
   plugin.activity = {
     :class => RefinerySetting,
     :title => 'title',

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

@@ -1,18 +1,26 @@
 class Resource < ActiveRecord::Base
 
+  # What is the max resource size a user can upload
+  MAX_SIZE_IN_MB = 50
+
   # Docs for attachment_fu http://github.com/technoweenie/attachment_fu
   has_attachment :storage => (USE_S3_BACKEND ? :s3 : :file_system),
-                 :size => 0.kilobytes..50.megabytes,
+                 :max_size => MAX_SIZE_IN_MB.megabytes,
                  :path_prefix => (USE_S3_BACKEND ? nil : 'public/system/resources')
 
+  # 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
   def validate
     if self.filename.nil?
       errors.add_to_base("You must choose a file to upload")
     else
       [:size].each do |attr_name|
         enum = attachment_options[attr_name]
+      
         unless enum.nil? || enum.include?(send(attr_name))
-          errors.add_to_base("Files should be smaller than 50 MB in size") if attr_name == :size
+          errors.add_to_base("Files should be smaller than #{MAX_SIZE_IN_MB} MB in size") if attr_name == :size
         end
       end
     end

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

@@ -45,7 +45,7 @@ class Theme < ActiveRecord::Base
 
   def read_theme
     self.title = File.basename(self.full_filename).split(".").first.titleize
-    self.license = File.open(File.join(theme_path, "LICENSE")).read if File.exists? File.join(theme_path, "LICENSE")
+    self.licence = File.open(File.join(theme_path, "LICENCE")).read if File.exists? File.join(theme_path, "LICENCE")
     self.description = File.open(File.join(theme_path, "README")).read if File.exists? File.join(theme_path, "README")
   end
 

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

@@ -7,20 +7,29 @@ class ThemeServer
   def initialize(app)
     @app = app
   end
-  
+
   def call(env)
     if env["PATH_INFO"] =~ /^\/theme/
       relative_path = env["PATH_INFO"].gsub(/^\/theme\//, '')
 
       if (file_path = Rails.root.join "themes", RefinerySetting[:theme], relative_path).exist?
-        [200, {"Content-Type" => Rack::Mime.mime_type(File.extname file_path)}, file_path.open]
+        # generate an etag for client-side caching.
+        etag = Digest::MD5.hexdigest("#{file_path.to_s}#{file_path.mtime}")
+        unless env["HTTP_IF_NONE_MATCH"] == etag
+          [200, {
+                  "Content-Type" => Rack::Mime.mime_type(file_path.extname),
+                  "ETag" => etag
+                }, file_path.open]
+        else
+          [304, {"Content-Type" => Rack::Mime.mime_type(file_path.extname)}, "Not Modified"]
+        end
       else
-        [404, {"Content-Type" => "text/html"}, ["404 file not found."]]
+        [404, {"Content-Type" => "text/html"}, ["Not Found"]]
       end
     else
       status, headers, response = @app.call(env)
       [status, headers, response]
     end
   end
-  
+
 end

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

@@ -11,4 +11,15 @@ Refinery::Plugin.register do |plugin|
   }
 end
 
-config.middleware.use "ThemeServer"
+config.middleware.use "ThemeServer"
+::ActionController::Base.module_eval %(
+  view_paths.unshift Rails.root.join("themes", RefinerySetting[:theme], "views").to_s if RefinerySetting[:theme].present?
+)
+
+# set up controller paths.
+if RefinerySetting[:theme].present?
+  controller_path = Rails.root.join("themes", RefinerySetting[:theme], "controllers").to_s
+
+  ::ActiveSupport::Dependencies.load_paths.unshift controller_path
+  config.controller_paths.unshift controller_path
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  version: 0.9.6.7
+  version: 0.9.6.8
 platform: ruby
 authors: 
 - Resolve Digital
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-11 00:00:00 +13:00
+date: 2010-02-15 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -32,6 +32,7 @@ files:
 - .gems
 - .gitignore
 - .yardopts
+- Gemfile
 - Rakefile
 - VERSION
 - app/controllers/admin/base_controller.rb
@@ -42,6 +43,7 @@ files:
 - bin/refinery-override
 - bin/refinery-update-core
 - config/amazon_s3.yml.example
+- config/application.rb
 - config/boot.rb
 - config/database.yml.example
 - config/environment.rb
@@ -67,6 +69,7 @@ files:
 - doc/.yardoc/checksums
 - doc/.yardoc/objects/root.dat
 - doc/.yardoc/proxy_types
+- lib/attachment_fu_patch.rb
 - lib/refinery_initializer.rb
 - license.md
 - public/.htaccess
@@ -214,16 +217,42 @@ files:
 - script/server
 - test/files/The world!.gif
 - test/files/car-wallpapers19.jpg
+- test/files/teng.pdf
 - test/fixtures/images.yml
+- test/fixtures/inquiries.yml
+- test/fixtures/news_items.yml
 - test/fixtures/page_parts.yml
 - test/fixtures/pages.yml
+- test/fixtures/refinery_settings.yml
+- test/fixtures/resources.yml
+- test/fixtures/themes.yml
 - test/performance/browsing_test.rb
 - test/test_helper.rb
 - test/unit/image_test.rb
+- test/unit/inquiry_test.rb
+- test/unit/news_items_test.rb
 - test/unit/page_part_test.rb
 - 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
+- todo.md
+- vendor/cache/aasm-2.1.3.gem
+- vendor/cache/actionmailer-2.3.5.gem
+- vendor/cache/actionpack-2.3.5.gem
+- vendor/cache/activerecord-2.3.5.gem
+- vendor/cache/activeresource-2.3.5.gem
+- vendor/cache/activesupport-2.3.5.gem
+- vendor/cache/friendly_id-2.3.1.gem
+- vendor/cache/hpricot-0.8.2.gem
+- vendor/cache/rack-1.0.1.gem
+- vendor/cache/rails-2.3.5.gem
+- vendor/cache/rake-0.8.7.gem
+- vendor/cache/rubyzip-0.9.1.gem
+- vendor/cache/slim_scrooge-1.0.3.gem
+- vendor/cache/will_paginate-2.3.11.gem
 - vendor/plugins/acts_as_indexed/CHANGELOG
 - vendor/plugins/acts_as_indexed/MIT-LICENSE
 - vendor/plugins/acts_as_indexed/README.rdoc
@@ -562,5 +591,10 @@ test_files:
 - test/performance/browsing_test.rb
 - test/test_helper.rb
 - test/unit/image_test.rb
+- test/unit/inquiry_test.rb
+- test/unit/news_items_test.rb
 - test/unit/page_part_test.rb
 - test/unit/page_test.rb
+- test/unit/refinery_setting_test.rb
+- test/unit/resource_test.rb
+- test/unit/theme_test.rb