refinerycms 0.9.5.20 → 0.9.5.21

data/Rakefile

@@ -9,6 +9,11 @@ require 'rake/rdoctask'
 
 require 'tasks/rails'
 
+unless REFINERY_ROOT == RAILS_ROOT
+  # Load any custom rakefile extensions (for the gem only)
+  Dir[File.join(REFINERY_ROOT, %w(vendor plugins * ** tasks ** *.rake))].sort.each { |ext| load ext }
+end
+
 desc 'Removes trailing whitespace'
 task :whitespace do
   sh %{find . -name '*.*rb' -exec sed -i '' 's/\t/  /g' {} \\; -exec sed -i '' 's/ *$//g' {} \\; }
@@ -23,7 +28,7 @@ begin
     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)
+    s.extra_rdoc_files = %w(README CONTRIBUTORS LICENSE VERSION)
   end
 
   namespace :version do
@@ -37,6 +42,6 @@ begin
       end
     end
   end
-rescue   LoadError
+rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.9.5.20
+0.9.5.21

data/bin/refinery-update-core

@@ -4,7 +4,7 @@ REFINERY_ROOT = File.expand_path(File.dirname(__FILE__) << "/..")
 RAILS_ROOT = ARGV.first unless defined? RAILS_ROOT
 unless RAILS_ROOT.nil? or RAILS_ROOT.length == 0
   # ensure asset directories exist.
-  dirs = [%w(public stylesheets), %w(public javascripts), %w(db migrate), %w(lib tasks)]
+  dirs = [%w(public stylesheets), %w(public javascripts), %w(db migrate)]
   FileUtils::makedirs dirs.map {|dir| File.join(RAILS_ROOT, dir) }
 
   # copy in the new assets.
@@ -17,9 +17,6 @@ unless RAILS_ROOT.nil? or RAILS_ROOT.length == 0
   # copy in any new migrations.
   FileUtils::cp Dir[File.join(REFINERY_ROOT, %w(db migrate *.rb))], File.join(RAILS_ROOT, %w(db migrate))
 
-  # copy any rake tasks from plugins to the main lib directory so they can be run.
-  FileUtils::cp Dir[File.join(REFINERY_ROOT, %w(** tasks *.rake))], File.join(RAILS_ROOT, %w(lib tasks))
-
 	# read in the config files
 	app_config = File.open(File.join(RAILS_ROOT, %w(config environment.rb)), "r").read
 	environment_updated = false

data/vendor/plugins/authentication/app/models/user.rb

@@ -49,7 +49,7 @@ class User < ActiveRecord::Base
   validates_uniqueness_of   :login, :email, :case_sensitive => false
   before_save :encrypt_password
 
-  serialize :plugins_column#, Array
+  serialize :plugins_column#, Array # this is seriously deprecated and will be removed later.
 
   has_many :plugins, :class_name => "UserPlugin", :order => "position ASC"
 
@@ -78,11 +78,11 @@ class User < ActiveRecord::Base
   end
 
   def plugins=(plugin_titles)
-    self.plugins.delete_all
+    unless self.new_record? # don't add plugins when the user_id is NULL.
+      self.plugins.delete_all
 
-    plugin_titles.each do |plugin_title|
-      if plugin_title.is_a?(String)
-        self.plugins.find_or_create_by_title(plugin_title)
+      plugin_titles.each do |plugin_title|
+        self.plugins.find_or_create_by_title(plugin_title) if plugin_title.is_a?(String)
       end
     end
   end

data/vendor/plugins/pages/app/controllers/pages_controller.rb

@@ -2,26 +2,30 @@ class PagesController < ApplicationController
 
   def home
     @page = Page.find_by_link_url("/", :include => [:parts, :slugs])
-    error_404 if @page.nil?
-
-    respond_to do |wants|
-      wants.html
+    if @page.nil?
+      error_404
+    else
+      respond_to do |wants|
+        wants.html
+      end
     end
   end
 
   def show
     @page = Page.find(params[:id], :include => [:parts, :slugs])
 
-    error_404 unless @page.live? or (logged_in? and current_user.authorized_plugins.include?("Pages"))
-
-    # if the admin wants this to be a "placeholder" page which goes to its first child, go to that instead.
-    if @page.skip_to_first_child
-      first_live_child = @page.children.find_by_draft(false, :order => "position ASC")
-      redirect_to first_live_child.url unless first_live_child.nil?
-    else
-      respond_to do |wants|
-        wants.html
+    if @page.live? or (logged_in? and current_user.authorized_plugins.include?("Pages"))
+      # if the admin wants this to be a "placeholder" page which goes to its first child, go to that instead.
+      if @page.skip_to_first_child
+        first_live_child = @page.children.find_by_draft(false, :order => "position ASC")
+        redirect_to first_live_child.url unless first_live_child.nil?
+      else
+        respond_to do |wants|
+          wants.html
+        end
       end
+    else
+      error_404
     end
   end
 

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

@@ -1,14 +1,14 @@
 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 
+    Dir.chdir(Rails.root) do
       model_names = Dir["**/app/models/**/*.rb"].collect {|filename| File.basename(filename) }.uniq
     end
 
@@ -24,14 +24,14 @@ module Indexer
         # No-op
       end
     end
-    
+
     @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
         # 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)
@@ -42,11 +42,11 @@ module Indexer
         case reflection_options.macro
         when :belongs_to
           # polymorphic?
-          @table_name = class_name.table_name.to_s 
+          @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"
-    
+
             @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
 
@@ -57,9 +57,9 @@ module Indexer
           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)
 
@@ -70,7 +70,7 @@ module Indexer
     end
 
     @missing_indexes = {}
-    
+
     @index_migrations.each do |table_name, foreign_keys|
 
       unless foreign_keys.blank?
@@ -79,32 +79,32 @@ module Indexer
         @missing_indexes[table_name] = keys_to_add unless keys_to_add.empty?
       end
     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
 
     @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|
-        
+
         # 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
@@ -112,18 +112,18 @@ module Indexer
           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]
-      
+
           if model_name == "self"
             model_name = File.basename(file_name).sub(/\.rb$/,'').camelize
-            table_name = model_name.constantize.table_name            
+            table_name = model_name.constantize.table_name
           else
             if model_name.respond_to?(:constantize)
-              if model_name.constantize.respond_to?(:table_name)             
+              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"
@@ -134,10 +134,10 @@ module Indexer
               next
             end
           end
-      
+
           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_')
 
@@ -158,11 +158,11 @@ module Indexer
         end
       end
     end
-    
+
     @missing_indexes = {}
     @indexes_required.each do |table_name, foreign_keys|
 
-      unless foreign_keys.blank?          
+      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}
@@ -176,15 +176,15 @@ module Indexer
         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)
@@ -204,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.
@@ -222,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
@@ -234,18 +234,20 @@ EOM
 
       puts "## Drop this into a file in db/migrate ##"
       puts migration
+    else
+      puts "Didn't find any models requiring indexing in your app/models directory."
     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(migration_mode=true)
     find_indexes = self.scan_finds
-    
+
     if migration_mode
       unless find_indexes.keys.empty?
         add = []
@@ -262,14 +264,14 @@ EOM
               add << "add_index :#{table_name}, :#{key}"
               remove << "remove_index :#{table_name}, :#{key}"
             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.
@@ -279,7 +281,7 @@ class AddFindsMissingIndexes < ActiveRecord::Migration
     # http://www.railsmentors.org
     # http://www.railstutor.org
     # http://guides.rubyonrails.org
-  
+
     #{add.uniq.join("\n    ")}
   end
 
@@ -288,9 +290,11 @@ class AddFindsMissingIndexes < ActiveRecord::Migration
   end
 end
 EOM
- 
+
         puts "## Drop this into a file in db/migrate ##"
         puts migration
+      else
+        puts "Didn't find any models requiring indexing in your app/models directory."
       end
     end
   else

data/vendor/plugins/rails_indexes/tasks/indexer.rake

@@ -1,18 +1,16 @@
-require File.join(File.dirname(__FILE__), "../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
+end

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

@@ -2,7 +2,7 @@ require 'rubygems'
 
 require 'test/unit'
 
-require 'activerecord'
+require 'active_record'
 require 'active_record/fixtures'
 require 'active_support'
 require 'active_support/test_case'

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

@@ -1,6 +1,6 @@
 begin
   # Try to include the rails initializer. If this isn't in a gem, this will fail.
-  require 'initializer'
+  require 'initializer' unless REFINERY_ROOT == RAILS_ROOT # A Refinery gem install's RAILS_ROOT is not the REFINERY_ROOT.
 rescue LoadError => load_error
 end
 
@@ -12,11 +12,25 @@ module Refinery
       end
     end
   end
+  if defined? Rails::Plugin::Loader
+    class GemedPluginLoader < Rails::Plugin::Loader
+      def add_plugin_load_paths
+        super
+        # add plugin lib paths to the $LOAD_PATH so that rake tasks etc. can be run when using a gem.
+        plugins.each do |plugin|
+          plugin.load_paths.reject { |path| path.scan(/refinerycms.+?vendor\/plugins\/.+?\/lib/).empty? }.each do |path|
+            $LOAD_PATH.unshift path
+          end
+        end
+      end
+    end
+  end
   if defined? Rails::Initializer
     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.
+        configuration.plugin_loader = Refinery::GemedPluginLoader unless REFINERY_ROOT == RAILS_ROOT # only do this in a gem.
         super
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  version: 0.9.5.20
+  version: 0.9.5.21
 platform: ruby
 authors: 
 - Resolve Digital
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-04 00:00:00 +13:00
+date: 2009-12-07 00:00:00 +13:00
 default_executable: 
 dependencies: []
 
@@ -27,6 +27,7 @@ extra_rdoc_files:
 - CONTRIBUTORS
 - LICENSE
 - README
+- VERSION
 files: 
 - .gems
 - .gitignore