refinerycms 0.9.5.15 → 0.9.5.16

data/bin/refinery-override

@@ -0,0 +1,74 @@
+#!/usr/bin/env ruby
+require 'fileutils'
+REFINERY_ROOT = File.expand_path(File.dirname(__FILE__) << "/..")
+unless (override_path = ARGV.shift).nil? or (override_path.length == 0)
+  # if "" or "." or "./" is specified then get the current directory otherwise accept the specified app_path.
+  if ((app_path = ARGV.shift).nil? or app_path.length <= 2) and ((is_current_dir = app_path =~ /(\.(\/)?)/).nil? or !is_current_dir or is_current_dir < 2)
+    RAILS_ROOT = Dir.getwd
+  else
+    RAILS_ROOT = app_path
+  end
+
+  if File.exists? RAILS_ROOT
+    # figure out what to override
+    override_parts = override_path.downcase.split('/').compact.collect {|part| part if part.length > 0 }.compact
+    admin = ""
+    if override_parts.first == "admin"
+      # we're inside the admin namespace
+      admin = override_parts.shift
+    end
+
+    if override_parts.length > 1
+      # controller plus action is specified
+      action = override_parts.pop
+    end
+
+    # controller is what's left.
+    controller = override_parts.first
+    controller_with_admin = [admin,override_parts].flatten.compact.join('/')
+
+    # copy the controller
+    unless controller_with_admin =~ /\*(\*)?/ and !action.nil?
+      refinery_controllers = Dir[File.join(REFINERY_ROOT, %w(vendor plugins ** app controllers), "#{controller_with_admin}_controller.rb")]
+      unless refinery_controllers.compact.empty? # the controllers may not exist.
+        refinery_controllers.each do |refinery_controller|
+          # make the directories
+          FileUtils.mkdir_p(copy_to = File.join(RAILS_ROOT, %w(app controllers), admin))
+          FileUtils.cp(refinery_controller, copy_to)
+        end
+      else
+        puts "Note: Couldn't find a matching controller to override."
+      end
+    end
+
+    # copy the action, if it exists
+    unless action.nil? or action.length == 0
+      # get all the matching files
+      looking_for = File.join(REFINERY_ROOT, %w(vendor plugins ** app views), controller_with_admin.split('/'), "#{action}*.erb")
+      action_files = Dir[looking_for]
+
+      # copy in the action template
+      action_files.each do |action_file|
+        action_file_path = action_file.split("/app/views/").last
+        action_file_dir = action_file_path.split('/')
+        action_file_dir.pop # get rid of the file.
+
+        FileUtils.mkdir_p(File.join(RAILS_ROOT, %w(app views), action_file_dir))
+        FileUtils.cp action_file, File.join(RAILS_ROOT, %w(app views), action_file_path)
+      end
+    else
+      puts "Note: No action was specified."
+    end
+
+  else
+    puts "Couldn't understand your project's directory?"
+  end
+else
+  puts "You didn't specify anything to override. Here's some examples:"
+  puts "refinery-override /pages/* /path/to/my/project"
+  puts "refinery-override /pages/show /path/to/my/project"
+  puts "refinery-override /admin/pages/index"
+  puts "refinery-override /shared/_menu /path/to/my/project"
+  puts "refinery-override **/*menu /path/to/my/project"
+  puts "refinery-override /shared/_menu_branch"
+end

data/config/boot.rb

@@ -82,8 +82,8 @@ module Rails
       end
 
       def load_rubygems
+        min_version = '1.3.2'
         require 'rubygems'
-        min_version = '1.3.1'
         unless rubygems_version >= min_version
           $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
           exit 1

data/config/environment.rb

@@ -7,7 +7,7 @@
 # Specifies gem version of Rails to use when vendor/rails is not present
 RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION
 # Freeze to a specific version of refinerycms when running as a gem
-# REFINERY_GEM_VERSION = 0.9.5.10 unless defined? REFINERY_GEM_VERSION
+# REFINERY_GEM_VERSION = '0.9.5.15' unless defined? REFINERY_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -69,7 +69,7 @@ eval("#{(defined? Refinery::Initializer) ? Refinery : Rails}::Initializer").run
   config.gem "rails", :version => ">= 2.3.4", :lib => "rails"
   config.gem "aasm", :version => ">= 2.1.3", :lib => "aasm", :source => "http://gemcutter.org"
   config.gem "unicode", :version => ">= 0.1", :lib => "unicode"
-  config.gem "slim_scrooge", :version => ">= 1.0.1", :lib => "slim_scrooge", :source => "http://gemcutter.org"
+  config.gem "slim_scrooge", :version => ">= 1.0.1", :lib => "slim_scrooge", :source => "http://gemcutter.org" unless RUBY_PLATFORM =~ /mswin|mingw/ # kill gem when windows is running.
   config.gem "hpricot", :version => "= 0.8.1", :lib => "hpricot", :source => "http://gemcutter.org"
   #===REFINERY END OF REQUIRED GEMS===
 end

data/public/javascripts/refinery/admin.js

@@ -10,9 +10,9 @@ FastInit.addOnLoad(function()
 {
   init_tooltips();
   // focus first field in an admin form.
-  try{$(document.forms[0]).getInputs('text').first().focus();}catch(err){}
+  jQuery('form input[type=text]:first').focus();
 
-  $$('a([href*="dialog=true"])').each(function(anchor)
+  jQuery('a[href*="dialog=true"]').each(function(i, anchor)
   {
     ['modal=true', 'width=928', 'height=473', 'titlebar=true', 'draggable=true'].each(function(feature)
     {
@@ -21,7 +21,52 @@ FastInit.addOnLoad(function()
         anchor.href += "&" + feature;
       }
     });
-    
+
     tb_init(anchor);
   });
+
+  jQuery('#submit_continue_button').bind('click', function(e) {
+    // ensure wymeditors are up to date.
+    if (jQuery(this).hasClass('wymupdate')) {
+      WYMeditor.INSTANCES.each(function(wym)
+      {
+        wym.update();
+      });
+    }
+
+    jQuery('#continue_editing').val(true);
+
+    if ((flash=$('flash')) != null) {
+      flash.hide();
+    }
+
+    jQuery.post(this.form.action, this.form.serialize(), function(data) {
+      if ((flash_container = $('flash_container')) != null) {
+        flash_container.update(data);
+
+        if ((flash = $('flash')) != null) {
+          flash.style.width = 'auto';
+          flash.appear();
+        }
+
+        jQuery('.errorExplanation').each(function(i, node) {
+          if (node.parentNode.id != 'flash_container') {
+            node.remove();
+          }
+        });
+
+        jQuery('.fieldWithErrors').each(function(i, field) {
+          field.removeClassName('fieldWithErrors').addClassName('field');
+        });
+
+        $('flash_container').scrollTo();
+
+        jQuery('#continue_editing').val(false);
+
+        jQuery('.fieldWithErrors:first :input:first').focus();
+      }
+    });
+
+    e.preventDefault();
+  });
 });

data/vendor/plugins/dashboard/{init.rb → rails/init.rb}

@@ -1,7 +1,6 @@
 Refinery::Plugin.register do |plugin|
-  plugin.directory = directory
   plugin.title = "Dashboard"
   plugin.description = "Gives an overview of activity in Refinery"
   plugin.version = 1.0
   plugin.always_allow_access = true
-end
+end

data/vendor/plugins/images/{init.rb → rails/init.rb}

@@ -1,5 +1,4 @@
 Refinery::Plugin.register do |plugin|
-  plugin.directory = directory
   plugin.title = "Images"
   plugin.description = "Manage images"
   plugin.version = 1.0

data/vendor/plugins/inquiries/{init.rb → rails/init.rb}

@@ -1,5 +1,4 @@
 Refinery::Plugin.register do |plugin|
-  plugin.directory = directory
   plugin.title = "Inquiries"
   plugin.description = "Provides a contact form and stores inquiries"
   plugin.version = 1.0

data/vendor/plugins/news/{init.rb → rails/init.rb}

@@ -1,5 +1,4 @@
 Refinery::Plugin.register do |plugin|
-  plugin.directory = directory
   plugin.title = "News"
   plugin.description = "Provides a blog-like news section"
   plugin.version = 1.0

data/vendor/plugins/pages/{init.rb → rails/init.rb}

@@ -1,5 +1,4 @@
 Refinery::Plugin.register do |plugin|
-  plugin.directory = directory
   plugin.title = "Pages"
   plugin.description = "Manage content pages"
   plugin.version = 1.0

data/vendor/plugins/refinery/app/views/shared/admin/_continue_editing.html.erb

@@ -1,51 +1,4 @@
 <% unless f.object.new_record? -%>
   <%= hidden_field_tag :continue_editing, false %>
   <%= f.submit 'Save &amp; Continue Editing', :id => "submit_continue_button", :class => "wymupdate" %>
-  <% content_for :head do -%>
-    <script type='text/javascript'>
-      FastInit.addOnLoad(function() {
-        if ($('submit_continue_button') != null) {
-          $('submit_continue_button').observe("click", function(e) {
-            $('continue_editing').value = true;
-
-            if ((flash=$('flash')) != null) {
-              flash.hide();
-            }
-
-            new Ajax.Request(this.form.action, {
-              method: this.form.method
-              , parameters: this.form.serialize()
-              , onComplete: function(e) {
-                if ((flash_container = $('flash_container')) != null) {
-
-                  flash_container.update(e.transport.responseText);
-
-                  if ((flash = $('flash')) != null) {
-                    flash.style.width = 'auto';
-                    flash.appear();
-                  }
-
-                  $$('#errorExplanation').each(function(errorExplanation) {
-                    if (errorExplanation.parentNode.id != 'flash_container') {
-                      errorExplanation.remove();
-                    }
-                  });
-
-                  $$('.fieldWithErrors').each(function(field) {
-                    field.removeClassName('fieldWithErrors').addClassName('field');
-                  });
-
-                  flash_container.scrollTo();
-                  $('continue_editing').value = false;
-                }
-              }
-              , evalScripts: true
-            });
-
-            e.preventDefault();
-          });
-        }
-      });
-    </script>
-  <% end -%>
-<% end -%>
+<% end -%>

data/vendor/plugins/refinery/lib/generators/refinery/refinery_generator.rb

@@ -15,7 +15,7 @@ class RefineryGenerator < Rails::Generator::NamedBase
       directories = ["vendor/plugins/#{plural_name}", "vendor/plugins/#{plural_name}/app", "vendor/plugins/#{plural_name}/app/controllers",
         "vendor/plugins/#{plural_name}/app/controllers/admin", "vendor/plugins/#{plural_name}/app/models", "vendor/plugins/#{plural_name}/app/views",
         "vendor/plugins/#{plural_name}/app/helpers", "vendor/plugins/#{plural_name}/app/views", "vendor/plugins/#{plural_name}/app/views/admin",
-        "vendor/plugins/#{plural_name}/config"]
+        "vendor/plugins/#{plural_name}/config", "vendor/plugins/#{plural_name}/rails"]
 
       directories.each do |dir|
         m.directory dir
@@ -50,7 +50,7 @@ class RefineryGenerator < Rails::Generator::NamedBase
       m.template "public_controller.rb", "vendor/plugins/#{plural_name}/app/controllers/#{plural_name}_controller.rb"
 
       # Add in the init file that ties the plugin to the app.
-      m.template "init.rb", "vendor/plugins/#{plural_name}/init.rb"
+      m.template "rails/init.rb", "vendor/plugins/#{plural_name}/rails/init.rb"
 
       m.directory 'db/migrate/'
       m.migration_template 'migration.rb', 'db/migrate', :assigns => {:migration_name => "Create#{class_name.pluralize}"}, :migration_file_name => "create_#{singular_name.pluralize}"

data/vendor/plugins/refinery/lib/generators/refinery/templates/{init.rb → rails/init.rb}

@@ -1,5 +1,4 @@
 Refinery::Plugin.register do |plugin|
-  plugin.directory = directory
   plugin.title = "<%= class_name.pluralize.underscore.titleize %>"
   plugin.description = "Manage <%= class_name.pluralize.underscore.titleize %>"
   plugin.version = 1.0

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

@@ -28,7 +28,7 @@ protected
 
   def restrict_controller
     if Refinery::Plugins.active.reject {|plugin| params[:controller] !~ Regexp.new(plugin.menu_match) }.empty?
-      flash[:error] = "You do not have permission to access the #{params[:controller]} controller on this plugin."
+      flash.now[:error] = "You do not have permission to access the #{params[:controller]} controller on this plugin."
       logger.warn "'#{current_user.login}' tried to access '#{params[:controller]}'"
     end
   end

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

@@ -16,6 +16,7 @@ module Refinery
     class Initializer < Rails::Initializer
       def self.run(command = :process, configuration = Configuration.new)
         Rails.configuration = configuration
+        configuration.reload_plugins = true if RAILS_ENV =~ /development/ and REFINERY_ROOT == RAILS_ROOT # seems to work, don't in gem.
         super
       end
 

data/vendor/plugins/refinery/{init.rb → rails/init.rb}

@@ -1,5 +1,4 @@
 Refinery::Plugin.register do |plugin|
-  plugin.directory = directory
   plugin.title = "Refinery"
   plugin.description = "Core refinery plugin"
   plugin.version = 1.0

data/vendor/plugins/refinery_dialogs/{init.rb → rails/init.rb}

@@ -1,5 +1,4 @@
 Refinery::Plugin.register do |plugin|
-  plugin.directory = directory
   plugin.title = "Dialogs"
   plugin.description = "Refinery Dialogs plugin"
   plugin.version = 1.0

data/vendor/plugins/refinery_settings/{init.rb → rails/init.rb}

@@ -1,5 +1,4 @@
 Refinery::Plugin.register do |plugin|
-  plugin.directory = directory
   plugin.title = "Settings"
   plugin.description = "Manage Refinery settings"
   plugin.version = 1.0

data/vendor/plugins/resources/{init.rb → rails/init.rb}

@@ -1,5 +1,4 @@
 Refinery::Plugin.register do |plugin|
-  plugin.directory = directory
   plugin.title = "Resources"
   plugin.description = "Upload and link to files"
   plugin.version = 1.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  version: 0.9.5.15
+  version: 0.9.5.16
 platform: ruby
 authors: 
 - Resolve Digital
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 +13:00
+date: 2009-11-26 00:00:00 +13:00
 default_executable: refinery
 dependencies: []
 
@@ -19,6 +19,7 @@ description: A beautiful open source Ruby on Rails content manager for small bus
 email: info@refinerycms.com
 executables: 
 - refinery
+- refinery-override
 - refinery-update-core
 extensions: []
 
@@ -36,6 +37,7 @@ files:
 - app/controllers/application_controller.rb
 - app/helpers/application_helper.rb
 - bin/refinery
+- bin/refinery-override
 - bin/refinery-update-core
 - config/amazon_s3.yml
 - config/boot.rb
@@ -332,7 +334,7 @@ files:
 - vendor/plugins/authentication/app/views/user_mailer/signup_notification.html.erb
 - vendor/plugins/authentication/app/views/users/new.html.erb
 - vendor/plugins/authentication/config/routes.rb
-- vendor/plugins/authentication/init.rb
+- vendor/plugins/authentication/rails/init.rb
 - vendor/plugins/authentication/lib/authenticated_system.rb
 - vendor/plugins/authentication/lib/authenticated_test_helper.rb
 - vendor/plugins/authentication/Rakefile
@@ -351,7 +353,7 @@ files:
 - vendor/plugins/dashboard/app/views/admin/dashboard/_recent_activity.html.erb
 - vendor/plugins/dashboard/app/views/admin/dashboard/index.html.erb
 - vendor/plugins/dashboard/config/routes.rb
-- vendor/plugins/dashboard/init.rb
+- vendor/plugins/dashboard/rails/init.rb
 - vendor/plugins/images/app/controllers/admin/images_controller.rb
 - vendor/plugins/images/app/helpers/admin/images_helper.rb
 - vendor/plugins/images/app/models/image.rb
@@ -364,7 +366,7 @@ files:
 - vendor/plugins/images/app/views/admin/images/insert.html.erb
 - vendor/plugins/images/app/views/admin/images/new.html.erb
 - vendor/plugins/images/config/routes.rb
-- vendor/plugins/images/init.rb
+- vendor/plugins/images/rails/init.rb
 - vendor/plugins/images/lib/tasks/images.rake
 - vendor/plugins/inquiries/app/controllers/admin/inquiries_controller.rb
 - vendor/plugins/inquiries/app/controllers/admin/inquiry_settings_controller.rb
@@ -385,7 +387,7 @@ files:
 - vendor/plugins/inquiries/app/views/inquiry_mailer/confirmation.html.erb
 - vendor/plugins/inquiries/app/views/inquiry_mailer/notification.html.erb
 - vendor/plugins/inquiries/config/routes.rb
-- vendor/plugins/inquiries/init.rb
+- vendor/plugins/inquiries/rails/init.rb
 - vendor/plugins/news/app/controllers/admin/news_items_controller.rb
 - vendor/plugins/news/app/controllers/news_items_controller.rb
 - vendor/plugins/news/app/models/news_item.rb
@@ -398,7 +400,7 @@ files:
 - vendor/plugins/news/app/views/news_items/index.html.erb
 - vendor/plugins/news/app/views/news_items/show.html.erb
 - vendor/plugins/news/config/routes.rb
-- vendor/plugins/news/init.rb
+- vendor/plugins/news/rails/init.rb
 - vendor/plugins/pages/app/controllers/admin/page_dialogs_controller.rb
 - vendor/plugins/pages/app/controllers/admin/page_parts_controller.rb
 - vendor/plugins/pages/app/controllers/admin/pages_controller.rb
@@ -418,7 +420,7 @@ files:
 - vendor/plugins/pages/app/views/pages/home.html.erb
 - vendor/plugins/pages/app/views/pages/show.html.erb
 - vendor/plugins/pages/config/routes.rb
-- vendor/plugins/pages/init.rb
+- vendor/plugins/pages/rails/init.rb
 - vendor/plugins/refinery/app/controllers/admin/refinery_core_controller.rb
 - vendor/plugins/refinery/app/views/admin/_head.html.erb
 - vendor/plugins/refinery/app/views/admin/_menu.html.erb
@@ -444,7 +446,7 @@ files:
 - vendor/plugins/refinery/app/views/welcome.html.erb
 - vendor/plugins/refinery/app/views/wymiframe.html.erb
 - vendor/plugins/refinery/config/routes.rb
-- vendor/plugins/refinery/init.rb
+- vendor/plugins/refinery/rails/init.rb
 - vendor/plugins/refinery/lib/crud.rb
 - vendor/plugins/refinery/lib/generators/refinery/install.rb
 - vendor/plugins/refinery/lib/generators/refinery/Rakefile
@@ -452,7 +454,7 @@ files:
 - vendor/plugins/refinery/lib/generators/refinery/refinery_generator.rb
 - vendor/plugins/refinery/lib/generators/refinery/templates/config/routes.rb
 - vendor/plugins/refinery/lib/generators/refinery/templates/controller.rb
-- vendor/plugins/refinery/lib/generators/refinery/templates/init.rb
+- vendor/plugins/refinery/lib/generators/refinery/templates/rails/init.rb
 - vendor/plugins/refinery/lib/generators/refinery/templates/migration.rb
 - vendor/plugins/refinery/lib/generators/refinery/templates/model.rb
 - vendor/plugins/refinery/lib/generators/refinery/templates/public_controller.rb
@@ -483,7 +485,7 @@ files:
 - vendor/plugins/refinery_dialogs/app/views/admin/dialogs/show.html.erb
 - vendor/plugins/refinery_dialogs/app/views/layouts/admin_dialog.html.erb
 - vendor/plugins/refinery_dialogs/config/routes.rb
-- vendor/plugins/refinery_dialogs/init.rb
+- vendor/plugins/refinery_dialogs/rails/init.rb
 - vendor/plugins/refinery_settings/app/controllers/admin/refinery_settings_controller.rb
 - vendor/plugins/refinery_settings/app/models/refinery_setting.rb
 - vendor/plugins/refinery_settings/app/views/admin/refinery_settings/_form.html.erb
@@ -493,7 +495,7 @@ files:
 - vendor/plugins/refinery_settings/app/views/admin/refinery_settings/index.html.erb
 - vendor/plugins/refinery_settings/app/views/admin/refinery_settings/new.html.erb
 - vendor/plugins/refinery_settings/config/routes.rb
-- vendor/plugins/refinery_settings/init.rb
+- vendor/plugins/refinery_settings/rails/init.rb
 - vendor/plugins/resources/app/controllers/admin/resources_controller.rb
 - vendor/plugins/resources/app/models/resource.rb
 - vendor/plugins/resources/app/views/admin/resources/_form.html.erb
@@ -503,7 +505,7 @@ files:
 - vendor/plugins/resources/app/views/admin/resources/insert.html.erb
 - vendor/plugins/resources/app/views/admin/resources/new.html.erb
 - vendor/plugins/resources/config/routes.rb
-- vendor/plugins/resources/init.rb
+- vendor/plugins/resources/rails/init.rb
 has_rdoc: true
 homepage: http://refinerycms.com
 licenses: []