refinerycms 0.9.5.5 → 0.9.5.6

data/bin/refinery

@@ -17,10 +17,12 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
     FileUtils::makedirs RAILS_ROOT
   
     # copy in all of the relevant directories and root files.
-    to_copy = %w(app config db public script CONTRIBUTORS LICENSE Rakefile README).map do |dir| 
+    to_copy = %w(app config db lib public script CONTRIBUTORS LICENSE Rakefile README).map do |dir| 
       File.join REFINERY_ROOT, dir
     end
     FileUtils::cp_r to_copy, RAILS_ROOT, :verbose => false
+    # ensure lib/refinery_initializer.rb doesn't make it in.
+    FileUtils::rm File.join(RAILS_ROOT, %w(lib refinery_initializer.rb)) if File.exists?(File.join(RAILS_ROOT, %w(lib refinery_initializer.rb)))
     
     # add in the database config file.
     FileUtils::move File.join(RAILS_ROOT, %w(config database.yml.example)), File.join(RAILS_ROOT, %w(config database.yml))

data/config/environment.rb

@@ -66,4 +66,5 @@ 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", :source => "http://gemcutter.org"
 end

data/db/migrate/20091109012126_add_missing_indexes.rb

@@ -0,0 +1,25 @@
+class AddMissingIndexes < ActiveRecord::Migration
+  def self.up
+    add_index :pages, :parent_id
+    add_index :pages, :custom_title_image_id
+    add_index :pages, :image_id
+    add_index :images, :parent_id
+    add_index :page_parts, :page_id
+    
+    add_index :pages, :id
+    add_index :page_parts, :id
+    add_index :users, :id
+  end
+  
+  def self.down
+    remove_index :pages, :parent_id
+    remove_index :pages, :custom_title_image_id
+    remove_index :pages, :image_id
+    remove_index :images, :parent_id
+    remove_index :page_parts, :page_id
+    
+    remove_index :pages, :id
+    remove_index :page_parts, :id
+    remove_index :users, :id
+  end
+end

data/db/schema.rb

@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20091029034951) do
+ActiveRecord::Schema.define(:version => 20091109012126) do
 
   create_table "images", :force => true do |t|
     t.integer  "parent_id"
@@ -24,6 +24,8 @@ ActiveRecord::Schema.define(:version => 20091029034951) do
     t.datetime "updated_at"
   end
 
+  add_index "images", ["parent_id"], :name => "index_images_on_parent_id"
+
   create_table "inquiries", :force => true do |t|
     t.string   "name"
     t.string   "email"
@@ -60,6 +62,9 @@ ActiveRecord::Schema.define(:version => 20091029034951) do
     t.datetime "updated_at"
   end
 
+  add_index "page_parts", ["id"], :name => "index_page_parts_on_id"
+  add_index "page_parts", ["page_id"], :name => "index_page_parts_on_page_id"
+
   create_table "pages", :force => true do |t|
     t.string   "title"
     t.integer  "parent_id"
@@ -82,6 +87,11 @@ ActiveRecord::Schema.define(:version => 20091029034951) do
     t.boolean  "skip_to_first_child",   :default => false
   end
 
+  add_index "pages", ["custom_title_image_id"], :name => "index_pages_on_custom_title_image_id"
+  add_index "pages", ["id"], :name => "index_pages_on_id"
+  add_index "pages", ["image_id"], :name => "index_pages_on_image_id"
+  add_index "pages", ["parent_id"], :name => "index_pages_on_parent_id"
+
   create_table "refinery_settings", :force => true do |t|
     t.string   "name"
     t.text     "value"
@@ -137,4 +147,6 @@ ActiveRecord::Schema.define(:version => 20091029034951) do
     t.datetime "updated_at"
   end
 
+  add_index "users", ["id"], :name => "index_users_on_id"
+
 end

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

@@ -36,11 +36,9 @@ class Admin::ImagesController < Admin::BaseController
   
   def create
     @image = Image.create(params[:image])
-    saved = @image.valid?
-    flash.now[:notice] = "'#{@image.title}' was successfully created." if saved
-    
     unless params[:insert]
-      if saved
+      if @image.valid?
+        flash[:notice] = "'#{@image.title}' was successfully created."
         unless from_dialog?
           redirect_to :action => 'index'
         else

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

@@ -22,7 +22,7 @@
   	<input type='hidden' name='update_image' value='<%= @update_image %>' />
   	<input type='hidden' name='thumbnail' value='<%= @thumbnail %>' />
   	<input type='hidden' name='callback' value='<%= @callback %>' />
-		<input type='hidden' name='conditions' value='<%= @conditions %>' >
+		<input type='hidden' name='conditions' value='<%= @conditions %>' />
 	<% end %>
 <% end %>
 

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

@@ -82,7 +82,7 @@
 			});
 			
 <% if @thickbox %>
-			$('submit_button').observe('click', function(e)
+			$('dialog-form-actions').down('#submit_button').observe('click', function(e)
 			{
 				selected = null;
 				$$('#existing_image_area_content ul li.selected img').each(function(selected_img)
@@ -91,19 +91,17 @@
 				});
 				if (selected != null)
 				{
-					if ('<%= @field %>'.length > 0)
+	<% unless @field.blank? %>
+					if ((field = parent.document.getElementById('<%= @field %>')) != null)
 					{
-						field = parent.document.getElementById('<%= @field %>');
-						if (field != null)
-						{
-							field.value = selected.id.replace("image_", "");
-						}
-						if ((image = parent.document.getElementById('<%= @update_image %>')) != null)
-						{
-							image.src = selected.src.replace("_dialog_thumb", '<%= "_#{@thumbnail}" unless @thumbnail.blank? %>');
-							$(image).writeAttribute("width", null).writeAttribute("height", null);
-						}
+						field.value = selected.id.replace("image_", "");
 					}
+					if ((image = parent.document.getElementById('<%= @update_image %>')) != null)
+					{
+						image.src = selected.src.replace("_dialog_thumb", '<%= "_#{@thumbnail}" unless @thumbnail.blank? %>');
+						$(image).writeAttribute("width", null).writeAttribute("height", null);
+					}
+	<% end %>
 					<%= "self.parent.#{@callback}();" unless @callback.blank? %>
 					self.parent.tb_remove();
 				}

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

@@ -56,21 +56,13 @@
 				</p>
 			</div>
 			<div id='custom_title_image' style='display: <%= @page.custom_title_type == 'image' ? 'block' : 'none' %>' class='clearfix'>
-				<%= f.hidden_field :custom_title_image_id %>
-				<div>
-					<a id='current_image_link' href="<%= insert_admin_images_url %>?thickbox=true&amp;modal=true&amp;titlebar=true&amp;field=page_custom_title_image_id&amp;update_image=current_custom_title_image&amp;callback=custom_title_image_changed&amp;thumbnail=&amp;KeepThis=true&amp;TB_iframe=true&amp;width=950&amp;height=510" style='border: 0px' title='Change Image' name='Change Image' class='thickbox'>
-						<% unless @page.custom_title_image.nil? %>
-							<%= image_fu @page.custom_title_image, nil, {:class => "brown_border", :id => "current_custom_title_image"} %>
-						<% else %>
-	            <img id="current_custom_title_image" class="" src="" alt="" />
-						<% end %>
-						<span id='no_custom_title_image_selected' <%= "style='display: none;'" unless @page.custom_title_image.nil? %>>
-							There is currently no image selected. Click here to add one
-						</span>
-					</a>
-					<br/>
-					<%= link_to "Remove Current Image", "", :id => "remove_custom_title_image", :style => "margin-top:8px;display:inline-block;width:auto;#{"display:none;" if @page.custom_title_image.nil?}" %>
-				</div>
+				<%= render :partial => "/shared/admin/image_picker", :locals => 
+				  {
+				    :f => f, 
+				    :field => :custom_title_image_id,
+				    :image => @page.custom_title_image
+				  } 
+				%>
 			</div>
 		</div>
 		<div class='field'>
@@ -136,7 +128,7 @@
 		<div id='dialog-form-actions' class='form-actions'>
 			<%= f.submit 'Save', :id => "new_page_part_save" %> 
 			or 
-			<%= link_to "Cancel", "#", :id => "new_page_part_cancel", :class => "close_dialog" %>
+			<%= link_to "Cancel", "", :id => "new_page_part_cancel", :class => "close_dialog" %>
 		</div>
 	</div>
 <% end %>
@@ -154,7 +146,7 @@
 		$('toggle_advanced_options').observe('click', function(e)
 		{
 			$('more_options').toggle();
-			e.stop();
+			e.preventDefault();
 		});
 		
 		$$('input[type=radio]').each(function(radio)
@@ -167,22 +159,12 @@
 				});
 			}
 		});
-
-		$('remove_custom_title_image').observe('click', function(e)
-		{
-			$('current_custom_title_image').removeClassName('brown_border');
-			$('current_custom_title_image').src = '';
-			$('current_custom_title_image').alt = 'There is currently no image selected. Click here to add one.';
-			$('page_custom_title_image_id').value = '';
-			this.hide();
-			e.stop();
-		});
 		
 <% if RefinerySetting.find_or_set(:new_page_parts, false) %>
 		$('add_page_part').observe('click', function(e) {
 			tb_show('Create Content Section', '#?auto_size_content=true&draggable=true&titlebar=true&inlineId=new_page_part_dialog&TB_inline=true&modal=true');
 			
-			e.stop();
+			e.preventDefault();
 		});
 		
 		$('new_page_part_save').observe('click', function(e) {
@@ -224,7 +206,7 @@
 		$('new_page_part_cancel').observe('click', function(e) {
 			$('new_page_part_title').value = "";
 			tb_remove();
-			e.stop();
+			e.preventDefault();
 		});
 		
 		$('delete_page_part').observe('click', function(e) {
@@ -250,17 +232,10 @@
 				WYMeditor.loaded();
 			}
 			
-			e.stop();
+			e.preventDefault();
 		});
 <% end %>
 	});
-
-	custom_title_image_changed = function()
-	{
-		$('remove_custom_title_image').show();
-		$('current_custom_title_image').addClassName('brown_border');
-		$('no_custom_title_image_selected').hide();
-	}
 	
 	// Hook into the loaded function. This will be called when WYMeditor has done its thing.
 	WYMeditor.loaded = function()

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

@@ -1,9 +1,10 @@
 <% flash.each do |key, value| %>
 <div id="flash" class="flash_<%= key %>" style='display: none;' >
-	<%= value %> (<%= link_to "close", "#", {:id => "close"} %>)
+	<%= value %> (<%= link_to "close", "", {:id => "close"} %>)
 	<script type="text/javascript">
-	   $('close').observe('click', function(){
+	   $('close').observe('click', function(e){
 	    $('flash').fade({ duration: 0.3 });
+	    e.preventDefault();
 	   });
 	</script>
 </div>

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

@@ -0,0 +1,42 @@
+<%= f.hidden_field field %>
+<div>
+	<a id='current_image_link' href="<%= insert_admin_images_url %>?thickbox=true&amp;modal=true&amp;titlebar=true&amp;field=<%= f.object.class.name.downcase %>_<%= field %>&amp;update_image=current_picked_image&amp;callback=picked_image_changed&amp;thumbnail=&amp;KeepThis=true&amp;TB_iframe=true&amp;width=<%= width ||= 950 %>&amp;height=<%= height ||= 510 %>" style='border: 0px' title='Change Image' name='Change Image' class='thickbox'>
+		<% unless image.nil? %>
+			<%= image_fu image, nil, {:class => "brown_border", :id => "current_picked_image"} %>
+		<% else %>
+      <img id="current_picked_image" class="" src="" alt="" style='display: none' />
+		<% end %>
+		<p id='no_picked_image_selected' <%= "style='display: none;'" unless image.nil? %>>
+			There is currently no image selected, please click here to add one.
+		</p>
+	</a>
+	<br/>
+  <%= link_to "Remove Current Image", "", :id => "remove_picked_image", :style => "margin-top:8px;display:inline-block;width:auto;#{"display:none;" if image.nil?}" %>
+</div>
+<% content_for :head do %>
+  <script type='text/javascript'>
+  	picked_image_changed = function()
+  	{
+  		$('remove_picked_image').show();
+  		$('current_picked_image').show();
+  		$('current_picked_image').addClassName('brown_border');
+  		$('no_picked_image_selected').hide();
+  	}
+  
+    FastInit.addOnLoad(function() {
+      $('remove_picked_image').observe('click', function(e)
+  		{
+  			$('current_picked_image').removeClassName('brown_border');
+  			$('current_picked_image').src = '';
+  			$('current_picked_image').alt = 'There is currently no image selected. Click here to add one.';
+  			$('<%= f.object.class.name.downcase %>_<%= field %>').value = '';
+  			$('current_picked_image').style.width = "auto";
+  			$('current_picked_image').style.height = "auto";
+  			$('no_picked_image_selected').show();
+  			$('current_picked_image').hide();
+  			this.hide();
+  			e.stop();
+  		});
+    });
+  </script>
+<% end %>

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

@@ -0,0 +1,52 @@
+<%= f.hidden_field field %>
+<div>
+	<a id='current_resource_link' href="<%= insert_admin_resources_url %>?thickbox=true&amp;modal=true&amp;titlebar=true&amp;field=<%= "#{f.object.class.name.downcase}_#{field}" %><%= "&amp;current_link=#{resource.public_filename unless resource.nil?}" %>&amp;update_resource=current_resource&amp;update_text=current_resource_text&amp;callback=resource_changed&amp;thumbnail=&amp;KeepThis=true&amp;TB_iframe=true&amp;width=<%= width ||= 950 %>&amp;height=<%= height ||= 510 %>" style='border: 0px' title='Change Resource' name='Change Resource' class='thickbox'>
+		<span id='no_resource_selected' <%= "style='display: none;'" unless resource.nil? %>>
+			There is currently no message file selected, click here to add one.
+		</span>
+	</a>
+	<div id='current_resource_container'>
+	<% unless resource.nil? %>
+	  Current message file: 
+	  <span id='current_resource_text'>
+	    <%= "#{resource.title} (#{resource.public_filename})" %>
+	  </span>
+	  <br/>
+	  <%= link_to "#{refinery_icon_tag("page_white_put.png")} Download current message file (<em>Opens in a new window</em>)", resource.public_filename, 
+	              :id => "current_resource",
+	              :target => "_blank" %>
+	<% else %>
+	  <%= link_to "#{refinery_icon_tag("page_white_put.png")} Download current message file (<em>Opens in a new window</em>)", "", 
+	              :id => "current_resource", 
+	              :style => "display:none;",
+	              :target => "_blank" %>
+	<% end %>
+	</div>
+	<br/>
+	<%= link_to "Remove Current Resource", "", 
+	              :id => "remove_resource", 
+	              :style => "margin-top:8px;display:inline-block;width:auto;#{"display:none;" if resource.nil?}" %>
+</div>
+
+<% content_for :head do %>
+  <script type='text/javascript'>
+    resource_changed = function() {
+      $('current_resource_link').href = $('current_resource_link').href.gsub(/current_link=([^&])*&/, "current_link=" + $('current_resource').href + "&");
+      $('remove_resource').show();
+      $('current_resource_container').show();
+  		$('no_resource_selected').hide();
+    }
+    
+    FastInit.addOnLoad(function() {
+      $('remove_resource').observe('click', function(e) {
+        $('<%= f.object.class.name.downcase %>_<%= field %>').value = "";
+        $('current_resource_container').hide();
+        $('current_resource_text').innerHTML = '';
+        $('no_resource_selected').show();
+        $('current_resource_link').href = $('current_resource_link').href.gsub(/current_link=([^&])*&/, "current_link=&");
+        this.hide();
+        e.preventDefault();
+      });
+    });
+  </script>
+<% end %>

data/vendor/plugins/refinery/lib/generators/refinery/templates/migration.rb

@@ -9,6 +9,8 @@ class <%= migration_name %> < ActiveRecord::Migration
 
       t.timestamps
     end
+    
+		add_index :<%= table_name %>, :id
 
 		User.find(:all).each do |user|
 			user.plugins.create(:title => "<%= class_name.pluralize.underscore.titleize %>", :position => (user.plugins.maximum(:position) || -1) +1)
@@ -17,8 +19,7 @@ class <%= migration_name %> < ActiveRecord::Migration
 		page = Page.create(:title => "<%= class_name.pluralize.underscore.titleize %>", :link_url => "/<%= plural_name %>", :deletable => false, :position => ((Page.maximum(:position, :conditions => "parent_id IS NULL") || -1)+1))
 		RefinerySetting.find_or_set(:default_page_parts, ["body", "side_body"]).each do |default_page_part|
 			page.parts.create(:title => default_page_part, :body => nil)
-		end
-		
+		end		
   end
 
   def self.down

data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_form.html.erb

@@ -1,13 +1,13 @@
-<%%= error_messages_for :<%= singular_name %> %>
-<%% form_for [:admin, @<%= singular_name %>] do |f| %>
+<%%= error_messages_for :<%= singular_name %> -%>
+<%% form_for [:admin, @<%= singular_name %>] do |f| -%>
 	<% attributes.each do |attribute| -%>
 <div class='field'>
-		<%%= f.label :<%= attribute.name %> %>
-		<% if attribute.field_type.to_s == "text_area" %>
-		  <%%= f.text_area :<%= attribute.name %>, :rows => 20, :cols => 140, :class => 'wymeditor' %>
-		<% else %>
-      <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
-    <% end %>
+    <%%= f.label :<%= attribute.name %> -%>
+<% if attribute.field_type.to_s == "text_area" -%>
+    <%%= f.text_area :<%= attribute.name %>, :rows => 20, :cols => 140, :class => 'wymeditor' -%>
+<% else -%>
+    <%%= f.<%= attribute.field_type -%> :<%= attribute.name -%> -%>
+<% end -%>
   </div>
 	<% end -%>
 <div class='form-actions'>

data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_singular_name.html.erb

@@ -2,7 +2,8 @@
 	<span class='title'>
 		<span class='actions'>
 			<%%= link_to refinery_icon_tag("application_go.png"), <%= singular_name %>_url(<%= singular_name %>), 
-					:title => 'View this <%= $title_name.downcase %>' %>
+					:title => 'View this <%= $title_name.downcase %><br/><em>Opens in a new window</em>', 
+					:target => "_blank" %>
 			<%%= link_to refinery_icon_tag("application_edit.png"), edit_admin_<%= singular_name %>_path(<%= singular_name %>),
 			 		:title => 'Edit this <%= $title_name.downcase %>' %>
 			<%%= link_to refinery_icon_tag("delete.png"), admin_<%= singular_name %>_path(<%= singular_name %>),

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

@@ -0,0 +1,280 @@
+module Indexer
+  
+  
+  def self.sortalize(array)
+    Marshal.load(Marshal.dump(array)).each do |element|
+      element.sort! if element.is_a?(Array)
+    end
+  end
+  
+  def self.check_for_indexes(migration_format = false)
+    model_names = []
+    Dir.chdir(Rails.root) do 
+      model_names = Dir["**/app/models/*.rb"].collect {|filename| File.basename(filename) }.uniq
+    end
+
+    model_classes = []
+    model_names.each do |model_name|
+      class_name = model_name.sub(/\.rb$/,'').camelize
+      begin
+        klass = class_name.split('::').inject(Object){ |klass,part| klass.const_get(part) }
+        if klass < ActiveRecord::Base && !klass.abstract_class?
+          model_classes << klass
+        end
+      rescue
+        # No-op
+      end
+    end
+    puts "Found #{model_classes.size} Models"
+
+    @indexes_required = Hash.new([])
+    @index_migrations = Hash.new([])
+
+    model_classes.each do |class_name|
+
+      # check if this is an STI child instance      
+      if class_name.base_class.name != class_name.name && (class_name.column_names.include?(class_name.base_class.inheritance_column) || class_name.column_names.include?(class_name.inheritance_column))
+        # add the inharitance column on the parent table
+        if !(migration_format)
+          @indexes_required[class_name.base_class.table_name] += [class_name.inheritance_column].sort unless  @indexes_required[class_name.base_class.table_name].include?([class_name.inheritance_column].sort)
+        else
+          # index migration for STI should require both the primary key and the inheritance_column in a composite index.
+          @index_migrations[class_name.base_class.table_name] += [[class_name.inheritance_column, class_name.base_class.primary_key].sort] unless @index_migrations[class_name.base_class.table_name].include?([class_name.base_class.inheritance_column].sort)
+        end
+      end
+
+      class_name.reflections.each_pair do |reflection_name, reflection_options|
+        case reflection_options.macro
+        when :belongs_to
+          # polymorphic?
+          @table_name = class_name.table_name.to_s #(reflection_options.options.has_key?(:class_name) ?  reflection_options.options[:class_name].constantize.table_name : )
+          if reflection_options.options.has_key?(:polymorphic) && (reflection_options.options[:polymorphic] == true)
+            poly_type = "#{reflection_options.name.to_s}_type"
+            poly_id = "#{reflection_options.name.to_s}_id"
+            if !(migration_format)
+              @indexes_required[@table_name.to_s] += [poly_type, poly_id].sort unless @indexes_required[@table_name.to_s].include?([poly_type, poly_id].sort)
+            else
+
+              @index_migrations[@table_name.to_s] += [[poly_type, poly_id].sort] unless @index_migrations[@table_name.to_s].include?([poly_type, poly_id].sort)
+            end
+          else
+
+            foreign_key = reflection_options.options[:foreign_key] ||= reflection_options.primary_key_name
+
+            if !(migration_format)
+              @indexes_required[@table_name.to_s] += [foreign_key] unless @indexes_required[@table_name.to_s].include?(foreign_key)
+            else
+              @index_migrations[@table_name.to_s] += [foreign_key] unless @index_migrations[@table_name.to_s].include?(foreign_key)
+            end
+          end
+        when :has_and_belongs_to_many
+          table_name = reflection_options.options[:join_table] ||= [class_name.table_name, reflection_name.to_s].sort.join('_')
+          association_foreign_key = reflection_options.options[:association_foreign_key] ||= "#{reflection_name.to_s.singularize}_id"
+          foreign_key = reflection_options.options[:foreign_key] ||= "#{class_name.name.tableize.singularize}_id"
+
+          if !(migration_format)
+            @indexes_required[table_name.to_s] += [association_foreign_key, foreign_key].sort unless @indexes_required[table_name].include?([association_foreign_key, foreign_key].sort)
+          else
+            @index_migrations[table_name.to_s] += [[association_foreign_key, foreign_key].sort] unless @index_migrations[table_name].include?([association_foreign_key, foreign_key].sort)
+          end
+        else
+          #nothing
+        end
+      end
+    end
+
+    @missing_indexes = {}
+    @indexes_required.each do |table_name, foreign_keys|
+
+      unless foreign_keys.blank?
+        existing_indexes = ActiveRecord::Base.connection.indexes(table_name.to_sym).collect(&:columns)
+        keys_to_add = self.sortalize(foreign_keys.uniq) - self.sortalize(existing_indexes)
+        @missing_indexes[table_name] = keys_to_add unless keys_to_add.empty?
+      end
+    end
+    if !(migration_format)
+      @missing_indexes
+    else
+      @index_migrations
+    end
+  end
+
+  def self.scan_finds
+    file_names = []
+    Dir.chdir(Rails.root) do 
+      file_names = Dir["**/app/**/*.rb"].uniq.reject {|file_with_path| file_with_path.include?('test')}
+    end
+
+    puts "Found #{file_names.size} files."
+
+    @indexes_required = Hash.new([])
+    file_names.each do |file_name| 
+      current_file = File.open(File.join(Rails.root, file_name), 'r')
+
+      current_file.each do |line|
+        find_regexp = Regexp.new(/([A-Z]{1}[A-Za-z]+).(find){1}((_all){0,1}(_by_){0,1}([A-Za-z_]+))?\(([0-9A-Za-z"\':=>. \[\]{},]*)\)/)
+        if matches = find_regexp.match(line)
+
+          model_name, column_names, options = matches[1], matches[6], matches[7]
+        #  puts "Model: #{model_name}, columns: #{column_names}, options: #{options}"
+          
+          if model_name.respond_to?(:constantize)
+            if model_name.constantize.respond_to?(:table_name)             
+              table_name = model_name.constantize.table_name
+            else
+              puts "Unable to get the table_name for #{model_name.to_s}. it could be an ActiveResource"
+              next
+            end
+          else
+            puts "Unable to constantize #{model_name.to_s}, if you are sure that #{model_name.to_s} is a valid class name, please file an issue on\nhttp://github.com/eladmeidar/rails_indexes\nPlease supply the relevant code as well, thanks. =)"
+            next
+          end
+
+          if column_names.blank?
+            primary_key = model_name.constantize.primary_key
+            @indexes_required[table_name] += [primary_key] unless @indexes_required[table_name].include?(primary_key)
+          else
+            column_names = column_names.split('_and_')
+
+            # remove find_by_sql references.
+           # column_names.delete("sql")
+
+            column_names = model_name.constantize.column_names & column_names
+
+            # Check if there were more than 1 column
+            if column_names.size == 1
+              column_name = column_names.first
+              @indexes_required[table_name] += [column_name] unless @indexes_required[table_name].include?(column_name)
+            else
+              @indexes_required[table_name] += [column_names.sort] unless @indexes_required[table_name].include?(column_names.sort)
+            end
+          end
+        end
+      end
+    end
+    @missing_indexes = {}
+    @indexes_required.each do |table_name, foreign_keys|
+
+      unless foreign_keys.blank?
+        existing_indexes = ActiveRecord::Base.connection.indexes(table_name.to_sym).collect(&:columns)
+        keys_to_add = self.sortalize(foreign_keys.uniq) - self.sortalize(existing_indexes)
+        @missing_indexes[table_name] = keys_to_add unless keys_to_add.empty?
+      end
+    end
+    
+    @indexes_required
+  end
+  
+  def self.key_exists?(table,key_columns)     
+    result = (key_columns.to_a - ActiveRecord::Base.connection.indexes(table).map { |i| i.columns }.flatten)
+    result.empty?
+  end
+  
+  def self.simple_migration
+    migration_format = true
+    missing_indexes = check_for_indexes(migration_format)
+
+    unless missing_indexes.keys.empty?
+      add = []
+      remove = []
+      missing_indexes.each do |table_name, keys_to_add|
+        keys_to_add.each do |key|
+          next if key_exists?(table_name,key)
+          next if key.blank?
+          if key.is_a?(Array)
+            keys = key.collect {|k| ":#{k}"}
+            add << "add_index :#{table_name}, [#{keys.join(', ')}]"
+            remove << "remove_index :#{table_name}, :column => [#{keys.join(', ')}]"
+          else
+            add << "add_index :#{table_name}, :#{key}"
+            remove << "remove_index :#{table_name}, :#{key}"
+          end
+          
+        end
+      end
+      
+      migration = <<EOM  
+class AddMissingIndexes < ActiveRecord::Migration
+  def self.up
+    
+    # These indexes were found by searching for AR::Base finds on your application
+    # It is strongly recommanded that you will consult a professional DBA about your infrastucture and implemntation before
+    # changing your database in that matter.
+    # There is a possibility that some of the indexes offered below is not required and can be removed and not added, if you require
+    # further assistance with your rails application, database infrastructure or any other problem, visit:
+    #
+    # http://www.railsmentors.org
+    # http://www.railstutor.org
+    # http://guides.rubyonrails.org
+
+    
+    #{add.uniq.join("\n    ")}
+  end
+  
+  def self.down
+    #{remove.uniq.join("\n    ")}
+  end
+end
+EOM
+
+      puts "## Drop this into a file in db/migrate ##"
+      puts migration
+    end
+  end
+  
+  def self.indexes_list
+    check_for_indexes.each do |table_name, keys_to_add|
+      puts "Table '#{table_name}' => #{keys_to_add.to_sentence}"
+    end
+  end
+  
+  def self.ar_find_indexes
+    find_indexes = self.scan_finds
+    
+    unless find_indexes.keys.empty?
+      add = []
+      remove = []
+      find_indexes.each do |table_name, keys_to_add|
+        keys_to_add.each do |key|
+          next if key_exists?(table_name,key)
+          next if key.blank?
+          if key.is_a?(Array)
+            keys = key.collect {|k| ":#{k}"}
+            add << "add_index :#{table_name}, [#{keys.join(', ')}]"
+            remove << "remove_index :#{table_name}, :column => [#{keys.join(', ')}]"
+          else
+            add << "add_index :#{table_name}, :#{key}"
+            remove << "remove_index :#{table_name}, :#{key}"
+          end
+          
+        end
+      end
+      
+      migration = <<EOM      
+class AddFindsMissingIndexes < ActiveRecord::Migration
+  def self.up
+    
+    # These indexes were found by searching for AR::Base finds on your application
+    # It is strongly recommanded that you will consult a professional DBA about your infrastucture and implemntation before
+    # changing your database in that matter.
+    # There is a possibility that some of the indexes offered below is not required and can be removed and not added, if you require
+    # further assistance with your rails application, database infrastructure or any other problem, visit:
+    #
+    # http://www.railsmentors.org
+    # http://www.railstutor.org
+    # http://guides.rubyonrails.org
+    
+    #{add.uniq.join("\n    ")}
+  end
+  
+  def self.down
+    #{remove.uniq.join("\n    ")}
+  end
+end
+EOM
+
+      puts "## Drop this into a file in db/migrate ##"
+      puts migration
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+require File.join(REFINERY_ROOT, %w(vendor plugins refinery lib indexer.rb))
+
+namespace :db do
+  desc "collect indexes based on AR::Base.find calls."
+  task :show_me_ar_find_indexes => :environment do
+    Indexer.ar_find_indexes
+  end
+  
+  desc "scan for possible required indexes"
+  task :show_me_some_indexes => :environment do
+    # Indexer.indexes_list
+    puts "Sorry, simple report is deprecated.\nuse rake db:show_me_a_migration or db:show_me_ar_find_indexes instead"
+  end
+  
+  task :show_me_a_migration => :environment do
+    Indexer.simple_migration
+  end
+end

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

@@ -10,16 +10,58 @@ class Admin::ResourcesController < Admin::BaseController
 	
 	def create
     @resource = Resource.create params[:resource]
-		if @resource.valid?
-			flash[:notice] = "'#{@resource.title}' was successfully created."
-			unless from_dialog?
-				redirect_to :action => 'index'
-			else
-				render :text => "<script type='text/javascript'>parent.window.location = '#{admin_resources_url}';</script>"
-			end
+		
+		unless params[:insert]
+  		if @resource.valid?
+  		  flash[:notice] = "'#{@resource.title}' was successfully created."
+  			unless from_dialog?
+  				redirect_to :action => 'index'
+  			else
+  				render :text => "<script type='text/javascript'>parent.window.location = '#{admin_resources_url}';</script>"
+  			end
+  		else
+  			render :action => 'new'
+  		end
 		else
-			render :action => 'new'
+		  @resource_id = @resource.id
+		  @resource = nil
+		  self.insert
 		end
   end
+  
+  def insert
+    self.new if @resource.nil?
+    @dialog = from_dialog?
+    @thickbox = !params[:thickbox].blank?
+    @field = params[:field]
+    @update_resource = params[:update_resource]
+    @update_text = params[:update_text]
+    @thumbnail = params[:thumbnail]
+    @callback = params[:callback]
+		@conditions = params[:conditions]
+		@current_link = params[:current_link]
+    @url_override = admin_resources_url(:dialog => @dialog, :insert => true)
+
+		unless params[:conditions].blank?
+			extra_condition = params[:conditions].split(',')
+			
+			extra_condition[1] = true if extra_condition[1] == "true"
+			extra_condition[1] = false if extra_condition[1] == "false"
+			extra_condition[1] = nil if extra_condition[1] == "nil"
+	    paginate_resources({extra_condition[0].to_sym => extra_condition[1]})
+		else
+			paginate_resources
+		end
+    render :action => "insert"
+  end
+  
+protected
+
+	def paginate_resources(conditions={})
+	  @resources = Resource.paginate 	:page => (@paginate_page_number ||= params[:page]),
+	                           	      :conditions => conditions,
+	                           	      :order => 'created_at DESC',
+	                           	      :per_page => Resource.per_page(from_dialog?)
+	end
 
 end

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

@@ -15,4 +15,15 @@
 		or 
 		<%= link_to "Cancel", admin_resources_url, :title => "Cancelling will lose all changes you've made to this file", :class => "close_dialog" -%>
 	</div>
+
+	<% if @thickbox %>
+  	<input type='hidden' name='thickbox' value='<%= @thickbox %>' />
+  	<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 %>' />
+  	<input type='hidden' name='thumbnail' value='<%= @thumbnail %>' />
+  	<input type='hidden' name='callback' value='<%= @callback %>' />
+		<input type='hidden' name='conditions' value='<%= @conditions %>' />
+		<input type='hidden' name='current_link' value='<%= @current_link %>' />
+	<% end %>
 <% end -%>

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

@@ -0,0 +1,110 @@
+<div class='clearfix'>
+	<div id='dialog_menu_left'>
+		<% unless @resources.empty? %>
+  		<span id='existing_resource_radio' class='radio'>
+  			<input type='radio' name='resource_type' value='existing_resource' id='resource_type_existing' <%= "checked='true'" if @resource.errors.empty? %> />
+  			<label for='resource_type_existing' class='stripped'>Existing File</label>
+  		</span>
+		<% end %>
+		<span id='upload_resource_radio' class='radio<%= " selected_radio" if @resource.errors.size > 0 %>'>
+			<input type='radio' name='resource_type' value='upload_resource' id='resource_type_upload' <%= "checked='true'" if @resources.empty? or !@resource.errors.empty? %> />
+			<label for='resource_type_upload' class='stripped'>New File</label>
+		</span>
+	</div>
+
+	<div id='dialog_main'>
+		<% unless @resources.empty? %>
+  		<div id='existing_resource_area' class='dialog_area' <%= "style='display:none;'" unless @resource.errors.empty? %>>
+  			<input type='hidden' name='linked_resource' id='linked_resource' />
+  			<div id='existing_resource_area_content' class='clearfix'>
+  			  <div id='pages_list'>
+    				<ul class='link_list'>
+      				<% @resources.each do |resource| -%>
+                <% resource_linked = (resource.public_filename == params[:current_link]) unless params[:current_link].blank? %>
+                <li<%= " class='linked'" if resource_linked %>>
+                  <%= link_to "#{resource.title} (#{resource.public_filename})", resource.public_filename, :title => 'Link to this Resource', 
+                              :rel => resource.title, :class => 'page_link', :id => "resource_#{resource.id}" %>
+                </li>
+              <% end %>
+    				</ul>
+  				</div>
+  			</div>
+  			<%= will_paginate @resources, :previous_label => '&laquo; Previous', :next_label => 'Next &raquo;', :renderer => Refinery::LinkRenderer, :url => {:controller => "admin/resources", :action => "insert", :dialog => @dialog} unless @thickbox %>
+  		</div>
+		<% end %>
+		<div id='upload_resource_area' class='dialog_area' <%= "style='display:none;'" if @resources.empty? %>>
+			<%= render :partial => "form", :locals => {:insert => true} %>
+		</div>
+	</div>
+</div>
+<% if @thickbox %>
+  <div id='dialog-form-actions' class='form-actions'>
+  	<%= submit_tag 'Insert', :id => "submit_button" %> 
+  	or 
+  	<%= link_to "Cancel", "", :id => "cancel_button", :class => "close_dialog" %>
+    
+  	<%= will_paginate @resources, :previous_label => '&laquo; Previous', :next_label => 'Next &raquo;', :renderer => Refinery::LinkRenderer, :url => {:controller => "admin/resources", :action => "insert", :dialog => @dialog } %>
+  </div>
+<% end %>
+<% content_for :head do %>
+  <%= javascript_include_tag 'refinery/parse_url' %>
+	<script type='text/javascript'>
+		set_resource = function(anchor)
+		{
+			if (anchor != null) {
+			  $$('#existing_resource_area_content ul li.linked').each(function(linked)
+  			{
+  				$(linked).removeClassName('linked');
+  			});
+				$(anchor.parentNode).addClassName('linked');
+			}
+		}
+		
+		FastInit.addOnLoad(function()
+		{
+<% unless @resource_id.nil? %>
+			set_resource($('resource_<%= @resource_id %>'));
+<% end %>
+			$$('#existing_resource_area_content ul li a').each(function(anchor) 
+			{
+				anchor.observe('click', function(e){set_resource(this);e.preventDefault()});
+			});
+			
+<% if @thickbox %>
+			$('dialog-form-actions').down('#submit_button').observe('click', function(e)
+			{
+				linked = null;
+				$$('#existing_resource_area_content ul li.linked a').each(function(linked_anchor)
+				{
+					linked = linked_anchor;
+				});
+				if (linked != null)
+				{
+  <% unless @field.blank? %>
+					if ((field = parent.document.getElementById('<%= @field %>')) != null)
+					{
+						field.value = linked.id.replace("resource_", "");
+					}
+					if ((resource = parent.document.getElementById('<%= @update_resource %>')) != null)
+					{
+					  resourceUrl = parseURL(linked.href);
+            relevant_href = resourceUrl.pathname;
+            // Add any alternate resource stores that need a absolute URL in the regex below
+            if( resourceUrl.hostname.match(/s3.amazonaws.com/) ) {
+              relevant_href = resourceUrl.protocol + '//' + resourceUrl.host + relevant_href;
+            }
+						resource.href = relevant_href;
+					}
+					if ((text = parent.document.getElementById('<%= @update_text %>')) != null) {
+					  text.innerHTML = linked.innerHTML;
+					}
+	<% end %>
+					<%= "self.parent.#{@callback}();" unless @callback.blank? %>
+					self.parent.tb_remove();
+				}
+				e.stop();
+			});
+<% end %>
+		});
+	</script>
+<% end %>

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

@@ -2,6 +2,6 @@ ActionController::Routing::Routes.draw do |map|
   map.resources :resources
 
   map.namespace(:admin) do |admin| 
-    admin.resources :resources
+    admin.resources :resources, :collection => {:insert => :get}
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  version: 0.9.5.5
+  version: 0.9.5.6
 platform: ruby
 authors: 
 - Resolve Digital
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-09 00:00:00 +13:00
+date: 2009-11-10 00:00:00 +13:00
 default_executable: refinery
 dependencies: []
 
@@ -45,6 +45,7 @@ files:
 - config/rackspace_cloudfiles.yml
 - config/routes.rb
 - db/migrate/20091029034951_remove_blurb_from_news_items.rb
+- db/migrate/20091109012126_add_missing_indexes.rb
 - db/schema.rb
 - db/seeds.rb
 - public/.htaccess
@@ -422,6 +423,8 @@ files:
 - vendor/plugins/refinery/app/views/shared/_message.html.erb
 - vendor/plugins/refinery/app/views/shared/_submenu.html.erb
 - vendor/plugins/refinery/app/views/shared/_submenu_branch.html.erb
+- vendor/plugins/refinery/app/views/shared/admin/_image_picker.html.erb
+- vendor/plugins/refinery/app/views/shared/admin/_resource_picker.html.erb
 - vendor/plugins/refinery/app/views/shared/admin/_make_sortable.html.erb
 - vendor/plugins/refinery/app/views/shared/admin/_search.html.erb
 - vendor/plugins/refinery/app/views/shared/admin/_sortable_list.html.erb
@@ -456,7 +459,9 @@ files:
 - vendor/plugins/refinery/lib/refinery/link_renderer.rb
 - vendor/plugins/refinery/lib/refinery/plugin.rb
 - vendor/plugins/refinery/lib/refinery/plugins.rb
+- vendor/plugins/refinery/lib/indexer.rb
 - vendor/plugins/refinery/lib/refinery.rb
+- vendor/plugins/refinery/lib/tasks/indexer.rake
 - vendor/plugins/refinery/lib/tasks/refinery.rake
 - vendor/plugins/refinery_dialogs/app/controllers/admin/dialogs_controller.rb
 - vendor/plugins/refinery_dialogs/app/views/admin/dialogs/show.html.erb
@@ -479,6 +484,7 @@ files:
 - vendor/plugins/resources/app/views/admin/resources/_resource.html.erb
 - vendor/plugins/resources/app/views/admin/resources/edit.html.erb
 - vendor/plugins/resources/app/views/admin/resources/index.html.erb
+- 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