RubyGems - merb - Versions diffs - 0.5.3 → 0.9.2 - Mend

merb 0.5.3 → 0.9.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (294) hide show

data/LICENSE +0 -20
data/README +0 -277
data/Rakefile +80 -199
data/TODO +0 -3
metadata +19 -438
data/SVN_REVISION +0 -1
data/app_generators/merb/USAGE +0 -5
data/app_generators/merb/merb_generator.rb +0 -108
data/app_generators/merb/templates/Rakefile +0 -124
data/app_generators/merb/templates/app/controllers/application.rb +0 -3
data/app_generators/merb/templates/app/controllers/exceptions.rb +0 -13
data/app_generators/merb/templates/app/helpers/global_helper.rb +0 -5
data/app_generators/merb/templates/app/mailers/views/layout/application.html.erb +0 -1
data/app_generators/merb/templates/app/mailers/views/layout/application.text.erb +0 -1
data/app_generators/merb/templates/app/parts/views/layout/application.html.erb +0 -1
data/app_generators/merb/templates/app/views/exceptions/internal_server_error.html.erb +0 -216
data/app_generators/merb/templates/app/views/exceptions/not_acceptable.html.erb +0 -38
data/app_generators/merb/templates/app/views/exceptions/not_found.html.erb +0 -40
data/app_generators/merb/templates/app/views/layout/application.html.erb +0 -11
data/app_generators/merb/templates/config/boot.rb +0 -11
data/app_generators/merb/templates/config/dependencies.rb +0 -41
data/app_generators/merb/templates/config/environments/development.rb +0 -1
data/app_generators/merb/templates/config/environments/production.rb +0 -1
data/app_generators/merb/templates/config/environments/test.rb +0 -1
data/app_generators/merb/templates/config/merb.yml +0 -82
data/app_generators/merb/templates/config/merb_init.rb +0 -17
data/app_generators/merb/templates/config/plugins.yml +0 -1
data/app_generators/merb/templates/config/router.rb +0 -35
data/app_generators/merb/templates/config/upload.conf +0 -0
data/app_generators/merb/templates/public/images/merb.jpg +0 -0
data/app_generators/merb/templates/public/merb.fcgi +0 -6
data/app_generators/merb/templates/public/stylesheets/master.css +0 -119
data/app_generators/merb/templates/script/destroy +0 -32
data/app_generators/merb/templates/script/generate +0 -32
data/app_generators/merb/templates/script/stop_merb +0 -13
data/app_generators/merb/templates/script/win_script.cmd +0 -1
data/app_generators/merb/templates/spec/spec.opts +0 -6
data/app_generators/merb/templates/spec/spec_helper.rb +0 -15
data/app_generators/merb/templates/test/test_helper.rb +0 -14
data/app_generators/merb_plugin/USAGE +0 -5
data/app_generators/merb_plugin/merb_plugin_generator.rb +0 -68
data/app_generators/merb_plugin/templates/LICENSE +0 -20
data/app_generators/merb_plugin/templates/README +0 -4
data/app_generators/merb_plugin/templates/Rakefile +0 -35
data/app_generators/merb_plugin/templates/TODO +0 -5
data/app_generators/merb_plugin/templates/merbtasks.rb +0 -6
data/app_generators/merb_plugin/templates/sampleplugin.rb +0 -10
data/app_generators/merb_plugin/templates/sampleplugin_spec.rb +0 -7
data/app_generators/merb_plugin/templates/spec_helper.rb +0 -2
data/bin/merb +0 -4
data/lib/autotest/discover.rb +0 -3
data/lib/autotest/merb_rspec.rb +0 -80
data/lib/merb.rb +0 -188
data/lib/merb/abstract_controller.rb +0 -399
data/lib/merb/assets.rb +0 -160
data/lib/merb/assets.rb.orig +0 -119
data/lib/merb/boot_loader.rb +0 -286
data/lib/merb/boot_loader.rb.orig +0 -235
data/lib/merb/caching.rb +0 -5
data/lib/merb/caching/action_cache.rb +0 -92
data/lib/merb/caching/fragment_cache.rb +0 -39
data/lib/merb/caching/store/file_cache.rb +0 -90
data/lib/merb/caching/store/memory_cache.rb +0 -85
data/lib/merb/config.rb +0 -290
data/lib/merb/constants.rb +0 -50
data/lib/merb/controller.rb +0 -220
data/lib/merb/cookies.rb +0 -95
data/lib/merb/core_ext.rb +0 -15
data/lib/merb/core_ext/array.rb +0 -0
data/lib/merb/core_ext/class.rb +0 -180
data/lib/merb/core_ext/enumerable.rb +0 -49
data/lib/merb/core_ext/get_args.rb +0 -76
data/lib/merb/core_ext/hash.rb +0 -306
data/lib/merb/core_ext/inflections.rb +0 -112
data/lib/merb/core_ext/inflector.rb +0 -275
data/lib/merb/core_ext/kernel.rb +0 -242
data/lib/merb/core_ext/mash.rb +0 -88
data/lib/merb/core_ext/module.rb +0 -67
data/lib/merb/core_ext/numeric.rb +0 -72
data/lib/merb/core_ext/object.rb +0 -183
data/lib/merb/core_ext/string.rb +0 -53
data/lib/merb/core_ext/symbol.rb +0 -6
data/lib/merb/dispatcher.rb +0 -109
data/lib/merb/drb_server.rb +0 -19
data/lib/merb/erubis_ext.rb +0 -10
data/lib/merb/exceptions.rb +0 -192
data/lib/merb/generators/merb_app/merb_app.rb +0 -22
data/lib/merb/generators/merb_generator_helpers.rb +0 -318
data/lib/merb/generators/merb_plugin.rb +0 -22
data/lib/merb/logger.rb +0 -78
data/lib/merb/mail_controller.rb +0 -268
data/lib/merb/mailer.rb +0 -87
data/lib/merb/mixins/basic_authentication.rb +0 -35
data/lib/merb/mixins/controller.rb +0 -160
data/lib/merb/mixins/erubis_capture.rb +0 -68
data/lib/merb/mixins/general_controller.rb +0 -253
data/lib/merb/mixins/inline_partial.rb +0 -32
data/lib/merb/mixins/render.rb +0 -465
data/lib/merb/mixins/responder.rb +0 -449
data/lib/merb/mixins/view_context.rb +0 -558
data/lib/merb/mixins/web_controller.rb +0 -36
data/lib/merb/mongrel_handler.rb +0 -168
data/lib/merb/part_controller.rb +0 -29
data/lib/merb/plugins.rb +0 -16
data/lib/merb/rack_adapter.rb +0 -37
data/lib/merb/request.rb +0 -465
data/lib/merb/router.rb +0 -646
data/lib/merb/server.rb +0 -169
data/lib/merb/session.rb +0 -23
data/lib/merb/session/cookie_store.rb +0 -118
data/lib/merb/session/mem_cache_session.rb +0 -131
data/lib/merb/session/memory_session.rb +0 -176
data/lib/merb/template.rb +0 -37
data/lib/merb/template/erubis.rb +0 -68
data/lib/merb/template/haml.rb +0 -87
data/lib/merb/template/markaby.rb +0 -59
data/lib/merb/template/xml_builder.rb +0 -50
data/lib/merb/test/fake_request.rb +0 -74
data/lib/merb/test/helper.rb +0 -260
data/lib/merb/test/hpricot.rb +0 -136
data/lib/merb/test/multipart.rb +0 -66
data/lib/merb/test/rspec.rb +0 -18
data/lib/merb/test/rspec_matchers/controller_matchers.rb +0 -117
data/lib/merb/test/rspec_matchers/markup_matchers.rb +0 -98
data/lib/merb/upload_handler.rb +0 -80
data/lib/merb/upload_progress.rb +0 -48
data/lib/merb/version.rb +0 -49
data/lib/merb/view_context.rb +0 -79
data/lib/tasks.rb +0 -7
data/lib/tasks/merb.rake +0 -54
data/merb_default_generators/model/USAGE +0 -0
data/merb_default_generators/model/model_generator.rb +0 -16
data/merb_default_generators/model/templates/new_model_template.erb +0 -5
data/merb_default_generators/resource_controller/USAGE +0 -0
data/merb_default_generators/resource_controller/resource_controller_generator.rb +0 -26
data/merb_default_generators/resource_controller/templates/controller.rb +0 -30
data/merb_default_generators/resource_controller/templates/edit.html.erb +0 -1
data/merb_default_generators/resource_controller/templates/helper.rb +0 -5
data/merb_default_generators/resource_controller/templates/index.html.erb +0 -1
data/merb_default_generators/resource_controller/templates/new.html.erb +0 -1
data/merb_default_generators/resource_controller/templates/show.html.erb +0 -1
data/merb_generators/controller/USAGE +0 -5
data/merb_generators/controller/controller_generator.rb +0 -16
data/merb_generators/controller/templates/controller.rb +0 -8
data/merb_generators/controller/templates/helper.rb +0 -5
data/merb_generators/controller/templates/index.html.erb +0 -3
data/merb_generators/part_controller/USAGE +0 -5
data/merb_generators/part_controller/part_controller_generator.rb +0 -27
data/merb_generators/part_controller/templates/controller.rb +0 -8
data/merb_generators/part_controller/templates/helper.rb +0 -5
data/merb_generators/part_controller/templates/index.html.erb +0 -3
data/merb_generators/resource/USAGE +0 -0
data/merb_generators/resource/resource_generator.rb +0 -67
data/rspec_generators/merb_controller_test/merb_controller_test_generator.rb +0 -67
data/rspec_generators/merb_controller_test/templates/controller_spec.rb +0 -8
data/rspec_generators/merb_controller_test/templates/edit_spec.rb +0 -12
data/rspec_generators/merb_controller_test/templates/helper_spec.rb +0 -5
data/rspec_generators/merb_controller_test/templates/index_spec.rb +0 -12
data/rspec_generators/merb_controller_test/templates/new_spec.rb +0 -12
data/rspec_generators/merb_controller_test/templates/show_spec.rb +0 -5
data/rspec_generators/merb_model_test/merb_model_test_generator.rb +0 -26
data/rspec_generators/merb_model_test/templates/model_spec_template.erb +0 -7
data/script/destroy +0 -14
data/script/generate +0 -14
data/spec/fixtures/config/environments/environment_config_test.yml +0 -1
data/spec/fixtures/config/merb.yml +0 -18
data/spec/fixtures/controllers/dispatch_spec_controllers.rb +0 -235
data/spec/fixtures/controllers/render_spec_controllers.rb +0 -184
data/spec/fixtures/foo.rb +0 -3
data/spec/fixtures/mailers/views/layout/application.html.erb +0 -3
data/spec/fixtures/mailers/views/layout/application.text.erb +0 -3
data/spec/fixtures/mailers/views/test_mail_controller/eighth.html.erb +0 -1
data/spec/fixtures/mailers/views/test_mail_controller/eighth.text.erb +0 -1
data/spec/fixtures/mailers/views/test_mail_controller/first.html.erb +0 -1
data/spec/fixtures/mailers/views/test_mail_controller/first.text.erb +0 -1
data/spec/fixtures/mailers/views/test_mail_controller/ninth.html.erb +0 -1
data/spec/fixtures/mailers/views/test_mail_controller/ninth.text.erb +0 -1
data/spec/fixtures/mailers/views/test_mail_controller/second.text.erb +0 -1
data/spec/fixtures/mailers/views/test_mail_controller/third.html.erb +0 -1
data/spec/fixtures/models/router_spec_models.rb +0 -30
data/spec/fixtures/parts/views/layout/todo_part.html.erb +0 -3
data/spec/fixtures/parts/views/layout/todo_part.xml.erb +0 -3
data/spec/fixtures/parts/views/todo_part/formatted_output.html.erb +0 -1
data/spec/fixtures/parts/views/todo_part/formatted_output.js.erb +0 -1
data/spec/fixtures/parts/views/todo_part/formatted_output.xml.erb +0 -1
data/spec/fixtures/parts/views/todo_part/list.html.erb +0 -3
data/spec/fixtures/sample.txt +0 -1
data/spec/fixtures/views/erubis.html.erb +0 -1
data/spec/fixtures/views/examples/_erubis.html.erb +0 -1
data/spec/fixtures/views/examples/_haml.html.haml +0 -1
data/spec/fixtures/views/examples/_markaby.html.mab +0 -1
data/spec/fixtures/views/examples/_throw_content.html.erb +0 -6
data/spec/fixtures/views/examples/hello.xml.builder +0 -1
data/spec/fixtures/views/examples/js.js.erb +0 -1
data/spec/fixtures/views/examples/template_catch_content.html.erb +0 -15
data/spec/fixtures/views/examples/template_catch_content_from_partial.html.erb +0 -6
data/spec/fixtures/views/examples/template_throw_content.html.erb +0 -10
data/spec/fixtures/views/examples/template_throw_content_without_block.html.erb +0 -3
data/spec/fixtures/views/exceptions/admin_access_required.html.erb +0 -1
data/spec/fixtures/views/extension_template_controller/_nested_js.js.erb +0 -1
data/spec/fixtures/views/extension_template_controller/_nested_xml.xml.erb +0 -1
data/spec/fixtures/views/extension_template_controller/_render_partial_multiple_times.html.erb +0 -1
data/spec/fixtures/views/extension_template_controller/erubis_templates.html.erb +0 -1
data/spec/fixtures/views/extension_template_controller/erubis_templates.js.erb +0 -1
data/spec/fixtures/views/extension_template_controller/erubis_templates.rhtml +0 -1
data/spec/fixtures/views/extension_template_controller/erubis_templates.xml.erb +0 -1
data/spec/fixtures/views/extension_template_controller/haml_index.html.haml +0 -0
data/spec/fixtures/views/extension_template_controller/haml_templates.html.haml +0 -1
data/spec/fixtures/views/extension_template_controller/haml_templates.js.haml +0 -1
data/spec/fixtures/views/extension_template_controller/haml_templates.xml.haml +0 -1
data/spec/fixtures/views/extension_template_controller/index.html.erb +0 -0
data/spec/fixtures/views/extension_template_controller/markaby_index.html.mab +0 -0
data/spec/fixtures/views/extension_template_controller/markaby_templates.html.mab +0 -1
data/spec/fixtures/views/extension_template_controller/markaby_templates.js.mab +0 -1
data/spec/fixtures/views/extension_template_controller/markaby_templates.xml.mab +0 -1
data/spec/fixtures/views/extension_template_controller/render_multiple_partials.html.erb +0 -4
data/spec/fixtures/views/extension_template_controller/render_nested_js.js.erb +0 -1
data/spec/fixtures/views/extension_template_controller/render_nested_xml.xml.erb +0 -1
data/spec/fixtures/views/haml.html.haml +0 -1
data/spec/fixtures/views/haml.xml.haml +0 -2
data/spec/fixtures/views/layout/application.html.erb +0 -1
data/spec/fixtures/views/layout/application.xml.erb +0 -1
data/spec/fixtures/views/layout/nested/example.html.erb +0 -1
data/spec/fixtures/views/markaby.html.mab +0 -1
data/spec/fixtures/views/nested/example/test.html.erb +0 -1
data/spec/fixtures/views/partials/_erubis.html.erb +0 -1
data/spec/fixtures/views/partials/_erubis_collection.html.erb +0 -1
data/spec/fixtures/views/partials/_erubis_collection_with_locals.html.erb +0 -1
data/spec/fixtures/views/partials/_erubis_new.html.erb +0 -1
data/spec/fixtures/views/partials/_haml.html.haml +0 -1
data/spec/fixtures/views/partials/_haml_collection.html.haml +0 -1
data/spec/fixtures/views/partials/_haml_collection_with_locals.html.haml +0 -1
data/spec/fixtures/views/partials/_haml_new.html.haml +0 -1
data/spec/fixtures/views/partials/_markaby.html.mab +0 -1
data/spec/fixtures/views/partials/_markaby_collection.html.mab +0 -1
data/spec/fixtures/views/partials/_markaby_collection_with_locals.html.mab +0 -1
data/spec/fixtures/views/partials/_markaby_new.html.mab +0 -1
data/spec/fixtures/views/render_object_controller/render_object_with_template.html.erb +0 -1
data/spec/fixtures/views/render_object_controller/render_object_with_template.js.erb +0 -1
data/spec/fixtures/views/render_object_controller/render_object_with_template.xml.erb +0 -1
data/spec/fixtures/views/template_views/interface__buffer_erubis.html.erb +0 -4
data/spec/fixtures/views/template_views/interface__buffer_haml.html.haml +0 -7
data/spec/fixtures/views/template_views/interface__buffer_markaby.html.mab +0 -7
data/spec/fixtures/views/template_views/interface_capture_erubis.html.erb +0 -15
data/spec/fixtures/views/template_views/interface_capture_haml.html.haml +0 -15
data/spec/fixtures/views/template_views/interface_capture_markaby.html.mab +0 -4
data/spec/fixtures/views/template_views/interface_concat_erubis.html.erb +0 -12
data/spec/fixtures/views/template_views/interface_concat_haml.html.haml +0 -11
data/spec/fixtures/views/template_views/interface_concat_markaby.html.mab +0 -14
data/spec/fixtures/views/test.dir/the_template.html.erb +0 -1
data/spec/merb/abstract_controller_spec.rb +0 -38
data/spec/merb/assets_spec.rb +0 -207
data/spec/merb/caching_spec.rb +0 -102
data/spec/merb/config_spec.rb +0 -29
data/spec/merb/controller_filters_spec.rb +0 -253
data/spec/merb/controller_spec.rb +0 -126
data/spec/merb/cookie_store_spec.rb +0 -72
data/spec/merb/cookies_spec.rb +0 -96
data/spec/merb/core_ext/class_spec.rb +0 -97
data/spec/merb/core_ext/enumerable_spec.rb +0 -27
data/spec/merb/core_ext/hash_spec.rb +0 -251
data/spec/merb/core_ext/inflector_spec.rb +0 -34
data/spec/merb/core_ext/kernel_spec.rb +0 -25
data/spec/merb/core_ext/numeric_spec.rb +0 -26
data/spec/merb/core_ext/object_spec.rb +0 -47
data/spec/merb/core_ext/string_spec.rb +0 -22
data/spec/merb/core_ext/symbol_spec.rb +0 -7
data/spec/merb/dependency_spec.rb +0 -22
data/spec/merb/dispatch_spec.rb +0 -528
data/spec/merb/fake_request_spec.rb +0 -80
data/spec/merb/generator_spec.rb +0 -248
data/spec/merb/handler_spec.rb +0 -169
data/spec/merb/mail_controller_spec.rb +0 -177
data/spec/merb/mailer_spec.rb +0 -87
data/spec/merb/multipart_spec.rb +0 -50
data/spec/merb/part_controller_spec.rb +0 -124
data/spec/merb/plugins_spec.rb +0 -80
data/spec/merb/render_spec.rb +0 -469
data/spec/merb/request_spec.rb +0 -287
data/spec/merb/responder_spec.rb +0 -562
data/spec/merb/router_spec.rb +0 -900
data/spec/merb/server_spec.rb +0 -19
data/spec/merb/template_spec.rb +0 -41
data/spec/merb/upload_handler_spec.rb +0 -108
data/spec/merb/version_spec.rb +0 -33
data/spec/merb/view_context_spec.rb +0 -366
data/spec/spec_generator_helper.rb +0 -34
data/spec/spec_helper.rb +0 -101
data/spec/spec_helpers/url_shared_behaviour.rb +0 -112
data/test_unit_generators/merb_controller_test/merb_controller_test_generator.rb +0 -53
data/test_unit_generators/merb_controller_test/templates/functional_test.rb +0 -17
data/test_unit_generators/merb_controller_test/templates/helper_test.rb +0 -9
data/test_unit_generators/merb_model_test/merb_model_test_generator.rb +0 -29
data/test_unit_generators/merb_model_test/templates/model_test_unit_template.erb +0 -9

data/lib/merb/mixins/basic_authentication.rb DELETED Viewed

@@ -1,35 +0,0 @@
-module Merb
-  module AuthenticationMixin
-    require 'base64'
-    def credentials
-      if d = %w{REDIRECT_X_HTTP_AUTHORIZATION X_HTTP_AUTHORIZATION
-             X-HTTP_AUTHORIZATION HTTP_AUTHORIZATION}.
-             inject([]) { |d,h| request.env.has_key?(h) ? request.env[h].to_s.split : d }
-        return Base64.decode64(d[1]).split(':')[0..1] if d[0] == 'Basic'
-      end
-    end
-    def authenticated?
-      username, password = *credentials
-      username == Merb::Config[:basic_auth][:username] and password == Merb::Config[:basic_auth][:password]
-    end
-    def basic_authentication
-      if !authenticated?
-        throw :halt, :access_denied
-      end
-    end
-    def access_denied
-      set_status(401)
-      headers['Content-type'] = 'text/plain'
-      headers['Status'] = 'Unauthorized'
-      headers['WWW-Authenticate'] = "Basic realm=\"#{Merb::Config[:basic_auth][:domain]}\""
-      return 'Unauthorized'
-    end
-  end
-end

data/lib/merb/mixins/controller.rb DELETED Viewed

@@ -1,160 +0,0 @@
-module Merb
-  # Module that is mixed in to all implemented controllers.
-  module ControllerMixin
-    # Renders the block given as a parameter using chunked
-    # encoding.
-    #
-    # ==== Examples
-    #
-    #   def stream
-    #     prefix = '<p>'
-    #     suffix = "</p>\r\n"
-    #     render_chunked do
-    #       IO.popen("cat /tmp/test.log") do |io|
-    #         done = false
-    #         until done
-    #           sleep 0.3
-    #           line = io.gets.chomp
-    #
-    #           if line == 'EOF'
-    #             done = true
-    #           else
-    #             send_chunk(prefix + line + suffix)
-    #           end
-    #         end
-    #       end
-    #     end
-    #   end
-    #
-    def render_chunked(&blk)
-      headers['Transfer-Encoding'] = 'chunked'
-      Proc.new {
-        response.send_status_no_connection_close(0)
-        response.send_header
-        blk.call
-        response.write("0\r\n\r\n")
-      }
-    end
-    # Returns a +Proc+ that Mongrel can call later, allowing
-    # Merb to release the thread lock and render another request.
-    #
-    def render_deferred(&blk)
-      Proc.new {
-        result = blk.call
-        response.send_status(result.length)
-        response.send_header
-        response.write(result)
-      }
-    end
-    # Writes a chunk from render_chunked to the response that
-    # is sent back to the client.
-    def send_chunk(data)
-      response.write('%x' % data.size + "\r\n")
-      response.write(data + "\r\n")
-    end
-    # Redirects to a URL.  The +url+ parameter can be either
-    # a relative URL (e.g., +/posts/34+) or a fully-qualified URL
-    # (e.g., +http://www.merbivore.com/+).
-    #
-    # ==== Parameters
-    #
-    # +url+ - URL to redirect to; it can be either a relative or
-    # fully-qualified URL.
-    # +permanent+ - Whether to use permanent redirection.
-    #
-    def redirect(url, permanent = false)
-      status = permanent ? 301 : 302
-      Merb.logger.info("Redirecting to: #{url} status: #{status}")
-      set_status(status)
-      headers['Location'] = url
-      "<html><body>You are being <a href=\"#{url}\">redirected</a>.</body></html>"
-    end
-    # Sends a file over HTTP.  When given a path to a file, it will set the
-    # right headers so that the static file is served directly.
-    #
-    # ==== Parameters
-    #
-    # +file+ - Path to file to send to the client.
-    #
-    def send_file(file, opts={})
-      opts.update(Merb::Const::DEFAULT_SEND_FILE_OPTIONS.merge(opts))
-      disposition = opts[:disposition].dup || 'attachment'
-      disposition << %(; filename="#{opts[:filename] ? opts[:filename] : File.basename(file)}")
-      headers.update(
-        'Content-Type'              => opts[:type].strip,  # fixes a problem with extra '\r' with some browsers
-        'Content-Disposition'       => disposition,
-        'Content-Transfer-Encoding' => 'binary',
-        'X-SENDFILE'                => file
-      )
-      return
-    end
-    # Streams a file over HTTP.
-    #
-    # ==== Example
-    #
-    # stream_file( { :filename => file_name,
-    #                :type => content_type,
-    #                :content_length => content_length }) do
-    #   AWS::S3::S3Object.stream(user.folder_name + "-" + user_file.unique_id, bucket_name) do |chunk|
-    #       response.write chunk
-    #   end
-    # end
-    def stream_file(opts={}, &stream)
-      opts.update(Merb::Const::DEFAULT_SEND_FILE_OPTIONS.merge(opts))
-      disposition = opts[:disposition].dup || 'attachment'
-      disposition << %(; filename="#{opts[:filename]}")
-      response.headers.update(
-        'Content-Type'              => opts[:type].strip,  # fixes a problem with extra '\r' with some browsers
-        'Content-Disposition'       => disposition,
-        'Content-Transfer-Encoding' => 'binary',
-        'CONTENT-LENGTH'            => opts[:content_length]
-      )
-      response.send_status(opts[:content_length])
-      response.send_header
-      stream
-    end
-    # Uses the nginx specific +X-Accel-Redirect+ header to send
-    # a file directly from nginx. For more information, see the nginx wiki:
-    # http://wiki.codemongers.com/NginxXSendfile
-    #
-    # ==== Parameters
-    #
-    # +file+ - Path to file to send to the client.
-    #
-    def nginx_send_file(file)
-      headers['X-Accel-Redirect'] = File.expand_path(file)
-      return
-    end
-    # Sets a cookie to be included in the response.  This method is used
-    # primarily internally in Merb.
-    #
-    # If you need to set a cookie, then use the +cookies+ hash.
-    #
-    def set_cookie(name, value, expires)
-      (headers['Set-Cookie'] ||=[]) << (Merb::Const::SET_COOKIE % [
-        name.to_s,
-        escape(value.to_s),
-        # Cookie expiration time must be GMT. See RFC 2109
-        expires.gmtime.strftime(Merb::Const::COOKIE_EXPIRATION_FORMAT)
-      ])
-    end
-    # Marks a cookie as deleted and gives it an expires stamp in
-    # the past.  This method is used primarily internally in Merb.
-    #
-    # Use the +cookies+ hash to manipulate cookies instead.
-    #
-    def delete_cookie(name)
-      set_cookie(name, nil, Merb::Const::COOKIE_EXPIRED_TIME)
-    end
-  end
-end

data/lib/merb/mixins/erubis_capture.rb DELETED Viewed

@@ -1,68 +0,0 @@
-module Merb
-  module ErubisCaptureMixin
-    # Provides direct acccess to the buffer for this view context
-    def _buffer( the_binding )
-      @_buffer = eval( "_buf", the_binding )
-    end
-    # Capture allows you to extract a part of the template into an
-    # instance variable. You can use this instance variable anywhere
-    # in your templates and even in your layout.
-    #
-    # Example of capture being used in a .herb page:
-    #
-    #   <% @foo = capture do %>
-    #     <p>Some Foo content!</p>
-    #   <% end %>
-    def capture(*args, &block)
-      # execute the block
-      begin
-        buffer = _buffer( block.binding )
-      rescue
-        buffer = nil
-      end
-      if buffer.nil?
-        capture_block(*args, &block)
-      else
-        capture_erb_with_buffer(buffer, *args, &block)
-      end
-    end
-    private
-      def capture_block(*args, &block)
-        block.call(*args)
-      end
-      def capture_erb(*args, &block)
-        buffer = _buffer
-        capture_erb_with_buffer(buffer, *args, &block)
-      end
-      def capture_erb_with_buffer(buffer, *args, &block)
-        pos = buffer.length
-        block.call(*args)
-        # extract the block
-        data = buffer[pos..-1]
-        # replace it in the original with empty string
-        buffer[pos..-1] = ''
-        data
-      end
-      def erb_content_for(name, &block)
-        controller.thrown_content[name] << capture_erb( &block )
-      end
-      def block_content_for(name, &block)
-        controller.thrown_content[name] << capture_block( &block )
-      end
-  end
-end

data/lib/merb/mixins/general_controller.rb DELETED Viewed

@@ -1,253 +0,0 @@
-# This module provides helper style functionality to all controllers.
-module Merb
-  module GeneralControllerMixin
-    include Merb::ControllerExceptions
-    # Returns a URL according to the defined route.  Accepts the path and
-    # an options hash.  The path specifies the route requested.  The options
-    # hash fills in the dynamic parts of the route.
-    #
-    # Merb routes can often be one-way; if they use a regex to define
-    # the route, then knowing the controller & action won't be enough
-    # to reverse-generate the route.  However, if you use the default
-    # /controller/action/id?query route, +default_route+ can generate
-    # it for you.
-    #
-    # For easy reverse-routes that use a Regex, be sure to also add
-    # a name to the route, so +url+ can find it.
-    #
-    # Nested resources such as:
-    #
-    #  r.resources :blogposts do |post|
-    #    post.resources :comments
-    #  end
-    #
-    # Provide the following routes:
-    #
-    #   [:blogposts, "/blogposts"]
-    #   [:blogpost, "/blogposts/:id"]
-    #   [:edit_blogpost, "/blogposts/:id/edit"]
-    #   [:new_blogpost, "/blogposts/new"]
-    #   [:custom_new_blogpost, "/blogposts/new/:action"]
-    #   [:comments, "/blogposts/:blogpost_id/comments"]
-    #   [:comment, "/blogposts/:blogpost_id/comments/:id"]
-    #   [:edit_comment, "/blogposts/:blogpost_id/comments/:id/edit"]
-    #   [:new_comment, "/blogposts/:blogpost_id/comments/new"]
-    #   [:custom_new_comment, "/blogposts/:blogpost_id/comments/new/:action"]
-    #
-    #
-    # ==== Parameters
-    #
-    # :route_name: - Symbol that represents a named route that you want to use, such as +:edit_post+.
-    # :new_params: - Parameters to be passed to the generated URL, such as the +id+ for a record to edit.
-    #
-    # ==== Examples
-    #
-    #  @post = Post.find(1)
-    #  @comment = @post.comments.find(1)
-    #
-    #  url(:blogposts)                                    # => /blogposts
-    #  url(:new_post)                                     # => /blogposts/new
-    #  url(:blogpost, @post)                              # => /blogposts/1
-    #  url(:edit_blogpost, @post)                         # => /blogposts/1/edit
-    #  url(:custom_new_blogpost, :action => 'alternate')  # => /blogposts/new/alternate
-    #
-    #  url(:comments, :blogpost_id => @post)         # => /blogposts/1/comments
-    #  url(:new_comment, :blogpost_id => @post)      # => /blogposts/1/comments/new
-    #  url(:comment, @comment)                    # => /blogposts/1/comments/1
-    #  url(:edit_comment, @comment)               # => /blogposts/1/comments/1/edit
-    #  url(:custom_new_comment, :blogpost_id => @post)
-    #
-    #  url(:page => 2)                            # => /posts/show/1?page=2
-    #  url(:new_post, :page => 3)                 # => /posts/new?page=3
-    #  url('/go/here', :page => 3)                # => /go/here?page=3
-    #
-    #  url(:controller => "welcome")              # => /welcome
-    #  url(:controller => "welcome", :action => "greet")
-    #                                             # => /welcome/greet
-    #
-    def url(route_name = nil, new_params = {})
-      if route_name.is_a?(Hash)
-        new_params = route_name
-        route_name = nil
-      end
-      url = if new_params.respond_to?(:keys) && route_name.nil? &&
-        !(new_params.keys & [:controller, :action, :id]).empty?
-          url_from_default_route(new_params)
-        elsif route_name.nil? && !route.regexp?
-          url_from_route(route, new_params)
-        elsif route_name.nil?
-          request.path + (new_params.empty? ? "" : "?" + params_to_query_string(new_params))
-        elsif route_name.is_a?(Symbol)
-          url_from_route(route_name, new_params)
-        elsif route_name.is_a?(String)
-          route_name + (new_params.empty? ? "" : "?" + params_to_query_string(new_params))
-        else
-          raise "URL not generated: #{route_name.inspect}, #{new_params.inspect}"
-        end
-      url = Merb::Config[:path_prefix] + url if Merb::Config[:path_prefix]
-      url
-    end
-    def url_from_route(symbol, new_params = {})
-      if new_params.respond_to?(:new_record?) && new_params.new_record?
-        symbol = "#{symbol}".singularize.to_sym
-        new_params = {}
-      end
-      route = symbol.is_a?(Symbol) ? Merb::Router.named_routes[symbol] : symbol
-      unless route
-        raise "URL could not be constructed. Route symbol not found: #{symbol.inspect}"
-      end
-      path = route.generate(new_params, params)
-      keys = route.symbol_segments
-      if new_params.is_a? Hash
-        if ext = format_extension(new_params)
-          new_params.delete(:format)
-          path += "." + ext
-        end
-        extras = new_params.reject{ |k, v| keys.include?(k) }
-        path += "?" + params_to_query_string(extras) unless extras.empty?
-      end
-      path
-    end
-    # this is pretty ugly, but it works.  TODO: make this cleaner
-    def url_from_default_route(new_params)
-      query_params = new_params.reject do |k,v|
-        [:controller, :action, :id, :format].include?(k)
-      end
-      controller = get_controller_for_url_generation(new_params)
-      url = "/#{controller}"
-      if new_params[:action] || new_params[:id] ||
-                new_params[:format] || !query_params.empty?
-        action = new_params[:action] || params[:action]
-        url += "/#{action}"
-      end
-      if new_params[:id]
-        url += "/#{new_params[:id]}"
-      end
-      if format = new_params[:format]
-        format = params[:format] if format == :current
-        url += ".#{format}"
-      end
-      unless query_params.empty?
-        url += "?" + params_to_query_string(query_params)
-      end
-      url
-    end
-    protected
-    # Creates query string from params, supporting nested arrays and hashes.
-    # ==== Example
-    #   params_to_query_string(:user => {:filter => {:name => "quux*"}, :order => ["name"]})
-    #   # => user[filter][name]=quux%2A&user[order][]=name
-    def params_to_query_string(value, prefix = nil)
-      case value
-      when Array
-        value.map { |v|
-          params_to_query_string(v, "#{prefix}[]")
-        } * "&"
-      when Hash
-        value.map { |k, v|
-          params_to_query_string(v, prefix ? "#{prefix}[#{escape(k)}]" : escape(k))
-        } * "&"
-      else
-        "#{prefix}=#{escape(value)}"
-      end
-    end
-    # +format_extension+ dictates when named route URLs generated by the url
-    # method will have a file extension. It will return either nil or the format
-    # extension to append.
-    #
-    # ==== Configuration Options
-    #
-    # By default, non-HTML URLs will be given an extension. It is posible
-    # to override this behaviour by setting +:use_format_in_urls+ in your
-    # Merb config (merb.yml) to either true/false.
-    #
-    # +true+  Results in all URLs (even HTML) being given extensions.
-    #         This effect is often desirable when you have many formats and dont
-    #         wish to treat .html any differently than any other format.
-    # +false+ Results in no URLs being given extensions and +format+
-    #         gets treated just like any other param (default).
-    #
-    # ==== Method parameters
-    #
-    # +new_params+ - New parameters to be appended to the URL
-    #
-    # ==== Examples
-    #
-    #   url(:post, :id => post, :format => 'xml')
-    #   # => /posts/34.xml
-    #
-    #   url(:accounts, :format => 'yml')
-    #   # => /accounts.yml
-    #
-    #   url(:edit_product, :id => 3, :format => 'html')
-    #   # => /products/3
-    #
-    def format_extension(new_params={})
-      format = params.merge(new_params)[:format] || 'html'
-      if format != 'html' || always_use_format_extension?
-        format || 'html'
-      end
-    end
-    def always_use_format_extension?
-      Merb::Config[:use_format_in_urls]
-    end
-    # Creates an MD5 hashed token based on the current time.
-    #
-    # ==== Example
-    #   make_token
-    #   # => "b9a82e011694cc13a4249731b9e83cea"
-    #
-    def make_token
-      require 'digest/md5'
-      Digest::MD5.hexdigest("#{inspect}#{Time.now}#{rand}")
-    end
-    # Escapes the string representation of +obj+ and escapes
-    # it for use in XML.
-    #
-    # ==== Parameter
-    #
-    # +obj+ - The object to escape for use in XML.
-    #
-    def escape_xml(obj)
-      obj.to_s.gsub(/[&<>"']/) { |s| Merb::Const::ESCAPE_TABLE[s] }
-    end
-    alias h escape_xml
-    alias html_escape escape_xml
-    def escape(s)
-      ::Merb::Request.escape(s)
-    end
-    # Unescapes a string (i.e., reverse URL escaping).
-    #
-    # ==== Parameter
-    #
-    # +s+ - String to unescape.
-    #
-    def unescape(s)
-      ::Merb::Request.unescape(s)
-    end
-    private
-    # Used for sepccing
-    def get_controller_for_url_generation(options)
-      raise "Controller Not Specified" unless options[:controller]
-      options[:controller]
-    end
-  end
-end