merb 0.3.0 → 0.3.1

data/Rakefile

@@ -15,7 +15,7 @@ include FileUtils
 
 
 NAME = "merb"
-VERS = "0.3.0"
+VERS = "0.3.1"
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']
 
 setup_clean [ "pkg", "lib/*.bundle", "*.gem", 

data/lib/merb.rb

@@ -1,5 +1,13 @@
 require 'rubygems'
-require 'mongrel'
+if ENV['SWIFT']
+ require 'swiftcore/swiftiplied_mongrel'
+ puts "Using Swiftiplied Mongrel"
+elsif ENV['EVENT']
+  require 'swiftcore/evented_mongrel' 
+  puts "Using Evented Mongrel"
+else
+ require 'mongrel'
+end
 require 'fileutils'
 require 'erubis'
 require 'logger'
@@ -12,7 +20,7 @@ end
 
 
 module Merb
-  VERSION='0.3.0' unless defined?VERSION
+  VERSION='0.3.1' unless defined?VERSION
   class Server
     class << self
       def config
@@ -72,7 +80,6 @@ MERB_LOGGER.level = case (Merb::Server.log_level.downcase rescue '')
 module Mongrel::Const
   HTTP_COOKIE   =  'HTTP_COOKIE'.freeze
   QUERY_STRING  =  'QUERY_STRING'.freeze
-  CONTENT_TYPE_TEXT_HTML_HASH = {'Content-Type' =>'text/html'}
   APPLICATION_JSON = 'application/json'.freeze 
   TEXT_JSON        = 'text/x-json'.freeze
   UPCASE_CONTENT_TYPE = 'CONTENT_TYPE'.freeze

data/lib/merb/core_ext/merb_object.rb

@@ -6,8 +6,11 @@ class Object
   end
   
   def meta_class() class << self; self end end
+  
   def meta_eval(&blk) meta_class.instance_eval( &blk ) end
+  
   def meta_def(name, &blk) meta_eval { define_method name, &blk } end
+  
   def class_def name, &blk
     self.class.class_eval { define_method name, &blk }
   end   

data/lib/merb/merb_controller.rb

@@ -39,7 +39,7 @@ module Merb
     def initialize(request, env, args, response)
       @env = MerbHash[env.to_hash]
       @status, @method, @response, @headers = 200, (env[Mongrel::Const::REQUEST_METHOD]||Mongrel::Const::GET).downcase.to_sym, response,
-          Mongrel::Const::CONTENT_TYPE_TEXT_HTML_HASH
+         {'Content-Type' =>'text/html'}
       cookies = query_parse(@env[Mongrel::Const::HTTP_COOKIE], ';,')
       querystring = query_parse(@env[Mongrel::Const::QUERY_STRING])
       

data/lib/merb/merb_dispatcher.rb

@@ -11,7 +11,7 @@ module Merb
       
       @@mutex = Mutex.new
       @@use_mutex = ::Merb::Server.use_mutex
-      # This is where we grab the incoming request PATH_INFO
+      # This is where we grab the incoming request REQUEST_URI
       # and use that in the merb routematcher to determine
       # which controller and method to run. 
       # returns a 2 element tuple of:

data/lib/merb/merb_upload_handler.rb

@@ -5,19 +5,21 @@ module Mongrel
     UPLOAD_ID    = 'upload_id'.freeze
   end
   
-  HttpHandler.class_eval do
-    def request_aborted(params)
-    end
-  end
-  
-  HttpRequest.class_eval do
-    def initialize_with_abort(params, socket, dispatchers)
-      initialize_without_abort(params, socket, dispatchers)
-      dispatchers.each {|d| d.request_aborted(params) if @body.nil? && d }
+  unless ENV['EVENT'] || ENV['SWIFT']
+    HttpHandler.class_eval do
+      def request_aborted(params)
+      end
     end
     
-    alias_method :initialize_without_abort, :initialize
-    alias_method :initialize, :initialize_with_abort
+    HttpRequest.class_eval do
+      def initialize_with_abort(params, socket, dispatchers)
+        initialize_without_abort(params, socket, dispatchers)
+        dispatchers.each {|d| d.request_aborted(params) if @body.nil? && d }
+      end
+      
+      alias_method :initialize_without_abort, :initialize
+      alias_method :initialize, :initialize_with_abort
+    end
   end
 end
 

data/lib/merb/template/haml.rb

@@ -32,6 +32,7 @@ module Merb
         
         @@hamls ||= {}
         @@mtimes ||= {}
+        
         def exempt_from_layout?
           false    
         end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: merb
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
-date: 2007-04-28 00:00:00 -07:00
+  version: 0.3.1
+date: 2007-04-30 00:00:00 -07:00
 summary: Merb == Mongrel + Erb. Pocket rocket web framework.
 require_paths: 
 - lib
@@ -35,14 +35,29 @@ files:
 - TODO
 - bin/merb
 - lib/merb
-- lib/merb.rb
-- lib/merb_tasks.rb
-- lib/tasks
 - lib/merb/caching
+- 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/memory_cache.rb
 - lib/merb/caching.rb
 - lib/merb/core_ext
+- lib/merb/core_ext/merb_class.rb
+- lib/merb/core_ext/merb_enumerable.rb
+- lib/merb/core_ext/merb_hash.rb
+- lib/merb/core_ext/merb_inflections.rb
+- lib/merb/core_ext/merb_inflector.rb
+- lib/merb/core_ext/merb_kernel.rb
+- lib/merb/core_ext/merb_module.rb
+- lib/merb/core_ext/merb_numeric.rb
+- lib/merb/core_ext/merb_object.rb
+- lib/merb/core_ext/merb_string.rb
+- lib/merb/core_ext/merb_symbol.rb
 - lib/merb/core_ext.rb
 - lib/merb/generators
+- lib/merb/generators/merb_app
+- lib/merb/generators/merb_app/merb_app.rb
 - lib/merb/merb_constants.rb
 - lib/merb/merb_controller.rb
 - lib/merb/merb_dispatcher.rb
@@ -58,28 +73,6 @@ files:
 - lib/merb/merb_view_context.rb
 - lib/merb/merb_yaml_store.rb
 - lib/merb/mixins
-- lib/merb/session
-- lib/merb/template
-- lib/merb/template.rb
-- lib/merb/vendor
-- 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/memory_cache.rb
-- lib/merb/core_ext/merb_class.rb
-- lib/merb/core_ext/merb_enumerable.rb
-- lib/merb/core_ext/merb_hash.rb
-- lib/merb/core_ext/merb_inflections.rb
-- lib/merb/core_ext/merb_inflector.rb
-- lib/merb/core_ext/merb_kernel.rb
-- lib/merb/core_ext/merb_module.rb
-- lib/merb/core_ext/merb_numeric.rb
-- lib/merb/core_ext/merb_object.rb
-- lib/merb/core_ext/merb_string.rb
-- lib/merb/core_ext/merb_symbol.rb
-- lib/merb/generators/merb_app
-- lib/merb/generators/merb_app/merb_app.rb
 - lib/merb/mixins/basic_authentication_mixin.rb
 - lib/merb/mixins/controller_mixin.rb
 - lib/merb/mixins/erubis_capture_mixin.rb
@@ -87,52 +80,59 @@ files:
 - lib/merb/mixins/render_mixin.rb
 - lib/merb/mixins/responder_mixin.rb
 - lib/merb/mixins/view_context_mixin.rb
+- lib/merb/session
 - lib/merb/session/merb_ar_session.rb
 - lib/merb/session/merb_memory_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/vendor
 - lib/merb/vendor/paginator
 - lib/merb/vendor/paginator/paginator.rb
 - lib/merb/vendor/paginator/README.txt
+- lib/merb.rb
+- lib/merb_tasks.rb
+- lib/tasks
 - lib/tasks/db.rake
 - lib/tasks/merb.rake
 - examples/README_EXAMPLES
 - examples/skeleton
-- examples/skeleton.tar
 - examples/skeleton/dist
-- examples/skeleton/log
-- examples/skeleton/Rakefile
-- examples/skeleton/script
-- examples/skeleton/test
 - examples/skeleton/dist/app
-- examples/skeleton/dist/conf
-- examples/skeleton/dist/lib
-- examples/skeleton/dist/plugins
-- examples/skeleton/dist/public
-- examples/skeleton/dist/schema
 - examples/skeleton/dist/app/controllers
+- examples/skeleton/dist/app/controllers/application.rb
 - examples/skeleton/dist/app/helpers
+- examples/skeleton/dist/app/helpers/global_helper.rb
 - examples/skeleton/dist/app/models
 - examples/skeleton/dist/app/views
-- examples/skeleton/dist/app/controllers/application.rb
-- examples/skeleton/dist/app/helpers/global_helper.rb
 - examples/skeleton/dist/app/views/layout
 - examples/skeleton/dist/app/views/layout/application.herb
+- examples/skeleton/dist/conf
 - examples/skeleton/dist/conf/merb.yml
 - examples/skeleton/dist/conf/merb_init.rb
 - examples/skeleton/dist/conf/router.rb
 - examples/skeleton/dist/conf/upload.conf
+- examples/skeleton/dist/lib
+- examples/skeleton/dist/plugins
+- examples/skeleton/dist/public
 - examples/skeleton/dist/public/images
 - examples/skeleton/dist/public/javascripts
 - examples/skeleton/dist/public/stylesheets
+- examples/skeleton/dist/schema
 - examples/skeleton/dist/schema/migrations
 - examples/skeleton/dist/schema/migrations/001_add_sessions_table.rb
+- examples/skeleton/log
+- examples/skeleton/Rakefile
+- examples/skeleton/script
 - examples/skeleton/script/new_migration
 - examples/skeleton/script/stop_merb
+- examples/skeleton/test
 - examples/skeleton/test/specs
 - examples/skeleton/test/unit
+- examples/skeleton.tar
 test_files: []
 
 rdoc_options: []