@@ -46,6 +46,10 @@ module Merb :response_headers => new_response_headers, :response_block => block }) + mimes.each do |mime| + ResponderMixin::MIMES.update(mime => key) + end + Merb::RenderMixin.class_eval <<-EOS, __FILE__, __LINE__ def render_#{key}(thing = nil, opts = {}) self.content_type = :#{key} lib/merb-core/controller/mime.rb @@ -98,6 +98,7 @@ module Merb module ResponderMixin TYPES = Dictionary.new + MIMES = {} class ContentTypeAlreadySet < StandardError; end @@ -457,9 +458,12 @@ module Merb # Array[String]:: # All Accept header values, such as "text/html", that match this type. def synonyms - @syns ||= Merb.available_mime_types.values.map do |e| - e[:accepts] if e[:accepts].include?(@media_range) - end.compact.flatten + return @syns if @syns + if mime = Merb.available_mime_types[Merb::ResponderMixin::MIMES[@media_range]] + @syns = mime[:accepts] + else + @syns = [] + end end # ==== Returns lib/merb-core/controller/mixins/responder.rb @@ -1,70 +1,101 @@ Gem::Specification.new do |s| - s.has_rdoc = "true" - s.specification_version = "2" - s.loaded = "false" - s.bindir = "bin" - s.email = "ez@engineyard.com" + s.requirements = ["install the json gem to get faster json parsing"] s.required_ruby_version = ">= 1.8.4" - s.rubygems_version = "1.1.0" + s.extra_rdoc_files = ["README", "LICENSE", "TODO"] + s.require_paths = ["lib"] + s.rubygems_version = "1.1.1" s.homepage = "http://merbivore.com" + s.executables = ["merb"] s.platform = "ruby" s.summary = "Merb. Pocket rocket web framework." - s.extra_rdoc_files = ["README", "LICENSE", "TODO"] - s.description = "Merb. Pocket rocket web framework." - s.add_dependency "erubis", ">= 0" - s.add_dependency "rake", ">= 0" - s.add_dependency "json_pure", ">= 0" - s.add_dependency "rspec", ">= 0" - s.add_dependency "rack", ">= 0" - s.add_dependency "hpricot", ">= 0" - s.add_dependency "mime-types", ">= 0" - s.executables = ["merb"] - s.date = "Thu May 08 00:00:00 +0300 2008" - s.version = "0.9.3" s.files = ["LICENSE", "README", "Rakefile", "TODO", - "docs/merb-core-call-stack-diagram.mmap", - "docs/setting-up-merb-application-structure.markdown", - "docs/new_render_api", - "docs/merb-core-call-stack-diagram.png", "docs/bootloading.dox", - "docs/merb-core-call-stack-diagram.pdf", "docs/documentation_standards", + "docs/merb-core-call-stack-diagram.mmap", + "docs/merb-core-call-stack-diagram.pdf", + "docs/merb-core-call-stack-diagram.png", + "docs/new_render_api", "bin/merb", "bin/merb-specs", + "spec/private", + "spec/private/config", + "spec/private/config/adapter_spec.rb", + "spec/private/config/config_spec.rb", + "spec/private/config/environment_spec.rb", + "spec/private/config/spec_helper.rb", + "spec/private/core_ext", + "spec/private/core_ext/class_spec.rb", + "spec/private/core_ext/hash_spec.rb", + "spec/private/core_ext/kernel_spec.rb", + "spec/private/core_ext/object_spec.rb", + "spec/private/core_ext/set_spec.rb", + "spec/private/core_ext/string_spec.rb", + "spec/private/core_ext/time_spec.rb", + "spec/private/dispatch", + "spec/private/dispatch/bootloader_spec.rb", + "spec/private/dispatch/cookies_spec.rb", + "spec/private/dispatch/dispatch_spec.rb", + "spec/private/dispatch/fixture", + "spec/private/dispatch/fixture/app", + "spec/private/dispatch/fixture/app/controllers", + "spec/private/dispatch/fixture/app/controllers/application.rb", + "spec/private/dispatch/fixture/app/controllers/exceptions.rb", + "spec/private/dispatch/fixture/app/controllers/foo.rb", + "spec/private/dispatch/fixture/app/helpers", + "spec/private/dispatch/fixture/app/helpers/global_helpers.rb", + "spec/private/dispatch/fixture/app/views", + "spec/private/dispatch/fixture/app/views/exeptions", + "spec/private/dispatch/fixture/app/views/exeptions/client_error.html.erb", + "spec/private/dispatch/fixture/app/views/exeptions/internal_server_error.html.erb", + "spec/private/dispatch/fixture/app/views/exeptions/not_acceptable.html.erb", + "spec/private/dispatch/fixture/app/views/exeptions/not_found.html.erb", + "spec/private/dispatch/fixture/app/views/foo", + "spec/private/dispatch/fixture/app/views/foo/bar.html.erb", + "spec/private/dispatch/fixture/app/views/layout", + "spec/private/dispatch/fixture/app/views/layout/application.html.erb", + "spec/private/dispatch/fixture/config", + "spec/private/dispatch/fixture/config/black_hole.rb", + "spec/private/dispatch/fixture/config/environments", + "spec/private/dispatch/fixture/config/environments/development.rb", + "spec/private/dispatch/fixture/config/environments/production.rb", + "spec/private/dispatch/fixture/config/environments/test.rb", + "spec/private/dispatch/fixture/config/init.rb", + "spec/private/dispatch/fixture/config/rack.rb", + "spec/private/dispatch/fixture/config/router.rb", + "spec/private/dispatch/fixture/log", + "spec/private/dispatch/fixture/log/merb_test.log", + "spec/private/dispatch/fixture/merb.4000.pid", + "spec/private/dispatch/fixture/public", + "spec/private/dispatch/fixture/public/images", + "spec/private/dispatch/fixture/public/images/merb.jpg", + "spec/private/dispatch/fixture/public/merb.fcgi", + "spec/private/dispatch/fixture/public/stylesheets", + "spec/private/dispatch/fixture/public/stylesheets/master.css", + "spec/private/dispatch/route_params_spec.rb", + "spec/private/dispatch/session_mixin_spec.rb", + "spec/private/dispatch/spec_helper.rb", + "spec/private/plugins", + "spec/private/plugins/plugin_spec.rb", + "spec/private/rack", + "spec/private/rack/application_spec.rb", + "spec/private/router", + "spec/private/router/behavior_spec.rb", + "spec/private/router/fixture", + "spec/private/router/fixture/log", + "spec/private/router/fixture/log/merb_test.log", + "spec/private/router/route_spec.rb", + "spec/private/router/router_spec.rb", + "spec/private/vendor", + "spec/private/vendor/facets", + "spec/private/vendor/facets/plural_spec.rb", + "spec/private/vendor/facets/singular_spec.rb", "spec/public", - "spec/public/template", - "spec/public/template/templates", - "spec/public/template/templates/template.html.myt", - "spec/public/template/templates/error.html.erb", - "spec/public/template/templates/template.html.erb", - "spec/public/template/template_spec.rb", - "spec/public/reloading", - "spec/public/reloading/reload_spec.rb", - "spec/public/reloading/directory", - "spec/public/reloading/directory/app", - "spec/public/reloading/directory/app/controllers", - "spec/public/reloading/directory/app/controllers/reload.rb", - "spec/public/reloading/directory/app/controllers/application.rb", - "spec/public/reloading/directory/config", - "spec/public/reloading/directory/config/init.rb", - "spec/public/reloading/directory/log", - "spec/public/reloading/directory/log/merb_test.log", "spec/public/abstract_controller", - "spec/public/abstract_controller/filter_spec.rb", - "spec/public/abstract_controller/render_spec.rb", - "spec/public/abstract_controller/display_spec.rb", "spec/public/abstract_controller/controllers", - "spec/public/abstract_controller/controllers/render.rb", - "spec/public/abstract_controller/controllers/display.rb", "spec/public/abstract_controller/controllers/alt_views", - "spec/public/abstract_controller/controllers/alt_views/partial", - "spec/public/abstract_controller/controllers/alt_views/partial/basic_partial_with_multiple_roots", - "spec/public/abstract_controller/controllers/alt_views/partial/basic_partial_with_multiple_roots/_partial.erb", - "spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_and_custom_location", - "spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_and_custom_location/index.erb", "spec/public/abstract_controller/controllers/alt_views/layout", "spec/public/abstract_controller/controllers/alt_views/layout/application.erb", "spec/public/abstract_controller/controllers/alt_views/layout/merb", @@ -73,337 +104,347 @@ Gem::Specification.new do |s| "spec/public/abstract_controller/controllers/alt_views/layout/merb/test/fixtures/abstract", "spec/public/abstract_controller/controllers/alt_views/layout/merb/test/fixtures/abstract/render_string_controller_layout.erb", "spec/public/abstract_controller/controllers/alt_views/layout/merb/test/fixtures/abstract/render_template_controller_layout.erb", - "spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_inherited", - "spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_inherited/index.erb", "spec/public/abstract_controller/controllers/alt_views/merb", "spec/public/abstract_controller/controllers/alt_views/merb/test", "spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures", "spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract", "spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract/display_object_with_multiple_roots", - "spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract/display_object_with_multiple_roots/show.erb", "spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract/display_object_with_multiple_roots/index.erb", + "spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract/display_object_with_multiple_roots/show.erb", "spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract/render_template_multiple_roots", "spec/public/abstract_controller/controllers/alt_views/merb/test/fixtures/abstract/render_template_multiple_roots/index.erb", + "spec/public/abstract_controller/controllers/alt_views/partial", + "spec/public/abstract_controller/controllers/alt_views/partial/basic_partial_with_multiple_roots", + "spec/public/abstract_controller/controllers/alt_views/partial/basic_partial_with_multiple_roots/_partial.erb", + "spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_and_custom_location", + "spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_and_custom_location/index.erb", + "spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_inherited", + "spec/public/abstract_controller/controllers/alt_views/render_template_multiple_roots_inherited/index.erb", + "spec/public/abstract_controller/controllers/cousins.rb", + "spec/public/abstract_controller/controllers/display.rb", + "spec/public/abstract_controller/controllers/filters.rb", + "spec/public/abstract_controller/controllers/helpers.rb", "spec/public/abstract_controller/controllers/partial.rb", + "spec/public/abstract_controller/controllers/render.rb", "spec/public/abstract_controller/controllers/views", - "spec/public/abstract_controller/controllers/views/test_display", - "spec/public/abstract_controller/controllers/views/test_display/foo.html.erb", - "spec/public/abstract_controller/controllers/views/partial", - "spec/public/abstract_controller/controllers/views/partial/with_partial", - "spec/public/abstract_controller/controllers/views/partial/with_partial/_with_partial.erb", - "spec/public/abstract_controller/controllers/views/partial/with_partial/index.erb", - "spec/public/abstract_controller/controllers/views/partial/partial_with_locals", - "spec/public/abstract_controller/controllers/views/partial/partial_with_locals/_variables.erb", - "spec/public/abstract_controller/controllers/views/partial/partial_with_locals/index.erb", - "spec/public/abstract_controller/controllers/views/partial/partial_with_with_and_locals", - "spec/public/abstract_controller/controllers/views/partial/partial_with_with_and_locals/_both.erb", - "spec/public/abstract_controller/controllers/views/partial/partial_with_with_and_locals/index.erb", - "spec/public/abstract_controller/controllers/views/partial/with_nil_partial", - "spec/public/abstract_controller/controllers/views/partial/with_nil_partial/_with_partial.erb", - "spec/public/abstract_controller/controllers/views/partial/with_nil_partial/index.erb", - "spec/public/abstract_controller/controllers/views/partial/partial_in_another_directory", - "spec/public/abstract_controller/controllers/views/partial/partial_in_another_directory/index.erb", - "spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_as", - "spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_as/_collection.erb", - "spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_as/index.erb", - "spec/public/abstract_controller/controllers/views/partial/with_as_partial", - "spec/public/abstract_controller/controllers/views/partial/with_as_partial/_with_partial.erb", - "spec/public/abstract_controller/controllers/views/partial/with_as_partial/index.erb", - "spec/public/abstract_controller/controllers/views/partial/partial_with_collections", - "spec/public/abstract_controller/controllers/views/partial/partial_with_collections/_collection.erb", - "spec/public/abstract_controller/controllers/views/partial/partial_with_collections/index.erb", - "spec/public/abstract_controller/controllers/views/partial/nested_partial", - "spec/public/abstract_controller/controllers/views/partial/nested_partial/_first.erb", - "spec/public/abstract_controller/controllers/views/partial/nested_partial/_second.erb", - "spec/public/abstract_controller/controllers/views/partial/nested_partial/index.erb", - "spec/public/abstract_controller/controllers/views/partial/basic_partial", - "spec/public/abstract_controller/controllers/views/partial/basic_partial/_partial.erb", - "spec/public/abstract_controller/controllers/views/partial/basic_partial/index.erb", - "spec/public/abstract_controller/controllers/views/partial/basic_partial_with_multiple_roots", - "spec/public/abstract_controller/controllers/views/partial/basic_partial_with_multiple_roots/index.erb", - "spec/public/abstract_controller/controllers/views/partial/partial_with_both", - "spec/public/abstract_controller/controllers/views/partial/partial_with_both/_collection.erb", - "spec/public/abstract_controller/controllers/views/partial/partial_with_both/index.erb", - "spec/public/abstract_controller/controllers/views/partial/another_directory", - "spec/public/abstract_controller/controllers/views/partial/another_directory/_partial.erb", - "spec/public/abstract_controller/controllers/views/layout", - "spec/public/abstract_controller/controllers/views/layout/alt.erb", - "spec/public/abstract_controller/controllers/views/layout/custom.erb", - "spec/public/abstract_controller/controllers/views/wonderful", - "spec/public/abstract_controller/controllers/views/wonderful/index.erb", "spec/public/abstract_controller/controllers/views/helpers", - "spec/public/abstract_controller/controllers/views/helpers/concat", - "spec/public/abstract_controller/controllers/views/helpers/concat/index.erb", "spec/public/abstract_controller/controllers/views/helpers/capture", "spec/public/abstract_controller/controllers/views/helpers/capture/index.erb", - "spec/public/abstract_controller/controllers/views/test_render", - "spec/public/abstract_controller/controllers/views/test_render/foo.html.erb", + "spec/public/abstract_controller/controllers/views/helpers/concat", + "spec/public/abstract_controller/controllers/views/helpers/concat/index.erb", + "spec/public/abstract_controller/controllers/views/layout", + "spec/public/abstract_controller/controllers/views/layout/alt.erb", + "spec/public/abstract_controller/controllers/views/layout/custom.erb", "spec/public/abstract_controller/controllers/views/merb", "spec/public/abstract_controller/controllers/views/merb/test", "spec/public/abstract_controller/controllers/views/merb/test/fixtures", "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract", "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/display_object", "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/display_object/index.erb", + "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/display_object_with_action", + "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/display_object_with_action/new.erb", "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template", "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template/index.erb", - "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_multiple_roots", - "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_multiple_roots/show.erb", - "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_multiple_roots/index.erb", - "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_custom_layout", - "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_custom_layout/index.erb", "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_app_layout", "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_app_layout/index.erb", - "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/display_object_with_action", - "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/display_object_with_action/new.erb", - "spec/public/abstract_controller/controllers/helpers.rb", - "spec/public/abstract_controller/controllers/filters.rb", + "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_custom_layout", + "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_custom_layout/index.erb", + "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_multiple_roots", + "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_multiple_roots/index.erb", + "spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_template_multiple_roots/show.erb", + "spec/public/abstract_controller/controllers/views/partial", + "spec/public/abstract_controller/controllers/views/partial/another_directory", + "spec/public/abstract_controller/controllers/views/partial/another_directory/_partial.erb", + "spec/public/abstract_controller/controllers/views/partial/basic_partial", + "spec/public/abstract_controller/controllers/views/partial/basic_partial/_partial.erb", + "spec/public/abstract_controller/controllers/views/partial/basic_partial/index.erb", + "spec/public/abstract_controller/controllers/views/partial/basic_partial_with_multiple_roots", + "spec/public/abstract_controller/controllers/views/partial/basic_partial_with_multiple_roots/index.erb", + "spec/public/abstract_controller/controllers/views/partial/nested_partial", + "spec/public/abstract_controller/controllers/views/partial/nested_partial/_first.erb", + "spec/public/abstract_controller/controllers/views/partial/nested_partial/_second.erb", + "spec/public/abstract_controller/controllers/views/partial/nested_partial/index.erb", + "spec/public/abstract_controller/controllers/views/partial/partial_in_another_directory", + "spec/public/abstract_controller/controllers/views/partial/partial_in_another_directory/index.erb", + "spec/public/abstract_controller/controllers/views/partial/partial_with_both", + "spec/public/abstract_controller/controllers/views/partial/partial_with_both/_collection.erb", + "spec/public/abstract_controller/controllers/views/partial/partial_with_both/index.erb", + "spec/public/abstract_controller/controllers/views/partial/partial_with_collections", + "spec/public/abstract_controller/controllers/views/partial/partial_with_collections/_collection.erb", + "spec/public/abstract_controller/controllers/views/partial/partial_with_collections/index.erb", + "spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_as", + "spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_as/_collection.erb", + "spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_as/index.erb", + "spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_counter", + "spec/public/abstract_controller/controllers/views/partial/partial_with_collections_and_yield", + "spec/public/abstract_controller/controllers/views/partial/partial_with_locals", + "spec/public/abstract_controller/controllers/views/partial/partial_with_locals/_variables.erb", + "spec/public/abstract_controller/controllers/views/partial/partial_with_locals/index.erb", + "spec/public/abstract_controller/controllers/views/partial/partial_with_with_and_locals", + "spec/public/abstract_controller/controllers/views/partial/partial_with_with_and_locals/_both.erb", + "spec/public/abstract_controller/controllers/views/partial/partial_with_with_and_locals/index.erb", + "spec/public/abstract_controller/controllers/views/partial/with_absolute_partial", + "spec/public/abstract_controller/controllers/views/partial/with_absolute_partial/_partial.erb", + "spec/public/abstract_controller/controllers/views/partial/with_absolute_partial/index.erb", + "spec/public/abstract_controller/controllers/views/partial/with_as_partial", + "spec/public/abstract_controller/controllers/views/partial/with_as_partial/_with_partial.erb", + "spec/public/abstract_controller/controllers/views/partial/with_as_partial/index.erb", + "spec/public/abstract_controller/controllers/views/partial/with_nil_partial", + "spec/public/abstract_controller/controllers/views/partial/with_nil_partial/_with_partial.erb", + "spec/public/abstract_controller/controllers/views/partial/with_nil_partial/index.erb", + "spec/public/abstract_controller/controllers/views/partial/with_partial", + "spec/public/abstract_controller/controllers/views/partial/with_partial/_with_partial.erb", + "spec/public/abstract_controller/controllers/views/partial/with_partial/index.erb", + "spec/public/abstract_controller/controllers/views/test_display", + "spec/public/abstract_controller/controllers/views/test_display/foo.html.erb", + "spec/public/abstract_controller/controllers/views/test_render", + "spec/public/abstract_controller/controllers/views/test_render/foo.html.erb", + "spec/public/abstract_controller/controllers/views/wonderful", + "spec/public/abstract_controller/controllers/views/wonderful/index.erb", + "spec/public/abstract_controller/display_spec.rb", + "spec/public/abstract_controller/filter_spec.rb", + "spec/public/abstract_controller/helper_spec.rb", "spec/public/abstract_controller/partial_spec.rb", + "spec/public/abstract_controller/render_spec.rb", "spec/public/abstract_controller/spec_helper.rb", - "spec/public/abstract_controller/helper_spec.rb", - "spec/public/DEFINITIONS", - "spec/public/test", - "spec/public/test/controller_matchers_spec.rb", - "spec/public/test/route_matchers_spec.rb", - "spec/public/test/request_helper_spec.rb", - "spec/public/test/multipart_request_helper_spec.rb", - "spec/public/test/view_matchers_spec.rb", - "spec/public/test/controllers", - "spec/public/test/controllers/controller_assertion_mock.rb", - "spec/public/test/controllers/spec_helper_controller.rb", - "spec/public/test/controllers/dispatch_controller.rb", - "spec/public/test/route_helper_spec.rb", - "spec/public/test/view_helper_spec.rb", - "spec/public/test/multipart_upload_text_file.txt", - "spec/public/request", - "spec/public/request/multipart_spec.rb", - "spec/public/request/request_spec.rb", - "spec/public/core", - "spec/public/core/merb_core_spec.rb", - "spec/public/router", - "spec/public/router/special_spec.rb", - "spec/public/router/default_spec.rb", - "spec/public/router/namespace_spec.rb", - "spec/public/router/deferred_spec.rb", - "spec/public/router/spec_helper.rb", - "spec/public/router/nested_resources_spec.rb", - "spec/public/router/resources_spec.rb", - "spec/public/router/resource_spec.rb", - "spec/public/router/string_spec.rb", - "spec/public/logger", - "spec/public/logger/logger_spec.rb", - "spec/public/logger/spec_helper.rb", "spec/public/boot_loader", "spec/public/boot_loader/boot_loader_spec.rb", "spec/public/boot_loader/spec_helper.rb", "spec/public/controller", "spec/public/controller/authentication_spec.rb", - "spec/public/controller/display_spec.rb", + "spec/public/controller/base_spec.rb", "spec/public/controller/controllers", + "spec/public/controller/controllers/authentication.rb", + "spec/public/controller/controllers/base.rb", "spec/public/controller/controllers/display.rb", - "spec/public/controller/controllers/url.rb", "spec/public/controller/controllers/responder.rb", - "spec/public/controller/controllers/authentication.rb", + "spec/public/controller/controllers/url.rb", "spec/public/controller/controllers/views", "spec/public/controller/controllers/views/layout", "spec/public/controller/controllers/views/layout/custom.html.erb", "spec/public/controller/controllers/views/layout/custom_arg.html.erb", + "spec/public/controller/controllers/views/layout/custom_arg.json.erb", "spec/public/controller/controllers/views/merb", "spec/public/controller/controllers/views/merb/test", "spec/public/controller/controllers/views/merb/test/fixtures", "spec/public/controller/controllers/views/merb/test/fixtures/controllers", - "spec/public/controller/controllers/views/merb/test/fixtures/controllers/multi_provides", - "spec/public/controller/controllers/views/merb/test/fixtures/controllers/multi_provides/index.html.erb", - "spec/public/controller/controllers/views/merb/test/fixtures/controllers/multi_provides/index.js.erb", - "spec/public/controller/controllers/views/merb/test/fixtures/controllers/layout", - "spec/public/controller/controllers/views/merb/test/fixtures/controllers/layout/custom.html.erb", - "spec/public/controller/controllers/views/merb/test/fixtures/controllers/html_default", - "spec/public/controller/controllers/views/merb/test/fixtures/controllers/html_default/index.html.erb", + "spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_provides", + "spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_provides/index.html.erb", + "spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_provides/index.xml.erb", + "spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template", + "spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template/index.html.erb", + "spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template/no_layout.html.erb", "spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template_argument", "spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template_argument/index.html.erb", + "spec/public/controller/controllers/views/merb/test/fixtures/controllers/html_default", + "spec/public/controller/controllers/views/merb/test/fixtures/controllers/html_default/index.html.erb", + "spec/public/controller/controllers/views/merb/test/fixtures/controllers/layout", + "spec/public/controller/controllers/views/merb/test/fixtures/controllers/layout/custom.html.erb", "spec/public/controller/controllers/views/merb/test/fixtures/controllers/local_provides", - "spec/public/controller/controllers/views/merb/test/fixtures/controllers/local_provides/index.xml.erb", "spec/public/controller/controllers/views/merb/test/fixtures/controllers/local_provides/index.html.erb", - "spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template", - "spec/public/controller/controllers/views/merb/test/fixtures/controllers/display_with_template/index.html.erb", - "spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_provides", - "spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_provides/index.xml.erb", - "spec/public/controller/controllers/views/merb/test/fixtures/controllers/class_provides/index.html.erb", - "spec/public/controller/controllers/base.rb", + "spec/public/controller/controllers/views/merb/test/fixtures/controllers/local_provides/index.xml.erb", + "spec/public/controller/controllers/views/merb/test/fixtures/controllers/multi_provides", + "spec/public/controller/controllers/views/merb/test/fixtures/controllers/multi_provides/index.html.erb", + "spec/public/controller/controllers/views/merb/test/fixtures/controllers/multi_provides/index.js.erb", + "spec/public/controller/display_spec.rb", + "spec/public/controller/responder_spec.rb", "spec/public/controller/spec_helper.rb", - "spec/public/controller/base_spec.rb", "spec/public/controller/url_spec.rb", - "spec/public/controller/responder_spec.rb", + "spec/public/core", + "spec/public/core/merb_core_spec.rb", + "spec/public/core_ext", + "spec/public/core_ext/fixtures", + "spec/public/core_ext/fixtures/core_ext_dependency.rb", + "spec/public/core_ext/kernel_spec.rb", + "spec/public/core_ext/spec_helper.rb", + "spec/public/DEFINITIONS", "spec/public/directory_structure", "spec/public/directory_structure/directory", "spec/public/directory_structure/directory/app", "spec/public/directory_structure/directory/app/controllers", - "spec/public/directory_structure/directory/app/controllers/base.rb", "spec/public/directory_structure/directory/app/controllers/application.rb", + "spec/public/directory_structure/directory/app/controllers/base.rb", "spec/public/directory_structure/directory/app/controllers/custom.rb", "spec/public/directory_structure/directory/app/views", - "spec/public/directory_structure/directory/app/views/wonderful", - "spec/public/directory_structure/directory/app/views/wonderful/template.erb", "spec/public/directory_structure/directory/app/views/base", "spec/public/directory_structure/directory/app/views/base/template.html.erb", + "spec/public/directory_structure/directory/app/views/wonderful", + "spec/public/directory_structure/directory/app/views/wonderful/template.erb", "spec/public/directory_structure/directory/config", "spec/public/directory_structure/directory/config/router.rb", "spec/public/directory_structure/directory/log", "spec/public/directory_structure/directory/log/merb_test.log", + "spec/public/directory_structure/directory/merb.4000.pid", "spec/public/directory_structure/directory_spec.rb", - "spec/private", - "spec/private/rack", - "spec/private/rack/application_spec.rb", - "spec/private/config", - "spec/private/config/config_spec.rb", - "spec/private/config/spec_helper.rb", - "spec/private/config/environment_spec.rb", - "spec/private/config/adapter_spec.rb", - "spec/private/dispatch", - "spec/private/dispatch/dispatch_spec.rb", - "spec/private/dispatch/spec_helper.rb", - "spec/private/dispatch/cookies_spec.rb", - "spec/private/dispatch/fixture", - "spec/private/dispatch/fixture/public", - "spec/private/dispatch/fixture/public/stylesheets", - "spec/private/dispatch/fixture/public/stylesheets/master.css", - "spec/private/dispatch/fixture/public/images", - "spec/private/dispatch/fixture/public/images/merb.jpg", - "spec/private/dispatch/fixture/public/merb.fcgi", - "spec/private/dispatch/fixture/app", - "spec/private/dispatch/fixture/app/controllers", - "spec/private/dispatch/fixture/app/controllers/exceptions.rb", - "spec/private/dispatch/fixture/app/controllers/foo.rb", - "spec/private/dispatch/fixture/app/controllers/application.rb", - "spec/private/dispatch/fixture/app/views", - "spec/private/dispatch/fixture/app/views/foo", - "spec/private/dispatch/fixture/app/views/foo/bar.html.erb", - "spec/private/dispatch/fixture/app/views/layout", - "spec/private/dispatch/fixture/app/views/layout/application.html.erb", - "spec/private/dispatch/fixture/app/views/exeptions", - "spec/private/dispatch/fixture/app/views/exeptions/internal_server_error.html.erb", - "spec/private/dispatch/fixture/app/views/exeptions/not_found.html.erb", - "spec/private/dispatch/fixture/app/views/exeptions/client_error.html.erb", - "spec/private/dispatch/fixture/app/views/exeptions/not_acceptable.html.erb", - "spec/private/dispatch/fixture/app/helpers", - "spec/private/dispatch/fixture/app/helpers/global_helpers.rb", - "spec/private/dispatch/fixture/config", - "spec/private/dispatch/fixture/config/router.rb", - "spec/private/dispatch/fixture/config/black_hole.rb", - "spec/private/dispatch/fixture/config/rack.rb", - "spec/private/dispatch/fixture/config/init.rb", - "spec/private/dispatch/fixture/config/environments", - "spec/private/dispatch/fixture/config/environments/production.rb", - "spec/private/dispatch/fixture/config/environments/development.rb", - "spec/private/dispatch/fixture/config/environments/test.rb", - "spec/private/dispatch/fixture/log", - "spec/private/dispatch/fixture/log/merb_test.log", - "spec/private/dispatch/route_params_spec.rb", - "spec/private/dispatch/bootloader_spec.rb", - "spec/private/plugins", - "spec/private/plugins/plugin_spec.rb", - "spec/private/core_ext", - "spec/private/core_ext/set_spec.rb", - "spec/private/core_ext/kernel_spec.rb", - "spec/private/core_ext/time_spec.rb", - "spec/private/core_ext/hash_spec.rb", - "spec/private/core_ext/string_spec.rb", - "spec/private/core_ext/class_spec.rb", - "spec/private/core_ext/object_spec.rb", + "spec/public/logger", + "spec/public/logger/logger_spec.rb", + "spec/public/logger/spec_helper.rb", + "spec/public/reloading", + "spec/public/reloading/directory", + "spec/public/reloading/directory/app", + "spec/public/reloading/directory/app/controllers", + "spec/public/reloading/directory/app/controllers/application.rb", + "spec/public/reloading/directory/app/controllers/reload.rb", + "spec/public/reloading/directory/config", + "spec/public/reloading/directory/config/init.rb", + "spec/public/reloading/directory/log", + "spec/public/reloading/directory/log/merb_test.log", + "spec/public/reloading/directory/merb.4000.pid", + "spec/public/reloading/reload_spec.rb", + "spec/public/request", + "spec/public/request/multipart_spec.rb", + "spec/public/request/request_spec.rb", + "spec/public/router", + "spec/public/router/default_spec.rb", + "spec/public/router/deferred_spec.rb", + "spec/public/router/fixation_spec.rb", + "spec/public/router/fixture", + "spec/public/router/fixture/log", + "spec/public/router/fixture/log/merb_test.log", + "spec/public/router/namespace_spec.rb", + "spec/public/router/nested_matches_spec.rb", + "spec/public/router/nested_resources_spec.rb", + "spec/public/router/resource_spec.rb", + "spec/public/router/resources_spec.rb", + "spec/public/router/spec_helper.rb", + "spec/public/router/special_spec.rb", + "spec/public/router/string_spec.rb", + "spec/public/template", + "spec/public/template/template_spec.rb", + "spec/public/template/templates", + "spec/public/template/templates/error.html.erb", + "spec/public/template/templates/template.html.erb", + "spec/public/template/templates/template.html.myt", + "spec/public/test", + "spec/public/test/controller_matchers_spec.rb", + "spec/public/test/controllers", + "spec/public/test/controllers/controller_assertion_mock.rb", + "spec/public/test/controllers/dispatch_controller.rb", + "spec/public/test/controllers/spec_helper_controller.rb", + "spec/public/test/multipart_request_helper_spec.rb", + "spec/public/test/multipart_upload_text_file.txt", + "spec/public/test/request_helper_spec.rb", + "spec/public/test/route_helper_spec.rb", + "spec/public/test/route_matchers_spec.rb", + "spec/public/test/view_helper_spec.rb", + "spec/public/test/view_matchers_spec.rb", + "spec/public/test_helper_methods", + "spec/public/test_helper_methods/controllers", "spec/spec_helper.rb", - "lib/merb-core.rb", - "lib/coretasks.rb", "lib/merb-core", + "lib/merb-core/autoload.rb", "lib/merb-core/bootloader.rb", + "lib/merb-core/config.rb", + "lib/merb-core/constants.rb", + "lib/merb-core/controller", + "lib/merb-core/controller/abstract_controller.rb", + "lib/merb-core/controller/exceptions.rb", + "lib/merb-core/controller/merb_controller.rb", + "lib/merb-core/controller/mime.rb", + "lib/merb-core/controller/mixins", + "lib/merb-core/controller/mixins/authentication.rb", + "lib/merb-core/controller/mixins/controller.rb", + "lib/merb-core/controller/mixins/render.rb", + "lib/merb-core/controller/mixins/responder.rb", + "lib/merb-core/controller/template.rb", + "lib/merb-core/core_ext", + "lib/merb-core/core_ext/class.rb", + "lib/merb-core/core_ext/hash.rb", + "lib/merb-core/core_ext/kernel.rb", + "lib/merb-core/core_ext/mash.rb", + "lib/merb-core/core_ext/object.rb", + "lib/merb-core/core_ext/object_space.rb", + "lib/merb-core/core_ext/rubygems.rb", + "lib/merb-core/core_ext/set.rb", + "lib/merb-core/core_ext/string.rb", + "lib/merb-core/core_ext/time.rb", + "lib/merb-core/core_ext.rb", + "lib/merb-core/dispatch", + "lib/merb-core/dispatch/cookies.rb", + "lib/merb-core/dispatch/dispatcher.rb", + "lib/merb-core/dispatch/exceptions.html.erb", + "lib/merb-core/dispatch/request.rb", + "lib/merb-core/dispatch/router", + "lib/merb-core/dispatch/router/behavior.rb", + "lib/merb-core/dispatch/router/cached_proc.rb", + "lib/merb-core/dispatch/router/route.rb", + "lib/merb-core/dispatch/router.rb", + "lib/merb-core/dispatch/session", + "lib/merb-core/dispatch/session/cookie.rb", + "lib/merb-core/dispatch/session/memcached.rb", + "lib/merb-core/dispatch/session/memory.rb", + "lib/merb-core/dispatch/session.rb", + "lib/merb-core/gem_ext", + "lib/merb-core/gem_ext/erubis.rb", + "lib/merb-core/logger.rb", + "lib/merb-core/plugins.rb", "lib/merb-core/rack", - "lib/merb-core/rack/handler", - "lib/merb-core/rack/handler/mongrel.rb", "lib/merb-core/rack/adapter", + "lib/merb-core/rack/adapter/ebb.rb", "lib/merb-core/rack/adapter/evented_mongrel.rb", - "lib/merb-core/rack/adapter/thin.rb", "lib/merb-core/rack/adapter/fcgi.rb", + "lib/merb-core/rack/adapter/irb.rb", "lib/merb-core/rack/adapter/mongrel.rb", - "lib/merb-core/rack/adapter/webrick.rb", "lib/merb-core/rack/adapter/runner.rb", - "lib/merb-core/rack/adapter/irb.rb", - "lib/merb-core/rack/adapter/ebb.rb", - "lib/merb-core/rack/application.rb", + "lib/merb-core/rack/adapter/thin.rb", + "lib/merb-core/rack/adapter/webrick.rb", "lib/merb-core/rack/adapter.rb", - "lib/merb-core/gem_ext", - "lib/merb-core/gem_ext/erubis.rb", - "lib/merb-core/config.rb", + "lib/merb-core/rack/application.rb", + "lib/merb-core/rack/apps", + "lib/merb-core/rack/apps/path_prefix.rb", + "lib/merb-core/rack/apps/static.rb", + "lib/merb-core/rack/handler", + "lib/merb-core/rack/handler/mongrel.rb", + "lib/merb-core/rack/middleware.rb", "lib/merb-core/rack.rb", + "lib/merb-core/server.rb", + "lib/merb-core/tasks", + "lib/merb-core/tasks/audit.rake", + "lib/merb-core/tasks/merb.rb", + "lib/merb-core/tasks/merb_rake_helper.rb", "lib/merb-core/test", - "lib/merb-core/test/matchers.rb", - "lib/merb-core/test/run_specs.rb", - "lib/merb-core/test/matchers", - "lib/merb-core/test/matchers/controller_matchers.rb", - "lib/merb-core/test/matchers/route_matchers.rb", - "lib/merb-core/test/matchers/view_matchers.rb", - "lib/merb-core/test/test_ext", - "lib/merb-core/test/test_ext/object.rb", - "lib/merb-core/test/test_ext/hpricot.rb", "lib/merb-core/test/helpers", "lib/merb-core/test/helpers/controller_helper.rb", + "lib/merb-core/test/helpers/multipart_request_helper.rb", + "lib/merb-core/test/helpers/request_helper.rb", "lib/merb-core/test/helpers/route_helper.rb", "lib/merb-core/test/helpers/view_helper.rb", - "lib/merb-core/test/helpers/request_helper.rb", - "lib/merb-core/test/helpers/multipart_request_helper.rb", "lib/merb-core/test/helpers.rb", + "lib/merb-core/test/matchers", + "lib/merb-core/test/matchers/controller_matchers.rb", + "lib/merb-core/test/matchers/route_matchers.rb", + "lib/merb-core/test/matchers/view_matchers.rb", + "lib/merb-core/test/matchers.rb", + "lib/merb-core/test/run_specs.rb", "lib/merb-core/test/tasks", "lib/merb-core/test/tasks/spectasks.rb", - "lib/merb-core/dispatch", - "lib/merb-core/dispatch/request.rb", - "lib/merb-core/dispatch/router.rb", - "lib/merb-core/dispatch/session.rb", - "lib/merb-core/dispatch/router", - "lib/merb-core/dispatch/router/route.rb", - "lib/merb-core/dispatch/router/behavior.rb", - "lib/merb-core/dispatch/router/cached_proc.rb", - "lib/merb-core/dispatch/cookies.rb", - "lib/merb-core/dispatch/dispatcher.rb", - "lib/merb-core/dispatch/exceptions.html.erb", - "lib/merb-core/dispatch/session", - "lib/merb-core/dispatch/session/memory.rb", - "lib/merb-core/dispatch/session/memcached.rb", - "lib/merb-core/dispatch/session/cookie.rb", - "lib/merb-core/core_ext.rb", - "lib/merb-core/plugins.rb", + "lib/merb-core/test/test_ext", + "lib/merb-core/test/test_ext/hpricot.rb", + "lib/merb-core/test/test_ext/object.rb", + "lib/merb-core/test/test_ext/string.rb", "lib/merb-core/test.rb", - "lib/merb-core/server.rb", - "lib/merb-core/constants.rb", - "lib/merb-core/logger.rb", - "lib/merb-core/autoload.rb", - "lib/merb-core/controller", - "lib/merb-core/controller/template.rb", - "lib/merb-core/controller/exceptions.rb", - "lib/merb-core/controller/mime.rb", - "lib/merb-core/controller/merb_controller.rb", - "lib/merb-core/controller/abstract_controller.rb", - "lib/merb-core/controller/mixins", - "lib/merb-core/controller/mixins/render.rb", - "lib/merb-core/controller/mixins/responder.rb", - "lib/merb-core/controller/mixins/controller.rb", - "lib/merb-core/controller/mixins/authentication.rb", "lib/merb-core/vendor", "lib/merb-core/vendor/facets", - "lib/merb-core/vendor/facets/inflect.rb", "lib/merb-core/vendor/facets/dictionary.rb", + "lib/merb-core/vendor/facets/inflect.rb", "lib/merb-core/vendor/facets.rb", - "lib/merb-core/core_ext", - "lib/merb-core/core_ext/string.rb", - "lib/merb-core/core_ext/rubygems.rb", - "lib/merb-core/core_ext/class.rb", - "lib/merb-core/core_ext/kernel.rb", - "lib/merb-core/core_ext/hash.rb", - "lib/merb-core/core_ext/mash.rb", - "lib/merb-core/core_ext/set.rb", - "lib/merb-core/core_ext/object.rb", - "lib/merb-core/core_ext/object_space.rb", - "lib/merb-core/core_ext/time.rb", - "lib/merb-core/version.rb"] + "lib/merb-core/version.rb", + "lib/merb-core.rb"] + s.description = "Merb. Pocket rocket web framework." + s.add_dependency "erubis", ">= 0" + s.add_dependency "rake", ">= 0" + s.add_dependency "json_pure", ">= 0" + s.add_dependency "rspec", ">= 0" + s.add_dependency "rack", ">= 0" + s.add_dependency "mime-types", ">= 0" + s.date = "Wed Jun 11 00:00:00 -0700 2008" s.authors = ["Ezra Zygmuntowicz"] - s.require_paths = ["lib"] - s.name = "merb-core" - s.requirements = ["install the json gem to get faster json parsing"] + s.bindir = "bin" + s.version = "0.9.4" s.required_rubygems_version = ">= 0" + s.has_rdoc = "true" + s.specification_version = "2" + s.name = "merb-core" + s.loaded = "false" + s.email = "ez@engineyard.com" end \ No newline at end of file merb-core.gemspec f3aba3d20379015aa810ecc95f019e212264aed2 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/7ea36e39165fb19e7f28939196b57534be52da4f 7ea36e39165fb19e7f28939196b57534be52da4f 2008-06-20T15:09:16-07:00 2008-06-20T15:09:16-07:00 Speed up synonym lookup by order of magnitude :( b81d24466343e700f3dc25769939a3b0366935b7 Yehuda Katz wycats@gmail.com