josevalim-inherited_resources 0.4.2 → 0.4.3

data/CHANGELOG

@@ -1,3 +1,8 @@
+# Version 0.4.3
+
+* rspec bug fix is not automatically required anymore. User has to do it
+  explicitly.
+
 # Version 0.4.2
 
 * Added a file which fix a rspec bug when render is called inside a method

data/README

@@ -1,6 +1,6 @@
 Inherited Resources
 License: MIT
-Version: 0.4.2
+Version: 0.4.3
 
 You can also read this README in pretty html at the GitHub project Wiki page:
 
@@ -33,6 +33,16 @@ If you want it as plugin, just do:
 
    script/plugin install git://github.com/josevalim/inherited_resources.git
 
+rspec-rails <= 1.1.12 known bug
+-------------------------------
+
+InheritedResources has a known bug with rspec-rails when using blocks inside
+actions. This will be fixed in the next rspec release, but until it comes out,
+InheritedResources ships with a patch. To apply it, just put the line below on
+your spec_helper.rb after loading rspec and rspec-rails:
+
+  require 'inherited_resources/spec'
+
 Basic Usage
 -----------
 

data/lib/inherited_resources/base.rb

@@ -166,7 +166,6 @@ require File.dirname(__FILE__) + '/class_methods.rb'
 require File.dirname(__FILE__) + '/dumb_responder.rb'
 require File.dirname(__FILE__) + '/polymorphic_helpers.rb'
 require File.dirname(__FILE__) + '/singleton_helpers.rb'
-require File.dirname(__FILE__) + '/spec.rb'
 require File.dirname(__FILE__) + '/url_helpers.rb'
 
 module InheritedResources

data/lib/inherited_resources/spec.rb

@@ -0,0 +1,75 @@
+# This is a nasty rspec bug fix when using InheritedResources.
+# The bug exists on rspec <= 1.1.12 versions.
+#
+if defined?(Spec::Rails::Example::ControllerExampleGroup)
+  unless Spec::Rails::Example::ControllerExampleGroup.const_defined?('TemplateIsolationExtensions')
+
+    module Spec::Rails::Example
+      class ControllerExampleGroup < FunctionalExampleGroup
+        module ControllerInstanceMethods #:nodoc:
+
+          # === render(options = nil, deprecated_status_or_extra_options = nil, &block)
+          #
+          # This gets added to the controller's singleton meta class,
+          # allowing Controller Examples to run in two modes, freely switching
+          # from context to context.
+          def render(options=nil, deprecated_status_or_extra_options=nil, &block)
+            if ::Rails::VERSION::STRING >= '2.0.0' && deprecated_status_or_extra_options.nil?
+              deprecated_status_or_extra_options = {}
+            end
+
+            unless block_given?
+              unless integrate_views?
+                if @template.respond_to?(:finder)
+                  (class << @template.finder; self; end).class_eval do
+                    define_method :file_exists? do; true; end
+                  end
+                else
+                  (class << @template; self; end).class_eval do
+                    define_method :file_exists? do; true; end
+                  end
+                end
+
+                (class << @template; self; end).send :include, TemplateIsolationExtensions
+              end
+            end
+
+            if matching_message_expectation_exists(options)
+              render_proxy.render(options, &block)
+              @performed_render = true
+            else
+              if matching_stub_exists(options)
+                @performed_render = true
+              else
+                super(options, deprecated_status_or_extra_options, &block)
+              end
+            end
+          end
+        end
+
+        module TemplateIsolationExtensions
+          def render_file(*args)
+            @first_render ||= args[0] unless args[0] =~ /^layouts/
+            @_first_render ||= args[0] unless args[0] =~ /^layouts/
+          end
+
+          def _pick_template(*args)
+            @_first_render ||= args[0] unless args[0] =~ /^layouts/
+            PickedTemplate.new
+          end
+
+          def render(*args)
+            if @_rendered
+              opts = args[0]
+              (@_rendered[:template] ||= opts[:file]) if opts[:file]
+              (@_rendered[:partials][opts[:partial]] += 1) if opts[:partial]
+            else
+              super
+            end
+          end
+        end
+      end
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josevalim-inherited_resources
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-17 00:00:00 -08:00
+date: 2009-02-26 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -36,6 +36,7 @@ files:
 - lib/inherited_resources/polymorphic_helpers.rb
 - lib/inherited_resources/respond_to.rb
 - lib/inherited_resources/singleton_helpers.rb
+- lib/inherited_resources/spec.rb
 - lib/inherited_resources/url_helpers.rb
 has_rdoc: true
 homepage: http://github.com/josevalim/inherited_resources