refinerycms 0.9.6.9 → 0.9.6.10

data/Rakefile

@@ -17,7 +17,7 @@ require 'tasks/rails'
 
 extra_rake_tasks = []
 # When running Refinery from a gem we lose the rake tasks, so add them back in:
-extra_rake_tasks << Dir[File.join(REFINERY_ROOT, %w(vendor plugins * ** tasks ** *.rake))].sort unless REFINERY_ROOT.to_s == Rails.root.to_s
+extra_rake_tasks << Dir[Refinery.root.join("vendor", "plugins", "*", "**", "tasks", "**", "*", "*.rake")].sort unless Refinery.root == Rails.root
 # We also need to load in the rake tasks from gem plugins whether Refinery is a gem or not:
 extra_rake_tasks << $refinery_gem_plugin_lib_paths.collect {|path| Dir[File.join(%W(#{path} tasks ** *.rake))].sort} if defined?($refinery_gem_plugin_lib_paths) && !$refinery_gem_plugin_lib_paths.nil?
 extra_rake_tasks.flatten.compact.uniq.each {|rake| load rake }

data/VERSION

@@ -1 +1 @@
-0.9.6.9
+0.9.6.10

data/bin/refinery

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
+require 'pathname'
 require 'fileutils'
-REFINERY_ROOT = File.expand_path(File.dirname(__FILE__) << "/..")
+
+REFINERY_ROOT = Pathname.new(File.expand_path(File.dirname(__FILE__) << "/..")) unless defined?(REFINERY_ROOT) && REFINERY_ROOT.is_a?(Pathname)
 unless (app_path = ARGV.shift).nil? or app_path.length == 0
   # if "" or "." or "./" is specified then get the current directory otherwise accept the specified app_path.
   RAILS_ROOT = (app_path.length <= 2 and ((is_current_dir = app_path =~ /(\.(\/)?)/).nil? or is_current_dir < 2)) ? Dir.getwd : app_path
@@ -19,7 +21,7 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
 
     # copy in all of the relevant directories and root files.
     to_copy = %w(app config db lib public script contributors.md license.md Rakefile readme.md VERSION).map do |dir|
-      File.join REFINERY_ROOT, dir
+      REFINERY_ROOT.join(dir).to_s
     end
     FileUtils::cp_r to_copy, RAILS_ROOT, :verbose => false
     FileUtils::mkdir File.join(%W(#{RAILS_ROOT} themes))

data/bin/refinery-override

@@ -1,15 +1,17 @@
 #!/usr/bin/env ruby
+require 'pathname'
 require 'fileutils'
-REFINERY_ROOT = File.expand_path(File.dirname(__FILE__) << "/..")
+
+REFINERY_ROOT = Pathname.new(File.expand_path(File.dirname(__FILE__) << "/..")) unless defined?(REFINERY_ROOT) && REFINERY_ROOT.is_a?(Pathname)
 unless (override_path = ARGV.shift).nil? or (override_path.length == 0)
   # if "" or "." or "./" is specified then get the current directory otherwise accept the specified app_path.
   if ((app_path = ARGV.shift).nil? or app_path.length <= 2) and ((is_current_dir = app_path =~ /(\.(\/)?)/).nil? or !is_current_dir or is_current_dir < 2)
-    RAILS_ROOT = Dir.getwd
+    RAILS_ROOT = Pathname.new(Dir.getwd)
   else
-    RAILS_ROOT = app_path
+    RAILS_ROOT = Pathname.new(app_path)
   end
 
-  if File.exists? RAILS_ROOT
+  if RAILS_ROOT.exists?
     # figure out what to override
     override_parts = override_path.downcase.split('/').compact.collect {|part| part if part.length > 0 }.compact
     admin = ""
@@ -29,11 +31,11 @@ unless (override_path = ARGV.shift).nil? or (override_path.length == 0)
 
     # copy the controller
     unless controller_with_admin =~ /\*(\*)?/ and !action.nil?
-      refinery_controllers = Dir[File.join(REFINERY_ROOT, %w(vendor plugins ** app controllers), "#{controller_with_admin}_controller.rb")]
+      refinery_controllers = Dir[REFINERY_ROOT.join("vendor", "plugins", "**", "app", "controllers", "#{controller_with_admin}_controller.rb")]
       if refinery_controllers.compact.any? # the controllers may not exist.
         refinery_controllers.each do |refinery_controller|
           # make the directories
-          FileUtils.mkdir_p(copy_to = File.join(RAILS_ROOT, %w(app controllers), admin))
+          FileUtils.mkdir_p(copy_to = RAILS_ROOT.join("app" "controllers", admin))
           FileUtils.cp(refinery_controller, copy_to)
         end
       else
@@ -44,7 +46,7 @@ unless (override_path = ARGV.shift).nil? or (override_path.length == 0)
     # copy the action, if it exists
     unless action.nil? or action.length == 0
       # get all the matching files
-      looking_for = File.join(REFINERY_ROOT, %w(vendor plugins ** app views), controller_with_admin.split('/'), "#{action}*.erb")
+      looking_for = REFINERY_ROOT.join("vendor", "plugins", "**", "app", "views", controller_with_admin.split('/'), "#{action}*.erb")
       action_files = Dir[looking_for]
 
       # copy in the action template
@@ -53,8 +55,8 @@ unless (override_path = ARGV.shift).nil? or (override_path.length == 0)
         action_file_dir = action_file_path.split('/')
         action_file_dir.pop # get rid of the file.
 
-        FileUtils.mkdir_p(File.join(RAILS_ROOT, %w(app views), action_file_dir))
-        FileUtils.cp action_file, File.join(RAILS_ROOT, %w(app views), action_file_path)
+        FileUtils.mkdir_p(RAILS_ROOT.join("app", "views", action_file_dir))
+        FileUtils.cp action_file, RAILS_ROOT.join("app", "views", action_file_path)
       end
     else
       puts "Note: No action was specified."

data/bin/refinery-update-core

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
+require 'pathname'
 require 'fileutils'
-REFINERY_ROOT = File.expand_path(File.dirname(__FILE__) << "/..")
+REFINERY_ROOT = Pathname.new(File.expand_path(File.dirname(__FILE__) << "/..")) unless defined?(REFINERY_ROOT) && REFINERY_ROOT.is_a?(Pathname)
 RAILS_ROOT = ARGV.first unless defined? RAILS_ROOT
 unless RAILS_ROOT.nil? or RAILS_ROOT.length == 0
   # ensure asset directories exist.

data/config/application.rb

@@ -39,7 +39,8 @@ else
     # Only load the plugins named here, in the order given. By default, all plugins
     # in vendor/plugins are loaded in alphabetical order.
     # :all can be used as a placeholder for all plugins not explicitly named
-    # config.plugins = [ :authentication, :acts_as_tree, :attachment_fu, :all ]
+    # Loading gem plugins that other plugins may rely on first.
+    config.plugins = [ :friendly_id, :will_paginate, :aasm, :all ]
 
     # Add additional load paths for your own custom dirs
     # config.load_paths += %W( #{RAILS_ROOT}/extras )

data/config/environments/production.rb

@@ -18,8 +18,7 @@ config.action_controller.perform_caching             = true
 # Disable delivery errors, bad email addresses will be ignored
 # config.action_mailer.raise_delivery_errors = false
 
-# We don't really need all the other stuff:
-config.log_level = :warn
+config.log_level = :info
 
 # Set to true in order to use Amazon's Simple Storage Service on your production machine
 # instead of the default file system for resources and images

data/config/preinitializer.rb

@@ -1,9 +1,12 @@
+require 'pathname'
+
 # until Rails 3
 ENV["GEM_HOME"] = File.expand_path('../../vendor/bundler_gems', __FILE__)
 
 # pick the refinery root path
-if File.exist?(non_gem_path=File.join(%W(#{RAILS_ROOT} lib refinery_initializer.rb)))
-  require non_gem_path
+rails_root = defined?(Rails.root) ? Rails.root : Pathname.new(RAILS_ROOT)
+if (non_gem_path = rails_root.join("lib", "refinery_initializer.rb")).exist?
+  require non_gem_path.to_s
 else
   require 'rubygems'
   version = if defined? REFINERY_GEM_VERSION
@@ -11,7 +14,7 @@ else
   elsif ENV.include?("REFINERY_GEM_VERSION")
     ENV["REFINERY_GEM_VERSION"]
   else
-    $1 if File.read(File.join(%W(#{RAILS_ROOT} config environment.rb))) =~ /^[^#]*REFINERY_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
+    $1 if rails_root.join("config", "application.rb") =~ /^[^#]*REFINERY_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
   end
 
   if version
@@ -23,9 +26,8 @@ else
   require 'refinery_initializer'
 end
 
-
-REFINERY_ROOT = RAILS_ROOT unless defined? REFINERY_ROOT
+Refinery.root = rails_root unless defined?(Refinery.root) && Refinery.root.is_a?(Pathname)
 
 # Set to true in your environment specific file (e.g. production.rb) to use Amazon's Simple
 # Storage Service instead of the default file system for resources and images
-USE_S3_BACKEND = false unless defined?(USE_S3_BACKEND)
+USE_S3_BACKEND = false unless defined?(USE_S3_BACKEND)

data/db/seeds.rb

@@ -119,7 +119,7 @@ Page.create(:title => "Down for maintenance",
 
 # Install default themes.
 Rails.root.join("themes").mkdir unless Rails.root.join("themes").directory?
-Dir[File.join(%W(#{REFINERY_ROOT} themes *.zip))].each do |theme|
+Dir[Refinery.root.join("themes", "*.zip")].each do |theme|
   Theme.create(:uploaded_data => {
     "size" => File.size(theme),
     "content_type" => "application/zip",

data/lib/refinery_initializer.rb

@@ -1,10 +1,17 @@
-REFINERY_ROOT = File.expand_path(File.dirname(__FILE__) << "/..")
+require 'pathname'
+begin
+  require 'vendor/plugins/refinery/lib/refinery'
+rescue LoadError => load_error
+  # We won't be able to load this if we're in the gem as there is no such thing.
+end
 
-unless REFINERY_ROOT == RAILS_ROOT # e.g. only if we're in a gem.
-  $LOAD_PATH.unshift "#{REFINERY_ROOT}/vendor/plugins"
-  $LOAD_PATH.unshift "#{REFINERY_ROOT}/vendor/plugins/refinery/lib"
+refinery_root = Pathname.new((defined?(Refinery.root) ? Refinery.root.to_s : File.expand_path(File.dirname(__FILE__) << "/.."))) 
+unless refinery_root == (defined?(Rails.root) ? Rails.root : Pathname.new(RAILS_ROOT)) # e.g. only if we're in a gem.
+  $LOAD_PATH.unshift refinery_root.join("vendor", "plugins").to_s
+  $LOAD_PATH.unshift refinery_root.join("vendor", "plugins", "refinery", "lib").to_s
 
   require 'refinery'
+  Refinery.root = refinery_root
   require 'refinery/initializer'
 end
 

data/test/unit/page_test.rb

@@ -51,7 +51,7 @@ class PageTest < ActiveSupport::TestCase
   end
 
   def test_should_have_regular_url
-    assert pages(:services).url[:controller] == "pages"
+    assert pages(:services).url[:controller] == "/pages"
     # not sure how I get it to render the friendly_id url /pages/services
     # test seems to reduce the id instead e.g. /pages/234423
   end

data/todo.md

@@ -1,9 +1,21 @@
-= Todo
+# Todo
 
 What are some of the known things that need to be done?
 
-== Tests
+## Tests
 
 * Add unit test coverage for user, user plugin and user mailer
 * Add unit test coverage for inquiry mailer and inquiry setting
-* Add functional tests for the whole of Refinery.
+* Add functional tests for the whole of Refinery.
+
+# Rails 3.0 Support
+
+We've started an effort to move to Rails 3.0 - that just needs to be completed.
+
+# Improve the Generator
+
+We need to have support for build in Refinery field types like "image". So I could run
+
+  ./script/generate refinery staff name:string bio:text mugshot:image
+  
+And it will automatically create a form field that pops open the image picker on the staff form.

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

@@ -10,4 +10,4 @@ Refinery::Plugin.register do |plugin|
 end
 
 # Set the actionmailer root so that it'll work for delivering emails from this plugin.
-ActionMailer::Base.template_root = "#{REFINERY_ROOT}/vendor/plugins/inquiries/app/views"
+ActionMailer::Base.template_root = Refinery.root.join("vendor", "plugins", "inquiries", "app", "views").to_s

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

@@ -1,9 +1,10 @@
 <%
   show_empty_sections ||= false
+  remove_automatic_sections ||= false
 
-  body_content_title = ((title = yield :body_content_title).present? or (title.blank? and show_empty_sections)) ? title : page_title
-  body_content_left = ((body_content_left = yield :body_content_left).present? or (body_content_left.blank? and show_empty_sections)) ? body_content_left : @page[:body]
-  body_content_right = ((body_content_right = yield :body_content_right).present? or (body_content_right.blank? and show_empty_sections)) ? body_content_right : @page[:side_body]
+  body_content_title = page_title if (body_content_title = yield :body_content_title).blank? and !show_empty_sections and !remove_automatic_sections
+  body_content_left = @page[:body] if (body_content_left = yield :body_content_left).blank? and !show_empty_sections and !remove_automatic_sections
+  body_content_right = @page[:side_body] if (body_content_right = yield :body_content_right).blank? and !show_empty_sections and !remove_automatic_sections
 
   extra_body_content_classes = []
   extra_body_content_classes << "no_title" if body_content_title.blank?
@@ -12,17 +13,17 @@
 -%>
 <%= render :partial => "/shared/submenu" if !admin? and (show_submenu ||= true) and RefinerySetting.find_or_set(:show_submenu_on_content_pages, true) %>
 <div id='body_content' class='clearfix<%= " #{extra_body_content_classes.join(" ")}" if extra_body_content_classes.any? %>'>
-<% if body_content_title.present? or show_empty_sections -%>
+<% if body_content_title.present? or (show_empty_sections and !remove_automatic_sections) -%>
   <h1 id='body_content_page_title'>
     <%= body_content_title %>
   </h1>
 <% end -%>
-<% if body_content_left.present? or show_empty_sections -%>
+<% if body_content_left.present? or (show_empty_sections and !remove_automatic_sections) -%>
   <div id='body_content_left' class='clearfix'>
     <%= body_content_left %>
   </div>
 <% end -%>
-<% if body_content_right.present? or show_empty_sections  -%>
+<% if body_content_right.present? or (show_empty_sections and !remove_automatic_sections)  -%>
   <div id='body_content_right' class='clearfix'>
     <%= body_content_right %>
   </div>

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

@@ -1,7 +1,8 @@
 <% cache(:action_suffix => "site_menu") do %>
   <ul id='<%= dom_id ||= "menu" %>' class='menu clearfix'>
     <%= render :partial => "/shared/menu_branch", :collection => @menu_pages, :locals => {
-      :hide_children => RefinerySetting.find_or_set(:menu_hide_children, false)
+      :hide_children => RefinerySetting.find_or_set(:menu_hide_children, false),
+      :sibling_count => @menu_pages.size-1
     } -%>
   </ul>
 <% end %>

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

@@ -2,7 +2,7 @@
   css = []
   css << "selected" if selected_page?(menu_branch) or descendant_page_selected?(menu_branch)
   css << "first" if menu_branch_counter == 0
-  css << "last" if menu_branch_counter == menu_branch.shown_siblings.size
+  css << "last" if menu_branch_counter == (sibling_count ||= menu_branch.shown_siblings.size)
   domid = "item_#{menu_branch_counter}" unless menu_branch.parent_id.present? or menu_branch.title.blank?
 -%>
 <% if menu_branch.in_menu? %>
@@ -11,12 +11,12 @@
     <%
       unless hide_children or
         menu_branch.parent_id.present? or
-        (children = menu_branch.children.collect{|c| c if c.in_menu? }.compact).empty?
+        (children = Page.find(:all, :conditions => "parent_id = #{menu_branch.id}").collect{|c| c if c.in_menu? }.compact).empty?
     -%>
       <ul class='clearfix'>
         <%= render :partial => "/shared/menu_branch",
                     :collection => children,
-                    :locals => {:hide_children => hide_children} -%>
+                    :locals => {:hide_children => hide_children, :sibling_count => children.size-1} -%>
       </ul>
     <% end -%>
   </li>

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

@@ -1,21 +1,7 @@
 module Refinery
 
-  def self.add_gems
-    ActiveRecord::Base.module_eval do
-      begin
-        require 'friendly_id'
-        require 'will_paginate'
-        require 'aasm'
-      rescue LoadError => load_error
-        # this will stop us running rake gems:install which we don't really want so just trap this error.
-      end
-
-      # Stub has_friendly_id. This will get overriden when/if included.
-      # The config will still complain that the gem is missing but this allows it to do so.
-      def self.has_friendly_id(column, options = {}, &block)
-        super if defined? super and table_exists?
-      end
-    end
+  class << self
+    attr_accessor :root
   end
 
-end
+end

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' unless REFINERY_ROOT == RAILS_ROOT # A Refinery gem install's Rails.root is not the REFINERY_ROOT.
+  require 'initializer' unless Refinery.root.to_s == RAILS_ROOT # A Refinery gem install's Rails.root is not the Refinery.root.
 rescue LoadError => load_error
 end
 
@@ -9,7 +9,7 @@ module Refinery
   if defined? Rails::Configuration
     class Configuration < Rails::Configuration
       def default_plugin_paths
-        paths = super.push(File.join(%W(#{REFINERY_ROOT} vendor plugins))).uniq
+        paths = super.push(Refinery.root.join("vendor", "plugins")).uniq
       end
     end
   end
@@ -19,9 +19,9 @@ module Refinery
       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 for refinery or gems for plugins.
-        search_for = Regexp.new(File.join(%W(\( #{REFINERY_ROOT} vendor plugins \)? .+? lib)))
+        search_for = Regexp.new(File.join(%W(\( #{Refinery.root.join("vendor", "plugins")} \)? .+? lib)))
         paths = plugins.collect{ |plugin| plugin.load_paths }.flatten.reject{|path| path.scan(search_for).empty? or path.include?('/rails-') }
-        paths = paths.reject{ |path| path.include?(REFINERY_ROOT) } if REFINERY_ROOT == Rails.root.to_s # superfluous when not in gem.
+        paths = paths.reject{ |path| path.include?(Refinery.root.to_s) } if Refinery.root == Rails.root # superfluous when not in gem.
         ($refinery_gem_plugin_lib_paths = paths).each do |path|
           $LOAD_PATH.unshift path
         end
@@ -33,16 +33,11 @@ module Refinery
   if defined? Rails::Initializer
     class Initializer < Rails::Initializer
       def self.run(command = :process, configuration = Configuration.new)
-        Rails.configuration = configuration
         configuration.plugin_loader = Refinery::PluginLoader
-        super
-      end
-
-      def load_plugins
-        Refinery.add_gems
+        Rails.configuration = configuration
         super
       end
     end
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  version: 0.9.6.9
+  version: 0.9.6.10
 platform: ruby
 authors: 
 - Resolve Digital