wycats-merb-core 0.9.8 → 0.9.9

data/CHANGELOG

@@ -1,4 +1,138 @@
-== 0.9.7 "Universe In A Bundle" 2008-09-13
+== 0.9.8 "Time Machine" 2008-06-10
+
+* Pre-release contributors file update.
+* Nillify Merb.logger first.
+* Legacy Merb apps log again. And Merb tells you where it logs on boot unless you are testing.
+* Fixes up RSpec matcher for request helper
+* remove vestigal  @_template_stack variable.
+* remove rogure require no longer needed
+* compile templates with preambles to assign locals, support recompiling partial templates if previously unseen locals are provided
+* Add a note on Dictionary and inflection code to public changelog.
+* Nuke files that are already part of Extlib.
+* Update public changelog.
+* Fixed Merb::BootLoader::Router issue
+* -core now depends on most recent Extlib
+* Revert "Added MinimalPrivilege to merb.thor. Thanks namelessjon."
+* Fixed stats.rake to check if directory exists
+* Move inflection code and Dictionary to extlib.
+* Rakefiles should be empty by default (so RSpec is not pushed down test unit users' throat).
+* Added MinimalPrivilege to merb.thor. Thanks namelessjon.
+* Added Merb::BootLoader::Router
+* Improve public specs for logger. Use Mash for log levels.
+* Untabify logger.rb.
+* Allow Merb.disable(:signals) to keep Merb from installing any signal handlers.
+* Added the ability to specify resource actions in the block
+* Fixed bug where subgems (of meta-gems) weren't reinstalled each time
+* Added process title reporting as per: LH #517
+* Making the :key a synonym to :keys for Behavior#resource
+* Fixing the rspec error when running rake tasks
+* Cleaned up the specs. Removed any stray pending specs.
+* Added stacking and redirecting deferred routing blocks.
+* Removed private/dispatch/route_params_spec.rb
+* New spec helpers ported over. Old #request helper becomes #mock_request, which uses some mocking and stubbing to set up the request. The new #request API uses no mocking, and has the following API changes:
+* Removed spec/private/config
+* Added dependency 'foo', :immediate => true for loading dependencies immediately
+* call to_s in the csrf middlewre
+* make StreamWrapper more duck typed to the old body string.
+* If --log-level or --log is explicitly given, never log to STDOUT, alsways to file
+* If Merb.env?(:test) we don't need ugly  = true spread all over the place
+* use Proc === @body instead
+* Bring the console adapter's #url back into action
+* update specs for new rack stream_wrapper
+* Updating streaming methods to work on *all* rack adapters.
+* Make Merb::Config[]= work without calling setup 1st
+* Default to  = 'UTF8' - you can just set this in init.rb if needed
+* Colorful GemManagement
+* Removed unused directory under spec.
+* Reorganized URL generation methods across Controller classes
+* Added a :singular option to resource route building
+* merb -k works right
+* Fixes stupid issue in spec loader
+* Route matching handles slashes according to the RFC
+* Added the #resource controller helper for URL generation.
+* Fixes #503; raise InternalServerError works now.
+* We shouldn't use minigems explicitly in our code (yet)
+* Add missing pieces of forking awesomeness.
+* Executable wrappers use /usr/bin/env again - run them with /path/to/ruby -S if you need a specific Ruby version
+* Merge in forking branch.
+* Use trenary operator here.
+* capture returns return value of passed in block if it is not a template block
+* Updated PUBLIC_CHANGELOG regarding Merb::RakeHelper
+* reverts URI generation on requests
+* Updates full_uri for the changes to the Request#protocol
+* Reorganized merb-core/tasks/merb to require merb-core/tasks/merb_rake_helper (see merb-gen too)
+* Cleanup of tasks/merb_rake_helper.rb
+* Added :gemspec task to Rakefile
+* Fixed executable wrapper code (for loading local gems)
+* Added Merb::RakeHelper.install_package method to install packages directly
+* Merb::RakeHelper now handles local ./bin and GEM_DIR installs correctly
+* Rakefile now uses Merb::RakeHelper.install
+* Added GemManagement module - working towards new install/uninstall rake tasks
+* Removed Merb::BootLoader::ReloadTemplates; Merb::Config[:reload_templates] needs to be set explicitly
+* Marked Kernel#track_dependency as @api private - updated specs to reflect this
+* Added warning when specs are run without memcached being available
+* Refactored Kernel#dependency and #load_dependency to work with Gem::Dependency
+* Include request uri in routing exception raised by request helpers.
+* Added require 'thread' explicitly for Mutex to be available
+* Revert "Initial support for fast redeploys and code reloading via forks."
+* Revert "Split out the code transaction into a method and do some experimentation with cluster forking."
+* Revert "Better exit message"
+* Revert "Initial experiments are a success. TODO: Move the logic out of mongrel and make a proper clustering instead of hardcoding to 4"
+* Fixes issue people were having
+* Initial experiments are a success. TODO: Move the logic out of mongrel and make a proper clustering instead of hardcoding to 4
+* Split out the code transaction into a method and do some experimentation with cluster forking.
+* Better exit message
+* Initial support for fast redeploys and code reloading via forks.
+* Fixed that YAML plugin configuratator wasn't requiring YAML.
+* Reindent core_ext/kernel.rb.
+* Register dependencies even after the BootLoader has finished
+* Fixes Merb::Request#protocol to remove the ://.  May Break things in apps if you're checking protocol directly.
+* Moves actual url generation methods onto the request object from the controller.
+  Also updates the Merb::Request#redirect method to be usable just like the controller version.
+* Throw the correct error when generating a non existent route.
+* Modify throw_content to not append. Add append_content for that purpose.
+* Significant router refactoring and feature development
+* Run specs in groups
+* Added more discriptive message when a class fails to load
+* Optimized Merb::Request.query_parse - fixed silly spec
+* Update Rack application spec to reflect current affairs.
+* Document template_for.
+* Make merb fast again. Also make rake install work from any Ruby via -S
+* ControllerMixin#html_escape => #escape_html (bring it in line with #escape_xml).
+* Protected makes no sense for class methods.
+* Remove dead code from responder.
+* Adds abstract! and abstract? for controller classes for your inheritance pleasure
+* Server#add_irb_trap should play nice with ruby-debugger.
+* Reworked the Server#add_irb_trap to suppress the warnings.
+* added flag for an IRB trap
+* Add links to nginx_send_file examples: gist and app at GitHub.
+* Untabify fixture controller for streaming.
+* Make Merb::Controller#nginx_send_file more user friendly.
+* More fine-grained check to see if a local ./bin executable should have been used
+* Ignore products RDoc generates.
+* Include RDoc in the gem.
+* Ignore RDoc template cache.
+* Remove RDoc template cache from version control.
+* Session cookies now expire at the end of a browser session again (instead of 2 weeks)
+* Second attempt: fixed load_dependency (hopefully)
+* Fixed failing spec regarding 'dependency' change
+* Make flat! more useful
+* This rescue is obsolete and is obscuring useful failing information, as well as loading
+  from the system even when you require a specific version that isn't available in the bundled gems.
+* Clean before installation. Remove *.so and *.log under spec.
+* Make gem 3 times lighter.
+* Merb::Release is gone.
+* Bump up version
+* Set @_content_type before running transform blocks
+* sneaky merge failure piece that shouldn't be here
+* Revert "Add specs for action-level only_provides"
+* Revert "add specs for does_not_provide"
+* add specs for does_not_provide
+* Add specs for action-level only_provides
+* Make controller.route work
+
+
+== 0.9.7 "Universe In A Bundle" 2008-13-09
 
 * Made the post body available to the routing when testing a request.
 * Better local gems dir detection and end-user feedback
@@ -30,7 +164,7 @@
 * Meaninful message when have_xpath matcher is used but libxml-ruby fails to load.
 * Don't blow up when there are no system paths.
 
-== 0.9.6 "Therapy session" 2008-09-08
+== 0.9.6 "Therapy session" 2008-08-09
 
 * Merge in simple conditional get support at controller level.
 * Merged in new bundling (aka freezer) branch

data/CONTRIBUTORS

@@ -22,10 +22,12 @@ Daniel Siemssen
 David James
 Diego Scataglini
 Dirkjan Bussink
+Drew Colthorp
 Dudley Flanders
 Ezra Zygmuntowicz
 Fabien Franzen
 Flea
+Foy Savas
 Gabe
 Geoffrey Grosenbach
 Goh Toh Chye
@@ -57,6 +59,7 @@ Max Lapshin
 Michael D'Auria
 Michael D. Ivey
 Michael Holub
+Michael Klishin
 Michael Latta
 Michael S. Klishin
 Michael Sheakoski
@@ -77,6 +80,8 @@ StarTrader
 Steve Tooke
 Thomas Reynolds
 Tim Kofol
+Tyler Hunt
+Tymon (teamon) Tobolski
 Wayne E. Seguin
 Wayne Larsen
 Wesley Beary
@@ -90,5 +95,6 @@ jonas
 jonuts
 macournoyer
 mde
+michael.s.klishin@gmail.com
 rick
 wvl

data/PUBLIC_CHANGELOG

@@ -1,3 +1,18 @@
+10/06/2008:
+
+* Use -L option or :log_file or :log_stream in init.rb or env init file
+  to point logger where you want.
+
+10/05/2008:
+* Merb does not add spec tasks to Rakefiles list by default. Add
+  require "merb-core/test/tasks/spectasks" in your existing Rakefiles
+	explicitly. This is done so that test unit users do not get spec
+	tasks they do not need down their throat in any merb application,
+	even running on just -core.
+
+* Dictionary and inflection code are now parts of Extlib library and shared
+  with other frameworks that use it (DataMapper, Halcyon, Mack, etc).
+
 9/26/2008:
 * For Merb developers, Rakefile features a new implementation of the :install
   and :uninstall tasks. These will work with Gems directly, without running

data/Rakefile

@@ -17,7 +17,6 @@ require __DIR__ + "/tools/annotation_extract"
 include FileUtils
 
 require "lib/merb-core/version"
-require "lib/merb-core/test/run_specs"
 require 'lib/merb-core/tasks/merb_rake_helper'
 
 ##############################################################################
@@ -58,7 +57,7 @@ spec = Gem::Specification.new do |s|
   s.extra_rdoc_files = %w( README LICENSE TODO )
 
   # Dependencies
-  s.add_dependency "extlib", ">= 0.9.6"
+  s.add_dependency "extlib", ">= 0.9.7"
   s.add_dependency "erubis"
   s.add_dependency "rake"
   s.add_dependency "json_pure"
@@ -169,7 +168,7 @@ namespace :doc do
 
   desc "rdoc to rubyforge"
   task :rubyforge do
-    sh %{#{sudo} chmod -R 755 doc} unless windows?
+    sh %{#{Merb::RakeHelper.sudo} chmod -R 755 doc} unless Merb::RakeHelper.windows?
     sh %{/usr/bin/scp -r -p doc/rdoc/* ezmobius@rubyforge.org:/var/www/gforge-projects/merb}
   end
 
@@ -184,47 +183,46 @@ task :aok => [:specs, :rcov]
 def setup_specs(name, spec_cmd='spec', run_opts = "-c")
   except = []
   except += Dir["spec/**/memcache*_spec.rb"] if ENV['MEMCACHED'] == 'no'
-  
-  public_globs = ["abstract_controller", "boot_loader",
-                  "controller/*_spec.rb", "core",
-                 "core_ext", "directory_structure", "logger", "rack/*_spec.rb", "reloading",
-                 "request", "router/*_spec.rb", "session/*_spec.rb", "template", "test"].map do |glob|
-    "spec/public/#{glob}"
-  end
 
-  private_globs = ["boot_loader", "config", "core_ext", "dispatch/**/*_spec.rb", "router/*_spec.rb", "vendor"].map do |glob|
-    "spec/private/#{glob}"
-  end
+  public_globs = Dir["#{Dir.pwd}/spec/public/**/*_spec.rb"]
+
+  private_globs = Dir["#{Dir.pwd}/spec/private/**/*_spec.rb"]
 
   desc "Run all specs (#{name})"
   task "specs:#{name}" do
+    require "lib/merb-core/test/run_specs"
     globs = public_globs + private_globs
     run_specs(globs, spec_cmd, ENV['RSPEC_OPTS'] || run_opts, except)
   end
   
   desc "Run private specs (#{name})"
   task "specs:#{name}:private" do
+    require "lib/merb-core/test/run_specs"
     run_specs(private_globs, spec_cmd, ENV['RSPEC_OPTS'] || run_opts)
   end
 
   desc "Run public specs (#{name})"
   task "specs:#{name}:public" do
+    require "lib/merb-core/test/run_specs"
     run_specs(public_globs, spec_cmd, ENV['RSPEC_OPTS'] || run_opts)
   end
   
   # With profiling formatter
   desc "Run all specs (#{name}) with profiling formatter"
   task "specs:#{name}_profiled" do
+    require "lib/merb-core/test/run_specs"
     run_specs("spec/**/*_spec.rb", spec_cmd, "-c -f o")
   end
 
   desc "Run private specs (#{name}) with profiling formatter"
   task "specs:#{name}_profiled:private" do
+    require "lib/merb-core/test/run_specs"
     run_specs("spec/private/**/*_spec.rb", spec_cmd, "-c -f o")
   end
 
   desc "Run public specs (#{name}) with profiling formatter"
   task "specs:#{name}_profiled:public" do
+    require "lib/merb-core/test/run_specs"
     run_specs("spec/public/**/*_spec.rb", spec_cmd, "-c -f o")
   end  
 end
@@ -338,7 +336,7 @@ def contributors(since_release = nil)
   git_log(since_release).split("\n").uniq.sort
 end
 
-PREVIOUS_RELEASE = '0.9.7'
+PREVIOUS_RELEASE = '0.9.8'
 namespace :history do
   namespace :update do
     desc "updates contributors list"

data/lib/merb-core.rb

@@ -22,6 +22,7 @@ require 'fileutils'
 require 'socket'
 require 'pathname'
 require "extlib"
+require "extlib/dictionary"
 
 __DIR__ = File.dirname(__FILE__)
 
@@ -29,13 +30,12 @@ $LOAD_PATH.unshift __DIR__ unless
   $LOAD_PATH.include?(__DIR__) ||
   $LOAD_PATH.include?(File.expand_path(__DIR__))
 
-require 'merb-core' / 'vendor' / 'facets'
-
 module Merb
   # Create stub module for global controller helpers.
   module GlobalHelpers; end
   
   class << self
+    attr_accessor :exiting
 
     # Merge environment settings
     # Can allow you to have a "localdev" that runs like your "development"
@@ -47,8 +47,9 @@ module Merb
     #   staging.rb:
     #     Merb.merge_env "production"         #We want to use all the settings production uses
     #     Merb::Config.use { |c|
-    #       c[:log_level]         = "debug"   #except we want debug log level
-    #       c[:exception_details] = true      #and we want to see exception details
+    #       c[:log_level]         = "debug"   # except we want debug log level
+    #       c[:log_stream]        = @some_io  # and log to this IO handle
+    #       c[:exception_details] = true      # and we want to see exception details
     #     }
     #
     # ==== Parameters
@@ -85,7 +86,6 @@ module Merb
       end
     end
 
-
     # Startup Merb by setting up the Config and starting the server.
     # This is where Merb application environment and root path are set.
     #
@@ -93,18 +93,24 @@ module Merb
     # argv<String, Hash>::
     #   The config arguments to start Merb with. Defaults to +ARGV+.
     def start(argv=ARGV)
+      # Hardcode the log stream to STDOUT
+      Merb::Config[:log_stream] = STDOUT
       if Hash === argv
         Merb::Config.setup(argv)
       else
         Merb::Config.parse_args(argv)
       end
+      Merb::Config[:log_stream] = STDOUT
+      
       Merb.environment = Merb::Config[:environment]
       Merb.root = Merb::Config[:merb_root]
       case Merb::Config[:action]
       when :kill
-        Merb::Server.kill(Merb::Config[:port], 1)
+        Merb::Server.kill(Merb::Config[:port], 2)
       when :kill_9
         Merb::Server.kill(Merb::Config[:port], 9)
+      when :fast_deploy
+        Merb::Server.kill("main", "HUP")
       else
         Merb::Server.start(Merb::Config[:port], Merb::Config[:cluster])
       end
@@ -263,21 +269,43 @@ module Merb
     end
 
     # Logger settings
-    attr_accessor :logger
+    def logger
+      Thread.current[:merb_logger] ||= Merb::Logger.new
+    end
+
+    def logger=(obj)
+      unless obj
+        Thread.current[:merb_logger] = nil
+      end
+    end
 
     # ==== Returns
     # String::
     #   The path to the log file. If this Merb instance is running as a daemon
     #   this will return +STDOUT+.
-    def log_file
-      if Merb::Config[:log_file]
-        Merb::Config[:log_file]
-      elsif Merb.testing?
-        log_path / "merb_test.log"
-      elsif !(Merb::Config[:daemonize] || Merb::Config[:cluster])
-        STDOUT
-      else
-        log_path / "merb.#{Merb::Config[:port]}.log"
+    def log_stream(port = "main")
+      @streams ||= {}
+      @streams[port] ||= begin
+        log = if Merb.testing?
+          log_path / "merb_test.log"
+        elsif !Merb::Config[:daemonize] && !Merb::Config[:force_logging]
+          STDOUT
+        else
+          log_path / "merb.#{port}.log"
+        end
+        
+        if log.is_a?(IO)
+          stream = log
+        elsif File.exist?(log)
+          stream = File.open(log, (File::WRONLY | File::APPEND))
+        else
+          FileUtils.mkdir_p(File.dirname(log))
+          stream = File.open(log, (File::WRONLY | File::APPEND | File::CREAT))
+          stream.write("#{Time.now.httpdate} #{Merb::Config[:log_delimiter]} " \
+            "info #{Merb::Config[:log_delimiter]} Logfile created\n")
+        end
+        stream.sync = true
+        stream
       end
     end
 
@@ -314,26 +342,26 @@ module Merb
       end
     end
 
-    # Allows flat apps by setting no default framework directories and yielding
-    # a Merb::Router instance. This is optional since the router will
-    # automatically configure the app with default routes.
-    #
-    # ==== Block parameters
-    # r<Merb::Router::Behavior>::
-    #   The root behavior upon which new routes can be added.
-    def flat!(framework = {})
-      default = {
-        :framework => { :public => [Merb.root / "public", nil] },
-        :session_store => 'none',
-        :exception_details => true
-      }
-            
-      Merb::Config[:framework] = default.merge(framework)
-
-      Merb::Router.prepare do |r|
-        yield(r) if block_given?
-        r.default_routes
+    def fatal!(str, e = nil)
+      Merb.logger.fatal!
+      Merb.logger.fatal!("\e[1;31;47mFATAL: #{str}\e[0m")
+      Merb.logger.fatal!
+
+      print_colorized_backtrace(e) if e && Merb::Config[:verbose]
+      exit(1)
+    end
+    
+    def print_colorized_backtrace(e)
+      e.backtrace.map! do |line|
+        line.gsub!(/^#{Merb.framework_root}/, "\e[34mFRAMEWORK_ROOT\e[31m")
       end
+      
+      Merb.logger.fatal! "\e[34mFRAMEWORK_ROOT\e[0m = #{Merb.framework_root}"
+      Merb.logger.fatal!
+      Merb.logger.fatal! "\e[31m#{e.class}: \e[1;31;47m#{e.message}\e[0m"
+      e.backtrace.each do |line|
+        Merb.logger.fatal! "\e[31m#{line}\e[0m"
+      end      
     end
 
     # Set up default variables under Merb
@@ -428,9 +456,11 @@ module Merb
     #                             flush after new messages are
     #                             added, defaults to true.
     #
-    # :log_file<IO>::             IO for logger. Default is STDOUT.
+    # :log_stream<IO>::           IO handle for logger. Defaults to STDOUT.
+    #
+    # :log_file<String>::         File path for logger. Overrides :log_stream.
     #
-    # :log_level<Symbol>::        logger level, default is :warn
+    # :log_level<Symbol>::        logger level, default is :info
     #
     # :disabled_components<Array[Symbol]>::
     #   array of disabled component names,
@@ -446,7 +476,7 @@ module Merb
     # application start, some of them are set in Merb init file
     # or environment-specific.
     def load_config(options = {})
-      Merb::Config.setup({ :log_file => STDOUT, :log_level => :warn, :log_auto_flush => true }.merge(options))
+      Merb::Config.setup(Merb::Config.defaults.merge(options))
       Merb::BootLoader::Logger.run
     end
 
@@ -475,7 +505,7 @@ module Merb
     # Boolean:: True if Merb environment is testing for instance,
     # Merb is running with RSpec, Test::Unit of other testing facility.
     def testing?
-      $TESTING || Merb::Config[:testing]
+      $TESTING ||= env?(:test) || Merb::Config[:testing]
     end
 
     # Ask the question about which environment you're in.
@@ -551,7 +581,7 @@ module Merb
     # Recommended way to find out what paths Rakefiles
     # are loaded from.
     def rakefiles
-      @rakefiles ||= ['merb-core/test/tasks/spectasks']
+      @rakefiles ||= []
     end
     
     # === Returns
@@ -565,12 +595,12 @@ module Merb
     end
 
     # ==== Parameters
-    # *rakefiles:: Rakefile pathss to add to the list of Rakefiles.
+    # *rakefiles:: Rakefile paths to add to the list of Rakefiles.
     #
     # ==== Notes
     # Recommended way to add Rakefiles load path for plugins authors.
     def add_rakefiles(*rakefiles)
-      @rakefiles ||= ['merb-core/test/tasks/spectasks']
+      @rakefiles ||= []
       @rakefiles += rakefiles
     end
     
@@ -584,6 +614,15 @@ module Merb
       @generators += generators
     end
 
+    # Install a signal handler for a given signal unless signals have
+    # been disabled with Merb.disable(:signals)
+    # ==== Parameters
+    # signal:: The name of the signal to install a handler for.
+    # &block:: The block to be run when the given signal is received.
+    def trap(signal, &block)
+      Kernel.trap(signal, &block) unless Merb.disabled?(:signals)
+    end
+
   end
 end
 
@@ -595,4 +634,4 @@ require 'merb-core/version'
 require 'merb-core/controller/mime'
 
 # Set the environment if it hasn't already been set.
-Merb.environment ||= ENV['MERB_ENV'] || Merb::Config[:environment] || (Merb.testing? ? 'test' : 'development')
+Merb.environment ||= ENV['MERB_ENV'] || Merb::Config[:environment] || (Merb.testing? ? 'test' : 'development')