merb 0.4.0 → 0.4.1

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
+rubygems_version: 0.9.2
 specification_version: 1
 name: merb
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
-date: 2007-11-06 00:00:00 -08:00
+  version: 0.4.1
+date: 2007-11-12 00:00:00 -06:00
 summary: Merb == Mongrel + Erb. Pocket rocket web framework.
 require_paths: 
 - lib
@@ -34,22 +34,185 @@ files:
 - Rakefile
 - TODO
 - bin/merb
+- spec/fixtures
+- spec/merb
+- spec/spec_generator_helper.rb
+- spec/spec_helper.rb
+- spec/fixtures/config
+- spec/fixtures/controllers
+- spec/fixtures/foo.rb
+- spec/fixtures/mailers
+- spec/fixtures/models
+- spec/fixtures/parts
+- spec/fixtures/sample.txt
+- spec/fixtures/views
+- spec/fixtures/config/merb.yml
+- spec/fixtures/controllers/dispatch_spec_controllers.rb
+- spec/fixtures/controllers/render_spec_controllers.rb
+- spec/fixtures/mailers/views
+- spec/fixtures/mailers/views/layout
+- spec/fixtures/mailers/views/test_mail_controller
+- spec/fixtures/mailers/views/layout/application.html.erb
+- spec/fixtures/mailers/views/layout/application.text.erb
+- spec/fixtures/mailers/views/test_mail_controller/eighth.html.erb
+- spec/fixtures/mailers/views/test_mail_controller/eighth.text.erb
+- spec/fixtures/mailers/views/test_mail_controller/first.html.erb
+- spec/fixtures/mailers/views/test_mail_controller/first.text.erb
+- spec/fixtures/mailers/views/test_mail_controller/ninth.html.erb
+- spec/fixtures/mailers/views/test_mail_controller/ninth.text.erb
+- spec/fixtures/mailers/views/test_mail_controller/second.text.erb
+- spec/fixtures/mailers/views/test_mail_controller/third.html.erb
+- spec/fixtures/models/router_spec_models.rb
+- spec/fixtures/parts/helpers
+- spec/fixtures/parts/views
+- spec/fixtures/parts/views/layout
+- spec/fixtures/parts/views/todo_part
+- spec/fixtures/parts/views/layout/todo_part.html.erb
+- spec/fixtures/parts/views/layout/todo_part.xml.erb
+- spec/fixtures/parts/views/todo_part/formatted_output.html.erb
+- spec/fixtures/parts/views/todo_part/formatted_output.js.erb
+- spec/fixtures/parts/views/todo_part/formatted_output.xml.erb
+- spec/fixtures/parts/views/todo_part/list.html.erb
+- spec/fixtures/views/erubis.html.erb
+- spec/fixtures/views/examples
+- spec/fixtures/views/exceptions
+- spec/fixtures/views/extension_template_controller
+- spec/fixtures/views/haml.html.haml
+- spec/fixtures/views/haml.xml.haml
+- spec/fixtures/views/layout
+- spec/fixtures/views/markaby.html.mab
+- spec/fixtures/views/nested
+- spec/fixtures/views/partials
+- spec/fixtures/views/render_object_controller
+- spec/fixtures/views/template_views
+- spec/fixtures/views/test.dir
+- spec/fixtures/views/examples/_erubis.html.erb
+- spec/fixtures/views/examples/_haml.html.haml
+- spec/fixtures/views/examples/_markaby.html.mab
+- spec/fixtures/views/examples/_throw_content.html.erb
+- spec/fixtures/views/examples/hello.xml.builder
+- spec/fixtures/views/examples/js.js.erb
+- spec/fixtures/views/examples/template_catch_content.html.erb
+- spec/fixtures/views/examples/template_catch_content_from_partial.html.erb
+- spec/fixtures/views/examples/template_throw_content.html.erb
+- spec/fixtures/views/exceptions/admin_access_required.html.erb
+- spec/fixtures/views/extension_template_controller/_nested_js.js.erb
+- spec/fixtures/views/extension_template_controller/_nested_xml.xml.erb
+- spec/fixtures/views/extension_template_controller/_render_partial_multiple_times.html.erb
+- spec/fixtures/views/extension_template_controller/erubis_templates.html.erb
+- spec/fixtures/views/extension_template_controller/erubis_templates.js.erb
+- spec/fixtures/views/extension_template_controller/erubis_templates.rhtml
+- spec/fixtures/views/extension_template_controller/erubis_templates.xml.erb
+- spec/fixtures/views/extension_template_controller/haml_index.html.haml
+- spec/fixtures/views/extension_template_controller/haml_templates.html.haml
+- spec/fixtures/views/extension_template_controller/haml_templates.js.haml
+- spec/fixtures/views/extension_template_controller/haml_templates.xml.haml
+- spec/fixtures/views/extension_template_controller/index.html.erb
+- spec/fixtures/views/extension_template_controller/markaby_index.html.mab
+- spec/fixtures/views/extension_template_controller/markaby_templates.html.mab
+- spec/fixtures/views/extension_template_controller/markaby_templates.js.mab
+- spec/fixtures/views/extension_template_controller/markaby_templates.xml.mab
+- spec/fixtures/views/extension_template_controller/render_multiple_partials.html.erb
+- spec/fixtures/views/extension_template_controller/render_nested_js.js.erb
+- spec/fixtures/views/extension_template_controller/render_nested_xml.xml.erb
+- spec/fixtures/views/layout/application.html.erb
+- spec/fixtures/views/layout/application.xml.erb
+- spec/fixtures/views/layout/nested
+- spec/fixtures/views/layout/nested/example.html.erb
+- spec/fixtures/views/nested/example
+- spec/fixtures/views/nested/example/test.html.erb
+- spec/fixtures/views/partials/_erubis.html.erb
+- spec/fixtures/views/partials/_erubis_collection.html.erb
+- spec/fixtures/views/partials/_erubis_collection_with_locals.html.erb
+- spec/fixtures/views/partials/_erubis_new.html.erb
+- spec/fixtures/views/partials/_haml.html.haml
+- spec/fixtures/views/partials/_haml_collection.html.haml
+- spec/fixtures/views/partials/_haml_collection_with_locals.html.haml
+- spec/fixtures/views/partials/_haml_new.html.haml
+- spec/fixtures/views/partials/_markaby.html.mab
+- spec/fixtures/views/partials/_markaby_collection.html.mab
+- spec/fixtures/views/partials/_markaby_collection_with_locals.html.mab
+- spec/fixtures/views/partials/_markaby_new.html.mab
+- spec/fixtures/views/render_object_controller/render_object_with_template.html.erb
+- spec/fixtures/views/render_object_controller/render_object_with_template.js.erb
+- spec/fixtures/views/render_object_controller/render_object_with_template.xml.erb
+- spec/fixtures/views/template_views/interface__buffer_erubis.html.erb
+- spec/fixtures/views/template_views/interface__buffer_haml.html.haml
+- spec/fixtures/views/template_views/interface__buffer_markaby.html.mab
+- spec/fixtures/views/template_views/interface_capture_erubis.html.erb
+- spec/fixtures/views/template_views/interface_capture_haml.html.haml
+- spec/fixtures/views/template_views/interface_capture_markaby.html.mab
+- spec/fixtures/views/template_views/interface_concat_erubis.html.erb
+- spec/fixtures/views/template_views/interface_concat_haml.html.haml
+- spec/fixtures/views/template_views/interface_concat_markaby.html.mab
+- spec/fixtures/views/test.dir/the_template.html.erb
+- spec/merb/abstract_controller_spec.rb
+- spec/merb/caching_spec.rb
+- spec/merb/config_spec.rb
+- spec/merb/controller_filters_spec.rb
+- spec/merb/controller_spec.rb
+- spec/merb/cookie_store_spec.rb
+- spec/merb/core_ext_spec.rb
+- spec/merb/dispatch_spec.rb
+- spec/merb/fake_request_spec.rb
+- spec/merb/form_control_mixin_spec.rb
+- spec/merb/generator_spec.rb
+- spec/merb/handler_spec.rb
+- spec/merb/mail_controller_spec.rb
+- spec/merb/mailer_spec.rb
+- spec/merb/multipart_spec.rb
+- spec/merb/part_controller_spec.rb
+- spec/merb/plugins_spec.rb
+- spec/merb/render_spec.rb
+- spec/merb/request_spec.rb
+- spec/merb/responder_spec.rb
+- spec/merb/router_spec.rb
+- spec/merb/template_spec.rb
+- spec/merb/upload_handler_spec.rb
+- spec/merb/view_context_spec.rb
 - lib/autotest
+- lib/merb
+- lib/merb.rb
+- lib/tasks
+- lib/tasks.rb
 - lib/autotest/discover.rb
 - lib/autotest/merb_rspec.rb
-- lib/merb
 - lib/merb/abstract_controller.rb
 - lib/merb/caching
+- lib/merb/caching.rb
+- lib/merb/constants.rb
+- lib/merb/controller.rb
+- lib/merb/core_ext
+- lib/merb/core_ext.rb
+- lib/merb/dispatcher.rb
+- lib/merb/drb_server.rb
+- lib/merb/erubis_ext.rb
+- lib/merb/exceptions.rb
+- lib/merb/generators
+- lib/merb/logger.rb
+- lib/merb/mail_controller.rb
+- lib/merb/mailer.rb
+- lib/merb/mixins
+- lib/merb/mongrel_handler.rb
+- lib/merb/part_controller.rb
+- lib/merb/plugins.rb
+- lib/merb/rack_adapter.rb
+- lib/merb/request.rb
+- lib/merb/router.rb
+- lib/merb/server.rb
+- lib/merb/session
+- lib/merb/session.rb
+- lib/merb/template
+- lib/merb/template.rb
+- lib/merb/test
+- lib/merb/upload_handler.rb
+- lib/merb/upload_progress.rb
+- lib/merb/view_context.rb
 - lib/merb/caching/action_cache.rb
 - lib/merb/caching/fragment_cache.rb
 - lib/merb/caching/store
 - lib/merb/caching/store/file_cache.rb
-- lib/merb/caching/store/memcache.rb
 - lib/merb/caching/store/memory_cache.rb
-- lib/merb/caching.rb
-- lib/merb/constants.rb
-- lib/merb/controller.rb
-- lib/merb/core_ext
 - lib/merb/core_ext/array.rb
 - lib/merb/core_ext/class.rb
 - lib/merb/core_ext/enumerable.rb
@@ -64,20 +227,10 @@ files:
 - lib/merb/core_ext/object.rb
 - lib/merb/core_ext/string.rb
 - lib/merb/core_ext/symbol.rb
-- lib/merb/core_ext.rb
-- lib/merb/dispatcher.rb
-- lib/merb/drb_server.rb
-- lib/merb/erubis_ext.rb
-- lib/merb/exceptions.rb
-- lib/merb/generators
 - lib/merb/generators/merb_app
-- lib/merb/generators/merb_app/merb_app.rb
 - lib/merb/generators/merb_generator_helpers.rb
 - lib/merb/generators/merb_plugin.rb
-- lib/merb/logger.rb
-- lib/merb/mail_controller.rb
-- lib/merb/mailer.rb
-- lib/merb/mixins
+- lib/merb/generators/merb_app/merb_app.rb
 - lib/merb/mixins/basic_authentication.rb
 - lib/merb/mixins/controller.rb
 - lib/merb/mixins/erubis_capture.rb
@@ -86,90 +239,78 @@ files:
 - lib/merb/mixins/responder.rb
 - lib/merb/mixins/view_context.rb
 - lib/merb/mixins/web_controller.rb
-- lib/merb/mongrel_handler.rb
-- lib/merb/part_controller.rb
-- lib/merb/plugins.rb
-- lib/merb/rack_adapter.rb
-- lib/merb/request.rb
-- lib/merb/router.rb
-- lib/merb/server.rb
-- lib/merb/session
 - lib/merb/session/cookie_store.rb
 - lib/merb/session/mem_cache_session.rb
 - lib/merb/session/memory_session.rb
-- lib/merb/session.rb
-- lib/merb/template
 - lib/merb/template/erubis.rb
 - lib/merb/template/haml.rb
 - lib/merb/template/markaby.rb
 - lib/merb/template/xml_builder.rb
-- lib/merb/template.rb
-- lib/merb/test
 - lib/merb/test/fake_request.rb
 - lib/merb/test/helper.rb
 - lib/merb/test/hpricot.rb
 - lib/merb/test/multipart.rb
 - lib/merb/test/rspec.rb
-- lib/merb/upload_handler.rb
-- lib/merb/upload_progress.rb
-- lib/merb/view_context.rb
-- lib/merb.rb
-- lib/tasks
 - lib/tasks/merb.rake
-- lib/tasks.rb
 - app_generators/merb
+- app_generators/merb_plugin
 - app_generators/merb/merb_generator.rb
 - app_generators/merb/templates
+- app_generators/merb/USAGE
 - app_generators/merb/templates/app
+- app_generators/merb/templates/config
+- app_generators/merb/templates/public
+- app_generators/merb/templates/Rakefile
+- app_generators/merb/templates/script
+- app_generators/merb/templates/spec
+- app_generators/merb/templates/test
 - app_generators/merb/templates/app/controllers
+- app_generators/merb/templates/app/helpers
+- app_generators/merb/templates/app/mailers
+- app_generators/merb/templates/app/parts
+- app_generators/merb/templates/app/views
 - app_generators/merb/templates/app/controllers/application.rb
 - app_generators/merb/templates/app/controllers/exceptions.rb
-- app_generators/merb/templates/app/helpers
 - app_generators/merb/templates/app/helpers/global_helper.rb
-- app_generators/merb/templates/app/mailers
 - app_generators/merb/templates/app/mailers/views
 - app_generators/merb/templates/app/mailers/views/layout
-- app_generators/merb/templates/app/mailers/views/layout/application.erb
-- app_generators/merb/templates/app/views
+- app_generators/merb/templates/app/mailers/views/layout/application.html.erb
+- app_generators/merb/templates/app/mailers/views/layout/application.text.erb
+- app_generators/merb/templates/app/parts/views
+- app_generators/merb/templates/app/parts/views/layout
+- app_generators/merb/templates/app/parts/views/layout/application.html.erb
 - app_generators/merb/templates/app/views/exceptions
+- app_generators/merb/templates/app/views/layout
 - app_generators/merb/templates/app/views/exceptions/internal_server_error.html.erb
 - app_generators/merb/templates/app/views/exceptions/not_acceptable.html.erb
 - app_generators/merb/templates/app/views/exceptions/not_found.html.erb
-- app_generators/merb/templates/app/views/layout
 - app_generators/merb/templates/app/views/layout/application.html.erb
-- app_generators/merb/templates/config
 - app_generators/merb/templates/config/boot.rb
 - app_generators/merb/templates/config/dependencies.rb
 - app_generators/merb/templates/config/environments
-- app_generators/merb/templates/config/environments/development.rb
-- app_generators/merb/templates/config/environments/production.rb
-- app_generators/merb/templates/config/environments/test.rb
 - app_generators/merb/templates/config/merb.yml
 - app_generators/merb/templates/config/merb_init.rb
 - app_generators/merb/templates/config/plugins.yml
 - app_generators/merb/templates/config/router.rb
 - app_generators/merb/templates/config/upload.conf
-- app_generators/merb/templates/public
+- app_generators/merb/templates/config/environments/development.rb
+- app_generators/merb/templates/config/environments/production.rb
+- app_generators/merb/templates/config/environments/test.rb
 - app_generators/merb/templates/public/images
-- app_generators/merb/templates/public/images/merb.jpg
 - app_generators/merb/templates/public/merb.fcgi
 - app_generators/merb/templates/public/stylesheets
+- app_generators/merb/templates/public/images/merb.jpg
 - app_generators/merb/templates/public/stylesheets/master.css
-- app_generators/merb/templates/Rakefile
-- app_generators/merb/templates/script
 - app_generators/merb/templates/script/destroy
 - app_generators/merb/templates/script/generate
 - app_generators/merb/templates/script/stop_merb
 - app_generators/merb/templates/script/win_script.cmd
-- app_generators/merb/templates/spec
 - app_generators/merb/templates/spec/spec.opts
 - app_generators/merb/templates/spec/spec_helper.rb
-- app_generators/merb/templates/test
 - app_generators/merb/templates/test/test_helper.rb
-- app_generators/merb/USAGE
-- app_generators/merb_plugin
 - app_generators/merb_plugin/merb_plugin_generator.rb
 - app_generators/merb_plugin/templates
+- app_generators/merb_plugin/USAGE
 - app_generators/merb_plugin/templates/LICENSE
 - app_generators/merb_plugin/templates/merbtasks.rb
 - app_generators/merb_plugin/templates/Rakefile
@@ -178,33 +319,33 @@ files:
 - app_generators/merb_plugin/templates/sampleplugin_spec.rb
 - app_generators/merb_plugin/templates/spec_helper.rb
 - app_generators/merb_plugin/templates/TODO
-- app_generators/merb_plugin/USAGE
 - merb_generators/controller
+- merb_generators/resource
 - merb_generators/controller/controller_generator.rb
 - merb_generators/controller/templates
+- merb_generators/controller/USAGE
 - merb_generators/controller/templates/controller.rb
 - merb_generators/controller/templates/helper.rb
 - merb_generators/controller/templates/index.html.erb
-- merb_generators/controller/USAGE
-- merb_generators/resource
 - merb_generators/resource/resource_generator.rb
 - merb_generators/resource/USAGE
 - merb_default_generators/model
+- merb_default_generators/resource_controller
 - merb_default_generators/model/model_generator.rb
 - merb_default_generators/model/templates
-- merb_default_generators/model/templates/new_model_template.erb
 - merb_default_generators/model/USAGE
-- merb_default_generators/resource_controller
+- merb_default_generators/model/templates/new_model_template.erb
 - merb_default_generators/resource_controller/resource_controller_generator.rb
 - merb_default_generators/resource_controller/templates
+- merb_default_generators/resource_controller/USAGE
 - merb_default_generators/resource_controller/templates/controller.rb
 - merb_default_generators/resource_controller/templates/edit.html.erb
 - merb_default_generators/resource_controller/templates/helper.rb
 - merb_default_generators/resource_controller/templates/index.html.erb
 - merb_default_generators/resource_controller/templates/new.html.erb
 - merb_default_generators/resource_controller/templates/show.html.erb
-- merb_default_generators/resource_controller/USAGE
 - rspec_generators/merb_controller_test
+- rspec_generators/merb_model_test
 - rspec_generators/merb_controller_test/merb_controller_test_generator.rb
 - rspec_generators/merb_controller_test/templates
 - rspec_generators/merb_controller_test/templates/controller_spec.rb
@@ -213,21 +354,18 @@ files:
 - rspec_generators/merb_controller_test/templates/index_spec.rb
 - rspec_generators/merb_controller_test/templates/new_spec.rb
 - rspec_generators/merb_controller_test/templates/show_spec.rb
-- rspec_generators/merb_model_test
 - rspec_generators/merb_model_test/merb_model_test_generator.rb
 - rspec_generators/merb_model_test/templates
 - rspec_generators/merb_model_test/templates/model_spec_template.erb
 - test_unit_generators/merb_controller_test
+- test_unit_generators/merb_model_test
 - test_unit_generators/merb_controller_test/merb_controller_test_generator.rb
 - test_unit_generators/merb_controller_test/templates
 - test_unit_generators/merb_controller_test/templates/functional_test.rb
 - test_unit_generators/merb_controller_test/templates/helper_test.rb
-- test_unit_generators/merb_model_test
 - test_unit_generators/merb_model_test/merb_model_test_generator.rb
 - test_unit_generators/merb_model_test/templates
 - test_unit_generators/merb_model_test/templates/model_test_unit_template.erb
-- script/destroy
-- script/generate
 test_files: []
 
 rdoc_options: []

data/lib/merb/caching/store/memcache.rb

@@ -1,20 +0,0 @@
-module Merb
-  module Caching
-    module MemcachedStore
-    
-
-    def get(name)
-      ::Cache.get("fragment:#{name}")
-    end
-    
-    def put(name, content = nil)
-      ::Cache.put("fragment:#{name}", content)
-      content
-    end
-    
-    def expire_fragment(name)
-      ::Cache.delete(name)
-    end     
-    end
-  end
-end      

data/script/destroy

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.join(File.dirname(__FILE__), '..')
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/destroy'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! :rubygems
-RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.join(File.dirname(__FILE__), '..')
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/generate'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! :rubygems
-RubiGen::Scripts::Generate.new.run(ARGV)