merb-core 0.9.9 → 0.9.10

data/README

@@ -19,7 +19,35 @@ Goals of this release:
 To familiarize yourself with how a merb-core application might look, 
 use merb-gen (from merb-more) to generate a few apps:
 
-$ merb-gen app myapp                   # a "normal" merb app
-$ merb-gen app myapp --flat            # a flattened app
-$ merb-gen app myapp --very-flat       # a single-file app
+$ merb-gen app myapp         # merb stack app, assuming you are using DM and RSpec
 
+The only option you can use with stack is --template_engine=(erb|haml).
+Default is erb.
+
+$ merb-gen core myapp        # a "regular" app without any predefined dependencies
+
+Options available:
+
+--orm=datamapper
+--orm=sequel
+--orm=activerecord
+
+Default is no ORM.
+
+--testing_framework=rspec
+--testing_framework=test_unit
+
+Default is rspec.
+
+--template_enging=erb
+--template_enging=haml
+
+Default is erb.
+
+$ merb-gen flat myapp        # a flattened app: one file and directory for views
+
+Options are same as for "regular" app.
+
+$ merb-gen very_flat myapp   # a single-file app
+
+Options are same as for "regular" app.

data/Rakefile

@@ -58,7 +58,7 @@ spec = Gem::Specification.new do |s|
 
   # Dependencies
   s.add_dependency "extlib", ">= 0.9.8"
-  s.add_dependency "erubis"
+  s.add_dependency "erubis", ">= 2.6.2"
   s.add_dependency "rake"
   s.add_dependency "json_pure"
   s.add_dependency "rspec"
@@ -336,7 +336,7 @@ def contributors(since_release = nil)
   git_log(since_release).split("\n").uniq.sort
 end
 
-PREVIOUS_RELEASE = '0.9.8'
+PREVIOUS_RELEASE = '0.9.9'
 namespace :history do
   namespace :update do
     desc "updates contributors list"

data/lib/merb-core.rb

@@ -23,6 +23,8 @@ require "pathname"
 require "extlib"
 require "extlib/dictionary"
 
+Thread.abort_on_exception = true
+
 __DIR__ = File.dirname(__FILE__)
 
 $LOAD_PATH.unshift __DIR__ unless
@@ -275,7 +277,7 @@ module Merb
     #
     # @api public
     def root=(value)
-      @root = value
+      @root = File.expand_path(value) + File::SEPARATOR
     end
 
     # ==== Parameters
@@ -710,7 +712,21 @@ module Merb
     #
     # @api public
     def trap(signal, &block)
-      Kernel.trap(signal, &block) unless Merb.disabled?(:signals)
+      if Signal.list.include?(signal)
+        Kernel.trap(signal, &block) unless Merb.disabled?(:signals)
+      end
+    end
+
+    def forking_environment?
+      !on_windows? && !on_jruby?
+    end
+
+    def on_jruby?
+      RUBY_PLATFORM =~ Merb::Const::JAVA_PLATFORM_REGEXP
+    end
+
+    def on_windows?
+      RUBY_PLATFORM =~ Merb::Const::WIN_PLATFORM_REGEXP
     end
 
   end

data/lib/merb-core/bootloader.rb

@@ -5,9 +5,12 @@ module Merb
     # def self.subclasses
     #
     # @api plugin
-    cattr_accessor :subclasses, :after_load_callbacks, :before_load_callbacks, :finished
+    cattr_accessor :subclasses, :after_load_callbacks, :before_load_callbacks,
+    :finished, :before_worker_shutdown_callbacks, :before_master_shutdown_callbacks
+
     self.subclasses, self.after_load_callbacks,
-      self.before_load_callbacks, self.finished = [], [], [], []
+      self.before_load_callbacks, self.finished, self.before_master_shutdown_callbacks,
+      self.before_worker_shutdown_callbacks = [], [], [], [], [], []
 
     class << self
 
@@ -34,7 +37,7 @@ module Merb
       #
       # ==== Returns
       # nil
-      # 
+      #
       # @api plugin
       def after(klass)
         move_klass(klass, 1)
@@ -131,7 +134,7 @@ module Merb
         Merb.push_path(:config,       Merb.root_path("config"), nil)
         Merb.push_path(:router,       Merb.dir_for(:config), (Merb::Config[:router_file] || "router.rb"))
         Merb.push_path(:lib,          Merb.root_path("lib"), nil)
-        Merb.push_path(:merb,         Merb.root_path("merb"))
+        Merb.push_path(:merb_session, Merb.root_path("merb" / "session"))
         Merb.push_path(:log,          Merb.log_path, nil)
         Merb.push_path(:public,       Merb.root_path("public"), nil)
         Merb.push_path(:stylesheet,   Merb.dir_for(:public) / "stylesheets", nil)
@@ -163,6 +166,14 @@ module Merb
       def before_app_loads(&block)
         before_load_callbacks << block
       end
+
+      def before_master_shutdown(&block)
+        before_master_shutdown_callbacks << block
+      end
+
+      def before_worker_shutdown(&block)
+        before_worker_shutdown_callbacks << block
+      end
     end
 
   end
@@ -193,7 +204,7 @@ class Merb::BootLoader::Logger < Merb::BootLoader
     Merb::Config[:log_stream] = Merb.log_stream
 
     print_warnings
-    
+
     nil
   end
 
@@ -234,10 +245,10 @@ end
 # Setup some useful defaults
 class Merb::BootLoader::Defaults < Merb::BootLoader
   # Sets up the defaults
-  #
+  # 
   # ==== Returns
   # nil
-  #
+  # 
   # @api plugin
   def self.run
     Merb::Request.http_method_overrides.concat([
@@ -352,7 +363,7 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
     # then environment init file, then start enabling specific
     # components, load dependencies and update logger.
     unless Merb::disabled?(:initfile)
-      load_initfile 
+      load_initfile
       load_env_config
     end
     enable_json_gem unless Merb::disabled?(:json)
@@ -362,7 +373,7 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
   end
 
   # Load each dependency that has been declared so far.
-  # 
+  #
   # ==== Returns
   # nil
   #
@@ -384,7 +395,7 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
     require "json/pure"
   end
 
-  # Resets the logger and sets the log_stream to Merb::Config[:log_file] 
+  # Resets the logger and sets the log_stream to Merb::Config[:log_file]
   # if one is specified, falling back to STDOUT.
   #
   # ==== Returns
@@ -403,7 +414,7 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
     else
       Merb::Config[:log_stream] ||= STDOUT
     end
-    
+
     nil
   end
 
@@ -589,7 +600,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
       end
 
       Merb::Controller.send :include, Merb::GlobalHelpers
-      
+
       nil
     end
 
@@ -607,14 +618,22 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
       Merb::Server.remove_pid("main")
       # terminate, workers remove their own pids
       # in on exit hook
+
+      Merb::BootLoader.before_master_shutdown_callbacks.each do |cb|
+        begin
+          cb.call
+        rescue Exception => e
+          Merb.logger.fatal "before_master_shutdown callback crashed: #{e.message}"
+        end
+      end
       exit
     end
 
-    # Set up the BEGIN point for fork-based loading and sets up 
+    # Set up the BEGIN point for fork-based loading and sets up
     # any signals in the parent and child. This is done by forking
     # the app. The child process continues on to run the app. The parent
     # process waits for the child process to finish and either forks again
-    # 
+    #
     #
     # ==== Returns
     # Parent Process:
@@ -668,7 +687,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
         reader_ary = [reader]
         loop do
           # wait for worker to exit and capture exit status
-          # 
+          #
           #
           # WNOHANG specifies that wait2 exists without waiting
           # if no worker processes are ready to be noticed.
@@ -705,13 +724,13 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
         Merb::Server.add_irb_trap
         at_exit { reap_workers }
       else
-        Merb.trap('INT') {}
+        Merb.trap('INT') { Merb::BootLoader.before_worker_shutdown_callbacks.each { |cb| cb.call } }
         Merb.trap('ABRT') { reap_workers }
         Merb.trap('HUP') { reap_workers(128) }
       end
     end
 
-    # Reap any workers of the spawner process and 
+    # Reap any workers of the spawner process and
     # exit with an appropriate status code.
     #
     # Note that exiting the spawner process with a status code
@@ -728,6 +747,16 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
     # @param status<Integer> The status code to exit with
     # @param sig<String>     The signal to send to workers
     def reap_workers(status = 0, sig = "ABRT")
+      Merb.logger.info "Executed all before worker shutdown callbacks..."
+      Merb::BootLoader.before_worker_shutdown_callbacks.each do |cb|
+        begin
+          cb.call
+        rescue Exception => e
+          Merb.logger.fatal "before worker shutdown callback crashed: #{e.message}"
+        end
+
+      end
+
       Merb.exiting = true unless status == 128
 
       begin
@@ -781,7 +810,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
       unless Merb::Config[:fork_for_class_load]
         LOADED_CLASSES[file] = ObjectSpace.classes - klasses
       end
-      
+
       nil
     end
 
@@ -808,7 +837,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
       end
       load_classes_with_requirements(orphaned_classes)
     end
-    
+
     # Reloads the classes in the specified file. If fork-based loading is used,
     # this causes the current processes to be killed and and all classes to be
     # reloaded. If class-based loading is not in use, the classes declared in that file
@@ -856,7 +885,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
       nil
     end
 
-    # Removes the specified class. 
+    # Removes the specified class.
     #
     # Additionally, removes the specified class from the subclass list of every superclass that
     # tracks it's subclasses in an array returned by _subclasses_list. Classes that wish to use this
@@ -943,7 +972,7 @@ class Merb::BootLoader::LoadClasses < Merb::BootLoader
         end
         break if(klasses.size == size_at_start || klasses.size == 0)
       end
-      
+
       nil
     end
 
@@ -955,7 +984,7 @@ end
 # the router has everything it needs to run.
 class Merb::BootLoader::Router < Merb::BootLoader
   class << self
-    
+
     # load the router file
     #
     # ==== Returns
@@ -964,7 +993,7 @@ class Merb::BootLoader::Router < Merb::BootLoader
     # @api plugin
     def run
       Merb::BootLoader::LoadClasses.load_file(router_file) if router_file
-      
+
       nil
     end
 
@@ -1110,29 +1139,20 @@ class Merb::BootLoader::SetupSession < Merb::BootLoader
     end
 
     # Mixin the Merb::Session module to add app-level functionality to sessions
+    overrides = (Merb::Session.instance_methods & Merb::SessionContainer.instance_methods)
+    overrides.each do |m| 
+      Merb.logger.warn!("Warning: Merb::Session##{m} overrides existing " \
+                        "Merb::SessionContainer##{m}")
+    end    
     Merb::SessionContainer.send(:include, Merb::Session)
     nil
   end
 
 end
 
-class Merb::BootLoader::AfterAppLoads < Merb::BootLoader
-
-  # Call any after_app_loads hooks that were registered via after_app_loads in
-  # init.rb.
-  #
-  # ==== Returns
-  # nil
-  #
-  # @api plugin
-  def self.run
-    Merb::BootLoader.after_load_callbacks.each {|x| x.call }
-    nil
-  end
-end
-
 # In case someone's running a sparse app, the default exceptions require the
-# Exceptions class.
+# Exceptions class.  This must run prior to the AfterAppLoads BootLoader
+# So that plugins may have ensured access in the after_app_loads block
 class Merb::BootLoader::SetupStubClasses < Merb::BootLoader
   # Declares empty Application and Exception controllers.
   #
@@ -1147,7 +1167,7 @@ class Merb::BootLoader::SetupStubClasses < Merb::BootLoader
           abstract!
         end
 
-        class Exceptions < Application
+        class Exceptions < Merb::Controller
         end
       RUBY
     end
@@ -1155,6 +1175,21 @@ class Merb::BootLoader::SetupStubClasses < Merb::BootLoader
   end
 end
 
+class Merb::BootLoader::AfterAppLoads < Merb::BootLoader
+
+  # Call any after_app_loads hooks that were registered via after_app_loads in
+  # init.rb.
+  #
+  # ==== Returns
+  # nil
+  #
+  # @api plugin
+  def self.run
+    Merb::BootLoader.after_load_callbacks.each {|x| x.call }
+    nil
+  end
+end
+
 class Merb::BootLoader::ChooseAdapter < Merb::BootLoader
 
   # Choose the Rack adapter/server to use and set Merb.adapter.
@@ -1197,7 +1232,7 @@ class Merb::BootLoader::RackUpApplication < Merb::BootLoader
          run Merb::Rack::Application.new
        }.to_app
     end
-    
+
     nil
   end
 end
@@ -1216,7 +1251,6 @@ class Merb::BootLoader::ReloadClasses < Merb::BootLoader
     #
     # @api private
     def self.every(seconds, &block)
-      Thread.abort_on_exception = true
       Thread.new do
         loop do
           sleep( seconds )
@@ -1227,10 +1261,10 @@ class Merb::BootLoader::ReloadClasses < Merb::BootLoader
     end
   end
 
-  # Set up the class reloader if class reloading is enabled. This checks periodically 
+  # Set up the class reloader if class reloading is enabled. This checks periodically
   # for modifications to files loaded by the LoadClasses BootLoader and reloads them
   # when they are modified.
-  # 
+  #
   # ==== Returns
   # nil
   #
@@ -1255,7 +1289,7 @@ class Merb::BootLoader::ReloadClasses < Merb::BootLoader
       GC.start
       reload(paths)
     end
-    
+
     nil
   end
 
@@ -1272,7 +1306,7 @@ class Merb::BootLoader::ReloadClasses < Merb::BootLoader
 
       LoadClasses.reload(file)
     end
-    
+
     nil
   end
 end

data/lib/merb-core/config.rb

@@ -18,7 +18,7 @@ module Merb
           :port                   => "4000",
           :adapter                => "runner",
           :reload_classes         => true,
-          :fork_for_class_load    => !(RUBY_PLATFORM =~ /(:?mswin|mingw|java)/),
+          :fork_for_class_load    => Merb.forking_environment?,
           :environment            => "development",
           :merb_root              => Dir.pwd,
           :use_mutex              => true,
@@ -26,7 +26,7 @@ module Merb
           :log_auto_flush         => false,
           :log_level              => :info,
           :log_stream             => STDOUT,
-          :disabled_components    => [],
+          :disabled_components    => Merb.on_windows? ? [:signals] : [],
           :deferred_actions       => [],
           :verbose                => false,
           :name                   => "merb"