RubyGems - refinerycms - Versions diffs - 0.9.6.19 → 0.9.6.21 - Mend

refinerycms 0.9.6.19 → 0.9.6.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (385) hide show

data/vendor/plugins/hpricot/test/test_paths.rb ADDED Viewed

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+require 'hpricot'
+require 'load_files'
+class TestParser < Test::Unit::TestCase
+  def test_roundtrip
+    @basic = Hpricot.parse(TestFiles::BASIC)
+    %w[link link[2] body #link1 a p.ohmy].each do |css_sel|
+      ele = @basic.at(css_sel)
+      assert_equal ele, @basic.at(ele.css_path)
+      assert_equal ele, @basic.at(ele.xpath)
+    end
+  end
+  def test_attr_brackets
+    doc = Hpricot('<input name="vendor[porkpies]"/>')
+    assert_equal 1, (doc/'input[@name^="vendor[porkpies]"]').length
+    assert_equal 1, (doc/'input[@name="vendor[porkpies]"]').length
+    assert_equal 0, (doc/'input[@name$="]]]]]"]').length
+    doc = Hpricot('<input name="vendor[porkpies][meaty]"/>')
+    assert_equal 1, (doc/'input[@name^="vendor[porkpies][meaty]"]').length
+  end
+end

data/vendor/plugins/hpricot/test/test_preserved.rb ADDED Viewed

@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+#!/usr/bin/env ruby
+require 'test/unit'
+require 'hpricot'
+require 'load_files'
+unless "".respond_to?(:lines)
+  require 'enumerator'
+  class String
+    def lines
+      Enumerable::Enumerator.new(self, :each_line)
+    end
+  end
+end
+class TestPreserved < Test::Unit::TestCase
+  def assert_roundtrip str
+    doc = Hpricot(str)
+    yield doc if block_given?
+    str2 = doc.to_original_html
+    if RUBY_VERSION =~ /^1.9/
+      str2.force_encoding('UTF-8')
+    end
+    str.lines.zip(str2.lines).each do |s1, s2|
+      assert_equal s1, s2
+    end
+  end
+  def assert_html str1, str2
+    doc = Hpricot(str2)
+    yield doc if block_given?
+    assert_equal str1, doc.to_original_html
+  end
+  def test_simple
+    str = "<p>Hpricot is a <b>you know <i>uh</b> fine thing.</p>"
+    assert_html str, str
+    assert_html "<p class=\"new\">Hpricot is a <b>you know <i>uh</b> fine thing.</p>", str do |doc|
+      (doc/:p).set('class', 'new')
+    end
+  end
+  def test_parent
+    str = "<html><base href='/'><head><title>Test</title></head><body><div id='wrap'><p>Paragraph one.</p><p>Paragraph two.</p></div></body></html>"
+    assert_html str, str
+    assert_html "<html><base href='/'><body><div id=\"all\"><div><p>Paragraph one.</p></div><div><p>Paragraph two.</p></div></div></body></html>", str do |doc|
+      (doc/:head).remove
+      (doc/:div).set('id', 'all')
+      (doc/:p).wrap('<div></div>')
+    end
+  end
+  def test_escaping_of_contents
+    doc = Hpricot(TestFiles::BOINGBOING)
+    assert_equal "Fukuda’s Automatic Door opens around your body as you pass through it. The idea is to save energy and keep the room clean.", doc.at("img[@alt='200606131240']").next.to_s.strip
+  end
+  def test_files
+    assert_roundtrip TestFiles::BASIC
+    assert_roundtrip TestFiles::BOINGBOING
+    assert_roundtrip TestFiles::CY0
+  end
+  def test_fixup_link
+    doc = %{<?xml version="1.0" encoding="UTF-8"?><rss><channel><link>ht</link></channel></rss>}
+    assert_roundtrip doc
+    assert_equal Hpricot(doc).to_s,
+      %{<?xml version="1.0" encoding="UTF-8"?><rss><channel><link />ht</channel></rss>}
+    assert_equal Hpricot.XML(doc).to_s,
+      %{<?xml version="1.0" encoding="UTF-8"?><rss><channel><link>ht</link></channel></rss>}
+  end
+  def test_escaping_of_attrs
+    # ampersands in URLs
+    str = %{<a href="http://google.com/search?q=hpricot&amp;l=en">Google</a>}
+    link = (doc = Hpricot(str)).at(:a)
+    assert_equal "http://google.com/search?q=hpricot&l=en", link['href']
+    assert_equal "http://google.com/search?q=hpricot&l=en", link.attributes['href']
+    assert_equal "http://google.com/search?q=hpricot&l=en", link.get_attribute('href')
+    assert_equal "http://google.com/search?q=hpricot&amp;l=en", link.raw_attributes['href']
+    assert_equal str, doc.to_html
+    # alter the url
+    link['href'] = "javascript:alert(\"AGGA-KA-BOO!\")"
+    assert_equal %{<a href="javascript:alert(&quot;AGGA-KA-BOO!&quot;)">Google</a>}, doc.to_html
+  end
+end

data/vendor/plugins/hpricot/test/test_xml.rb ADDED Viewed

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+require 'hpricot'
+require 'load_files'
+class TestParser < Test::Unit::TestCase
+  # normally, the link tags are empty HTML tags.
+  # contributed by laudney.
+  def test_normally_empty
+    doc = Hpricot::XML("<rss><channel><title>this is title</title><link>http://fake.com</link></channel></rss>")
+    assert_equal "this is title", (doc/:rss/:channel/:title).text
+    assert_equal "http://fake.com", (doc/:rss/:channel/:link).text
+  end
+  # make sure XML doesn't get downcased
+  def test_casing
+    doc = Hpricot::XML(TestFiles::WHY)
+    assert_equal "hourly", (doc.at "sy:updatePeriod").inner_html
+    assert_equal 1, (doc/"guid[@isPermaLink]").length
+  end
+  # be sure tags named "text" are ok
+  def test_text_tags
+    doc = Hpricot::XML("<feed><title>City Poisoned</title><text>Rita Lee has poisoned Brazil.</text></feed>")
+    assert_equal "City Poisoned", (doc/"title").text
+  end
+end

data/vendor/plugins/inquiries/app/controllers/admin/inquiries_controller.rb CHANGED Viewed

@@ -8,12 +8,7 @@ class Admin::InquiriesController < Admin::BaseController
   def toggle_status
     @inquiry.toggle!(:open)
-    flash[:notice] = "'#{@inquiry.name}' has been " +
-    if @inquiry.open?
-      "reopened"
-    else
-      "closed"
-    end
+    flash[:notice] = "'#{@inquiry.name}' has been #{@inquiry.open? ? "reopened" : "closed"}"
     redirect_to :action => 'index'
   end

data/vendor/plugins/inquiries/app/helpers/inquiries_helper.rb CHANGED Viewed

@@ -1,13 +1,2 @@
 module InquiriesHelper
-  def open_close_link(inquiry)
-    if inquiry.open?
-      link_to("Open", {:action => 'toggle_status', :id => inquiry.id},
-                      {:title => "Click to close this inquiry"})
-    else
-      link_to("Closed", {:action => 'toggle_status', :id => inquiry.id},
-                        {:title => "Click to open this inquiry back up"})
-    end
-  end
 end

data/vendor/plugins/inquiries/app/views/admin/inquiries/_inquiry.html.erb CHANGED Viewed

@@ -1,12 +1,16 @@
 <li class='clearfix record <%= cycle("on", "on-hover") %>'>
   <span class='title'>
     <span class='actions'>
-      <%= link_to refinery_icon_tag("#{inquiry.open? ? 'accept' : 'arrow_up'}.png"), {:action => "toggle_status", :id => inquiry.id},
-                                                    {:title => "Move this inquiry to #{inquiry.open? ? 'closed' : 'open'}"} %>
-      <%= link_to refinery_icon_tag('email_open.png'), {:action => 'show', :id => inquiry.id},
-                                                    {:title => "Read this inquiry"} -%>
-      <%= link_to refinery_icon_tag('delete.png'), admin_inquiry_url(inquiry), :class => "cancel confirm-delete",
-                                                    :title => "Remove this inquiry forever" -%>
+      <%= link_to refinery_icon_tag("#{inquiry.open? ? 'accept' : 'arrow_up'}.png"),
+                  toggle_status_admin_inquiry_url(inquiry),
+                  :title => "Move this inquiry to #{inquiry.open? ? 'closed' : 'open'}" %>
+      <%= link_to refinery_icon_tag('email_open.png'),
+                  admin_inquiry_url(inquiry),
+                  :title => "Read this inquiry" -%>
+      <%= link_to refinery_icon_tag('delete.png'),
+                  admin_inquiry_url(inquiry),
+                  :class => "cancel confirm-delete",
+                  :title => "Remove this inquiry forever" -%>
     </span>
     <%=h inquiry.name %>
     <span class="preview">

data/vendor/plugins/inquiries/app/views/inquiry_mailer/confirmation.html.erb CHANGED Viewed

	@@ -1 +1 @@
1	- <%= InquirySetting.confirmation_body.value.gsub("%name%", @inquiry.name) %>
1	+ <%= InquirySetting.confirmation_body.value.gsub("%name%", h(@inquiry.name)) %>

data/vendor/plugins/inquiries/config/routes.rb CHANGED Viewed

@@ -2,7 +2,7 @@ ActionController::Routing::Routes.draw do |map|
   map.resources :inquiries, :collection => {:thank_you => :get}
   map.namespace(:admin) do |admin|
-    admin.resources :inquiries
+    admin.resources :inquiries, :member => {:toggle_status => :get}
     admin.resources :inquiry_settings
   end
 end

data/vendor/plugins/pages/app/controllers/admin/pages_controller.rb CHANGED Viewed

@@ -2,7 +2,7 @@ class Admin::PagesController < Admin::BaseController
   crudify :page, :conditions => "parent_id IS NULL", :order => "position ASC", :include => [:parts, :slugs, :children], :paging => false
   before_filter :find_pages_for_parents_list, :only => [:new, :create, :edit, :update]
-  after_filter :expire_menu_fragment_caching, :only => [:create, :update, :destroy]
+  after_filter :expire_menu_fragment_caching, :only => [:create, :update, :destroy, :update_positions]
   def new
     @page = Page.new
@@ -18,8 +18,12 @@ protected
   # This finds all of the pages that could possibly be assigned as the current page's parent.
   def find_pages_for_parents_list
-    @pages_for_parents_list = Page.find(:all, :order => "parent_id, position ASC")
+    @pages_for_parents_list = []
+    Page.find_all_by_parent_id(nil, :order => "position ASC").each do |page|
+      @pages_for_parents_list << page
+      @pages_for_parents_list += add_pages_branch_to_parents_list(page)
+    end
+    @pages_for_parents_list.flatten.compact!
     # We need to remove all references to the current page or any of its decendants or we get a nightmare.
     unless @page.nil? or @page.new_record?
       @pages_for_parents_list.reject! do |page|
@@ -27,5 +31,14 @@ protected
       end
     end
   end
+  def add_pages_branch_to_parents_list(page)
+    list = []
+    page.children.each do |child|
+      list << child
+      list += add_pages_branch_to_parents_list if child.children.any?
+    end
+    list
+  end
 end

data/vendor/plugins/pages/app/models/page_part.rb CHANGED Viewed

@@ -9,4 +9,13 @@ class PagePart < ActiveRecord::Base
     "page_part_#{self.title.downcase.gsub(" ", "_")}"
   end
+  before_save :normalise_text_fields
+protected
+  def normalise_text_fields
+    unless self.body.blank? or self.body =~ /^\</
+      self.body = "<p>#{self.body.gsub("\r\n\r\n", "</p><p>").gsub("\r\n", "<br/>")}</p>"
+    end
+  end
 end

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

@@ -155,11 +155,9 @@ module Indexer
             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
       end

data/vendor/plugins/refinery/app/views/admin/_head.html.erb CHANGED Viewed

@@ -2,9 +2,10 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
   <title><%= RefinerySetting.find_or_set(:site_name, 'Company Name').titleize %> - Refinery</title>
-  <%= stylesheet_link_tag 'refinery/refinery', 'refinery/tooltips', :cache => (use_caching ? "cache/refinery" : false) %>
+  <%= stylesheet_link_tag 'refinery/refinery', 'refinery/tooltips', "wymeditor/skins/refinery/skin", :cache => (use_caching ? "cache/refinery" : false) %>
   <%= render :partial => "/shared/admin/head_before_javascript_libraries" -%>
   <%= jquery_include_tags(use_caching) %>
+  <%= yield :head_after_javascript_libraries %>
   <%= javascript_include_tag 'admin', 'wymeditor/jquery.refinery.wymeditor.js', 'refinery/boot_wym', 'refinery/admin', :cache => (use_caching ? "cache/admin" : false) %>
   <%= javascript_include_tag "http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js" if RefinerySetting.find_or_set(:show_firebug_lite, false) -%>
   <%= yield :head %>

data/vendor/plugins/refinery/app/views/shared/_head.html.erb CHANGED Viewed

@@ -6,7 +6,6 @@
   <%= stylesheet_link_tag "theme" %>
   <%= stylesheet_link_tag "home", :theme => theme if home_page? %>
   <%= "<!--[if IE 7]>#{stylesheet_link_tag 'ie7'}<![endif]-->" if request.env['HTTP_USER_AGENT'] =~ /MSIE/ -%>
-  <%= auto_discovery_link_tag(:rss, news_items_url(:format => 'rss')) %>
   <link rel="shortcut icon" href="/favicon.ico" />
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <%= "<meta name=\"keywords\" content=\"#{@meta.meta_keywords}\" />" if @meta.meta_keywords.present? %>

data/vendor/plugins/refinery/app/views/shared/_ie6check.html.erb CHANGED Viewed

@@ -1,11 +1,23 @@
-<!--[if lte IE 6]>
-<div id="ie6msg_wrapper">
-<div id="ie6msg">
-<h4>Did you know that your browser is out of date?</h4>
-<div id='ie6message'>
-<p>To get the best possible experience using our website we recommend that you upgrade your browser to a newer version. The current version is <a class="getie8" href="http://upgradeie.s3.amazonaws.com/eng/index.html">Internet Explorer 8</a>. The upgrade is free. If you're using a PC at work you should contact your IT administrator.</p>
-<p>If you want to you may also try some other popular and <strong>free</strong> Internet browsers like:<br/> <a class="ie6expl" href="http://getfirefox.com" target='_blank'>Firefox</a>, <a class="ie6expl" href="http://www.opera.com" target='_blank'>Opera</a>, <a class="ie6expl" href="http://www.apple.com/safari/download/" target='_blank'>Safari</a> or <a class="ie6expl" href="http://www.google.com/chrome" target='_blank'>Chrome</a></p>
-</div>
-</div>
-</div>
-<![endif]-->
+<% if RefinerySetting.find_or_set(:ie6_upgrade_message_enabled, true) -%>
+  <!--[if lte IE 6]>
+    <div id="ie6msg_wrapper">
+      <div id="ie6msg">
+        <h4>Did you know that your browser is out of date?</h4>
+        <div id='ie6message'>
+          <p>
+            To get the best possible experience using our website we recommend that you upgrade your browser to a newer version. The current version is
+            <a class="getie8" href="http://upgradeie.s3.amazonaws.com/eng/index.html">Internet Explorer 8</a>.
+            The upgrade is free. If you're using a PC at work you should contact your IT administrator.
+          </p>
+          <p>
+            If you want to you may also try some other popular and <strong>free</strong> Internet browsers like:<br/>
+            <a class="ie6expl" href="http://getfirefox.com" target='_blank'>Firefox</a>,
+            <a class="ie6expl" href="http://www.opera.com" target='_blank'>Opera</a>,
+            <a class="ie6expl" href="http://www.apple.com/safari/download/" target='_blank'>Safari</a> or
+            <a class="ie6expl" href="http://www.google.com/chrome" target='_blank'>Chrome</a>
+          </p>
+        </div>
+      </div>
+    </div>
+  <![endif]-->
+<% end -%>

data/vendor/plugins/refinery/app/views/welcome.html.erb CHANGED Viewed

@@ -8,6 +8,6 @@
   <strong>http://<%= request.host %>/admin</strong>
 </p>
 <p>
-  Alright let's get you setup so you can login...
+  Alright, let's get you set up so you can log in...
 </p>
 <%= button_to "Continue...", new_user_url %>

data/vendor/plugins/refinery/app/views/wymiframe.html.erb CHANGED Viewed

@@ -1,7 +1,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <title>WYMeditor iframe</title>
+    <%= "<meta http-equiv='X-UA-Compatible' content='IE-EmulateIE7' />" if request.env['HTTP_USER_AGENT'] =~ /MSIE/ %>
+    <title>WYMeditor</title>
     <%= stylesheet_link_tag "wymeditor/skins/refinery/wymiframe", "formatting", "theme", :media => "all" %>
   </head>
   <body class="wym_iframe"></body>

data/vendor/plugins/refinery/lib/generators/refinery/USAGE CHANGED Viewed

@@ -1,2 +1,2 @@
 Usage:
-  ./script/generate refinery team_member title:string description:text image:image
+  ./script/generate refinery team_member title:string description:text image:image resource:resource

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

@@ -4,8 +4,8 @@ class <%= migration_name %> < ActiveRecord::Migration
     create_table :<%= table_name %> do |t|
 <%
   attributes.each do |attribute|
-    # turn image into what it was supposed to be which is an integer reference to an image.
-    if attribute.type.to_s == 'image'
+    # turn image or resource into what it was supposed to be which is an integer reference to an image or resource.
+    if attribute.type.to_s =~ /^(image|resource)$/
       attribute.type = 'integer'
       attribute.name = "#{attribute.name}_id".gsub("_id_id", "_id")
     end

data/vendor/plugins/refinery/lib/generators/refinery/templates/model.rb CHANGED Viewed

@@ -9,5 +9,9 @@ class <%= class_name %> < ActiveRecord::Base
 <% attributes.collect{|a| a if a.type.to_s == 'image'}.compact.uniq.each do |a| -%>
   belongs_to :<%= a.name.gsub("_id", "") %><%= ", :class_name => 'Image'" unless a.name =~ /^image(_id)?$/ %>
 <% end -%>
+<% attributes.collect{|a| a if a.type.to_s == 'resource'}.compact.uniq.each do |a| -%>
+  belongs_to :<%= a.name.gsub("_id", "") %><%= ", :class_name => 'Resource'" unless a.name =~ /^resource(_id)?$/ %>
+<% end -%>
 end

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

@@ -10,6 +10,12 @@
       :image => @<%= singular_name %>.<%= attribute.name.gsub("_id", "") %>,
       :toggle_image_display => false
     } %>
+<% elsif attribute.type.to_s == 'resource' %>
+    <%%= render :partial => "/shared/admin/resource_picker", :locals => {
+      :f => f,
+      :field => :<%= "#{attribute.name}_id".gsub("_id_id", "_id") %>,
+      :resource => @<%= singular_name %>.<%= attribute.name.gsub("_id", "") %>,
+    } %>
 <% elsif attribute.field_type.to_s == "text_area" -%>
     <%%= f.text_area :<%= attribute.name %>, :rows => 20, :cols => 140, :class => 'wymeditor' -%>
 <% else -%>

data/vendor/plugins/refinery/lib/generators/refinery/templates/views/show.html.erb CHANGED Viewed

@@ -6,10 +6,12 @@
   <% attributes.each do |attribute| %>
   <div>
     <h3><%= attribute.name.titleize %></h3>
-<% unless attribute.type.to_s == 'image' -%>
-    <%%= @<%= singular_name %>.<%= attribute.name %> %>
-<% else -%>
+<% if attribute.type.to_s == 'image' -%>
     <%%= image_fu @<%= singular_name %>.<%= attribute.name %>, nil %>
+<% elsif attribute.type.to_s == 'resource' -%>
+    <%%= link_to <%= "'#{attribute.name}'" %>, @<%= singular_name %>.<%= attribute.name %>.public_filename %>
+<% else -%>
+    <%%= @<%= singular_name %>.<%= attribute.name %> %>
 <% end -%>
   </div>
   <% end %>

data/vendor/plugins/refinery/lib/refinery/application_helper.rb CHANGED Viewed

@@ -42,9 +42,9 @@ module Refinery::ApplicationHelper
         //google.load('jqueryui', '1.8');
         // google isn't using jqueryui 1.8 yet although it was before.
       </script>
-      #{javascript_include_tag 'jquery-ui-1.8rc1.min.js'}"
+      #{javascript_include_tag 'jquery-ui-1.8.min.js'}"
     else
-      javascript_include_tag 'jquery', 'jquery-ui-1.8rc1.min.js', :cache => (use_caching ? "cache/libraries" : nil)
+      javascript_include_tag 'jquery', 'jquery-ui-1.8.min.js', :cache => (use_caching ? "cache/libraries" : nil)
     end
   end

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

@@ -31,28 +31,14 @@ module Refinery
       end
       $LOAD_PATH.uniq!
     end
-    # We need to overload this because some gems raise errors if they're not installed
-    # rather than just letting the framework handle it so we need to trap them here.
-    def ensure_all_registered_plugins_are_loaded!
-      begin
-        super
-      rescue LoadError => load_error
-        raise LoadError, load_error.to_s unless load_error.to_s =~ /friendly_id|aasm|will_paginate/
-      end
-    end
   end
   class Initializer < Rails::Initializer
     def self.run(command = :process, configuration = Configuration.new)
-      # Set up configuration that is rather specific to Refinery. We make sure we check that things haven't already been set in the application.
+      # Set up configuration that is rather specific to Refinery. (some plugins require on other more 'core' plugins).
+      # We do make sure we check that things haven't already been set in the application.
       configuration.plugin_loader = Refinery::PluginLoader unless configuration.plugin_loader != Rails::Plugin::Loader
-      configuration.plugins = [ :friendly_id, :will_paginate, :aasm, :all ] if configuration.plugins.nil?
-      configuration.gem "aasm", :version => "~> 2.1.3", :lib => "aasm"
-      configuration.gem "friendly_id", :version => "~> 2.2.2", :lib => "friendly_id"
-      configuration.gem "hpricot", :version => "~> 0.8.1", :lib => "hpricot"
-      configuration.gem "slim_scrooge", :version => "~> 1.0.5", :lib => "slim_scrooge"
-      configuration.gem "will_paginate", :version => "~> 2.3.11", :lib => "will_paginate"
+      configuration.plugins = [ :authlogic, :friendly_id, :will_paginate, :all ] if configuration.plugins.nil?
       # Pass our configuration along to Rails.
       Rails.configuration = configuration
@@ -63,29 +49,6 @@ module Refinery
       # Create deprecations for variables that we've stopped using (possibly remove in 1.0?)
       require 'refinery/deprecations'
     end
-    def load_plugins
-      # inject all gems that manipulate ActiveRecord::Base into the application
-      # and stub any calls that are dangerous.
-      ::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.
-          puts "*** Trapping error caused by missing gems ***"
-        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
-      # call Rails' load_plugins
-      super
-    end
   end
 end