fix deprecations

Rakefile

@@ -34,7 +34,7 @@ unless defined? RADIANT_ROOT
 end
 
 require 'rake'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'rake/testtask'
 
 rspec_base = File.expand_path(RADIANT_ROOT + '/vendor/plugins/rspec/lib')

spec/controllers/admin_page_controller_extensions_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 # We only have this spec because setting up an isolated view spec would be too
 # complicated.  Instead we have a quasi-integration test.

spec/controllers/part_types_controller_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Admin::PartTypesController do
   dataset :users, :part_types

spec/controllers/templates_controller_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 # Re-raise errors caught by the controller.
 Admin::TemplatesController.class_eval { def rescue_action(e) raise e end }

spec/helpers/templates_helper_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Templates::Helper do
   dataset :pages, :templates

spec/models/page_extensions_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Page, "extended with templates" do
   it "should be associated to its template" do

spec/models/part_type_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe PartType do
   before :each do

spec/models/tags_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe "Templates::Tags" do
   dataset :pages

spec/models/template_part_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe TemplatePart do
   dataset :part_types

spec/models/template_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe ::Template do
   dataset :templates, :pages

spec/spec_helper.rb

@@ -11,10 +11,13 @@
 end
 require "#{RADIANT_ROOT}/spec/spec_helper"
 
-# if File.directory?(File.dirname(__FILE__) + "/scenarios")
-#   Scenario.load_paths.unshift File.dirname(__FILE__) + "/scenarios"
-# end
 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 }

vendor/plugins/make_resourceful/lib/resourceful/default/accessors.rb

@@ -125,7 +125,7 @@ def build_object
         @current_object = if current_model.respond_to? :build
           current_model.build(object_parameters)
         else
-          returning(current_model.new(object_parameters)) do |obj|
+          current_model.new(object_parameters).tap do |obj|
             if singular? && parent?
               obj.send("#{parent_name}_id=", parent_object.id)
               obj.send("#{parent_name}_type=", parent_object.class.to_s) if polymorphic_parent?