radiant 1.1.3 → 1.1.4

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## 1.1.4
+
+* Remove autotest support [Jim Gay]
+* Bump to Rails 2.3.18 [Jim Gay]
+* Update versions for several extensions in the generated Gemfile [Benny Degezelle]
+* Move snippet configuration into snippets extension [Benny Degezelle]
+* Get default gravatar image locally when fire walled [Andrew Vonderluft, Benny Degezelle]
+* Fix migration problems concerning allowed_children_cache [Andrew Vonderluft]
+* Prevent spec errors on generated extensions [Andrew Vonderluft]
+
 ## 1.1.3
 
 * Move to Rails 2.3.17 [Jim Gay]

data/Gemfile

@@ -1,4 +1,6 @@
-source :rubygems
+
+
+source 'https://rubygems.org'
 
 # This is the minimum of dependency required to run
 # the radiant instance generator, which is (normally)
@@ -7,7 +9,7 @@ source :rubygems
 # requires radiant and therefore pulls in every
 # dependency mentioned in radiant.gemspec.
 
-gem "rails",   "2.3.17"
+gem "rails",   "2.3.18"
 gem "sqlite3", "1.3.5", :group => [:development, :test], :platform => :ruby
 
 # When radiant is installed as a gem you can run all of

data/Gemfile.lock

@@ -1,25 +1,25 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    actionmailer (2.3.17)
-      actionpack (= 2.3.17)
-    actionpack (2.3.17)
-      activesupport (= 2.3.17)
+    actionmailer (2.3.18)
+      actionpack (= 2.3.18)
+    actionpack (2.3.18)
+      activesupport (= 2.3.18)
       rack (~> 1.1.0)
-    activerecord (2.3.17)
-      activesupport (= 2.3.17)
-    activeresource (2.3.17)
-      activesupport (= 2.3.17)
-    activesupport (2.3.17)
+    activerecord (2.3.18)
+      activesupport (= 2.3.18)
+    activeresource (2.3.18)
+      activesupport (= 2.3.18)
+    activesupport (2.3.18)
     rack (1.1.6)
-    rails (2.3.17)
-      actionmailer (= 2.3.17)
-      actionpack (= 2.3.17)
-      activerecord (= 2.3.17)
-      activeresource (= 2.3.17)
-      activesupport (= 2.3.17)
+    rails (2.3.18)
+      actionmailer (= 2.3.18)
+      actionpack (= 2.3.18)
+      activerecord (= 2.3.18)
+      activeresource (= 2.3.18)
+      activesupport (= 2.3.18)
       rake (>= 0.8.3)
-    rake (10.0.3)
+    rake (10.1.0)
     sqlite3 (1.3.5)
 
 PLATFORMS
@@ -27,5 +27,5 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  rails (= 2.3.17)
+  rails (= 2.3.18)
   sqlite3 (= 1.3.5)

data/README.md

@@ -4,8 +4,7 @@ Radiant is a no-fluff, open source content management system designed for
 small teams. It is similar to Textpattern or MovableType, but is a general
 purpose content management system (not just a blogging engine).
 
-[![Build Status](https://secure.travis-ci.org/radiant/radiant.png?branch=master)](http://travis-ci.org/radiant/radiant)
-[![Dependency Status](https://gemnasium.com/radiant/radiant.png)](https://gemnasium.com/radiant/radiant)
+[![Build Status](https://secure.travis-ci.org/radiant/radiant.png?branch=1.x)](http://travis-ci.org/radiant/radiant)
 
 Radiant features:
 

data/app/helpers/application_helper.rb

@@ -180,25 +180,31 @@ module ApplicationHelper
   def gravatar_url(email, options={})
     # Default to highest rating. Rating can be one of G, PG, R X.
     options[:rating] ||= "G"
-    
+
     # Default size of the image.
     options[:size] ||= "32px"
-    
+
     # Default image url to be used when no gravatar is found
     # or when an image exceeds the rating parameter.
-    default_avatar_url = "#{request.protocol}#{request.host_with_port}#{ActionController::Base.relative_url_root}/images/admin/avatar_#{([options[:size].to_i] * 2).join('x')}.png"
+    local_avatar_url = "/images/admin/avatar_#{([options[:size].to_i] * 2).join('x')}.png"
+    default_avatar_url = "#{request.protocol}#{request.host_with_port}#{ActionController::Base.relative_url_root}#{local_avatar_url}"
     options[:default] ||= default_avatar_url
-    
+
     unless email.blank?
-      # Build the Gravatar url.
-      url = '//gravatar.com/avatar/'
+      # Build the Gravatar url. 
+      url = '//gravatar.com/avatar/'  
       url << "#{Digest::MD5.new.update(email)}?"
       url << "rating=#{options[:rating]}" if options[:rating]
       url << "&size=#{options[:size]}" if options[:size]
       url << "&default=#{options[:default]}" if options[:default]
-      url
+      # Test the Gravatar url
+      require 'open-uri'
+      begin; open "http:#{url}", :proxy => true
+      rescue; local_avatar_url
+      else; url
+      end
     else
-      default_avatar_url
+      local_avatar_url
     end
   end
   

data/app/models/standard_tags.rb

@@ -731,17 +731,25 @@ module StandardTags
     name = (tag.attr['name'] || page.created_by.name)
     rating = (tag.attr['rating'] || 'G')
     size = (tag.attr['size'] || '32px')
-    email = User.find_by_name(name).email
-    default = "#{request.protocol}#{request.host_with_port}/images/admin/avatar_#{([size.to_i] * 2).join('x')}.png"
+    user = User.find_by_name(name)
+    email = user ? user.email : nil
+    local_avatar_url = "/images/admin/avatar_#{([size.to_i] * 2).join('x')}.png"    
+    default_avatar_url = "#{request.protocol}#{request.host_with_port}#{local_avatar_url}"
+        
     unless email.blank?
       url = '//gravatar.com/avatar/'
       url << "#{Digest::MD5.new.update(email)}?"
       url << "rating=#{rating}"
       url << "&size=#{size.to_i}"
-      url << "&default=#{default}"
-      url
+      url << "&default=#{default_avatar_url}" unless request.host_with_port == 'testhost.tld'
+      # Test the Gravatar url
+      require 'open-uri'
+      begin; open "http:#{url}", :proxy => true
+      rescue; local_avatar_url
+      else; url
+      end
     else
-      default
+      local_avatar_url
     end
   end
 

data/bin/ci/before_script

@@ -7,6 +7,8 @@ case $DB in
   "postgres" )
     psql -c 'create database radiant_test;' -U postgres
     cp spec/ci/database.postgresql.yml config/database.yml;;
+  "sqlite" )
+    cp spec/ci/database.sqlite.yml config/database.yml;;
 esac
 
 bundle exec rake db:migrate

data/config/cucumber.yml

@@ -1,7 +1,7 @@
 <%
 rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
 rerun_opts = rerun.to_s.strip.empty? ? "--format progress features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
-std_opts = "#{rerun_opts} --format rerun --out rerun.txt --strict --require features --tags ~@wip"
+std_opts = "#{rerun_opts} -b --format rerun --out rerun.txt --strict --require features --tags ~@wip"
 %>
 default: <%= std_opts %>
 wip: --tags @wip:3 --wip features

data/config/initializers/radiant_config.rb

@@ -7,7 +7,6 @@ Radiant.config do |config|
   config.define 'defaults.page.status', :select_from => lambda { Status.selectable_values }, :allow_blank => false, :default => "Draft"
   config.define 'defaults.page.filter', :select_from => lambda { TextFilter.descendants.map { |s| s.filter_name }.sort }, :allow_blank => true
   config.define 'defaults.page.fields'
-  config.define 'defaults.snippet.filter', :select_from => lambda { TextFilter.descendants.map { |s| s.filter_name }.sort }, :allow_blank => true
   config.define 'pagination.param_name', :default => 'page'
   config.define 'pagination.per_page_param_name', :default => 'per_page'
   config.define 'admin.pagination.per_page', :type => :integer, :default => 50

data/db/migrate/20100805155020_convert_page_metas.rb

@@ -1,11 +1,15 @@
 class ConvertPageMetas < ActiveRecord::Migration
   def self.up
+    # following add and remove column enables running this migration 
+    # when upgrading radiant with allowed_children_cache added to Page model
+    add_column :pages, :allowed_children_cache, :text
     Page.all.each do |page|
       page.fields.create(:name => 'Keywords', :content => page.keywords)
       page.fields.create(:name => 'Description', :content => page.description)
     end
     remove_column :pages, :keywords
     remove_column :pages, :description
+    remove_column :pages, :allowed_children_cache
   end
 
   def self.down

data/db/migrate/20110902203823_add_allowed_children_cache_to_pages.rb

@@ -1,6 +1,6 @@
 class AddAllowedChildrenCacheToPages < ActiveRecord::Migration
   def self.up
-    add_column :pages, :allowed_children_cache, :text, :default => ''
+    add_column :pages, :allowed_children_cache, :text
     Page.reset_column_information
     Page.find_each do |page|
       page.save # update the allowed_children_cache

data/db/migrate/20120209231801_change_pages_allowed_children_cache_to_text.rb

@@ -1,6 +1,8 @@
 class ChangePagesAllowedChildrenCacheToText  < ActiveRecord::Migration
   def self.up
-    change_column :pages, :allowed_children_cache, :text
+    unless Page.columns_hash['allowed_children_cache'].type == :text
+      change_column :pages, :allowed_children_cache, :text
+    end
   end
 
   def self.down

data/lib/generators/extension/templates/spec_helper.rb

@@ -12,6 +12,12 @@ end
 require "#{RADIANT_ROOT}/spec/spec_helper"
 
 Dataset::Resolver.default << (File.dirname(__FILE__) + "/datasets")
+# Include any datasets from loaded extensions
+Radiant::Extension.descendants.each do |extension|
+  if File.directory?(extension.root + "/spec/datasets")
+    Dataset::Resolver.default << (extension.root + "/spec/datasets")
+  end
+end
 
 if File.directory?(File.dirname(__FILE__) + "/matchers")
   Dir[File.dirname(__FILE__) + "/matchers/*.rb"].each {|file| require file }

data/lib/generators/instance/templates/instance_gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 # If you make any changes in this file, please run `bundle install`.
 # If new versions of your installed gems are available, run `bundle update`
@@ -41,17 +41,17 @@ gem "radiant-clipped-extension",             "~> 1.1.0"
 gem "radiant-debug-extension",               "~> 1.0.2"
 gem "radiant-exporter-extension",            "~> 1.1.0"
 gem "radiant-markdown_filter-extension",     "~> 1.0.2"
-gem "radiant-sheets-extension",              "~> 1.1.0.alpha"
-gem "radiant-snippets-extension",            "~> 1.1.0.alpha"
-gem "radiant-site_templates-extension",      "~> 1.0.4"
+gem "radiant-sheets-extension",              "~> 1.1.0"
+gem "radiant-snippets-extension",            "~> 1.1.2"
+gem "radiant-site_templates-extension",      "~> 1.0.6"
 gem "radiant-smarty_pants_filter-extension", "~> 1.0.2"
 gem "radiant-textile_filter-extension",      "~> 1.0.4"
 
 
 # Language packs
-# gem "radiant-dutch_language_pack-extension",    "~> 1.0.0"
+# gem "radiant-dutch_language_pack-extension",    "~> 1.0.1"
 # gem "radiant-french_language_pack-extension",   "~> 1.0.0"
-# gem "radiant-german_language_pack-extension",   "~> 1.0.0"
+# gem "radiant-german_language_pack-extension",   "~> 1.0.1"
 # gem "radiant-italian_language_pack-extension",  "~> 1.0.0"
 # gem "radiant-japanese_language_pack-extension", "~> 1.0.0"
 # gem "radiant-russian_language_pack-extension",  "~> 1.0.0"
@@ -77,5 +77,5 @@ gem "radiant-textile_filter-extension",      "~> 1.0.4"
 #   gem "webrat",           "~> 0.7.3"
 #   gem "rspec-rails",      "~> 1.3.3"
 #   gem "sqlite3",          "~> 1.3.4"
-#   gem "ZenTest",          "4.6.0"
+#   gem "ZenTest",          "4.6.2"
 # end

data/lib/radiant.rb

@@ -5,7 +5,7 @@ unless defined? Radiant::Version
     module Version
       Major = '1'
       Minor = '1'
-      Tiny  = '3'
+      Tiny  = '4'
       Patch = nil # set to nil for normal release
 
       class << self

data/lib/radiant/initializer.rb

@@ -67,7 +67,7 @@ module Radiant
       env = ENV["RAILS_ENV"] || RAILS_ENV
       paths = [Rails.root + 'vendor/extensions']
       paths.unshift(Radiant.root + "vendor/extensions") unless Rails.root == Radiant.root
-      paths.unshift(Radiant.root + "test/fixtures/extensions") if env == "test"
+      paths.unshift(Radiant.root + "test/fixtures/extensions") if env =~ /test|cucumber/
       paths
     end
     

data/radiant.gemspec

@@ -25,7 +25,7 @@ a general purpose content managment system--not merely a blogging engine.}
   s.license = %q{MIT}
 
   s.add_dependency "tzinfo",        "~> 0.3.31"
-  s.add_dependency "rails",         "~> 2.3.17"
+  s.add_dependency "rails",         "~> 2.3.18"
   s.add_dependency "rdoc",          ">= 3.9.2"
   s.add_dependency "acts_as_tree",  "~> 0.1.1"
   s.add_dependency "bundler",       ">= 1.0.0"
@@ -45,8 +45,8 @@ a general purpose content managment system--not merely a blogging engine.}
   s.add_development_dependency "cucumber-rails",    "~> 0.3.2"
   s.add_development_dependency "database_cleaner",  "~> 0.6.5"
   s.add_development_dependency "webrat",            "~> 0.7.3"
+  s.add_development_dependency "nokogiri",          "~> 1.5.10"
   s.add_development_dependency "rspec",             "~> 1.3.1"
   s.add_development_dependency "rspec-rails",       "~> 1.3.3"
   s.add_development_dependency "test-unit",         "1.2.3"
-  s.add_development_dependency "ZenTest",           "4.6.2"
 end

data/spec/generators/instance_generator_spec.rb

@@ -9,63 +9,63 @@ shared_examples_for "all instance generators" do
       ''.should have_generated_directory(dir)
     end
   end
-  
+
   # Check for files
   %w(CHANGELOG.md CONTRIBUTORS.md LICENSE.md INSTALL.md README.md Rakefile).each do |file|
     it "should have a #{file}" do
       ''.should have_generated_file(file)
     end
   end
-  
+
   # Check for configs
   %w(boot.rb routes.rb environments/production.rb environments/development.rb environments/test.rb).each do |file|
     it "should have a #{file} config file" do
       'config'.should have_generated_file(file)
     end
   end
-  
+
   # Check for public files
   %w(.htaccess robots.txt 404.html 500.html favicon.ico dispatch.cgi dispatch.fcgi dispatch.rb).each do |file|
     it "should have a #{file} in public/" do
       'public'.should have_generated_file(file)
     end
   end
-  
+
   # Check for scripts
-  %w(about breakpointer cucumber extension runner spec version autospec console dbconsole generate server 
-    spec_server performance/benchmarker performance/profiler performance/request process/inspector 
+  %w(about breakpointer cucumber extension runner spec version console dbconsole generate server
+    spec_server performance/benchmarker performance/profiler performance/request process/inspector
     process/reaper process/spawner process/spinner).each do |file|
     it "should have a #{file} script" do
       'script'.should have_generated_file(file)
     end
   end
-  
+
   # Check for admin sass
-  %w(modules/_links.sass 
-    partials/_avatars.sass partials/_footer.sass partials/_layout.sass main.sass 
-    _base.sass partials/_forms.sass partials/_messages.sass partials/_content.sass 
-    partials/_header.sass partials/_popup.sass partials/_tabcontrol.sass partials/_dateinput.sass 
+  %w(modules/_links.sass
+    partials/_avatars.sass partials/_footer.sass partials/_layout.sass main.sass
+    _base.sass partials/_forms.sass partials/_messages.sass partials/_content.sass
+    partials/_header.sass partials/_popup.sass partials/_tabcontrol.sass partials/_dateinput.sass
     partials/_toolbar.sass).each do |file|
-    it "should have a #{file} sass file" do 
+    it "should have a #{file} sass file" do
       'public/stylesheets/sass/admin'.should have_generated_file(file)
     end
   end
-  
+
   # Check for admin images
   %w(navigation_secondary_separator.gif add_tab.png minus_disabled.png
      snippet.png brown_bottom_line.gif single_form_shadow.png
-    spinner.gif collapse.png 
-    status_background.png draft_page.png status_bottom_left.png expand.png page.png 
-    status_bottom_right.png layout.png plus.png status_spinner.gif plus_grey.png 
-    status_top_left.png metadata_toggle.png popup_border_background.png status_top_right.png minus.png 
-    popup_border_bottom_left.png tab_close.png minus_grey.png popup_border_bottom_right.png 
-    popup_border_top_left.png 
+    spinner.gif collapse.png
+    status_background.png draft_page.png status_bottom_left.png expand.png page.png
+    status_bottom_right.png layout.png plus.png status_spinner.gif plus_grey.png
+    status_top_left.png metadata_toggle.png popup_border_background.png status_top_right.png minus.png
+    popup_border_bottom_left.png tab_close.png minus_grey.png popup_border_bottom_right.png
+    popup_border_top_left.png
     popup_border_top_right.png virtual_page.png).each do |file|
     it "should have a #{file} admin image" do
       'public/images/admin'.should have_generated_file(file)
     end
   end
-  
+
   # Check for admin javascripts
   %w(application.js controls.js dragdrop.js lowpro.js popup.js pagefield.js ruledtable.js sitemap.js
     tabcontrol.js codearea.js cookie.js effects.js prototype.js shortcuts.js status.js utility.js).each do |file|
@@ -75,7 +75,7 @@ shared_examples_for "all instance generators" do
   end
 
   # Check for initializers
-  # initializers are now run from RADIANT_ROOT before the instance, 
+  # initializers are now run from RADIANT_ROOT before the instance,
   # so most of those are should no longer be copied across
   %w(radiant_config.rb).each do |file|
     it "should have a #{file} initializer" do
@@ -86,15 +86,15 @@ shared_examples_for "all instance generators" do
     it "should not have a #{file} initializer" do
       'config/initializers'.should_not have_generated_file(file)
     end
-  end 
-  
+  end
+
 end
 
 describe "IntanceGenerator" do
   include FileUtils
   include GeneratorSpecHelperMethods
   Rails::Generator::Base.prepend_sources(Rails::Generator::PathSource.new(:radiant, File.join(BASE_ROOT, 'lib', 'generators')))
-  
+
   describe('with no options') do
     it_should_behave_like "all instance generators"
 
@@ -105,13 +105,13 @@ describe "IntanceGenerator" do
     after(:all) do
       FileUtils.rm_rf Dir["#{RADIANT_ROOT}"]
     end
-    
+
     it "should have run bundle install" do
       @generator_output.should =~ /Fetching (source index for|gem metadata from)/
     end
   end
 
-  { 'db2'=>'ibm_db', 'mysql'=>'mysql', 'postgresql'=>'postgresql', 
+  { 'db2'=>'ibm_db', 'mysql'=>'mysql', 'postgresql'=>'postgresql',
     'sqlite3'=>'sqlite3', 'sqlserver'=>'sqlserver' }.each do |db, adapter|
     describe("with #{db} database option") do
       it_should_behave_like "all instance generators"
@@ -125,13 +125,13 @@ describe "IntanceGenerator" do
           %w(production development test).each {|env| yaml[env]['adapter'].should == adapter}
         end
       end
-    
+
       after(:all) do
         FileUtils.rm_rf Dir["#{RADIANT_ROOT}"]
       end
     end
   end
-  
+
   describe('with shebang option') do
     it_should_behave_like "all instance generators"
 
@@ -141,7 +141,7 @@ describe "IntanceGenerator" do
       @files = Dir.glob("#{RADIANT_ROOT}/script/**/*") + Dir.glob("#{RADIANT_ROOT}/public/dispatch*")
       @files.collect! {|i| [i, i.gsub(/\A#{Regexp.escape(RADIANT_ROOT)}\//, '')] }
     end
-    
+
     it 'should set shebang for scripts & dispatchers' do
       @files.each do |fn, f|
         next if File.directory?(fn)
@@ -150,7 +150,7 @@ describe "IntanceGenerator" do
         end
       end
     end
-    
+
     after(:all) do
       FileUtils.rm_rf Dir["#{RADIANT_ROOT}"]
     end

data/spec/models/standard_tags_spec.rb

@@ -580,23 +580,23 @@ describe "Standard Tags" do
 
   describe "<r:gravatar>" do
     it "should render the Gravatar URL of author of the current page" do
-      page.should render('<r:gravatar />').as('//gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?rating=G&size=32&default=http://testhost.tld/images/admin/avatar_32x32.png')
+      page.should render('<r:gravatar />').as('//gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?rating=G&size=32')
     end
 
     it "should render the Gravatar URL of the name user" do
-      page.should render('<r:gravatar name="Admin" />').as('//gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?rating=G&size=32&default=http://testhost.tld/images/admin/avatar_32x32.png')
+      page.should render('<r:gravatar name="Admin" />').as('//gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?rating=G&size=32')
     end
 
     it "should render the default avatar when the user has not set an email address" do
-      page.should render('<r:gravatar name="Designer" />').as('http://testhost.tld/images/admin/avatar_32x32.png')
+      page.should render('<r:gravatar name="Designer" />').as('/images/admin/avatar_32x32.png')
     end
 
     it "should render the specified size" do
-      page.should render('<r:gravatar name="Designer" size="96px" />').as('http://testhost.tld/images/admin/avatar_96x96.png')
+      page.should render('<r:gravatar name="Designer" size="96px" />').as('/images/admin/avatar_96x96.png')
     end
 
     it "should render the specified rating" do
-      page.should render('<r:gravatar rating="X" />').as('//gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?rating=X&size=32&default=http://testhost.tld/images/admin/avatar_32x32.png')
+      page.should render('<r:gravatar rating="X" />').as('//gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?rating=X&size=32')
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radiant
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.17
+        version: 2.3.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,13 +42,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.17
+        version: 2.3.18
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.9.2
   type: :runtime
@@ -56,7 +56,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.9.2
 - !ruby/object:Gem::Dependency
@@ -80,7 +80,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
@@ -88,7 +88,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
@@ -208,7 +208,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :runtime
@@ -216,7 +216,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
@@ -332,13 +332,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.7.3
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.5.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -346,15 +346,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.5.10
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -362,31 +362,31 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
-  name: ZenTest
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.6.2
+        version: 1.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -394,13 +394,11 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.6.2
-description: ! 'Radiant is a simple and powerful publishing system designed for small
-  teams.
-
+        version: 1.2.3
+description: |-
+  Radiant is a simple and powerful publishing system designed for small teams.
   It is built with Rails and is similar to Textpattern or MovableType, but is
-
-  a general purpose content managment system--not merely a blogging engine.'
+  a general purpose content managment system--not merely a blogging engine.
 email: radiant@radiantcms.org
 executables:
 - radiant
@@ -570,8 +568,6 @@ files:
 - GemfileRails3
 - INSTALL.md
 - lib/annotatable.rb
-- lib/autotest/discover.rb
-- lib/autotest/radiant_rails_rspec.rb
 - lib/generators/extension/extension_generator.rb
 - lib/generators/extension/templates/cucumber.yml
 - lib/generators/extension/templates/cucumber_env.rb
@@ -772,9 +768,6 @@ files:
 - public/javascripts/admin/validationerror.js
 - public/loading-iframe.html
 - public/robots.txt
-- public/stylesheets/admin/assets.css
-- public/stylesheets/admin/main.css
-- public/stylesheets/admin/overrides.css
 - public/stylesheets/sass/admin/_base.sass
 - public/stylesheets/sass/admin/main.sass
 - public/stylesheets/sass/admin/modules/_boxes.sass
@@ -803,7 +796,6 @@ files:
 - Rakefile
 - README.md
 - script/about
-- script/autospec
 - script/breakpointer
 - script/console
 - script/cucumber
@@ -913,7 +905,6 @@ files:
 - spec/helpers/application_helper_spec.rb
 - spec/helpers/site_helper_spec.rb
 - spec/lib/annotatable_spec.rb
-- spec/lib/autotest_spec.rb
 - spec/lib/core_ext/string_ext_spec.rb
 - spec/lib/inheritable_class_attributes_spec.rb
 - spec/lib/login_system_spec.rb
@@ -936,7 +927,6 @@ files:
 - spec/lib/simpleton_spec.rb
 - spec/lib/task_support_spec.rb
 - spec/lib/translation_support_spec.rb
-- spec/matchers/autotest_matchers.rb
 - spec/matchers/generator_matchers.rb
 - spec/matchers/login_system_matcher.rb
 - spec/matchers/render_form_errors_matcher.rb
@@ -1010,91 +1000,6 @@ files:
 - test/helpers/user_test_helper.rb
 - test/helpers/validation_test_helper.rb
 - test/test_helper.rb
-- tmp/cache_files_test/a.txt
-- tmp/cache_files_test/all.txt
-- tmp/cache_files_test/b.txt
-- tmp/config/radiant_config.yml
-- tmp/sass-cache/0b2c41dd475d0b959138b0510f2bf1d22b0abcb0/_hover-link.scssc
-- tmp/sass-cache/0b2c41dd475d0b959138b0510f2bf1d22b0abcb0/_link-colors.scssc
-- tmp/sass-cache/0b2c41dd475d0b959138b0510f2bf1d22b0abcb0/_unstyled-link.scssc
-- tmp/sass-cache/254839e93900d503c222f940ac5a2fb100a8c64c/_ellipsis.scssc
-- tmp/sass-cache/254839e93900d503c222f940ac5a2fb100a8c64c/_force-wrap.scssc
-- tmp/sass-cache/254839e93900d503c222f940ac5a2fb100a8c64c/_nowrap.scssc
-- tmp/sass-cache/254839e93900d503c222f940ac5a2fb100a8c64c/_replacement.scssc
-- tmp/sass-cache/26c8abc39e42e1257ad9e93ddc62df6cd6da27f3/_links.scssc
-- tmp/sass-cache/26c8abc39e42e1257ad9e93ddc62df6cd6da27f3/_lists.scssc
-- tmp/sass-cache/26c8abc39e42e1257ad9e93ddc62df6cd6da27f3/_text.scssc
-- tmp/sass-cache/26c8abc39e42e1257ad9e93ddc62df6cd6da27f3/_vertical_rhythm.scssc
-- tmp/sass-cache/39f7397f9c437bc5a7941343d972dc34e92dbf1e/_css3.scssc
-- tmp/sass-cache/39f7397f9c437bc5a7941343d972dc34e92dbf1e/_support.scssc
-- tmp/sass-cache/39f7397f9c437bc5a7941343d972dc34e92dbf1e/_typography.scssc
-- tmp/sass-cache/39f7397f9c437bc5a7941343d972dc34e92dbf1e/_utilities.scssc
-- tmp/sass-cache/5879649cd0b175860e6dac9eeefbad1e556b1132/_utilities.scssc
-- tmp/sass-cache/5c04132c0a986f20481acadf71a9af37b84e481e/_alternating-rows-and-columns.scssc
-- tmp/sass-cache/5c04132c0a986f20481acadf71a9af37b84e481e/_borders.scssc
-- tmp/sass-cache/5c04132c0a986f20481acadf71a9af37b84e481e/_scaffolding.scssc
-- tmp/sass-cache/92c1d5bcd1ce65635f62ba3d3a8ffd07845a58bf/_boxes.sassc
-- tmp/sass-cache/92c1d5bcd1ce65635f62ba3d3a8ffd07845a58bf/_gradients.sassc
-- tmp/sass-cache/92c1d5bcd1ce65635f62ba3d3a8ffd07845a58bf/_links.sassc
-- tmp/sass-cache/995d7caa6648510447e11384ef762c226db7f403/_bullets.scssc
-- tmp/sass-cache/995d7caa6648510447e11384ef762c226db7f403/_horizontal-list.scssc
-- tmp/sass-cache/995d7caa6648510447e11384ef762c226db7f403/_inline-block-list.scssc
-- tmp/sass-cache/995d7caa6648510447e11384ef762c226db7f403/_inline-list.scssc
-- tmp/sass-cache/a3a0d1ef393f162899105b056524f6f6282a02ec/_color.scssc
-- tmp/sass-cache/a3a0d1ef393f162899105b056524f6f6282a02ec/_general.scssc
-- tmp/sass-cache/a3a0d1ef393f162899105b056524f6f6282a02ec/_sprites.scssc
-- tmp/sass-cache/a3a0d1ef393f162899105b056524f6f6282a02ec/_tables.scssc
-- tmp/sass-cache/b5ac720d39606afafebf17001ffc6bf58202e0ca/_contrast.scssc
-- tmp/sass-cache/bf937c58e8a66e7b4fec6f35a8981ba7cfcb0652/_base.scssc
-- tmp/sass-cache/bf937c58e8a66e7b4fec6f35a8981ba7cfcb0652/_sprite-img.scssc
-- tmp/sass-cache/c815c62650b1524d4d2f92581c5c1712cc25440f/_appearance.scssc
-- tmp/sass-cache/c815c62650b1524d4d2f92581c5c1712cc25440f/_background-clip.scssc
-- tmp/sass-cache/c815c62650b1524d4d2f92581c5c1712cc25440f/_background-origin.scssc
-- tmp/sass-cache/c815c62650b1524d4d2f92581c5c1712cc25440f/_background-size.scssc
-- tmp/sass-cache/c815c62650b1524d4d2f92581c5c1712cc25440f/_border-radius.scssc
-- tmp/sass-cache/c815c62650b1524d4d2f92581c5c1712cc25440f/_box-shadow.scssc
-- tmp/sass-cache/c815c62650b1524d4d2f92581c5c1712cc25440f/_box-sizing.scssc
-- tmp/sass-cache/c815c62650b1524d4d2f92581c5c1712cc25440f/_box.scssc
-- tmp/sass-cache/c815c62650b1524d4d2f92581c5c1712cc25440f/_columns.scssc
-- tmp/sass-cache/c815c62650b1524d4d2f92581c5c1712cc25440f/_filter.scssc
-- tmp/sass-cache/c815c62650b1524d4d2f92581c5c1712cc25440f/_font-face.scssc
-- tmp/sass-cache/c815c62650b1524d4d2f92581c5c1712cc25440f/_hyphenation.scssc
-- tmp/sass-cache/c815c62650b1524d4d2f92581c5c1712cc25440f/_images.scssc
-- tmp/sass-cache/c815c62650b1524d4d2f92581c5c1712cc25440f/_inline-block.scssc
-- tmp/sass-cache/c815c62650b1524d4d2f92581c5c1712cc25440f/_opacity.scssc
-- tmp/sass-cache/c815c62650b1524d4d2f92581c5c1712cc25440f/_regions.scssc
-- tmp/sass-cache/c815c62650b1524d4d2f92581c5c1712cc25440f/_shared.scssc
-- tmp/sass-cache/c815c62650b1524d4d2f92581c5c1712cc25440f/_text-shadow.scssc
-- tmp/sass-cache/c815c62650b1524d4d2f92581c5c1712cc25440f/_transform.scssc
-- tmp/sass-cache/c815c62650b1524d4d2f92581c5c1712cc25440f/_transition.scssc
-- tmp/sass-cache/d070e00ab17d4c5a92bb411bab483fa63017c523/_grid-background.scssc
-- tmp/sass-cache/d5e053bc7eda17e42e4af2545c689fe1e1827ebb/_compass.scssc
-- tmp/sass-cache/e08f7babd3eefa30ecaedb285b6f03aeb1567de0/_base.sassc
-- tmp/sass-cache/e08f7babd3eefa30ecaedb285b6f03aeb1567de0/main.sassc
-- tmp/sass-cache/e08f7babd3eefa30ecaedb285b6f03aeb1567de0/overrides.sassc
-- tmp/sass-cache/f027b5a9f77da841b8b2e807a06c14f16aaf8c9f/_actions.sassc
-- tmp/sass-cache/f027b5a9f77da841b8b2e807a06c14f16aaf8c9f/_avatars.sassc
-- tmp/sass-cache/f027b5a9f77da841b8b2e807a06c14f16aaf8c9f/_content.sassc
-- tmp/sass-cache/f027b5a9f77da841b8b2e807a06c14f16aaf8c9f/_dateinput.sassc
-- tmp/sass-cache/f027b5a9f77da841b8b2e807a06c14f16aaf8c9f/_deprecated.sassc
-- tmp/sass-cache/f027b5a9f77da841b8b2e807a06c14f16aaf8c9f/_dropdown.sassc
-- tmp/sass-cache/f027b5a9f77da841b8b2e807a06c14f16aaf8c9f/_footer.sassc
-- tmp/sass-cache/f027b5a9f77da841b8b2e807a06c14f16aaf8c9f/_forms.sassc
-- tmp/sass-cache/f027b5a9f77da841b8b2e807a06c14f16aaf8c9f/_header.sassc
-- tmp/sass-cache/f027b5a9f77da841b8b2e807a06c14f16aaf8c9f/_index.sassc
-- tmp/sass-cache/f027b5a9f77da841b8b2e807a06c14f16aaf8c9f/_layout.sassc
-- tmp/sass-cache/f027b5a9f77da841b8b2e807a06c14f16aaf8c9f/_messages.sassc
-- tmp/sass-cache/f027b5a9f77da841b8b2e807a06c14f16aaf8c9f/_popup.sassc
-- tmp/sass-cache/f027b5a9f77da841b8b2e807a06c14f16aaf8c9f/_tabcontrol.sassc
-- tmp/sass-cache/f027b5a9f77da841b8b2e807a06c14f16aaf8c9f/_toolbar.sassc
-- tmp/sass-cache/f027b5a9f77da841b8b2e807a06c14f16aaf8c9f/_typography.sassc
-- tmp/sass-cache/f027b5a9f77da841b8b2e807a06c14f16aaf8c9f/_validations.sassc
-- tmp/sass-cache/f70e5df716076570f6b1e421f918e7330651c50b/_clearfix.scssc
-- tmp/sass-cache/f70e5df716076570f6b1e421f918e7330651c50b/_float.scssc
-- tmp/sass-cache/f70e5df716076570f6b1e421f918e7330651c50b/_hacks.scssc
-- tmp/sass-cache/f70e5df716076570f6b1e421f918e7330651c50b/_min.scssc
-- tmp/sass-cache/f70e5df716076570f6b1e421f918e7330651c50b/_reset.scssc
-- tmp/sass-cache/f70e5df716076570f6b1e421f918e7330651c50b/_tag-cloud.scssc
 - vendor/plugins/dataset/CHANGELOG
 - vendor/plugins/dataset/dataset.gemspec
 - vendor/plugins/dataset/lib/dataset/base.rb
@@ -1188,18 +1093,18 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: radiant
-rubygems_version: 1.8.25
+rubygems_version: 1.8.26
 signing_key: 
 specification_version: 3
 summary: A no-fluff content management system designed for small teams.

data/lib/autotest/discover.rb

@@ -1,3 +0,0 @@
-Autotest.add_discovery do
-  "radiant" if File.exists?(File.join('bin', 'radiant'))
-end

data/lib/autotest/radiant_rails_rspec.rb

@@ -1,111 +0,0 @@
-# (c) Copyright 2006 Nick Sieger <nicksieger@gmail.com>
-#
-# 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.
-
-$:.push(*Dir["vendor/rails/*/lib"])
-
-require 'active_support'
-require 'autotest/rspec'
-
-Autotest.add_hook :initialize do |at|
-  
-  %w{^config/ ^coverage/ ^db/ ^doc/ ^log/ ^public/ ^script ^vendor/rails ^vendor/plugins previous_failures.txt}.each do |exception|
-    at.add_exception(exception)
-  end
-  
-  at.clear_mappings
-  
-  at.add_mapping(%r%^(test|spec)/fixtures/(.*).yml$%) { |_, m|
-    ["spec/models/#{m[2].singularize}_spec.rb"] + at.files_matching(%r%^spec\/views\/#{m[2]}/.*_spec\.rb$%)
-  }
-  at.add_mapping(%r%^spec/(models|controllers|views|helpers|lib)/.*rb$%) { |filename, _|
-    filename
-  }
-  at.add_mapping(%r%^app/models/(.*)\.rb$%) { |_, m|
-    ["spec/models/#{m[1]}_spec.rb"]
-  }
-  at.add_mapping(%r%^app/views/(.*)$%) { |_, m|
-    at.files_matching %r%^spec/views/#{m[1]}_spec.rb$%
-  }
-  at.add_mapping(%r%^app/controllers/(.*)\.rb$%) { |_, m|
-    if m[1] == "application"
-      at.files_matching %r%^spec/controllers/.*_spec\.rb$%
-    else
-      ["spec/controllers/#{m[1]}_spec.rb"]
-    end
-  }
-  at.add_mapping(%r%^app/helpers/(.*)_helper\.rb$%) { |_, m|
-    if m[1] == "application" then
-      at.files_matching(%r%^spec/(views|helpers)/.*_spec\.rb$%)
-    else
-      ["spec/helpers/#{m[1]}_helper_spec.rb"] + at.files_matching(%r%^spec\/views\/#{m[1]}/.*_spec\.rb$%)
-    end
-  }
-  at.add_mapping(%r%^config/routes\.rb$%) {
-    at.files_matching %r%^spec/(controllers|views|helpers)/.*_spec\.rb$%
-  }
-  at.add_mapping(%r%^config/database\.yml$%) { |_, m|
-    at.files_matching %r%^spec/models/.*_spec\.rb$%
-  }
-  at.add_mapping(%r%^(spec/(spec_helper|shared/.*)|config/(boot|environment(s/test)?))\.rb$%) {
-    at.files_matching %r%^spec/(models|controllers|views|helpers)/.*_spec\.rb$%
-  }
-  at.add_mapping(%r%^lib/(.*)\.rb$%) { |_, m|
-    ["spec/lib/#{m[1]}_spec.rb"]
-  }
-  at.add_mapping(%r%^vendor/extensions/(.*)/app/models/(.*)\.rb$%) { |_, m|
-    ["vendor/extensions/#{m[1]}/spec/models/#{m[2]}_spec.rb"]
-  }
-  at.add_mapping(%r%^vendor/extensions/.*/spec/(models|controllers|views|helpers|lib)/.*rb$%) { |filename, _|
-    filename
-  }
-  at.add_mapping(%r%^vendor/extensions/(.*)/app/views/(.*)$%) { |_, m|
-    at.files_matching %r%^vendor/extensions/#{m[1]}/spec/views/#{m[2]}_spec.rb$%
-  }
-  at.add_mapping(%r%^vendor/extensions/(.*)/app/controllers/(.*)\.rb%) { |_, m|
-    if m[2] == "#{m[1]}_controller"
-      at.files_matching %r%^vendor/extensions/#{m[1]}/spec/controllers/.*_spec\.rb$%
-    else
-      ["vendor/extensions/#{m[1]}/spec/controllers/#{m[2]}_spec.rb"]
-    end
-  }
-  at.add_mapping(%r%^vendor/extensions/(.*)/app/helpers/(.*)_helper\.rb$%) { |_, m|
-    if m[2] == m[1] then
-      at.files_matching(%r%^vendor/extensions/#{m[1]}/spec/(views|helpers)/.*_spec\.rb$%)
-    else
-      ["vendor/extensions/#{m[1]}/spec/helpers/#{m[2]}_helper_spec.rb"] + at.files_matching(%r%^vendor/extensions/#{m[1]}/spec\/views\/#{m[2]}/.*_spec\.rb$%)
-    end
-  }
-  at.add_mapping(%r%^vendor/extensions/(.*)/lib/(.*)\.rb$%) { |_, m|
-    ["vendor/extensions/#{m[1]}/spec/lib/#{m[2]}_spec.rb"]
-  }
-  at.add_mapping(%r%^vendor/extensions/(.*)/(.*)_extension\.rb%) { |_, m|
-    at.files_matching(%r%^vendor/extensions/#{m[1]}/spec/.*_spec\.rb$%) if m[1] == m[2]
-  }
-end
-
-class Autotest::RadiantRailsRspec < Autotest::Rspec
-
-  def spec_command
-    "script/spec"
-  end
-    
-end

data/script/autospec

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-ENV['RSPEC'] = 'true'     # allows autotest to discover rspec
-ENV['AUTOTEST'] = 'true'  # allows autotest to run w/ color on linux
-system((RUBY_PLATFORM =~ /mswin|mingw/ ? 'autotest.bat' : 'autotest'), *ARGV) ||
-  $stderr.puts("Unable to find autotest.  Please install ZenTest or fix your PATH")

data/spec/lib/autotest_spec.rb

@@ -1,81 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require File.join(File.dirname(__FILE__), *%w[.. .. lib autotest radiant_rails_rspec])
-require File.join(File.dirname(__FILE__), *%w[.. matchers autotest_matchers])
-
-describe Autotest::RadiantRailsRspec, "file mapping" do
-  before(:each) do
-    @autotest = Autotest::RadiantRailsRspec.new
-    @autotest.hook :initialize
-  end
-  
-  it "should map model example to model" do
-    @autotest.should map_specs(['spec/models/thing_spec.rb']).
-                            to('app/models/thing.rb')
-  end
-  
-  it "should map controller example to controller" do
-    @autotest.should map_specs(['spec/controllers/things_controller_spec.rb']).
-                            to('app/controllers/things_controller.rb')
-  end
-
-  it "should map view.rhtml" do
-    @autotest.should map_specs(['spec/views/things/index.rhtml_spec.rb']).
-                            to('app/views/things/index.rhtml')
-  end
-
-  it "should map view.rhtml with underscores in example filename" do
-    @autotest.should map_specs(['spec/views/things/index_rhtml_spec.rb']).
-                            to('app/views/things/index.rhtml')
-  end
-
-  it "should map view.html.erb" do
-    @autotest.should map_specs(['spec/views/things/index.html.erb_spec.rb']).
-                            to('app/views/things/index.html.erb')
-  end
-
-  describe "with extensions" do
-    it "should map model example to model" do
-      @autotest.should map_specs(["#{ext_path}spec/models/thing_spec.rb"]).
-                              to("#{ext_path}app/models/thing.rb")
-    end
-
-    it "should map controller example to controller" do
-      @autotest.should map_specs(["#{ext_path}spec/controllers/things_controller_spec.rb"]).
-                              to("#{ext_path}app/controllers/things_controller.rb")
-    end
-
-    it "should map nested controller example to nested controller" do
-      @autotest.should map_specs(["#{ext_path}spec/controllers/nest/things_controller_spec.rb"]).
-                              to("#{ext_path}app/controllers/nest/things_controller.rb")
-    end
-
-    it "should map view example to view" do
-      @autotest.should map_specs(["#{ext_path}spec/views/things/index.html.erb_spec.rb"]).
-                              to("#{ext_path}app/views/things/index.html.erb")
-    end
-
-    it "should map nested view example to nested view" do
-      @autotest.should map_specs(["#{ext_path}spec/views/nest/things/index.html.erb_spec.rb"]).
-                              to("#{ext_path}app/views/nest/things/index.html.erb")
-    end
-
-    it "should map helper example to helper" do
-      @autotest.should map_specs(["#{ext_path}spec/helpers/thing_helper_spec.rb"]).
-                              to("#{ext_path}app/helpers/thing_helper.rb")
-    end
-
-    it "should map nested helper example to nested helper" do
-      @autotest.should map_specs(["#{ext_path}spec/helpers/nest/thing_helper_spec.rb"]).
-                              to("#{ext_path}app/helpers/nest/thing_helper.rb")
-    end
-
-    it "should map lib example to lib" do
-      @autotest.should map_specs(["#{ext_path}spec/lib/thing_spec.rb"]).
-                              to("#{ext_path}lib/thing.rb")
-    end
-  end
-
-  def ext_path
-    'vendor/extensions/extension/'
-  end
-end

data/spec/matchers/autotest_matchers.rb

@@ -1,47 +0,0 @@
-module Spec
-  module Matchers
-    class AutotestMappingMatcher
-      def initialize(specs)
-        @specs = specs
-      end
-  
-      def to(file)
-        @file = file
-        self
-      end
-  
-      def matches?(autotest)
-        @autotest = prepare autotest
-        @actual = autotest.test_files_for(@file)
-        @actual == @specs
-      end
-  
-      def failure_message
-        "expected #{@autotest.class} to map #{@specs.inspect} to #{@file.inspect}\ngot #{@actual.inspect}"
-      end
-  
-      private
-      def prepare autotest
-        stub_found_files autotest
-        stub_find_order autotest
-        autotest
-      end
-  
-      def stub_found_files autotest
-        found_files = @specs.inject({}){|h,f| h[f] = Time.at(0)}
-        autotest.stub!(:find_files).and_return(found_files)
-      end
-
-      def stub_find_order autotest
-        find_order = @specs.dup << @file
-        autotest.instance_eval { @find_order = find_order }
-      end
-
-    end
-    
-    def map_specs(specs)
-      AutotestMappingMatcher.new(specs)
-    end
-    
-  end
-end