dan-manges-unit_controller 0.0.1 → 0.1.0

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2008 Dan Manges
+
+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.

data/README.markdown

@@ -0,0 +1,38 @@
+UnitController
+==============
+
+UnitController stubs view rendering to help with unit testing controller.
+
+Loading UnitController:
+
+    gem "unit_controller"
+    require "unit_controller"
+  
+In the setup method for your test case:
+  
+    def setup
+      @controller = SampleController.new
+      @request = ActionController::TestRequest.new
+      @response = ActionController::TestResponse.new
+      @controller.do_not_render_view
+    end  
+
+Development
+-----------
+
+Active development occurs on the [GitHub](http://github.com/dan-manges/unit-controller). Changes are also pushed to the Rubyforge git repository.
+
+For bugs/patches/etc please use the [Rubyforge tracker](http://rubyforge.org/tracker/?group_id=5086)
+
+Maintainer
+----------
+[Dan Manges](http://www.dcmanges.com)
+
+Contributors
+------------
+
+* David Vollbracht
+
+License
+-------
+Released under the MIT license

data/Rakefile

@@ -1,48 +1,29 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'rake/contrib/sshpublisher'
 
 desc "Default: run tests"
-task :default => :test
+task :default => "test:multi_verbose"
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end
 
-desc "Generate documentation"
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = "doc"
-  rdoc.title    = "UnitController"
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README')
-end
-
-desc "Upload RDoc to RubyForge"
-task :publish_rdoc => [:rerdoc] do
-  Rake::SshDirPublisher.new("dcmanges@rubyforge.org", "/var/www/gforge-projects/unit-controller", "doc").upload
-end
-
 require "date"
 Gem.manage_gems
 gem_spec = Gem::Specification.new do |s|
 	s.name   = "unit_controller"
   s.summary = "UnitController assists with unit testing controllers by stubbing view rendering."
-	s.version = "0.0.1"
+	s.version = "0.1.0"
 	s.author = "Dan Manges"
 	s.description = s.summary
 	s.email = "daniel.manges@gmail.com"
   s.homepage = "http://unit-controller.rubyforge.org"
   s.rubyforge_project = "unit-controller"
 
-  s.has_rdoc = true
-  s.extra_rdoc_files = ['README']
-  s.rdoc_options << '--title' << "UnitController" << '--main' << 'README' << '--line-numbers'
-
-  s.files = FileList['{lib,test}/**/*.rb', 'README', 'Rakefile'].to_a
+  s.files = FileList['{lib,test}/**/*.rb', 'README.markdown', 'LICENSE', 'Rakefile'].to_a
 end
 Rake::GemPackageTask.new(gem_spec) do |package|
   package.need_zip = false
@@ -61,15 +42,22 @@ namespace :gemspec do
   end
 end
 
-RAILS_VERSIONS = %w[1.2.6 2.0.2]
+RAILS_VERSIONS = %w[1.2.6 2.0.2 2.1.0 2.1.1]
 
 namespace :test do
   desc "test with multiple versions of rails"
   task :multi do
     RAILS_VERSIONS.each do |rails_version|
+      puts "Testing with Rails #{rails_version}"
       sh "RAILS_VERSION='#{rails_version}' rake test > /dev/null 2>&1"
     end
   end
+  
+  task :multi_verbose do
+    RAILS_VERSIONS.each do |rails_version|
+      sh "RAILS_VERSION='#{rails_version}' rake test"
+    end
+  end
 end
 
 desc "pre-commit task"

data/lib/unit_controller.rb

@@ -1,5 +1,5 @@
 require "unit_controller/capture_render"
-require "unit_controller/no_view_rendering"
 require "unit_controller/test_case_extension"
-ActionController::Base.send :include, UnitController::NoViewRendering
+
+ActionController::Base.send :include, UnitController::CaptureRender
 Test::Unit::TestCase.send :include, UnitController::TestCaseExtension

data/lib/unit_controller/capture_render.rb

@@ -2,11 +2,29 @@ module UnitController
   module CaptureRender
     attr_reader :rendered
     
-    def render(options = nil)
-      raise ActionController::DoubleRenderError, "Can only render or redirect once per action" if performed?
-      @performed_render = true
-      @rendered = options
-      response.headers["Status"] = ActionController::Base::DEFAULT_RENDER_STATUS_CODE
+    def do_not_render_view
+      @render_view = false
+    end
+    
+    def render_view?
+      instance_variables.include?("@render_view") ? @render_view : true
+    end
+
+    def render_with_unit_controller(*args, &block)
+      @rendered = args.first
+      if render_view?
+        render_without_unit_controller *args, &block
+      else
+        raise ActionController::DoubleRenderError, "Can only render or redirect once per action" if performed?
+        @performed_render = true
+        response.headers["Status"] = ActionController::Base::DEFAULT_RENDER_STATUS_CODE
+      end
+    end
+    
+    def self.included(klass)
+      klass.class_eval do
+        alias_method_chain :render, :unit_controller
+      end
     end
   end
 end

data/lib/unit_controller/test_case_extension.rb

@@ -1,9 +1,6 @@
 module UnitController
   module TestCaseExtension
     def assert_rendered(options = nil, message = nil)
-      if !@controller.respond_to?(:rendered)
-        raise NoMethodError, "#{@controller} did not remember what it rendered. Did you call @controller.do_not_render_view ?"
-      end
       assert_equal options, @controller.rendered, message
     end
   end

data/test/sample_controller.rb

@@ -3,7 +3,7 @@ class SampleController < ActionController::Base
     render :text => "once"
     render :text => "twice"
   end
-
+  
   def implicit_template
   end
   
@@ -11,6 +11,16 @@ class SampleController < ActionController::Base
     render :inline => "<% raise 'raise in template' %>"
   end
   
+  def render_then_redirect
+    render :text => "hi"
+    redirect_to :action => :text_foo
+  end
+  
+  def redirect_then_render
+    redirect_to :action => :text_foo
+    render :text => "hi"
+  end
+
   def text_foo
     render :text => "foo"
   end

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 require "rubygems"
 gem "rails", ENV["RAILS_VERSION"] || ">= 2.0.2"
 require "rails/version"
+puts "==== Testing with Rails #{Rails::VERSION::STRING} ===="
 require "action_controller"
 require "action_controller/test_process"
 
@@ -12,8 +13,16 @@ $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
 require "unit_controller"
 
 require "test/unit"
-gem "dust", "0.1.6"
-require "dust"
+
+Test::Unit::TestCase.class_eval do
+  def self.test(name, &block)
+    test_name = "test_" + name.gsub(/\W/, "_")
+    if self.instance_methods.include? test_name
+      raise "#{test_name} is already defined in #{self}"
+    end
+    define_method test_name, &block
+  end
+end
 
 require File.dirname(__FILE__) + "/sample_controller"
 
@@ -29,12 +38,28 @@ end
 
 module TestHelper
   def self.define_test_case(&block)
-    klass = Rails::VERSION::MAJOR >= 2 ? rails2_test_case : rails1_test_case
+    klass = if Rails::VERSION::MAJOR >= 2
+      Rails::VERSION::MINOR.zero? ? rails2_0_test_case : rails2_test_case
+    else
+      rails1_test_case
+    end
     klass.class_eval &block
     klass
   end
   
-  def self.rails2_test_case
+  def self.rails2_test_case(&block)
+    klass = Class.new(ActionController::TestCase)
+    klass.class_eval do
+      tests SampleController
+
+      def setup
+        @controller.do_not_render_view
+      end
+    end
+    klass
+  end
+
+  def self.rails2_0_test_case
     klass = Class.new(ActionController::TestCase)
     klass.class_eval do
       tests SampleController
@@ -60,3 +85,8 @@ module TestHelper
     klass
   end
 end
+
+# tests weren't running on rails 2.2.0 without this !?!?!?
+if Rails::VERSION::STRING[0,3] == "2.2"
+  at_exit { subclasses_of(Test::Unit::TestCase) }
+end

data/test/unit_controller_test.rb

@@ -17,15 +17,31 @@ TestHelper.define_test_case do
       get :double_render
     end
   end
+
+  test "raise on render then redirect" do
+    assert_raises(ActionController::DoubleRenderError) do
+      get :render_then_redirect
+    end
+  end
+
+  test "raise on redirect then render" do
+    assert_raises(ActionController::DoubleRenderError) do
+      get :redirect_then_render
+    end
+  end
   
-  test "friendly error message if you forgot to tell controller not to render view" do
+  test "controller remembers what it renders even if rendering view" do
     @controller = @controller.class.new
-    exception = nil
-    begin
-      assert_rendered @controller
-    rescue NoMethodError => exception
-    end
-    assert_not_nil exception
-    assert_equal "#{@controller} did not remember what it rendered. Did you call @controller.do_not_render_view ?", exception.message
+    assert_equal true, @controller.render_view?
+    get :text_foo
+    assert_rendered :text => "foo"
+    assert_equal "foo", @response.body
+  end
+  
+  test "render_view?" do
+    @controller = @controller.class.new
+    assert_equal true, @controller.render_view?
+    @controller.do_not_render_view
+    assert_equal false, @controller.render_view?
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dan-manges-unit_controller
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors: 
 - Dan Manges
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-20 00:00:00 -07:00
+date: 2008-10-24 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -19,28 +19,24 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README
+extra_rdoc_files: []
+
 files: 
 - lib/unit_controller/capture_render.rb
-- lib/unit_controller/no_view_rendering.rb
 - lib/unit_controller/test_case_extension.rb
 - lib/unit_controller.rb
 - test/sample_controller.rb
 - test/test_case_test.rb
 - test/test_helper.rb
 - test/unit_controller_test.rb
-- README
+- README.markdown
+- LICENSE
 - Rakefile
-has_rdoc: true
+has_rdoc: false
 homepage: http://unit-controller.rubyforge.org
 post_install_message: 
-rdoc_options: 
-- --title
-- UnitController
-- --main
-- README
-- --line-numbers
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -58,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: unit-controller
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: UnitController assists with unit testing controllers by stubbing view rendering.

data/README

@@ -1,14 +0,0 @@
-= UnitController
-
-Note to self: http://dev.rubyonrails.org/ticket/10536
-
-== Development
-
-Active development occurs on the GitHub.[http://github.com/dan-manges/unit-controller] Changes are pushed to the Rubyforge git repository.
-
-== Contributors
-
-* Dan Manges
-
-== License
-Released under Ruby's license.[http://www.ruby-lang.org/en/LICENSE.txt]

data/lib/unit_controller/no_view_rendering.rb

@@ -1,7 +0,0 @@
-module UnitController
-  module NoViewRendering
-    def do_not_render_view
-      extend UnitController::CaptureRender
-    end
-  end
-end