spicycode-micronaut-rails 0.2.4 → 0.2.5

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 4
 :major: 0
 :minor: 2
+:patch: 5

data/lib/micronaut/rails/controllers.rb

@@ -20,74 +20,67 @@ module Micronaut
 
       end
 
+      module TemplateIsolationExtensions
+        def file_exists?(ignore); true; end
+        
+        def render_file(*args)
+          @first_render ||= args[0] unless args[0] =~ /^layouts/
+        end
+        
+        def render(*args)
+          return super if Hash === args.last && args.last[:inline]
+          record_render(args[0])
+        end
+      
+      private
+      
+        def record_render(opts)
+          @_rendered ||= {}
+          (@_rendered[:template] ||= opts[:file]) if opts[:file]
+          (@_rendered[:partials][opts[:partial]] += 1) if opts[:partial]
+        end
+
+      end
+
+
       module RenderOverrides
 
         def render_views!
           @render_views = true
         end
 
-        def render_views?
+        def rendering_views?
           @render_views
         end
         
-        def render(options=nil, &block)
-          response.headers['Status'] = interpret_status((options.is_a?(Hash) && options[:status]) || ::ActionController::Base::DEFAULT_RENDER_STATUS_CODE)
-
-          unless block_given? || render_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
+        def render(options=nil, extra_options={}, &block)
+          unless block_given?
+            unless rendering_views?
+              @template.extend TemplateIsolationExtensions
             end
-            (class << @template; self; end).class_eval do
-
-              define_method :render_file do |*args|
-                @first_render ||= args[0] unless args[0] =~ /^layouts/
-                @_first_render ||= args[0] unless args[0] =~ /^layouts/
-              end
-
-              define_method :_pick_template do |*args|
-                @_first_render ||= args[0] unless args[0] =~ /^layouts/
-                PickedTemplate.new
-              end
-
-            end
-
-          end     
-
-          super(options, &block)
+          end
+ 
+          super
         end
 
       end
 
-      # Returned by _pick_template when running controller examples in isolation mode.
-      class PickedTemplate 
-        # Do nothing when running controller examples in isolation mode.
-        def render_template(*ignore_args); end
-        # Do nothing when running controller examples in isolation mode.
-        def render_partial(*ignore_args);  end
-      end
-
       def self.extended(extended_behaviour)
         extended_behaviour.send :include, ::ActionController::TestProcess, InstanceMethods, ::Micronaut::Rails::Matchers::Controllers
         extended_behaviour.describes.send :include, RenderOverrides, ::ActionController::TestCase::RaiseActionExceptions
 
         extended_behaviour.before do
-          @controller = self.class.describes.new
-          @controller.request = @request = ::ActionController::TestRequest.new
+          @request = ::ActionController::TestRequest.new
           @response = ::ActionController::TestResponse.new
-          @response.session = @request.session
-          
+          @controller ||= self.class.describes.new
+
+          @controller.request = @request
           @controller.params = {}
-          @controller.send(:initialize_current_url)          
+          @controller.send(:initialize_current_url)
         end
 
       end
 
     end
   end
-end
+end

data/lib/micronaut/rails/matchers/controllers/render_template.rb

@@ -10,11 +10,24 @@ module Micronaut
             @expected = expected
           end
 
-          def matches?(response)
+          def matches?(response_or_controller)
+            response = response_or_controller.respond_to?(:response) ?
+                       response_or_controller.response :
+                       response_or_controller
+   
             if response.respond_to?(:rendered_file)
               @actual = response.rendered_file
-            elsif response.respond_to?(:captured_render)
-              @actual = @controller.captured_render
+            elsif response.respond_to?(:rendered)
+              case template = response.rendered[:template]
+              when nil
+                unless response.rendered[:partials].empty?
+                  @actual = path_and_file(response.rendered[:partials].keys.first).join("/_")
+                end
+              when ActionView::Template
+                @actual = template.path
+              when String
+                @actual = template
+              end
             else
               @actual = response.rendered_template.to_s
             end
@@ -100,4 +113,4 @@ module Micronaut
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spicycode-micronaut-rails
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Chad Humphries
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-10 00:00:00 -08:00
+date: 2009-04-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: actionpack
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: spicycode-micronaut
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -36,8 +38,9 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README
+- LICENSE
 files: 
 - LICENSE
 - Rakefile