refinerycms 0.9.5.19 → 0.9.5.20

data/.gems

@@ -0,0 +1,6 @@
+rake --version '>= 0.8.3'
+friendly_id --version '>= 2.1.4'
+mislav-will_paginate --version '>= 2.3.11'
+rails --version '>= 2.3.2'
+rubyist-aasm --version '>= 2.1.1'
+unicode --version '>= 0.1'

data/.gitignore

@@ -0,0 +1,14 @@
+public/system/*
+log/*.log
+tmp/**/*
+.DS_Store
+doc/api
+doc/app
+config/database.yml
+public/images/system/*
+nbproject
+index/**/*
+db/*.sqlite3
+*.tmproj
+*.autobackupbyrefinery.*
+refinerycms*.gem

data/README

@@ -2,12 +2,12 @@
 
 Refinery is a simple, easy to use, well presented content manager for small businesses.
 
-Refinery was born out of Resolve Digital (http://resolvedigital.co.nz). 
+Refinery was born out of Resolve Digital (http://resolvedigital.co.nz).
 After building 40 real client sites, we began making our own content manager which would suit the small businesses we worked with. We learnt all the common requests and included them and nothing more.
 
 == License
 
-Refinery is released under the MIT license and is copyright (c) 2005-2009 Resolve Digital Ltd. 
+Refinery is released under the MIT license and is copyright (c) 2005-2009 Resolve Digital Ltd.
 A copy of the MIT license can be found in the LICENSE file.
 
 == Help
@@ -54,15 +54,17 @@ Refinery runs using a number of gems which (as of Refinery version 0.9.5) are ou
 
 - "rake", :version => ">= 0.8.3"
 - "friendly_id", :version => ">= 2.2.2"
-- "mislav-will_paginate", :version => ">= 2.3.11"
+- "will_paginate", :version => ">= 2.3.11"
 - "rails", :version => ">= 2.3.4"
-- "rubyist-aasm", :version => ">= 2.1.3"
+- "aasm", :version => ">= 2.1.3"
 - "unicode", :version => ">= 0.1"
+- "slim_scrooge", :version => ">= 1.0.1" (Note: This gem is disabled under Windows as we've had reports it doesn't work on Windows.)
+- "hpricot", :version => "= 0.8.1"
 
 == Updates to core files
 
 If you are running Refinery as a gem, updates are simple to incorporate into your project.
-Simply run the command 'refinery-update-core /path/to/project' and the up-to-date core files will be copied from the latest gem into your project's directory. 
+Simply run the command 'refinery-update-core /path/to/project' and the up-to-date core files will be copied from the latest gem into your project's directory.
 Note: the directory that you specify here must be the Rails root for the project.
 
 If you are running using a git clone, you can update by running these commands:

data/Rakefile

@@ -1,15 +1,42 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
- 
+
 require(File.join(File.dirname(__FILE__), 'config', 'boot'))
- 
+
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
- 
+
 require 'tasks/rails'
 
 desc 'Removes trailing whitespace'
 task :whitespace do
   sh %{find . -name '*.*rb' -exec sed -i '' 's/\t/  /g' {} \\; -exec sed -i '' 's/ *$//g' {} \\; }
 end
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |s|
+    s.name = %q{refinerycms}
+    s.description = %q{A beautiful open source Ruby on Rails content manager for small business. Easy to extend, easy to use, lightweight and all wrapped up in a super slick UI.}
+    s.summary = %q{A beautiful open source Ruby on Rails content manager for small business.}
+    s.email = %q{info@refinerycms.com}
+    s.homepage = %q{http://refinerycms.com}
+    s.authors = ["Resolve Digital", "David Jones", "Philip Arndt"]
+    s.extra_rdoc_files = %w(README CONTRIBUTORS LICENSE)
+  end
+
+  namespace :version do
+    namespace :bump do
+      desc "Bump the gemspec by a build version."
+      task :build => [:version_required, :version] do
+        version = Jeweler::VersionHelper.new(RAILS_ROOT)
+        version.update_to(version.major, version.minor, version.patch, ((version.build || 0).to_i + 1))
+        version.write
+        $stdout.puts "Updated version: #{version.to_s}"
+      end
+    end
+  end
+rescue   LoadError
+  puts "Jeweler not available. Install it with: sudo gem install jeweler"
+end

data/VERSION

@@ -0,0 +1 @@
+0.9.5.20

data/db/schema.rb

@@ -1,4 +1,4 @@
-# This file is auto-generated from the current state of the database. Instead of editing this file,
+# This file is auto-generated from the current state of the database. Instead of editing this file, 
 # please use the migrations feature of Active Record to incrementally modify your database, and
 # then regenerate this schema definition.
 #

data/public/javascripts/wymeditor/jquery.refinery.wymeditor.js

@@ -1332,7 +1332,7 @@ WYMeditor.editor.prototype.uniqueStamp = function() {
 };
 
 WYMeditor.editor.prototype.paste = function(sData) {
-console.log('pasting..');
+//console.log('pasting..');
 	var sTmp;
 	var container = this.selected();
 

data/public/stylesheets/refinery/application.css

@@ -11,31 +11,35 @@
 	float: right;
 	width: 360px;
 }
-
 .inquiries form label {
 	width: 150px;
 	float: left;
 }
 .inquiries form input {
-	
+
 }
 .inquiries form input, .inquiries form textarea {
-	
+
 }
 .inquiries form textarea {
-	
+
 }
 .inquiries form .actions {
 	margin-left: 150px;
 }
-
 .inquiries form .actions input {
 }
-
 .inquiries .field {
 	margin: 12px 0px;
 }
-
 .inquiries form {
 	padding-top: 12px;
+}
+.page_not_live {
+    border: 1px solid #A00027;
+    color: #A00027;
+    background: #FFB1B1;
+    padding:3px 9px;
+    font-weight:bold;
+    width:auto;
 }

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

@@ -21,6 +21,29 @@ class Page < ActiveRecord::Base
     self.deletable && self.link_url.blank? and self.menu_match.blank?
   end
 
+  # provide helpful feedback
+  def destroy
+    if self.deletable?
+      super
+    else
+      puts "This page is not deletable. Please use .destroy! if you really want it gone or first"
+      puts "unset .link_url" unless self.link_url.blank?
+      puts "unset .menu_match" unless self.menu_match.blank?
+      puts "set .deletable to true" unless self.deletable
+      return false
+    end
+  end
+
+  # provide a method to definitely get rid of the page.
+  def destroy!
+    self.update_attributes({
+      :menu_match => nil,
+      :link_url => nil,
+      :deletable => true
+    })
+    self.destroy
+  end
+
   # used for the browser title to get the full path to this page
   def path(reverse = true)
     unless self.parent.nil?

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

@@ -60,7 +60,8 @@
           {
             :f => f,
             :field => :custom_title_image_id,
-            :image => @page.custom_title_image
+            :image => @page.custom_title_image,
+            :toggle_image_display => false
           }
         %>
       </div>

data/vendor/plugins/rails_indexes/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009 [name of plugin creator]
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/vendor/plugins/rails_indexes/README.textile

@@ -0,0 +1,46 @@
+h1. Rails Indexes
+
+Rails indexes is a small package of 2 rake tasks that scan your application models and displays a list of columns that _probably_ should be indexed.
+
+note: there should be mode fields depending on your application design and custom queries.
+
+h2. Installation
+
+as a rails plugin:
+<pre>script/plugin install git://github.com/eladmeidar/rails_indexes.git</pre>
+
+h2. Usage
+
+<del>Display a simple report:</del>
+<pre><del>rake db:show_me_some_indexes</del></pre>
+ - *deprecated*
+
+Display a migration for adding/removing all necessary indexes based on associations:
+<pre>rake db:show_me_a_migration</pre>
+
+Display a migration for adding/removing all necessary indexes based on AR::Base#find calls (including: find, find_by, find_all_by, find_by_x_and_y, find_all_by_x_and_y):
+<pre>rake db:show_me_ar_find_indexes</pre>
+
+Note that it would probably make more sense running those tasks on production, where you *actually* need those indexes to be added.
+
+* Add an option to create a migration that adds all the needed indexes.
+* Add an option to scan the application root tree for #find, #find_all_by and #find_by to get some more index-required columns.
+
+h2. Tests
+
+Requires SQLite3 installed, then just:
+<pre>rake</pre>
+to run the tests
+
+h4. Author:
+
+Elad Meidar
+"http://blog.eizesus.com":http://blog.eizesus.com
+
+Thanks:
+Eric Davis,
+"http://littlestreamsoftware.com":http://littlestreamsoftware.com
+   
+Released under the same license as Ruby. No Support. No Warranty, no Pain.
+
+

data/vendor/plugins/rails_indexes/Rakefile

@@ -0,0 +1,23 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Testing the rails indexes plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Generate documentation for the rails_indexes plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'RailsIndexes'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/vendor/plugins/{refinery → rails_indexes}/lib/indexer.rb

@@ -1,16 +1,15 @@
 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
+    Dir.chdir(Rails.root) do 
+      model_names = Dir["**/app/models/**/*.rb"].collect {|filename| File.basename(filename) }.uniq
     end
 
     model_classes = []
@@ -25,58 +24,45 @@ module Indexer
         # 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
+      # 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
+        # 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
-
+      #puts "class name: #{class_name}"
       class_name.reflections.each_pair do |reflection_name, reflection_options|
+        #puts "reflection => #{reflection_name}"
         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 : )
+          @table_name = class_name.table_name.to_s 
           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
+    
+            @index_migrations[@table_name.to_s] += [[poly_type, poly_id].sort] unless @index_migrations[@table_name.to_s].include?([poly_type, poly_id].sort)
           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"
+          
+          composite_keys = [association_foreign_key, foreign_key]
+          
+          @index_migrations[table_name.to_s] += [composite_keys] unless @index_migrations[table_name].include?(composite_keys)
+          @index_migrations[table_name.to_s] += [composite_keys.reverse] unless @index_migrations[table_name].include?(composite_keys.reverse)
 
-          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
@@ -84,60 +70,79 @@ module Indexer
     end
 
     @missing_indexes = {}
-    @indexes_required.each do |table_name, foreign_keys|
+    
+    @index_migrations.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)
+        existing_indexes = ActiveRecord::Base.connection.indexes(table_name.to_sym).collect {|index| index.columns.size > 1 ? index.columns : index.columns.first}
+        keys_to_add = foreign_keys.uniq - existing_indexes #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
+    
+    @missing_indexes
   end
 
   def self.scan_finds
     file_names = []
-    Dir.chdir(Rails.root) do
+    
+    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|
+    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"\':=>. \[\]{},]*)\)/)
+        
+        # by default, try to add index on primary key, based on file name
+        # this will fail if the file isnot a model file
+        
+        begin
+          current_model_name = File.basename(file_name).sub(/\.rb$/,'').camelize
+        rescue
+          # NO-OP
+        end
+        
+        klass = current_model_name.split('::').inject(Object){ |klass,part| klass.const_get(part) } rescue nil
+        if klass.present? && klass < ActiveRecord::Base && !klass.abstract_class?
+          current_model = current_model_name.constantize
+          primary_key = current_model.primary_key
+          table_name = current_model.table_name
+          @indexes_required[table_name] += [primary_key] unless @indexes_required[table_name].include?(primary_key)
+        end
+        
+        find_regexp = Regexp.new(/([A-Z]{1}[A-Za-z]+|self).(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
+      
+          if model_name == "self"
+            model_name = File.basename(file_name).sub(/\.rb$/,'').camelize
+            table_name = model_name.constantize.table_name            
+          else
+            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 get the table_name for #{model_name.to_s}. it could be an ActiveResource"
+              #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
-          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
+      
+          primary_key = model_name.constantize.primary_key
+          @indexes_required[table_name] += [primary_key] unless @indexes_required[table_name].include?(primary_key)
+      
+          if column_names.present?
             column_names = column_names.split('_and_')
 
             # remove find_by_sql references.
-           # column_names.delete("sql")
+            column_names.delete("sql")
 
             column_names = model_name.constantize.column_names & column_names
 
@@ -146,30 +151,40 @@ module Indexer
               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)
+              @indexes_required[table_name] += [column_names] unless @indexes_required[table_name].include?(column_names)
+              @indexes_required[table_name] += [column_names.reverse] unless @indexes_required[table_name].include?(column_names.reverse)
             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?
+      unless foreign_keys.blank?          
+        begin
+          if ActiveRecord::Base.connection.tables.include?(table_name.to_s)
+            existing_indexes = ActiveRecord::Base.connection.indexes(table_name.to_sym).collect {|index| index.columns.size > 1 ? index.columns : index.columns.first}
+            keys_to_add = self.sortalize(foreign_keys.uniq) - self.sortalize(existing_indexes)
+            @missing_indexes[table_name] = keys_to_add unless keys_to_add.empty?
+          else
+            puts "BUG: table '#{table_name.to_s}' does not exist, please report this bug."
+          end
+        rescue Exception => e
+          puts "ERROR: #{e}"
+        end
       end
     end
-
+    
     @indexes_required
   end
-
-  def self.key_exists?(table,key_columns)
+  
+  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)
@@ -189,14 +204,14 @@ module Indexer
             add << "add_index :#{table_name}, :#{key}"
             remove << "remove_index :#{table_name}, :#{key}"
           end
-
+          
         end
       end
-
-      migration = <<EOM
+      
+      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.
@@ -207,10 +222,10 @@ class AddMissingIndexes < ActiveRecord::Migration
     # http://www.railstutor.org
     # http://guides.rubyonrails.org
 
-
+    
     #{add.uniq.join("\n    ")}
   end
-
+  
   def self.down
     #{remove.uniq.join("\n    ")}
   end
@@ -221,39 +236,40 @@ EOM
       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
+  
+  def self.ar_find_indexes(migration_mode=true)
     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}"
+    
+    if migration_mode
+      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
-      end
-
-      migration = <<EOM
+      
+        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.
@@ -263,7 +279,7 @@ class AddFindsMissingIndexes < ActiveRecord::Migration
     # http://www.railsmentors.org
     # http://www.railstutor.org
     # http://guides.rubyonrails.org
-
+  
     #{add.uniq.join("\n    ")}
   end
 
@@ -272,9 +288,12 @@ class AddFindsMissingIndexes < ActiveRecord::Migration
   end
 end
 EOM
-
-      puts "## Drop this into a file in db/migrate ##"
-      puts migration
+ 
+        puts "## Drop this into a file in db/migrate ##"
+        puts migration
+      end
     end
+  else
+    find_indexes
   end
-end
+end

data/vendor/plugins/{refinery/lib → rails_indexes}/tasks/indexer.rake

@@ -1,4 +1,4 @@
-require File.join(REFINERY_ROOT, %w(vendor plugins refinery lib indexer.rb))
+require File.join(File.dirname(__FILE__), "../lib/indexer.rb")
 
 namespace :db do
   desc "collect indexes based on AR::Base.find calls."

data/vendor/plugins/rails_indexes/test/fixtures/app/controllers/users_controller.rb

@@ -0,0 +1,8 @@
+class UsersController < ActionController::Base
+  
+  
+  def index
+    @freelancer = Freelancer.find_all_by_name(param[:name])
+    @user = User.find(1)
+  end
+end

data/vendor/plugins/rails_indexes/test/fixtures/app/models/address.rb

@@ -0,0 +1,5 @@
+class Address < ActiveRecord::Base
+  
+  belongs_to :addressable, :polymorphic => true
+  belongs_to :country
+end

data/vendor/plugins/rails_indexes/test/fixtures/app/models/company.rb

@@ -0,0 +1,11 @@
+class Company < ActiveRecord::Base
+
+  belongs_to :owner, :foreign_key => 'owner_id', :class_name => 'User'
+  belongs_to :country
+  
+  has_one :address, :as => :addressable
+  
+  has_many :users
+  
+  has_and_belongs_to_many :freelancers
+end

data/vendor/plugins/rails_indexes/test/fixtures/app/models/country.rb

@@ -0,0 +1,4 @@
+class Country < ActiveRecord::Base
+  has_many :addresses
+  has_many :companies
+end

data/vendor/plugins/rails_indexes/test/fixtures/app/models/freelancer.rb

@@ -0,0 +1,3 @@
+class Freelancer < ActiveRecord::Base
+  has_and_belongs_to_many :companies
+end

data/vendor/plugins/rails_indexes/test/fixtures/app/models/gift.rb

@@ -0,0 +1,10 @@
+class Gift < ActiveRecord::Base
+  
+  set_primary_key :custom_primary_key
+  has_and_belongs_to_many :users, :join_table => "purchases", :association_foreign_key => 'buyer_id', :foreign_key => 'present_id'
+  
+  def search_all(name, price)
+    Gift.find_all_by_name_and_price(name, price)
+  end
+  
+end

data/vendor/plugins/rails_indexes/test/fixtures/app/models/god.rb

@@ -0,0 +1,3 @@
+class God < ActiveRecord::Base
+  self.abstract_class = true
+end

data/vendor/plugins/rails_indexes/test/fixtures/app/models/user.rb

@@ -0,0 +1,16 @@
+class User < ActiveRecord::Base
+  
+  has_one :company, :foreign_key => 'owner_id'
+  has_one :address, :as => :addressable 
+
+  has_and_belongs_to_many :users, :join_table => "purchases", :association_foreign_key => 'present_id', :foreign_key => 'buyer_id'
+  
+  
+  def search_via_email(email = "user@domain.com")
+    self.find_by_email(email)
+  end
+  
+  def search_via_email_and_name(email, name)
+    self.find_by_email_and_name(email, name)
+  end
+end

data/vendor/plugins/rails_indexes/test/fixtures/app/sweepers/user_sweeper.rb

@@ -0,0 +1,9 @@
+class UserSweeper < ActionController::Caching::Sweeper
+  # This sweeper is going to keep an eye on the Product model
+  observe User
+
+  # If our sweeper detects that a Product was created call this
+  def after_create(product)
+    logger.info "Sweeped!"
+  end
+end

data/vendor/plugins/rails_indexes/test/fixtures/schema.rb

@@ -0,0 +1,46 @@
+ActiveRecord::Schema.define do
+  create_table "users", :force => true do |t|
+    t.column "name",  :text
+    t.column "email", :text
+  end
+  
+  create_table "companies", :force => true do |t|
+    t.column "name",  :text
+    t.column "owned_id", :integer
+    t.column "country_id", :integer
+  end
+  
+  add_index :companies, :country_id
+  
+  create_table "addresses", :force => true do |t|
+    t.column "addressable_type", :string
+    t.column "addressable_id", :integer
+    t.column "address", :text
+    t.column "country_id", :integer
+  end
+  
+  create_table "freelancers", :force => true do |t|
+    t.column "name", :string
+    t.column "price_per_hour", :integer
+  end
+  
+  create_table "companies_freelancers", :force => true do |t|
+    t.column "freelancer_id", :integer
+    t.column "company_id", :integer
+  end
+  
+  create_table "gifts", :force => true do |t|
+    t.column "custom_primary_key", :integer
+    t.column "name", :string
+    t.column "price", :integer
+  end
+  
+  create_table "purchases", :force => true do |t|
+    t.column "present_id", :integer
+    t.column "buyer_id", :integer
+  end
+  
+  create_table "countries", :force => true do |t|
+    t.column "name", :string
+  end
+end

data/vendor/plugins/rails_indexes/test/rails_indexes_test.rb

@@ -0,0 +1,83 @@
+require 'test_helper'
+
+class RailsIndexesTest < ActiveSupport::TestCase
+  
+  test "relationship indexes are found" do
+    @relationship_indexes = Indexer.check_for_indexes
+
+    assert @relationship_indexes.size > 0
+    
+    assert @relationship_indexes.has_key?("companies")
+    assert @relationship_indexes.has_key?("companies_freelancers")
+    assert @relationship_indexes.has_key?("addresses")
+    assert @relationship_indexes.has_key?("purchases")
+  end
+  
+  # should add 2 composite indexes or each pair
+  test "has_and_belongs_to_many" do
+    @relationship_indexes = Indexer.check_for_indexes(true)
+    
+    assert @relationship_indexes["companies_freelancers"].include?(["company_id", "freelancer_id"])
+    assert @relationship_indexes["companies_freelancers"].include?(["freelancer_id", "company_id"])
+  end
+  
+  test "has_and_belongs_to_many with custom columns" do
+    @relationship_indexes = Indexer.check_for_indexes(true)
+    
+    assert @relationship_indexes["purchases"].include?(["present_id", "buyer_id"])
+    assert @relationship_indexes["purchases"].include?(["buyer_id", "present_id"])
+  end
+  
+  test "belongs_to" do
+    @relationship_indexes = Indexer.check_for_indexes(true)
+    assert @relationship_indexes["addresses"].include?("country_id")
+  end
+  
+  test "belongs_to with a custom foreign key" do
+    @relationship_indexes = Indexer.check_for_indexes(true)
+    assert @relationship_indexes["companies"].include?("owner_id")
+  end
+  
+  test "should not add an already existing index" do
+    @relationship_indexes = Indexer.check_for_indexes(true)
+    assert !(@relationship_indexes["companies"].include?("country_id"))
+  end
+  
+  test "default find_by indexes for primary keys" do
+    @find_by_indexes = Indexer.ar_find_indexes(false)
+    
+    # Default added the primary key for each table
+    assert @find_by_indexes.has_key?("users")
+    assert @find_by_indexes.has_key?("companies")
+    assert @find_by_indexes.has_key?("gifts")
+    assert @find_by_indexes.has_key?("freelancers")
+    assert @find_by_indexes.has_key?("countries")
+  end
+  
+  test "default find_by indexes for custom primary keys" do
+    @find_by_indexes = Indexer.ar_find_indexes(false)
+
+    assert @find_by_indexes["gifts"].include?("custom_primary_key")
+  end
+  
+  test "find_by indexes for self.find_by_email_and_name" do
+    @find_by_indexes = Indexer.ar_find_indexes(false)
+    
+    assert @find_by_indexes["users"].include?(["name", "email"])
+    assert @find_by_indexes["users"].include?(["email", "name"])
+  end
+  
+  test "find_by indexes for Gift.find_all_by_name_and_price" do
+    @find_by_indexes = Indexer.ar_find_indexes(false)
+    
+    assert @find_by_indexes["gifts"].include?(["name", "price"])
+    assert @find_by_indexes["gifts"].include?(["price", "name"])
+  end
+  
+  test "find_by indexes from UsersController" do
+    @find_by_indexes = Indexer.ar_find_indexes(false)
+    
+    assert @find_by_indexes["freelancers"].include?("name")
+
+  end
+end

data/vendor/plugins/rails_indexes/test/test_helper.rb

@@ -0,0 +1,30 @@
+require 'rubygems'
+
+require 'test/unit'
+
+require 'activerecord'
+require 'active_record/fixtures'
+require 'active_support'
+require 'active_support/test_case'
+require 'action_controller'
+
+require 'indexer'
+
+ActiveRecord::Base.establish_connection(
+  :adapter  => "sqlite3",
+  :database => ":memory:"
+)
+
+class Rails
+  def self.root
+    "test/fixtures/"
+  end
+end
+
+load 'test/fixtures/schema.rb'
+
+# Load models
+Dir['test/fixtures/app/models/**/*.rb'].each { |f| require f }
+
+# load controllers
+Dir['test/fixtures/app/controllers/**/*.rb'].each { |f| require f }

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

@@ -1,5 +1,6 @@
+<%= link_to "Show", "", :id => "current_image_toggler" if (toggle_image_display ||= false) %>
 <%= f.hidden_field field %>
-<div>
+<div id='current_image_container'<%= " style='display: none'" if (toggle_image_display ||= false) %>>
   <a id='current_image_link' href="<%= insert_admin_images_url %>?thickbox=true&amp;modal=true&amp;titlebar=true&amp;field=<%= f.object.class.name.underscore.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 <%= (description ||= "image").titleize %>' name='Change <%= (description ||= "image").titleize %>' class='thickbox'>
     <% unless image.nil? %>
       <%= image_fu image, nil, {:class => "brown_border", :id => "current_picked_image"} %>
@@ -37,6 +38,13 @@
         this.hide();
         e.stop();
       });
+<% if toggle_image_display ||= false -%>
+      jQuery('#current_image_toggler').click(function(e){
+        jQuery(this).html((jQuery(this).html() == 'Show' ? 'Hide' : 'Show'));
+        jQuery("#current_image_container").toggle();
+        e.preventDefault();
+      });
+<% end -%>
     });
   </script>
 <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  version: 0.9.5.19
+  version: 0.9.5.20
 platform: ruby
 authors: 
 - Resolve Digital
@@ -11,8 +11,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-01 00:00:00 +13:00
-default_executable: refinery
+date: 2009-12-04 00:00:00 +13:00
+default_executable: 
 dependencies: []
 
 description: A beautiful open source Ruby on Rails content manager for small business. Easy to extend, easy to use, lightweight and all wrapped up in a super slick UI.
@@ -24,14 +24,17 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- README
 - CONTRIBUTORS
 - LICENSE
+- README
 files: 
+- .gems
+- .gitignore
 - CONTRIBUTORS
 - LICENSE
 - README
 - Rakefile
+- VERSION
 - app/controllers/admin/base_controller.rb
 - app/controllers/application.rb
 - app/controllers/application_controller.rb
@@ -174,8 +177,8 @@ files:
 - public/javascripts/effects.js
 - public/javascripts/fastinit.js
 - public/javascripts/jquery/GPL-LICENSE.txt
-- public/javascripts/jquery/jquery.js
 - public/javascripts/jquery/MIT-LICENSE.txt
+- public/javascripts/jquery/jquery.js
 - public/javascripts/lightbox.js
 - public/javascripts/livepipe.js
 - public/javascripts/prototype.js
@@ -246,35 +249,39 @@ files:
 - script/runner
 - script/server
 - vendor/plugins/acts_as_indexed/CHANGELOG
+- vendor/plugins/acts_as_indexed/MIT-LICENSE
+- vendor/plugins/acts_as_indexed/README.rdoc
+- vendor/plugins/acts_as_indexed/Rakefile
 - vendor/plugins/acts_as_indexed/init.rb
 - vendor/plugins/acts_as_indexed/lib/acts_as_indexed.rb
 - vendor/plugins/acts_as_indexed/lib/search_atom.rb
 - vendor/plugins/acts_as_indexed/lib/search_index.rb
 - vendor/plugins/acts_as_indexed/lib/will_paginate_search.rb
-- vendor/plugins/acts_as_indexed/MIT-LICENSE
-- vendor/plugins/acts_as_indexed/Rakefile
-- vendor/plugins/acts_as_indexed/README.rdoc
 - vendor/plugins/acts_as_indexed/test/abstract_unit.rb
 - vendor/plugins/acts_as_indexed/test/acts_as_indexed_test.rb
 - vendor/plugins/acts_as_indexed/test/database.yml
 - vendor/plugins/acts_as_indexed/test/fixtures/post.rb
 - vendor/plugins/acts_as_indexed/test/fixtures/posts.yml
 - vendor/plugins/acts_as_indexed/test/schema.rb
+- vendor/plugins/acts_as_tree/README
+- vendor/plugins/acts_as_tree/Rakefile
 - vendor/plugins/acts_as_tree/init.rb
 - vendor/plugins/acts_as_tree/lib/active_record/acts/tree.rb
-- vendor/plugins/acts_as_tree/Rakefile
-- vendor/plugins/acts_as_tree/README
 - vendor/plugins/acts_as_tree/test/abstract_unit.rb
 - vendor/plugins/acts_as_tree/test/acts_as_tree_test.rb
 - vendor/plugins/acts_as_tree/test/database.yml
 - vendor/plugins/acts_as_tree/test/fixtures/mixin.rb
 - vendor/plugins/acts_as_tree/test/fixtures/mixins.yml
 - vendor/plugins/acts_as_tree/test/schema.rb
-- vendor/plugins/attachment_fu/amazon_s3.yml.tpl
 - vendor/plugins/attachment_fu/CHANGELOG
+- vendor/plugins/attachment_fu/LICENSE
+- vendor/plugins/attachment_fu/README
+- vendor/plugins/attachment_fu/Rakefile
+- vendor/plugins/attachment_fu/amazon_s3.yml.tpl
 - vendor/plugins/attachment_fu/init.rb
 - vendor/plugins/attachment_fu/install.rb
 - vendor/plugins/attachment_fu/lib/geometry.rb
+- vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu.rb
 - vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/cloud_file_backend.rb
 - vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/db_file_backend.rb
 - vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/backends/file_system_backend.rb
@@ -284,11 +291,7 @@ files:
 - vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/image_science_processor.rb
 - vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/mini_magick_processor.rb
 - vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu/processors/rmagick_processor.rb
-- vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu.rb
-- vendor/plugins/attachment_fu/LICENSE
 - vendor/plugins/attachment_fu/rackspace_cloudfiles.yml.tpl
-- vendor/plugins/attachment_fu/Rakefile
-- vendor/plugins/attachment_fu/README
 - vendor/plugins/attachment_fu/test/backends/db_file_test.rb
 - vendor/plugins/attachment_fu/test/backends/file_system_test.rb
 - vendor/plugins/attachment_fu/test/backends/remote/cloudfiles_test.rb
@@ -317,6 +320,8 @@ files:
 - vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/scale.rb
 - vendor/plugins/attachment_fu/vendor/red_artisan/core_image/filters/watermark.rb
 - vendor/plugins/attachment_fu/vendor/red_artisan/core_image/processor.rb
+- vendor/plugins/authentication/README
+- vendor/plugins/authentication/Rakefile
 - vendor/plugins/authentication/app/controllers/admin/users_controller.rb
 - vendor/plugins/authentication/app/controllers/sessions_controller.rb
 - vendor/plugins/authentication/app/controllers/users_controller.rb
@@ -335,11 +340,9 @@ 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/rails/init.rb
 - vendor/plugins/authentication/lib/authenticated_system.rb
 - vendor/plugins/authentication/lib/authenticated_test_helper.rb
-- vendor/plugins/authentication/Rakefile
-- vendor/plugins/authentication/README
+- vendor/plugins/authentication/rails/init.rb
 - vendor/plugins/authentication/test/fixtures/users.yml
 - vendor/plugins/authentication/test/functional/admin/base_controller_test.rb
 - vendor/plugins/authentication/test/functional/admin/dashboard_controller_test.rb
@@ -367,8 +370,8 @@ 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/rails/init.rb
 - vendor/plugins/images/lib/tasks/images.rake
+- vendor/plugins/images/rails/init.rb
 - vendor/plugins/inquiries/app/controllers/admin/inquiries_controller.rb
 - vendor/plugins/inquiries/app/controllers/admin/inquiry_settings_controller.rb
 - vendor/plugins/inquiries/app/controllers/inquiries_controller.rb
@@ -422,6 +425,23 @@ files:
 - vendor/plugins/pages/app/views/pages/show.html.erb
 - vendor/plugins/pages/config/routes.rb
 - vendor/plugins/pages/rails/init.rb
+- vendor/plugins/rails_indexes/MIT-LICENSE
+- vendor/plugins/rails_indexes/README.textile
+- vendor/plugins/rails_indexes/Rakefile
+- vendor/plugins/rails_indexes/lib/indexer.rb
+- vendor/plugins/rails_indexes/tasks/indexer.rake
+- vendor/plugins/rails_indexes/test/fixtures/app/controllers/users_controller.rb
+- vendor/plugins/rails_indexes/test/fixtures/app/models/address.rb
+- vendor/plugins/rails_indexes/test/fixtures/app/models/company.rb
+- vendor/plugins/rails_indexes/test/fixtures/app/models/country.rb
+- vendor/plugins/rails_indexes/test/fixtures/app/models/freelancer.rb
+- vendor/plugins/rails_indexes/test/fixtures/app/models/gift.rb
+- vendor/plugins/rails_indexes/test/fixtures/app/models/god.rb
+- vendor/plugins/rails_indexes/test/fixtures/app/models/user.rb
+- vendor/plugins/rails_indexes/test/fixtures/app/sweepers/user_sweeper.rb
+- vendor/plugins/rails_indexes/test/fixtures/schema.rb
+- vendor/plugins/rails_indexes/test/rails_indexes_test.rb
+- vendor/plugins/rails_indexes/test/test_helper.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
@@ -448,18 +468,18 @@ 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/rails/init.rb
 - vendor/plugins/refinery/lib/crud.rb
-- vendor/plugins/refinery/lib/generators/refinery/install.rb
-- vendor/plugins/refinery/lib/generators/refinery/Rakefile
 - vendor/plugins/refinery/lib/generators/refinery/README
+- vendor/plugins/refinery/lib/generators/refinery/Rakefile
+- vendor/plugins/refinery/lib/generators/refinery/USAGE
+- vendor/plugins/refinery/lib/generators/refinery/install.rb
 - 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/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
+- vendor/plugins/refinery/lib/generators/refinery/templates/rails/init.rb
 - vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_form.html.erb
 - vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_singular_name.html.erb
 - vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_sortable_list.html.erb
@@ -468,8 +488,7 @@ files:
 - vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/new.html.erb
 - vendor/plugins/refinery/lib/generators/refinery/templates/views/index.html.erb
 - vendor/plugins/refinery/lib/generators/refinery/templates/views/show.html.erb
-- vendor/plugins/refinery/lib/generators/refinery/USAGE
-- vendor/plugins/refinery/lib/indexer.rb
+- vendor/plugins/refinery/lib/refinery.rb
 - vendor/plugins/refinery/lib/refinery/activity.rb
 - vendor/plugins/refinery/lib/refinery/admin_base_controller.rb
 - vendor/plugins/refinery/lib/refinery/application_controller.rb
@@ -480,9 +499,8 @@ 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/refinery.rb
-- vendor/plugins/refinery/lib/tasks/indexer.rake
 - vendor/plugins/refinery/lib/tasks/refinery.rake
+- vendor/plugins/refinery/rails/init.rb
 - vendor/plugins/refinery_dialogs/app/controllers/admin/dialogs_controller.rb
 - vendor/plugins/refinery_dialogs/app/views/admin/dialogs/show.html.erb
 - vendor/plugins/refinery_dialogs/app/views/layouts/admin_dialog.html.erb
@@ -513,8 +531,8 @@ homepage: http://refinerycms.com
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement