refinerycms 0.9.6.14 → 0.9.6.15

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

@@ -14,11 +14,11 @@ module Refinery
     def default_plugin_paths
       paths = super.push(Refinery.root.join("vendor", "plugins").to_s).uniq
     end
-  end if defined?(Rails::Configuration)
+  end
 
   class PluginLoader < Rails::Plugin::Loader
     def add_plugin_load_paths
-      # call rails' add_plugin_load_paths
+      # call Rails' add_plugin_load_paths
       super
 
       # 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.
@@ -41,15 +41,27 @@ module Refinery
         raise LoadError, load_error.to_s unless load_error.to_s =~ /friendly_id|aasm|will_paginate/
       end
     end
-  end if defined?(Rails::Plugin::Loader)
+  end
 
   class Initializer < Rails::Initializer
     def self.run(command = :process, configuration = Configuration.new)
-      configuration.plugin_loader = Refinery::PluginLoader
+      # Set up configuration that is rather specific to Refinery. We make sure we check that things haven't already been set in the application.
+      configuration.plugin_loader = Refinery::PluginLoader unless configuration.plugin_loader != Rails::Plugin::Loader
+      configuration.plugins = [ :friendly_id, :will_paginate, :aasm, :all ] if configuration.plugins.nil?
+      configuration.gem "aasm", :version => "~> 2.1.3", :lib => "aasm"
+      configuration.gem "friendly_id", :version => "~> 2.3.2", :lib => "friendly_id"
+      configuration.gem "hpricot", :version => "~> 0.8.1", :lib => "hpricot"
+      configuration.gem "slim_scrooge", :version => "~> 1.0.5", :lib => "slim_scrooge"
+      configuration.gem "will_paginate", :version => "~> 2.3.11", :lib => "will_paginate"
+
+      # Pass our configuration along to Rails.
       Rails.configuration = configuration
 
-      # call rails' run
+      # call Rails' run
       super
+
+      # Create deprecations for variables that we've stopped using (possibly remove in 1.0?)
+      require 'refinery/deprecations'
     end
 
     def load_plugins
@@ -72,9 +84,8 @@ module Refinery
         end
       end
 
-      # call rails' load_plugins
+      # call Rails' load_plugins
       super
     end
-  end if defined?(Rails::Initializer)
-
-end
+  end
+end

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

@@ -7,20 +7,21 @@ class Admin::DialogsController < Admin::BaseController
 
     if @dialog_type
       @submit_button_text = "Insert"
+      @cancel_button_text = "Cancel"
 
       url_params = params.reject {|key, value| key =~ /(action)|(controller)/}
 
-      if @dialog_type == 'image'
-        @iframe_src = insert_admin_images_url(:dialog => true)
+      @iframe_src = if @dialog_type == 'image'
+        insert_admin_images_url(:dialog => true)
       elsif @dialog_type == 'link'
-        @iframe_src = link_to_admin_pages_dialogs_url(url_params)
+        link_to_admin_pages_dialogs_url(url_params)
       end
 
-      render :layout => false #"admin_dialog"
+      render :layout => false
 
     else
       render :nothing => true
     end
   end
 
-end
+end

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

@@ -15,6 +15,6 @@
   <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>
+    <a href='' class='wym_cancel close_dialog'><%= @cancel_button_text ||= 'Cancel' %></a>
   </div>
-</form>
+</form>

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

@@ -4,12 +4,23 @@ class RefinerySetting < ActiveRecord::Base
   validates_uniqueness_of :name
 
   serialize :value # stores into YAML format
-  
+  after_save do |object|
+    cache_write(object.name, object.value)
+  end
+
+  def self.cache_write(name, value)
+    Rails.cache.write("refinery_setting_#{name}", value)
+  end
+
+  def self.cache_read(name)
+    Rails.cache.read("refinery_setting_#{name}")
+  end
+
   # 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
@@ -17,7 +28,7 @@ class RefinerySetting < ActiveRecord::Base
   end
 
   # 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]
+  # 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
@@ -32,12 +43,33 @@ class RefinerySetting < ActiveRecord::Base
   end
 
   def self.find_or_set(name, the_value)
-    setting = find_or_create_by_name(:name => name.to_s, :value => the_value)
-    setting.value
+    # Try to get the value from cache first.
+    unless (value = cache_read(name)).present?
+      # Either find the record or create one with the defined value
+      value = find_or_create_by_name(:name => name.to_s, :value => the_value).value
+      # Cache it
+      cache_write(name, value)
+    end
+
+    # Return what we found.
+    value
   end
 
   def self.[](name)
-    self.find_by_name(name.to_s).value rescue nil
+    # Try to get the value from cache first.
+    unless (value = cache_read(name)).present?
+      # Not found in cache, try to find the record
+      value = if (setting = self.find_by_name(name.to_s)).present?
+        # Cache it
+        cache_write(name, setting.value)
+      else
+        # Still cache the nil to prevent more lookups to find nothing.
+        cache_write(name, nil)
+      end
+    end
+
+    # Return what we found.
+    value
   end
 
   def self.[]=(name, value)
@@ -46,8 +78,6 @@ 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
@@ -58,7 +88,7 @@ class RefinerySetting < ActiveRecord::Base
   def value
     current_value = self[:value]
 
-    unless current_value.nil?
+    if current_value.present?
       # This bit handles true and false so that true and false are actually returned
       # not "0" and "1"
       REPLACEMENTS.each do |current, new_value|
@@ -69,7 +99,7 @@ class RefinerySetting < ActiveRecord::Base
       # if the value is an integer
       begin
         if current_value.to_i.to_s == current_value
-          current_value = current_value.to_i  
+          current_value = current_value.to_i
         end
       rescue
         current_value
@@ -85,4 +115,4 @@ class RefinerySetting < ActiveRecord::Base
     self[:value] = new_value
   end
 
-end
+end

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

@@ -6,7 +6,7 @@
     <%= f.text_field :name, :class => "larger", :size => 67 %>
   <% else %>
     <label>Name</label>
-    <%= @refinery_setting.name.titleize %> <span class="preview">- (<%= h @refinery_setting.name %>)</span>
+    <%= h(@refinery_setting.name).titleize %> <span class="preview">- (<%= h @refinery_setting.name %>)</span>
   <% end %>
   </div>
   <div class='field'>

data/vendor/plugins/resources/app/controllers/admin/resources_controller.rb

@@ -74,7 +74,7 @@ class Admin::ResourcesController < Admin::BaseController
 protected
 
   def init_dialog
-    @thickbox = params[:thickbox].present?
+    @app_dialog = params[:app_dialog].present?
     @field = params[:field]
     @update_resource = params[:update_resource]
     @update_text = params[:update_text]

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

@@ -4,9 +4,9 @@ class Resource < ActiveRecord::Base
   MAX_SIZE_IN_MB = 50
 
   # Docs for attachment_fu http://github.com/technoweenie/attachment_fu
-  has_attachment :storage => (USE_S3_BACKEND ? :s3 : :file_system),
+  has_attachment :storage => (Refinery.s3_backend ? :s3 : :file_system),
                  :max_size => MAX_SIZE_IN_MB.megabytes,
-                 :path_prefix => (USE_S3_BACKEND ? nil : 'public/system/resources')
+                 :path_prefix => (Refinery.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
@@ -18,7 +18,7 @@ class Resource < ActiveRecord::Base
     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 #{MAX_SIZE_IN_MB} MB in size") if attr_name == :size
         end

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

@@ -13,8 +13,8 @@
 
   <%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false} %>
 
-  <% if @thickbox -%>
-    <input type='hidden' name='thickbox' value='<%= @thickbox %>' />
+  <% if @app_dialog -%>
+    <input type='hidden' name='app_dialog' value='<%= @app_dialog %>' />
     <input type='hidden' name='field' value='<%= @field %>' />
     <input type='hidden' name='update_resource' value='<%= @update_resource %>' />
     <input type='hidden' name='update_text' value='<%= @update_text %>' />

data/vendor/plugins/resources/app/views/admin/resources/insert.html.erb

@@ -37,7 +37,7 @@
                           :previous_label => '« Previous',
                           :next_label => 'Next »',
                           :renderer => Refinery::LinkRenderer,
-                          :url => {:controller => "admin/resources", :action => "insert", :dialog => from_dialog?} unless @thickbox %>
+                          :url => {:controller => "admin/resources", :action => "insert", :dialog => from_dialog?} unless @app_dialog %>
       </div>
     <% end %>
     <div id='upload_resource_area' class='dialog_area' <%= "style='display:none;'" if @resources.any? and @resource.errors.empty? %>>
@@ -45,7 +45,7 @@
     </div>
   </div>
 </div>
-<% if @thickbox %>
+<% if @app_dialog %>
   <div id='dialog-form-actions' class='form-actions'>
     <%= submit_tag 'Insert', :id => "submit_button" %>
 

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

@@ -22,4 +22,4 @@ module ThemesHelper
     tag.gsub!(/\/stylesheets\//, "/theme/stylesheets/") if theme
     tag.gsub(/theme=(.+?)\ /, '') # we need to remove any addition of theme='false' etc.
   end
-end
+end

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

@@ -27,4 +27,4 @@ class ThemeServer
     end
   end
 
-end
+end

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

@@ -1,24 +1,32 @@
-# Set up middleware to serve theme files
-config.middleware.use "ThemeServer"
+# Before the application gets setup this will fail badly if there's no database.
+if RefinerySetting.table_exists?
+  # Set up middleware to serve theme files
+  config.middleware.use "ThemeServer"
 
-# 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
+  # Add or remove theme paths to/from Refinery application
+  ::Refinery::ApplicationController.module_eval do
+    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
+
+        RefinerySetting[:refinery_menu_cache_action_suffix] = "#{theme}_site_menu"
+      else
+        # Set the cache key for the site menu (thus expiring the fragment cache if theme changes).
+        RefinerySetting[:refinery_menu_cache_action_suffix] = "site_menu"
+      end
     end
   end
-)
 
-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
+  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
+    ::ActiveSupport::Dependencies.load_paths.unshift controller_path
+    config.controller_paths.unshift controller_path
+  end
 
-# Include theme functions into application helper.
-Refinery::ApplicationHelper.send :include, ThemesHelper
+  # Include theme functions into application helper.
+  Refinery::ApplicationHelper.send :include, ThemesHelper
+end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 6
-  - 14
-  version: 0.9.6.14
+  - 15
+  version: 0.9.6.15
 platform: ruby
 authors: 
 - Resolve Digital
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-25 00:00:00 +13:00
+date: 2010-03-01 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -38,7 +38,6 @@ files:
 - .gems
 - .gitignore
 - .yardopts
-- Gemfile
 - Rakefile
 - VERSION
 - app/controllers/admin/base_controller.rb
@@ -76,6 +75,8 @@ files:
 - doc/.yardoc/checksums
 - doc/.yardoc/objects/root.dat
 - doc/.yardoc/proxy_types
+- lib/refinery/tasks/refinery.rake
+- lib/refinery/tasks/refinery.rb
 - lib/refinery_initializer.rb
 - license.md
 - public/.htaccess
@@ -89,6 +90,7 @@ files:
 - public/images/refinery/branch-end.gif
 - public/images/refinery/branch-start.gif
 - public/images/refinery/branch.gif
+- public/images/refinery/dialogLoadingAnimation.gif
 - public/images/refinery/header_background.png
 - public/images/refinery/hover-gradient.jpg
 - public/images/refinery/icons/accept.png
@@ -164,7 +166,6 @@ files:
 - public/javascripts/jquery/MIT-LICENSE.txt
 - public/javascripts/refinery/admin.js
 - public/javascripts/refinery/boot_wym.js
-- public/javascripts/thickbox.js
 - public/javascripts/wymeditor/jquery.refinery.wymeditor.js
 - public/javascripts/wymeditor/lang/ca.js
 - public/javascripts/wymeditor/lang/cs.js
@@ -198,7 +199,6 @@ files:
 - public/stylesheets/refinery/home.css
 - public/stylesheets/refinery/refinery.css
 - public/stylesheets/refinery/theme.css
-- public/stylesheets/refinery/thickbox.css
 - public/stylesheets/refinery/tooltips.css
 - public/stylesheets/theme.css
 - public/stylesheets/wymeditor/skins/refinery/skin.css
@@ -231,8 +231,10 @@ files:
 - test/fixtures/pages.yml
 - test/fixtures/refinery_settings.yml
 - test/fixtures/resources.yml
+- test/fixtures/user_plugins.yml
 - test/fixtures/users.yml
 - test/functional/dashboard_controller_test.rb
+- test/functional/images_controller_test.rb
 - test/performance/browsing_test.rb
 - test/test_helper.rb
 - test/unit/image_test.rb
@@ -268,20 +270,6 @@ files:
 - 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
-- 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
@@ -540,6 +528,7 @@ files:
 - vendor/plugins/refinery/lib/refinery/application_helper.rb
 - vendor/plugins/refinery/lib/refinery/attachment_fu_patch.rb
 - vendor/plugins/refinery/lib/refinery/base_presenter.rb
+- vendor/plugins/refinery/lib/refinery/deprecations.rb
 - vendor/plugins/refinery/lib/refinery/form_helpers.rb
 - vendor/plugins/refinery/lib/refinery/html_truncation_helper.rb
 - vendor/plugins/refinery/lib/refinery/initializer.rb
@@ -614,6 +603,7 @@ 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/functional/images_controller_test.rb
 - test/performance/browsing_test.rb
 - test/test_helper.rb
 - test/unit/image_test.rb

data/Gemfile

@@ -1,12 +0,0 @@
-# Please add your gems above the Refinery required gems here:
-
-#===REFINERY REQUIRED GEMS===
-source "http://rubygems.org"
-gem "aasm", ">= 2.1.3", :require => "aasm"
-gem "friendly_id", ">= 2.3.2", :require => "friendly_id"
-gem "hpricot", ">= 0.8.1", :require => "hpricot"
-gem "slim_scrooge", ">= 1.0.5", :require => "slim_scrooge"
-gem "will_paginate", ">= 2.3.11", :require => "will_paginate"
-gem "rails", ">= 2.3.5", :require => "rails"
-gem "rake", ">= 0.8.3", :require => "rake"
-#===REFINERY END OF REQUIRED GEMS===