Commit 7ea36e39165fb19e7f28939196b57534be52da4f to ivey's merb-core

ivey / merb-core

Fork of wycats/merb-core
Description:	ivey's experimental merb-core
Homepage:	http://gweezlebur.com
Clone URL:	git://github.com/ivey/merb-core.git Give this clone URL to anyone. `git clone git://github.com/ivey/merb-core.git`
Search Repo:

Speed up synonym lookup by order of magnitude :(

wycats (author)

Fri Jun 20 15:09:16 -0700 2008

commit 7ea36e39165fb19e7f28939196b57534be52da4f
tree b81d24466343e700f3dc25769939a3b0366935b7
parent f3aba3d20379015aa810ecc95f019e212264aed2

lib/merb-core/controller/mime.rb
lib/merb-core/controller/mixins/responder.rb
merb-core.gemspec

lib/merb-core/controller/mime.rb

0
@@ -46,6 +46,10 @@ module Merb
0
          :response_headers  => new_response_headers,
0
          :response_block    => block })
0
 
0
+      mimes.each do |mime|
0
+        ResponderMixin::MIMES.update(mime => key)
0
+      end
0
+
0
       Merb::RenderMixin.class_eval <<-EOS, __FILE__, __LINE__
0
         def render_#{key}(thing = nil, opts = {})
0
           self.content_type = :#{key}

lib/merb-core/controller/mixins/responder.rb

0
@@ -98,6 +98,7 @@ module Merb
0
   module ResponderMixin
0
     
0
     TYPES = Dictionary.new
0
+    MIMES = {}
0
 
0
     class ContentTypeAlreadySet < StandardError; end
0
     
0
@@ -457,9 +458,12 @@ module Merb
0
     # Array[String]::
0
     #   All Accept header values, such as "text/html", that match this type.
0
     def synonyms
0
-      @syns ||= Merb.available_mime_types.values.map do |e| 
0
-        e[:accepts] if e[:accepts].include?(@media_range)
0
-      end.compact.flatten
0
+      return @syns if @syns
0
+      if mime = Merb.available_mime_types[Merb::ResponderMixin::MIMES[@media_range]]
0
+        @syns = mime[:accepts]
0
+      else
0
+        @syns = []
0
+      end
0
     end
0
 
0
     # ==== Returns

merb-core.gemspec

0
@@ -1,70 +1,101 @@
0
 Gem::Specification.new do |s|
0
-  s.has_rdoc = "true"
0
-  s.specification_version = "2"
0
-  s.loaded = "false"
0
-  s.bindir = "bin"
0
-  s.email = "ez@engineyard.com"
0
+  s.requirements = ["install the json gem to get faster json parsing"]
0
   s.required_ruby_version = ">= 1.8.4"
0
-  s.rubygems_version = "1.1.0"
0
+  s.extra_rdoc_files = ["README", "LICENSE", "TODO"]
0
+  s.require_paths = ["lib"]
0
+  s.rubygems_version = "1.1.1"
0
   s.homepage = "http://merbivore.com"
0
+  s.executables = ["merb"]
0
   s.platform = "ruby"
0
   s.summary = "Merb. Pocket rocket web framework."
0
-  s.extra_rdoc_files = ["README", "LICENSE", "TODO"]
0
-  s.description = "Merb. Pocket rocket web framework."
0
-  s.add_dependency "erubis", ">= 0"
0
-  s.add_dependency "rake", ">= 0"
0
-  s.add_dependency "json_pure", ">= 0"
0
-  s.add_dependency "rspec", ">= 0"
0
-  s.add_dependency "rack", ">= 0"
0
-  s.add_dependency "hpricot", ">= 0"
0
-  s.add_dependency "mime-types", ">= 0"
0
-  s.executables = ["merb"]
0
-  s.date = "Thu May 08 00:00:00 +0300 2008"
0
-  s.version = "0.9.3"
0
   s.files = ["LICENSE",
0
  "README",
0
  "Rakefile",
0
  "TODO",
0
- "docs/merb-core-call-stack-diagram.mmap",
0
- "docs/setting-up-merb-application-structure.markdown",
0
- "docs/new_render_api",
0
- "docs/merb-core-call-stack-diagram.png",
0
  "docs/bootloading.dox",
0
- "docs/merb-core-call-stack-diagram.pdf",
0
  "docs/documentation_standards",
0
+ "docs/merb-core-call-stack-diagram.mmap",
0
+ "docs/merb-core-call-stack-diagram.pdf",
0
+ "docs/merb-core-call-stack-diagram.png",
0
+ "docs/new_render_api",
0
  "bin/merb",
0
  "bin/merb-specs",
0
+ "spec/private",
0
+ "spec/private/config",
0
+ "spec/private/config/adapter_spec.rb",
0
+ "spec/private/config/config_spec.rb",
0
+ "spec/private/config/environment_spec.rb",
0
+ "spec/private/config/spec_helper.rb",
0
+ "spec/private/core_ext",
0
+ "spec/private/core_ext/class_spec.rb",
0
+ "spec/private/core_ext/hash_spec.rb",
0
+ "spec/private/core_ext/kernel_spec.rb",
0
+ "spec/private/core_ext/object_spec.rb",
0
+ "spec/private/core_ext/set_spec.rb",
0
+ "spec/private/core_ext/string_spec.rb",
0
+ "spec/private/core_ext/time_spec.rb",
0
+ "spec/private/dispatch",
0
+ "spec/private/dispatch/bootloader_spec.rb",
0
+ "spec/private/dispatch/cookies_spec.rb",
0
+ "spec/private/dispatch/dispatch_spec.rb",
0
+ "spec/private/dispatch/fixture",
0
+ "spec/private/dispatch/fixture/app",
0
+ "spec/private/dispatch/fixture/app/controllers",
0
+ "spec/private/dispatch/fixture/app/controllers/application.rb",
0
+ "spec/private/dispatch/fixture/app/controllers/exceptions.rb",
0
+ "spec/private/dispatch/fixture/app/controllers/foo.rb",
0
+ "spec/private/dispatch/fixture/app/helpers",
0
+ "spec/private/dispatch/fixture/app/helpers/global_helpers.rb",
0
+ "spec/private/dispatch/fixture/app/views",
0
+ "spec/private/dispatch/fixture/app/views/exeptions",
0
+ "spec/private/dispatch/fixture/app/views/exeptions/client_error.html.erb",
0
+ "spec/private/dispatch/fixture/app/views/exeptions/internal_server_error.html.erb",
0
+ "spec/private/dispatch/fixture/app/views/exeptions/not_acceptable.html.erb",
0
+ "spec/private/dispatch/fixture/app/views/exeptions/not_found.html.erb",
0
+ "spec/private/dispatch/fixture/app/views/foo",
0
+ "spec/private/dispatch/fixture/app/views/foo/bar.html.erb",
0
+ "spec/private/dispatch/fixture/app/views/layout",
0
+ "spec/private/dispatch/fixture/app/views/layout/application.html.erb",
0
+ "spec/private/dispatch/fixture/config",
0
+ "spec/private/dispatch/fixture/config/black_hole.rb",
0
+ "spec/private/dispatch/fixture/config/environments",
0
+ "spec/private/dispatch/fixture/config/environments/development.rb",
0
+ "spec/private/dispatch/fixture/config/environments/production.rb",
0
+ "spec/private/dispatch/fixture/config/environments/test.rb",
0
+ "spec/private/dispatch/fixture/config/init.rb",
0
+ "spec/private/dispatch/fixture/config/rack.rb",
0
+ "spec/private/dispatch/fixture/config/router.rb",
0
+ "spec/private/dispatch/fixture/log",
0
+ "spec/private/dispatch/fixture/log/merb_test.log",
0
+ "spec/private/dispatch/fixture/merb.4000.pid",
0
+ "spec/private/dispatch/fixture/public",
0
+ "spec/private/dispatch/fixture/public/images",
0
+ "spec/private/dispatch/fixture/public/images/merb.jpg",
0
+ "spec/private/dispatch/fixture/public/merb.fcgi",
0
+ "spec/private/dispatch/fixture/public/stylesheets",
0
+ "spec/private/dispatch/fixture/public/stylesheets/master.css",
0
+ "spec/private/dispatch/route_params_spec.rb",
0
+ "spec/private/dispatch/session_mixin_spec.rb",
0
+ "spec/private/dispatch/spec_helper.rb",
0
+ "spec/private/plugins",
0
+ "spec/private/plugins/plugin_spec.rb",
0
+ "spec/private/rack",
0
+ "spec/private/rack/application_spec.rb",
0
+ "spec/private/router",
0
+ "spec/private/router/behavior_spec.rb",
0
+ "spec/private/router/fixture",
0
+ "spec/private/router/fixture/log",
0
+ "spec/private/router/fixture/log/merb_test.log",
0
+ "spec/private/router/route_spec.rb",
0
+ "spec/private/router/router_spec.rb",
0
+ "spec/private/vendor",
0
+ "spec/private/vendor/facets",
0
+ "spec/private/vendor/facets/plural_spec.rb",
0
+ "spec/private/vendor/facets/singular_spec.rb",
0
  "spec/public",
0
- "spec/public/template",
0
- "spec/public/template/templates",
0
- "spec/public/template/templates/template.html.myt",
0
- "spec/public/template/templates/error.html.erb",
0
- "spec/public/template/templates/template.html.erb",
0
- "spec/public/template/template_spec.rb",
0
- "spec/public/reloading",
0
- "spec/public/reloading/reload_spec.rb",
0
- "spec/public/reloading/directory",
0
- "spec/public/reloading/directory/app",
0
- "spec/public/reloading/directory/app/controllers",
0
- "spec/public/reloading/directory/app/controllers/reload.rb",
0
- "spec/public/reloading/directory/app/controllers/application.rb",
0
- "spec/public/reloading/directory/config",
0
- "spec/public/reloading/directory/config/init.rb",
0
- "spec/public/reloading/directory/log",
0
- "spec/public/reloading/directory/log/merb_test.log",
0
  "spec/public/abstract_controller",
0
- "spec/public/abstract_controller/filter_spec.rb",
0
- "spec/public/abstract_controller/render_spec.rb",
0
- "spec/public/abstract_controller/display_spec.rb",
0
  "spec/public/abstract_controller/controllers",
0
- "spec/public/abstract_controller/controllers/render.rb",
0
- "spec/public/abstract_controller/controllers/display.rb",
0
  "spec/public/abstract_controller/controllers/alt_views",
0
- "spec/public/abstract_controller/controllers/alt_views/partial",
0
- "spec/public/abstract_controller/controllers/alt_views/partial/basic_partial_with_multiple_roots",
0
- "spec/public/abstract_controller/controllers/alt_views/partial/basic_partial_with_multiple_roots/_partial.erb",
0
- "spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_and_custom_location",
0
- "spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_and_custom_location/index.erb",
0
  "spec/public/abstract_controller/controllers/alt_views/layout",
0
  "spec/public/abstract_controller/controllers/alt_views/layout/application.erb",
0
  "spec/public/abstract_controller/controllers/alt_views/layout/merb",
0
@@ -73,337 +104,347 @@ Gem::Specification.new do |s|
0
  "spec/public/abstract_controller/controllers/alt_views/layout/merb/test/fixtures/abstract",
0
  "spec/public/abstract_controller/controllers/alt_views/layout/merb/test/fixtures/abstract/render_string_controller_layout.erb",
0
  "spec/public/abstract_controller/controllers/alt_views/layout/merb/test/fixtures/abstract/render_template_controller_layout.erb",
0
- "spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_inherited",
0
- "spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_inherited/index.erb",
0
  "spec/public/abstract_controller/controllers/alt_views/merb",
0
  "spec/public/abstract_controller/controllers/alt_views/merb/test",
0
  "spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures",
0
  "spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract",
0
  "spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract/display_object_with_multiple_roots",
0
- "spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract/display_object_with_multiple_roots/show.erb",
0
  "spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract/display_object_with_multiple_roots/index.erb",
0
+ "spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract/display_object_with_multiple_roots/show.erb",
0
  "spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract/render_template_multiple_roots",
0
  "spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract/render_template_multiple_roots/index.erb",
0
+ "spec/public/abstract_controller/controllers/alt_views/partial",
0
+ "spec/public/abstract_controller/controllers/alt_views/partial/basic_partial_with_multiple_roots",
0
+ "spec/public/abstract_controller/controllers/alt_views/partial/basic_partial_with_multiple_roots/_partial.erb",
0
+ "spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_and_custom_location",
0
+ "spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_and_custom_location/index.erb",
0
+ "spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_inherited",
0
+ "spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_inherited/index.erb",
0
+ "spec/public/abstract_controller/controllers/cousins.rb",
0
+ "spec/public/abstract_controller/controllers/display.rb",
0
+ "spec/public/abstract_controller/controllers/filters.rb",
0
+ "spec/public/abstract_controller/controllers/helpers.rb",
0
  "spec/public/abstract_controller/controllers/partial.rb",
0
+ "spec/public/abstract_controller/controllers/render.rb",
0
  "spec/public/abstract_controller/controllers/views",
0
- "spec/public/abstract_controller/controllers/views/test_display",
0
- "spec/public/abstract_controller/controllers/views/test_display/foo.html.erb",
0
- "spec/public/abstract_controller/controllers/views/partial",
0
- "spec/public/abstract_controller/controllers/views/partial/with_partial",
0
- "spec/public/abstract_controller/controllers/views/partial/with_partial/_with_partial.erb",
0
- "spec/public/abstract_controller/controllers/views/partial/with_partial/index.erb",
0
- "spec/public/abstract_controller/controllers/views/partial/partial_with_locals",
0
- "spec/public/abstract_controller/controllers/views/partial/partial_with_locals/_variables.erb",
0
- "spec/public/abstract_controller/controllers/views/partial/partial_with_locals/index.erb",
0
- "spec/public/abstract_controller/controllers/views/partial/partial_with_with_and_locals",
0
- "spec/public/abstract_controller/controllers/views/partial/partial_with_with_and_locals/_both.erb",
0
- "spec/public/abstract_controller/controllers/views/partial/partial_with_with_and_locals/index.erb",
0
- "spec/public/abstract_controller/controllers/views/partial/with_nil_partial",
0
- "spec/public/abstract_controller/controllers/views/partial/with_nil_partial/_with_partial.erb",
0
- "spec/public/abstract_controller/controllers/views/partial/with_nil_partial/index.erb",
0
- "spec/public/abstract_controller/controllers/views/partial/partial_in_another_directory",
0
- "spec/public/abstract_controller/controllers/views/partial/partial_in_another_directory/index.erb",
0
- "spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_as",
0
- "spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_as/_collection.erb",
0
- "spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_as/index.erb",
0
- "spec/public/abstract_controller/controllers/views/partial/with_as_partial",
0
- "spec/public/abstract_controller/controllers/views/partial/with_as_partial/_with_partial.erb",
0
- "spec/public/abstract_controller/controllers/views/partial/with_as_partial/index.erb",
0
- "spec/public/abstract_controller/controllers/views/partial/partial_with_collections",
0
- "spec/public/abstract_controller/controllers/views/partial/partial_with_collections/_collection.erb",
0
- "spec/public/abstract_controller/controllers/views/partial/partial_with_collections/index.erb",
0
- "spec/public/abstract_controller/controllers/views/partial/nested_partial",
0
- "spec/public/abstract_controller/controllers/views/partial/nested_partial/_first.erb",
0
- "spec/public/abstract_controller/controllers/views/partial/nested_partial/_second.erb",
0
- "spec/public/abstract_controller/controllers/views/partial/nested_partial/index.erb",
0
- "spec/public/abstract_controller/controllers/views/partial/basic_partial",
0
- "spec/public/abstract_controller/controllers/views/partial/basic_partial/_partial.erb",
0
- "spec/public/abstract_controller/controllers/views/partial/basic_partial/index.erb",
0
- "spec/public/abstract_controller/controllers/views/partial/basic_partial_with_multiple_roots",
0
- "spec/public/abstract_controller/controllers/views/partial/basic_partial_with_multiple_roots/index.erb",
0
- "spec/public/abstract_controller/controllers/views/partial/partial_with_both",
0
- "spec/public/abstract_controller/controllers/views/partial/partial_with_both/_collection.erb",
0
- "spec/public/abstract_controller/controllers/views/partial/partial_with_both/index.erb",
0
- "spec/public/abstract_controller/controllers/views/partial/another_directory",
0
- "spec/public/abstract_controller/controllers/views/partial/another_directory/_partial.erb",
0
- "spec/public/abstract_controller/controllers/views/layout",
0
- "spec/public/abstract_controller/controllers/views/layout/alt.erb",
0
- "spec/public/abstract_controller/controllers/views/layout/custom.erb",
0
- "spec/public/abstract_controller/controllers/views/wonderful",
0
- "spec/public/abstract_controller/controllers/views/wonderful/index.erb",
0
  "spec/public/abstract_controller/controllers/views/helpers",
0
- "spec/public/abstract_controller/controllers/views/helpers/concat",
0
- "spec/public/abstract_controller/controllers/views/helpers/concat/index.erb",
0
  "spec/public/abstract_controller/controllers/views/helpers/capture",
0
  "spec/public/abstract_controller/controllers/views/helpers/capture/index.erb",
0
- "spec/public/abstract_controller/controllers/views/test_render",
0
- "spec/public/abstract_controller/controllers/views/test_render/foo.html.erb",
0
+ "spec/public/abstract_controller/controllers/views/helpers/concat",
0
+ "spec/public/abstract_controller/controllers/views/helpers/concat/index.erb",
0
+ "spec/public/abstract_controller/controllers/views/layout",
0
+ "spec/public/abstract_controller/controllers/views/layout/alt.erb",
0
+ "spec/public/abstract_controller/controllers/views/layout/custom.erb",
0
  "spec/public/abstract_controller/controllers/views/merb",
0
  "spec/public/abstract_controller/controllers/views/merb/test",
0
  "spec/public/abstract_controller/controllers/views/merb/test/fixtures",
0
  "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract",
0
  "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/display_object",
0
  "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/display_object/index.erb",
0
+ "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/display_object_with_action",
0
+ "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/display_object_with_action/new.erb",
0
  "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template",
0
  "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template/index.erb",
0
- "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_multiple_roots",
0
- "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_multiple_roots/show.erb",
0
- "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_multiple_roots/index.erb",
0
- "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_custom_layout",
0
- "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_custom_layout/index.erb",
0
  "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_app_layout",
0
  "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_app_layout/index.erb",
0
- "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/display_object_with_action",
0
- "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/display_object_with_action/new.erb",
0
- "spec/public/abstract_controller/controllers/helpers.rb",
0
- "spec/public/abstract_controller/controllers/filters.rb",
0
+ "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_custom_layout",
0
+ "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_custom_layout/index.erb",
0
+ "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_multiple_roots",
0
+ "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_multiple_roots/index.erb",
0
+ "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_multiple_roots/show.erb",
0
+ "spec/public/abstract_controller/controllers/views/partial",
0
+ "spec/public/abstract_controller/controllers/views/partial/another_directory",
0
+ "spec/public/abstract_controller/controllers/views/partial/another_directory/_partial.erb",
0
+ "spec/public/abstract_controller/controllers/views/partial/basic_partial",
0
+ "spec/public/abstract_controller/controllers/views/partial/basic_partial/_partial.erb",
0
+ "spec/public/abstract_controller/controllers/views/partial/basic_partial/index.erb",
0
+ "spec/public/abstract_controller/controllers/views/partial/basic_partial_with_multiple_roots",
0
+ "spec/public/abstract_controller/controllers/views/partial/basic_partial_with_multiple_roots/index.erb",
0
+ "spec/public/abstract_controller/controllers/views/partial/nested_partial",
0
+ "spec/public/abstract_controller/controllers/views/partial/nested_partial/_first.erb",
0
+ "spec/public/abstract_controller/controllers/views/partial/nested_partial/_second.erb",
0
+ "spec/public/abstract_controller/controllers/views/partial/nested_partial/index.erb",
0
+ "spec/public/abstract_controller/controllers/views/partial/partial_in_another_directory",
0
+ "spec/public/abstract_controller/controllers/views/partial/partial_in_another_directory/index.erb",
0
+ "spec/public/abstract_controller/controllers/views/partial/partial_with_both",
0
+ "spec/public/abstract_controller/controllers/views/partial/partial_with_both/_collection.erb",
0
+ "spec/public/abstract_controller/controllers/views/partial/partial_with_both/index.erb",
0
+ "spec/public/abstract_controller/controllers/views/partial/partial_with_collections",
0
+ "spec/public/abstract_controller/controllers/views/partial/partial_with_collections/_collection.erb",
0
+ "spec/public/abstract_controller/controllers/views/partial/partial_with_collections/index.erb",
0
+ "spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_as",
0
+ "spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_as/_collection.erb",
0
+ "spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_as/index.erb",
0
+ "spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_counter",
0
+ "spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_yield",
0
+ "spec/public/abstract_controller/controllers/views/partial/partial_with_locals",
0
+ "spec/public/abstract_controller/controllers/views/partial/partial_with_locals/_variables.erb",
0
+ "spec/public/abstract_controller/controllers/views/partial/partial_with_locals/index.erb",
0
+ "spec/public/abstract_controller/controllers/views/partial/partial_with_with_and_locals",
0
+ "spec/public/abstract_controller/controllers/views/partial/partial_with_with_and_locals/_both.erb",
0
+ "spec/public/abstract_controller/controllers/views/partial/partial_with_with_and_locals/index.erb",
0
+ "spec/public/abstract_controller/controllers/views/partial/with_absolute_partial",
0
+ "spec/public/abstract_controller/controllers/views/partial/with_absolute_partial/_partial.erb",
0
+ "spec/public/abstract_controller/controllers/views/partial/with_absolute_partial/index.erb",
0
+ "spec/public/abstract_controller/controllers/views/partial/with_as_partial",
0
+ "spec/public/abstract_controller/controllers/views/partial/with_as_partial/_with_partial.erb",
0
+ "spec/public/abstract_controller/controllers/views/partial/with_as_partial/index.erb",
0
+ "spec/public/abstract_controller/controllers/views/partial/with_nil_partial",
0
+ "spec/public/abstract_controller/controllers/views/partial/with_nil_partial/_with_partial.erb",
0
+ "spec/public/abstract_controller/controllers/views/partial/with_nil_partial/index.erb",
0
+ "spec/public/abstract_controller/controllers/views/partial/with_partial",
0
+ "spec/public/abstract_controller/controllers/views/partial/with_partial/_with_partial.erb",
0
+ "spec/public/abstract_controller/controllers/views/partial/with_partial/index.erb",
0
+ "spec/public/abstract_controller/controllers/views/test_display",
0
+ "spec/public/abstract_controller/controllers/views/test_display/foo.html.erb",
0
+ "spec/public/abstract_controller/controllers/views/test_render",
0
+ "spec/public/abstract_controller/controllers/views/test_render/foo.html.erb",
0
+ "spec/public/abstract_controller/controllers/views/wonderful",
0
+ "spec/public/abstract_controller/controllers/views/wonderful/index.erb",
0
+ "spec/public/abstract_controller/display_spec.rb",
0
+ "spec/public/abstract_controller/filter_spec.rb",
0
+ "spec/public/abstract_controller/helper_spec.rb",
0
  "spec/public/abstract_controller/partial_spec.rb",
0
+ "spec/public/abstract_controller/render_spec.rb",
0
  "spec/public/abstract_controller/spec_helper.rb",
0
- "spec/public/abstract_controller/helper_spec.rb",
0
- "spec/public/DEFINITIONS",
0
- "spec/public/test",
0
- "spec/public/test/controller_matchers_spec.rb",
0
- "spec/public/test/route_matchers_spec.rb",
0
- "spec/public/test/request_helper_spec.rb",
0
- "spec/public/test/multipart_request_helper_spec.rb",
0
- "spec/public/test/view_matchers_spec.rb",
0
- "spec/public/test/controllers",
0
- "spec/public/test/controllers/controller_assertion_mock.rb",
0
- "spec/public/test/controllers/spec_helper_controller.rb",
0
- "spec/public/test/controllers/dispatch_controller.rb",
0
- "spec/public/test/route_helper_spec.rb",
0
- "spec/public/test/view_helper_spec.rb",
0
- "spec/public/test/multipart_upload_text_file.txt",
0
- "spec/public/request",
0
- "spec/public/request/multipart_spec.rb",
0
- "spec/public/request/request_spec.rb",
0
- "spec/public/core",
0
- "spec/public/core/merb_core_spec.rb",
0
- "spec/public/router",
0
- "spec/public/router/special_spec.rb",
0
- "spec/public/router/default_spec.rb",
0
- "spec/public/router/namespace_spec.rb",
0
- "spec/public/router/deferred_spec.rb",
0
- "spec/public/router/spec_helper.rb",
0
- "spec/public/router/nested_resources_spec.rb",
0
- "spec/public/router/resources_spec.rb",
0
- "spec/public/router/resource_spec.rb",
0
- "spec/public/router/string_spec.rb",
0
- "spec/public/logger",
0
- "spec/public/logger/logger_spec.rb",
0
- "spec/public/logger/spec_helper.rb",
0
  "spec/public/boot_loader",
0
  "spec/public/boot_loader/boot_loader_spec.rb",
0
  "spec/public/boot_loader/spec_helper.rb",
0
  "spec/public/controller",
0
  "spec/public/controller/authentication_spec.rb",
0
- "spec/public/controller/display_spec.rb",
0
+ "spec/public/controller/base_spec.rb",
0
  "spec/public/controller/controllers",
0
+ "spec/public/controller/controllers/authentication.rb",
0
+ "spec/public/controller/controllers/base.rb",
0
  "spec/public/controller/controllers/display.rb",
0
- "spec/public/controller/controllers/url.rb",
0
  "spec/public/controller/controllers/responder.rb",
0
- "spec/public/controller/controllers/authentication.rb",
0
+ "spec/public/controller/controllers/url.rb",
0
  "spec/public/controller/controllers/views",
0
  "spec/public/controller/controllers/views/layout",
0
  "spec/public/controller/controllers/views/layout/custom.html.erb",
0
  "spec/public/controller/controllers/views/layout/custom_arg.html.erb",
0
+ "spec/public/controller/controllers/views/layout/custom_arg.json.erb",
0
  "spec/public/controller/controllers/views/merb",
0
  "spec/public/controller/controllers/views/merb/test",
0
  "spec/public/controller/controllers/views/merb/test/fixtures",
0
  "spec/public/controller/controllers/views/merb/test/fixtures/controllers",
0
- "spec/public/controller/controllers/views/merb/test/fixtures/controllers/multi_provides",
0
- "spec/public/controller/controllers/views/merb/test/fixtures/controllers/multi_provides/index.html.erb",
0
- "spec/public/controller/controllers/views/merb/test/fixtures/controllers/multi_provides/index.js.erb",
0
- "spec/public/controller/controllers/views/merb/test/fixtures/controllers/layout",
0
- "spec/public/controller/controllers/views/merb/test/fixtures/controllers/layout/custom.html.erb",
0
- "spec/public/controller/controllers/views/merb/test/fixtures/controllers/html_default",
0
- "spec/public/controller/controllers/views/merb/test/fixtures/controllers/html_default/index.html.erb",
0
+ "spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_provides",
0
+ "spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_provides/index.html.erb",
0
+ "spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_provides/index.xml.erb",
0
+ "spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template",
0
+ "spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template/index.html.erb",
0
+ "spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template/no_layout.html.erb",
0
  "spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template_argument",
0
  "spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template_argument/index.html.erb",
0
+ "spec/public/controller/controllers/views/merb/test/fixtures/controllers/html_default",
0
+ "spec/public/controller/controllers/views/merb/test/fixtures/controllers/html_default/index.html.erb",
0
+ "spec/public/controller/controllers/views/merb/test/fixtures/controllers/layout",
0
+ "spec/public/controller/controllers/views/merb/test/fixtures/controllers/layout/custom.html.erb",
0
  "spec/public/controller/controllers/views/merb/test/fixtures/controllers/local_provides",
0
- "spec/public/controller/controllers/views/merb/test/fixtures/controllers/local_provides/index.xml.erb",
0
  "spec/public/controller/controllers/views/merb/test/fixtures/controllers/local_provides/index.html.erb",
0
- "spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template",
0
- "spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template/index.html.erb",
0
- "spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_provides",
0
- "spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_provides/index.xml.erb",
0
- "spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_provides/index.html.erb",
0
- "spec/public/controller/controllers/base.rb",
0
+ "spec/public/controller/controllers/views/merb/test/fixtures/controllers/local_provides/index.xml.erb",
0
+ "spec/public/controller/controllers/views/merb/test/fixtures/controllers/multi_provides",
0
+ "spec/public/controller/controllers/views/merb/test/fixtures/controllers/multi_provides/index.html.erb",
0
+ "spec/public/controller/controllers/views/merb/test/fixtures/controllers/multi_provides/index.js.erb",
0
+ "spec/public/controller/display_spec.rb",
0
+ "spec/public/controller/responder_spec.rb",
0
  "spec/public/controller/spec_helper.rb",
0
- "spec/public/controller/base_spec.rb",
0
  "spec/public/controller/url_spec.rb",
0
- "spec/public/controller/responder_spec.rb",
0
+ "spec/public/core",
0
+ "spec/public/core/merb_core_spec.rb",
0
+ "spec/public/core_ext",
0
+ "spec/public/core_ext/fixtures",
0
+ "spec/public/core_ext/fixtures/core_ext_dependency.rb",
0
+ "spec/public/core_ext/kernel_spec.rb",
0
+ "spec/public/core_ext/spec_helper.rb",
0
+ "spec/public/DEFINITIONS",
0
  "spec/public/directory_structure",
0
  "spec/public/directory_structure/directory",
0
  "spec/public/directory_structure/directory/app",
0
  "spec/public/directory_structure/directory/app/controllers",
0
- "spec/public/directory_structure/directory/app/controllers/base.rb",
0
  "spec/public/directory_structure/directory/app/controllers/application.rb",
0
+ "spec/public/directory_structure/directory/app/controllers/base.rb",
0
  "spec/public/directory_structure/directory/app/controllers/custom.rb",
0
  "spec/public/directory_structure/directory/app/views",
0
- "spec/public/directory_structure/directory/app/views/wonderful",
0
- "spec/public/directory_structure/directory/app/views/wonderful/template.erb",
0
  "spec/public/directory_structure/directory/app/views/base",
0
  "spec/public/directory_structure/directory/app/views/base/template.html.erb",
0
+ "spec/public/directory_structure/directory/app/views/wonderful",
0
+ "spec/public/directory_structure/directory/app/views/wonderful/template.erb",
0
  "spec/public/directory_structure/directory/config",
0
  "spec/public/directory_structure/directory/config/router.rb",
0
  "spec/public/directory_structure/directory/log",
0
  "spec/public/directory_structure/directory/log/merb_test.log",
0
+ "spec/public/directory_structure/directory/merb.4000.pid",
0
  "spec/public/directory_structure/directory_spec.rb",
0
- "spec/private",
0
- "spec/private/rack",
0
- "spec/private/rack/application_spec.rb",
0
- "spec/private/config",
0
- "spec/private/config/config_spec.rb",
0
- "spec/private/config/spec_helper.rb",
0
- "spec/private/config/environment_spec.rb",
0
- "spec/private/config/adapter_spec.rb",
0
- "spec/private/dispatch",
0
- "spec/private/dispatch/dispatch_spec.rb",
0
- "spec/private/dispatch/spec_helper.rb",