innate 2009.05 → 2009.06

data/MANIFEST

@@ -56,6 +56,7 @@ lib/innate/route.rb
 lib/innate/session.rb
 lib/innate/session/flash.rb
 lib/innate/spec.rb
+lib/innate/spec/bacon.rb
 lib/innate/state.rb
 lib/innate/state/accessor.rb
 lib/innate/traited.rb
@@ -93,6 +94,7 @@ spec/innate/helper/view/num.xhtml
 spec/innate/helper/view/partial.xhtml
 spec/innate/helper/view/recursive.xhtml
 spec/innate/mock.rb
+spec/innate/modes.rb
 spec/innate/node/mapping.rb
 spec/innate/node/node.rb
 spec/innate/node/resolve.rb
@@ -115,9 +117,8 @@ tasks/authors.rake
 tasks/bacon.rake
 tasks/changelog.rake
 tasks/gem.rake
-tasks/gem_installer.rake
+tasks/gem_setup.rake
 tasks/grancher.rake
-tasks/install_dependencies.rake
 tasks/manifest.rake
 tasks/rcov.rake
 tasks/release.rake

data/Rakefile

@@ -26,9 +26,9 @@ GEMSPEC = Gem::Specification.new{|s|
   s.add_dependency('rack', '~> 1.0.0')
 
   # rip those out if they cause you trouble
-  # s.add_development_dependency('bacon', '>= 1.0')
-  # s.add_development_dependency('json', '~> 1.1.3')
-  # s.add_development_dependency('rack-test', '>= 0.1.0')
+  s.add_development_dependency('bacon',     '>= 1.1.0')
+  s.add_development_dependency('json',      '~> 1.1.6')
+  s.add_development_dependency('rack-test', '>= 0.3.0')
 }
 
 Dir['tasks/*.rake'].each{|f| import(f) }

data/innate.gemspec

@@ -2,19 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{innate}
-  s.version = "2009.05"
+  s.version = "2009.06"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael 'manveru' Fellinger"]
-  s.date = %q{2009-05-07}
+  s.date = %q{2009-06-02}
   s.description = %q{Simple, straight-forward base for web-frameworks.}
   s.email = %q{m.fellinger@gmail.com}
-  s.files = ["AUTHORS", "CHANGELOG", "COPYING", "MANIFEST", "README.md", "Rakefile", "example/app/retro_games.rb", "example/app/todo/layout/default.xhtml", "example/app/todo/spec/todo.rb", "example/app/todo/start.rb", "example/app/todo/view/index.xhtml", "example/app/whywiki_erb/layout/wiki.html.erb", "example/app/whywiki_erb/spec/wiki.rb", "example/app/whywiki_erb/start.rb", "example/app/whywiki_erb/view/edit.erb", "example/app/whywiki_erb/view/index.erb", "example/custom_middleware.rb", "example/hello.rb", "example/howto_spec.rb", "example/link.rb", "example/provides.rb", "example/session.rb", "innate.gemspec", "lib/innate.rb", "lib/innate/action.rb", "lib/innate/adapter.rb", "lib/innate/cache.rb", "lib/innate/cache/api.rb", "lib/innate/cache/drb.rb", "lib/innate/cache/file_based.rb", "lib/innate/cache/marshal.rb", "lib/innate/cache/memory.rb", "lib/innate/cache/yaml.rb", "lib/innate/current.rb", "lib/innate/dynamap.rb", "lib/innate/helper.rb", "lib/innate/helper/aspect.rb", "lib/innate/helper/cgi.rb", "lib/innate/helper/flash.rb", "lib/innate/helper/link.rb", "lib/innate/helper/redirect.rb", "lib/innate/helper/render.rb", "lib/innate/helper/send_file.rb", "lib/innate/log.rb", "lib/innate/log/color_formatter.rb", "lib/innate/log/hub.rb", "lib/innate/middleware_compiler.rb", "lib/innate/mock.rb", "lib/innate/node.rb", "lib/innate/options.rb", "lib/innate/options/dsl.rb", "lib/innate/options/stub.rb", "lib/innate/request.rb", "lib/innate/response.rb", "lib/innate/route.rb", "lib/innate/session.rb", "lib/innate/session/flash.rb", "lib/innate/spec.rb", "lib/innate/state.rb", "lib/innate/state/accessor.rb", "lib/innate/traited.rb", "lib/innate/trinity.rb", "lib/innate/version.rb", "lib/innate/view.rb", "lib/innate/view/erb.rb", "lib/innate/view/etanni.rb", "lib/innate/view/none.rb", "spec/example/app/retro_games.rb", "spec/example/hello.rb", "spec/example/link.rb", "spec/example/provides.rb", "spec/example/session.rb", "spec/helper.rb", "spec/innate/action/layout.rb", "spec/innate/action/layout/file_layout.xhtml", "spec/innate/cache/common.rb", "spec/innate/cache/marshal.rb", "spec/innate/cache/memory.rb", "spec/innate/cache/yaml.rb", "spec/innate/dynamap.rb", "spec/innate/helper.rb", "spec/innate/helper/aspect.rb", "spec/innate/helper/cgi.rb", "spec/innate/helper/flash.rb", "spec/innate/helper/link.rb", "spec/innate/helper/redirect.rb", "spec/innate/helper/render.rb", "spec/innate/helper/send_file.rb", "spec/innate/helper/view/aspect_hello.xhtml", "spec/innate/helper/view/locals.xhtml", "spec/innate/helper/view/loop.xhtml", "spec/innate/helper/view/num.xhtml", "spec/innate/helper/view/partial.xhtml", "spec/innate/helper/view/recursive.xhtml", "spec/innate/mock.rb", "spec/innate/node/mapping.rb", "spec/innate/node/node.rb", "spec/innate/node/resolve.rb", "spec/innate/node/view/another_layout/another_layout.xhtml", "spec/innate/node/view/bar.xhtml", "spec/innate/node/view/foo.html.xhtml", "spec/innate/node/view/only_view.xhtml", "spec/innate/node/view/with_layout.xhtml", "spec/innate/node/wrap_action_call.rb", "spec/innate/options.rb", "spec/innate/parameter.rb", "spec/innate/provides.rb", "spec/innate/provides/list.html.xhtml", "spec/innate/provides/list.txt.xhtml", "spec/innate/request.rb", "spec/innate/route.rb", "spec/innate/session.rb", "spec/innate/traited.rb", "tasks/authors.rake", "tasks/bacon.rake", "tasks/changelog.rake", "tasks/gem.rake", "tasks/gem_installer.rake", "tasks/grancher.rake", "tasks/install_dependencies.rake", "tasks/manifest.rake", "tasks/rcov.rake", "tasks/release.rake", "tasks/reversion.rake", "tasks/setup.rake", "tasks/ycov.rake"]
-  s.has_rdoc = true
+  s.files = ["AUTHORS", "CHANGELOG", "COPYING", "MANIFEST", "README.md", "Rakefile", "example/app/retro_games.rb", "example/app/todo/layout/default.xhtml", "example/app/todo/spec/todo.rb", "example/app/todo/start.rb", "example/app/todo/view/index.xhtml", "example/app/whywiki_erb/layout/wiki.html.erb", "example/app/whywiki_erb/spec/wiki.rb", "example/app/whywiki_erb/start.rb", "example/app/whywiki_erb/view/edit.erb", "example/app/whywiki_erb/view/index.erb", "example/custom_middleware.rb", "example/hello.rb", "example/howto_spec.rb", "example/link.rb", "example/provides.rb", "example/session.rb", "innate.gemspec", "lib/innate.rb", "lib/innate/action.rb", "lib/innate/adapter.rb", "lib/innate/cache.rb", "lib/innate/cache/api.rb", "lib/innate/cache/drb.rb", "lib/innate/cache/file_based.rb", "lib/innate/cache/marshal.rb", "lib/innate/cache/memory.rb", "lib/innate/cache/yaml.rb", "lib/innate/current.rb", "lib/innate/dynamap.rb", "lib/innate/helper.rb", "lib/innate/helper/aspect.rb", "lib/innate/helper/cgi.rb", "lib/innate/helper/flash.rb", "lib/innate/helper/link.rb", "lib/innate/helper/redirect.rb", "lib/innate/helper/render.rb", "lib/innate/helper/send_file.rb", "lib/innate/log.rb", "lib/innate/log/color_formatter.rb", "lib/innate/log/hub.rb", "lib/innate/middleware_compiler.rb", "lib/innate/mock.rb", "lib/innate/node.rb", "lib/innate/options.rb", "lib/innate/options/dsl.rb", "lib/innate/options/stub.rb", "lib/innate/request.rb", "lib/innate/response.rb", "lib/innate/route.rb", "lib/innate/session.rb", "lib/innate/session/flash.rb", "lib/innate/spec.rb", "lib/innate/spec/bacon.rb", "lib/innate/state.rb", "lib/innate/state/accessor.rb", "lib/innate/traited.rb", "lib/innate/trinity.rb", "lib/innate/version.rb", "lib/innate/view.rb", "lib/innate/view/erb.rb", "lib/innate/view/etanni.rb", "lib/innate/view/none.rb", "spec/example/app/retro_games.rb", "spec/example/hello.rb", "spec/example/link.rb", "spec/example/provides.rb", "spec/example/session.rb", "spec/helper.rb", "spec/innate/action/layout.rb", "spec/innate/action/layout/file_layout.xhtml", "spec/innate/cache/common.rb", "spec/innate/cache/marshal.rb", "spec/innate/cache/memory.rb", "spec/innate/cache/yaml.rb", "spec/innate/dynamap.rb", "spec/innate/helper.rb", "spec/innate/helper/aspect.rb", "spec/innate/helper/cgi.rb", "spec/innate/helper/flash.rb", "spec/innate/helper/link.rb", "spec/innate/helper/redirect.rb", "spec/innate/helper/render.rb", "spec/innate/helper/send_file.rb", "spec/innate/helper/view/aspect_hello.xhtml", "spec/innate/helper/view/locals.xhtml", "spec/innate/helper/view/loop.xhtml", "spec/innate/helper/view/num.xhtml", "spec/innate/helper/view/partial.xhtml", "spec/innate/helper/view/recursive.xhtml", "spec/innate/mock.rb", "spec/innate/modes.rb", "spec/innate/node/mapping.rb", "spec/innate/node/node.rb", "spec/innate/node/resolve.rb", "spec/innate/node/view/another_layout/another_layout.xhtml", "spec/innate/node/view/bar.xhtml", "spec/innate/node/view/foo.html.xhtml", "spec/innate/node/view/only_view.xhtml", "spec/innate/node/view/with_layout.xhtml", "spec/innate/node/wrap_action_call.rb", "spec/innate/options.rb", "spec/innate/parameter.rb", "spec/innate/provides.rb", "spec/innate/provides/list.html.xhtml", "spec/innate/provides/list.txt.xhtml", "spec/innate/request.rb", "spec/innate/route.rb", "spec/innate/session.rb", "spec/innate/traited.rb", "tasks/authors.rake", "tasks/bacon.rake", "tasks/changelog.rake", "tasks/gem.rake", "tasks/gem_setup.rake", "tasks/grancher.rake", "tasks/manifest.rake", "tasks/rcov.rake", "tasks/release.rake", "tasks/reversion.rake", "tasks/setup.rake", "tasks/ycov.rake"]
   s.homepage = %q{http://github.com/manveru/innate}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{innate}
-  s.rubygems_version = %q{1.3.2}
+  s.rubygems_version = %q{1.3.3}
   s.summary = %q{Powerful web-framework wrapper for Rack.}
 
   if s.respond_to? :specification_version then
@@ -23,10 +22,19 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<bacon>, [">= 1.1.0"])
+      s.add_development_dependency(%q<json>, ["~> 1.1.6"])
+      s.add_development_dependency(%q<rack-test>, [">= 0.3.0"])
     else
       s.add_dependency(%q<rack>, ["~> 1.0.0"])
+      s.add_dependency(%q<bacon>, [">= 1.1.0"])
+      s.add_dependency(%q<json>, ["~> 1.1.6"])
+      s.add_dependency(%q<rack-test>, [">= 0.3.0"])
     end
   else
     s.add_dependency(%q<rack>, ["~> 1.0.0"])
+    s.add_dependency(%q<bacon>, [">= 1.1.0"])
+    s.add_dependency(%q<json>, ["~> 1.1.6"])
+    s.add_dependency(%q<rack-test>, [">= 0.3.0"])
   end
 end

data/lib/innate.rb

@@ -107,7 +107,7 @@ module Innate
       file = given_options.delete(:file)
 
       found_root = go_figure_root(caller, :root => root, :file => file)
-      Innate.options.roots = [found_root] if found_root
+      Innate.options.roots = [*found_root] if found_root
 
       # Convert some top-level option keys to the internal ones that we use.
       PROXY_OPTIONS.each{|k,v| given_options[v] = given_options.delete(k) }
@@ -255,16 +255,15 @@ module Innate
   #
   # @see Rack::MiddlewareCompiler
   middleware :dev do |m|
-    m.apps(Rack::Lint, Rack::CommonLogger, Rack::ShowExceptions,
-           Rack::ShowStatus, Rack::ConditionalGet, Rack::ContentLength,
-           Rack::Head)
+    m.apps(Rack::Lint, Rack::Head, Rack::ContentLength, Rack::CommonLogger,
+           Rack::ShowExceptions, Rack::ShowStatus, Rack::ConditionalGet)
     m.use(Rack::Reloader, 2)
     m.innate
   end
 
   middleware :live do |m|
-    m.apps(Rack::CommonLogger, Rack::ShowStatus, Rack::ConditionalGet,
-           Rack::ContentLength, Rack::Head)
+    m.apps(Rack::Head, Rack::ContentLength, Rack::CommonLogger,
+           Rack::ShowStatus, Rack::ConditionalGet)
     m.innate
   end
 end

data/lib/innate/cache/drb.rb

@@ -9,7 +9,7 @@ module Innate
     # example below is using a normal Hash, but it is recommended to use a
     # thread-safe alternative like SyncHash.
     #
-    # @usage example for DRb server
+    # @example usage of DRb server
     #   require 'drb'
     #
     #   URI = "druby://127.0.0.1:9069"
@@ -23,10 +23,10 @@ module Innate
     # Please note that on some Ruby implementations, access to Hash is not
     # atomic and you might need to lock around access to avoid race conditions.
     #
-    # @usage for all caches
+    # @example for all caches
     #   Innate.options.cache.default = Innate::Cache::DRb
     #
-    # @usage for sessions only
+    # @example for sessions only
     #   Innate.options.cache.session = Innate::Cache::DRb
     class DRb
       include Cache::API

data/lib/innate/helper/render.rb

@@ -115,14 +115,23 @@ module Innate
       # @see render_custom
       # @author manveru
       def render_file(filename, variables = {})
-        render_custom(action.path, variables) do |action|
-          action.layout = nil
-          action.method = nil
-          action.view = filename
-          yield(action) if block_given?
-        end
+        action = Action.create(:view => filename)
+        action.sync_variables(self.action)
+
+        action.node      = self.class
+        action.engine    = self.action.engine
+        action.instance  = action.node.new
+        action.variables = variables.dup
+
+        yield(action) if block_given?
+
+        valid_action = action.view || action.method
+        Log.warn("Empty action: %p" % [action]) unless valid_action
+        action.render
       end
 
+      # @api internal
+      # @author manveru
       def render_custom(action_name, variables = {})
         unless action = resolve(action_name.to_s)
           raise(ArgumentError, "No Action %p on #{self}" % [action_name])

data/lib/innate/log/hub.rb

@@ -63,11 +63,15 @@ module Innate
       eval %~
         def #{meth}(*args, &block)
           return unless @active
-          @loggers.each{|l| l.#{meth}(*args, &block) }
+          args.each{|arg| @loggers.each{|logger| logger.#{meth}(arg, &block) }}
         end
       ~
 
       send(meth, *args, &block)
     end
+
+    def write(*args)
+      self.<<(*args)
+    end
   end
 end

data/lib/innate/middleware_compiler.rb

@@ -57,7 +57,7 @@ module Innate
     end
 
     def compile!
-      @compiled = @middlewares.inject(@app){|s, (app, args, block)|
+      @compiled = @middlewares.reverse.inject(@app){|s, (app, args, block)|
         app.new(s, *args, &block) }
       self
     end

data/lib/innate/session.rb

@@ -9,12 +9,17 @@ module Innate
   # You may store anything in here that you may also store in the corresponding
   # store, usually it's best to keep it to things that are safe to Marshal.
   #
-  # The default time of expiration is:
-  #   Time.at(2147483647) # => Tue Jan 19 12:14:07 +0900 2038
+  # The Session instance is compatible with the specification of rack.session.
   #
-  # Hopefully we all have 64bit systems by then.
+  # Since the Time class is used to create the cookie expiration timestamp, you
+  # will have to keep the ttl in a reasonable range.
+  # The maximum value that Time can store on a 32bit system is:
+  #   Time.at(2147483647) # => Tue Jan 19 12:14:07 +0900 2038
   #
-  # The Session instance is compatible with the specification of rack.session.
+  # The default expiration time for cookies and the session cache was reduced
+  # to a default of 30 days.
+  # This was done to be compatible with the maximum ttl of MemCache. You may
+  # increase this value if you do not use MemCache to persist your sessions.
   class Session
     include Optioned
 
@@ -28,7 +33,14 @@ module Innate
       o "Use secure cookie",
         :secure, false
       o "Time of cookie expiration",
-        :expires, Time.at((1 << 31) - 1)
+        :expires, nil
+      o "Time to live for session cookies and cache, nil/false will prevent setting",
+        :ttl, (60 * 60 * 24 * 30) # 30 days
+
+      trigger(:expires){|v|
+        self.ttl = v - Time.now.to_i
+        Log.warn("Innate::Session.options.expires is deprecated, use #ttl instead")
+      }
     end
 
     attr_reader :cookie_set, :request, :response, :flash
@@ -67,21 +79,20 @@ module Innate
       return if !@cache_sid or @cache_sid.empty?
 
       flash.rotate!
-      ttl = (Time.at(cookie_value[:expires]) - Time.now).to_i
-      cache.store(sid, cache_sid, :ttl => ttl)
+      cache.store(sid, cache_sid, :ttl => options.ttl)
       set_cookie(response)
     end
 
+    def sid
+      @sid ||= cookie || generate_sid
+    end
+
     private
 
     def cache_sid
       @cache_sid ||= cache[sid] || {}
     end
 
-    def sid
-      @sid ||= cookie || generate_sid
-    end
-
     def cookie
       @request.cookies[options.key]
     end
@@ -98,11 +109,10 @@ module Innate
     end
 
     def cookie_value
-      { :value   => sid,
-        :domain  => options.domain,
-        :path    => options.path,
-        :secure  => options.secure,
-        :expires => options.expires }
+      o = options
+      cookie = {:domain => o.domain, :path => o.path, :secure => o.secure}
+      cookie[:expires] = (Time.now + o.ttl) if o.ttl
+      cookie.merge!(:value => sid)
     end
 
     def generate_sid

data/lib/innate/spec.rb

@@ -1,23 +1 @@
-begin; require 'rubygems'; rescue LoadError; end
-
-require 'bacon'
-require 'rack/test'
-require(File.expand_path("#{__FILE__}/../")) unless defined?(Innate)
-
-Bacon.summary_on_exit
-
-module Innate
-  # minimal middleware, no exception handling
-  middleware(:spec){|m| m.innate }
-
-  # skip starting adapter
-  options.started = true
-  options.mode = :spec
-end
-
-shared :mock do
-  Innate.setup_dependencies
-  extend Rack::Test::Methods
-
-  def app; Innate.middleware; end
-end
+require 'innate/spec/bacon'

data/lib/innate/spec/bacon.rb

@@ -0,0 +1,28 @@
+begin; require 'rubygems'; rescue LoadError; end
+
+require 'bacon'
+require 'rack/test'
+require File.expand_path('../../', __FILE__) unless defined?(Innate)
+
+Bacon.summary_on_exit
+
+module Innate
+  # minimal middleware, no exception handling
+  middleware(:spec){|m| m.innate }
+
+  # skip starting adapter
+  options.started = true
+  options.mode = :spec
+end
+
+shared :rack_test do
+  Innate.setup_dependencies
+  extend Rack::Test::Methods
+
+  def app; Innate.middleware; end
+end
+
+shared :mock do
+  warn 'behaves_like(:mock) is deprecated, use behaves_like(:rack_test) instead'
+  behaves_like :rack_test
+end

data/lib/innate/version.rb

@@ -1,3 +1,3 @@
 module Innate
-  VERSION = "2009.05"
+  VERSION = "2009.06"
 end

data/spec/example/app/retro_games.rb

@@ -2,7 +2,7 @@ require 'spec/helper'
 require 'example/app/retro_games'
 
 describe 'Retro-games app' do
-  behaves_like :mock
+  behaves_like :rack_test
 
   it 'lists the first game' do
     get '/'

data/spec/example/hello.rb

@@ -2,7 +2,7 @@ require 'spec/helper'
 require 'example/hello'
 
 describe 'example/hello' do
-  behaves_like :mock
+  behaves_like :rack_test
 
   should 'have index action' do
     got = get('/')

data/spec/example/link.rb

@@ -2,7 +2,7 @@ require 'spec/helper'
 require 'example/link'
 
 describe 'example/link' do
-  behaves_like :mock
+  behaves_like :rack_test
 
   should 'have index on Linking' do
     get('/').body.should == 'Index links to <a href="/help">Help?</a>'

data/spec/example/provides.rb

@@ -2,7 +2,7 @@ require 'spec/helper'
 require 'example/provides'
 
 describe 'examples/provide' do
-  behaves_like :mock
+  behaves_like :rack_test
 
   it 'provides YAML representation' do
     get '/list.yaml'

data/spec/example/session.rb

@@ -2,7 +2,7 @@ require 'spec/helper'
 require 'example/session'
 
 describe 'example/session' do
-  behaves_like :mock
+  behaves_like :rack_test
 
   it 'starts at 0' do
     get('/').body.should =~ /Value is: 0/

data/spec/innate/action/layout.rb

@@ -75,7 +75,7 @@ class SpecActionLayoutMulti < SpecActionLayout
 end
 
 describe 'Innate::Action#layout' do
-  behaves_like :mock
+  behaves_like :rack_test
 
   it 'uses a layout method' do
     get('/from_method').body.should == '<pre>Method Layout</pre>'

data/spec/innate/helper/aspect.rb

@@ -36,7 +36,7 @@ class AspecNoMethodSpec
 end
 
 describe Innate::Helper::Aspect do
-  behaves_like :mock
+  behaves_like :rack_test
 
   it 'executes before aspect' do
     $aspect_spec_before = 0

data/spec/innate/helper/flash.rb

@@ -54,7 +54,7 @@ class SpecFlashSub < SpecFlash
 end
 
 describe Innate::Helper::Flash do
-  behaves_like :mock
+  behaves_like :rack_test
 
   should 'set and forget flash twice' do
     get('/welcome').body.should == 'Welcome manveru'

data/spec/innate/helper/link.rb

@@ -130,7 +130,7 @@ describe Innate::Helper::Link do
   end
 
   describe '#route_self' do
-    behaves_like :mock
+    behaves_like :rack_test
     should 'provide a route to the node of the currently active action' do
       get('/auto_route').body.should == '/elsewhere'
       get('/two/auto_route').body.should == '/two/elsewhere'

data/spec/innate/helper/redirect.rb

@@ -65,7 +65,7 @@ class SpecRedirectHelper
 end
 
 describe Innate::Helper::Redirect do
-  behaves_like :mock
+  behaves_like :rack_test
 
   @uri = 'http://localhost:7000'
 

data/spec/innate/helper/render.rb

@@ -96,7 +96,7 @@ end
 
 describe Innate::Helper::Render do
   describe '#render_full' do
-    behaves_like :mock
+    behaves_like :rack_test
 
     it 'renders a full action' do
       get('/render_full/standard').body.should == 'foo: []'
@@ -120,7 +120,7 @@ describe Innate::Helper::Render do
   end
 
   describe '#render_partial' do
-    behaves_like :mock
+    behaves_like :rack_test
 
     it 'renders action with layout' do
       get('/render_partial/standard').body.should == '{ hello }'
@@ -132,7 +132,7 @@ describe Innate::Helper::Render do
   end
 
   describe '#render_view' do
-    behaves_like :mock
+    behaves_like :rack_test
 
     it 'renders action without calling the method or applying layout' do
       get('/render_view/without_method_or_layout').body.should == '{ 42 }'
@@ -140,7 +140,7 @@ describe Innate::Helper::Render do
   end
 
   describe 'misc functionality' do
-    behaves_like :mock
+    behaves_like :rack_test
 
     it 'can render_partial in a loop' do
       get('/misc/loop').body.scan(/\d+/).should == %w[1 2 3 4 5]
@@ -152,7 +152,7 @@ describe Innate::Helper::Render do
   end
 
   describe '#render_file' do
-    behaves_like :mock
+    behaves_like :rack_test
 
     it 'renders file from absolute path' do
       get('/render_file/absolute').body.should == '{ ! }'