merb-core 0.9.5 → 0.9.6

data/CONTRIBUTORS

@@ -0,0 +1,93 @@
+Use merb? Say thanks the following people:
+
+Aaron Wheeler
+Abhay Kumar
+Adam Jacob
+Andy C
+Antti Tarvainen
+Ben Burkert
+Ben Chiu
+Ben Griffiths
+Bradly Feeley
+Brandon Dimcheff
+Brian Mitchell
+Bryan Ray
+Carl Lerche
+Charles Jolley
+Coda Hale
+Cory ODaniel
+Daniel Neighman
+Daniel Schierbeck
+Daniel Siemssen
+David James
+Diego Scataglini
+Dirkjan Bussink
+Dudley Flanders
+Ezra Zygmuntowicz
+Fabien Franzen
+Flea
+Gabe
+Geoffrey Grosenbach
+Goh Toh Chye
+Grant Hollingworth
+Guillaume Maury
+Hampton Catlin
+Ho-Sheng Hsiao
+Jack Dempsey
+James Herdman
+James Whiteman
+Janne Asmala
+Jaroslaw Zabiello
+Jonas Nicklas
+Jonathan Younger
+Josh Nichols
+Kyle Drake
+Lance Carlson
+Loren Segal
+Lori Holden
+Martin Grund
+Mason Browne
+Matt Aimonetti
+Matt Todd
+Matthew Ford
+Matthew Windwer
+Matthijs Langenberg
+Max Aller
+Max Lapshin
+Michael D'Auria
+Michael D. Ivey
+Michael Holub
+Michael Latta
+Michael S. Klishin
+Michael Sheakoski
+Mirko Froehlich
+Nathan Weizenbaum
+Oliver Jakubiec
+Paul Boone
+Paul Carey
+Ray Morgan
+Rich Cavanaugh
+Ross Lawley
+Shalon Wood
+Shay Arnett
+Simon Jefford
+Sindre Aarsaether
+StarTrader
+Steve Tooke
+Thomas Reynolds
+Tim Kofol
+Wayne E. Seguin
+Wayne Larsen
+Wesley Beary
+Will Prater
+William Smith
+Wilson Bilkovich
+Yehuda Katz
+Zach Holt
+brainopia
+jonas
+jonuts
+macournoyer
+mde
+rick
+wvl

data/PUBLIC_CHANGELOG

@@ -0,0 +1,85 @@
+9/5/2008:
+* Language::English::Inflector is now English::Inflect - be sure to change your
+  custom inflections in config/init.rb. Additionally, the merb-gen template 
+  config/init.rb has been changed to document the features accordingly.
+
+9/2/2008:
+* AbstractController now uniformly uses instance_eval for Procs where previously
+  the controller instance (self) was passed as an argument:
+  - Procs thrown during dispatch 
+  - Procs used as before/after filters
+  - Procs used as conditions to before/after filters
+  
+  This means that code like this:
+  
+  proc { |c| c.a_controller_method }
+  
+  Becomes the following for the cases mentioned:
+  
+  proc { a_controller_method }
+
+8/29/2008:
+* The directory Merb.root / 'framework' is now gone - framework gems are
+  expected to be installed as local gems in Merb.root / 'gems':
+  sudo gem install merb -i ./gems
+* The notion of a frozen application setup (using bundled gems) is now known
+  as a bundled setup; Merb.frozen? => Merb.bundled? By default an app uses
+  bundled gems (the -B or --bundle options to merb), to disable this use
+  the option --no-bundle.
+
+8/27/2008:
+* Merb::Request#protocol now returns valid protocol names: http, not http://.
+
+8/22/2008:
+* controller.cookies['foo'] = { ... } (Hash with options) is now deprecated;
+  use controller.cookies['foo'] = 'bar' for simple cookies without options, or
+  use controller.cookies.set_cookie('foo', 'bar', options) for more control.
+
+8/21/2008:
+* Memcached sessions are now configured by assignment to 
+  Merb::MemcachedSession.store (previously the CACHE constant was used)
+* Added Merb::Config[:ignore_tampered_cookies] option to skip cookie warnings   
+  during development. This defaults to 'on' in the development environment.
+* Merb::Config[:session_store] or Merb::Config[:session_stores] now accept an
+  Array (or String); when an Array is given, multiple session stores will be
+  available to the application.
+* If you have custom session stores (that inherit from Merb::SessionContainer)
+  be sure to require them in your init.rb
+
+8/20/2008:
+* Merb::Config[:session_cookie_domain] is now     
+  Merb::Config[:default_cookie_domain]
+* Merb.registered_session_types is now Merb::Request.registered_session_types
+* When running in :development env, cookie-based sessions won't bother you 
+  by raising TamperedWithCookie anymore.
+
+8/14/2008:
+*  Merb.orm_generator_scope and friends are renamed.
+** Merb.orm_generator_scope => Merb.orm
+** Merb.test_framework_generator_scope => Merb.test_framework
+** Added Merb.template_engine
+
+Merb-gen is updated accordingly. This let us add --haml and similar
+options to merb-gen and plugin generators.
+
+8/10/2008:
+* Modified the way Exceptions are handled in the Dispatcher
+** To rescue all exceptions, supply Exceptions#exception
+** To rescue all Merb-generated exceptions, supply Exceptions#base
+** Exceptions#internal_server_error is no longer a catch-all and should
+   not be used as such.
+
+6/22/2008:
+
+Erubis modified:
+* <%= %> now can take a block, so <%= helper do %>Hello<% end %> now works
+* Erubis buffer is now an ivar (@_erb_buf), which eliminates the need for
+  eval in capture helpers.
+  
+CONSEQUENCE:
+Helpers that take a block should simply return a string, and should not
+use concat. Example:
+  
+  def my_helper(&blk)
+    "My helper says #{capture(&blk)}."
+  end

data/Rakefile

@@ -51,15 +51,14 @@ spec = Gem::Specification.new do |s|
   s.description  = PROJECT_DESCRIPTION
   s.executables  = %w( merb )
   s.require_path = "lib"
-  s.files        = %w( LICENSE README Rakefile TODO ) + Dir["{docs,bin,spec,lib,examples,app_generators,merb_generators,merb_default_generators,rspec_generators,test_unit_generators,script}/**/*"]
+  s.files        = %w( LICENSE README Rakefile TODO CHANGELOG PUBLIC_CHANGELOG CONTRIBUTORS ) + Dir["{docs,bin,spec,lib}/**/*"]
 
   # rdoc
   s.has_rdoc         = true
   s.extra_rdoc_files = %w( README LICENSE TODO )
-  #s.rdoc_options     += RDOC_OPTS + ["--exclude", "^(app|uploads)"]
 
   # Dependencies
-  s.add_dependency "extlib", ">=0.9.4"
+  s.add_dependency "extlib", ">= 0.9.5"
   s.add_dependency "erubis"
   s.add_dependency "rake"
   s.add_dependency "json_pure"
@@ -80,22 +79,27 @@ end
 
 desc "Run :package and install the resulting .gem"
 task :install => :package do
-  sh %{#{sudo} gem install #{install_home} --local pkg/#{GEM_NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
+  sh install_command(GEM_NAME, GEM_VERSION)
 end
 
 desc "Install Merb with development dependencies"
 task :dev_install => :package do
-  sh %{#{sudo} gem install #{install_home} --local pkg/#{GEM_NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri --development}  
+  sh dev_install_command(GEM_NAME, GEM_VERSION)  
 end
 
 desc "Run :package and install the resulting .gem with jruby"
 task :jinstall => :package do
-  sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri}
+  sh jinstall_command(GEM_NAME, GEM_VERSION)
+end
+
+desc "Run :package and install the resulting .gem with jruby (development dependencies)"
+task :jinstall => :package do
+  sh dev_jinstall_command(GEM_NAME, GEM_VERSION)
 end
 
 desc "Run :clean and uninstall the .gem"
 task :uninstall => :clean do
-  sh %{#{sudo} gem uninstall #{NAME}}
+  sh uninstall_command(GEM_NAME)
 end
 
 CLEAN.include ["**/.*.sw?", "pkg", "lib/*.bundle", "*.gem", "doc/rdoc", ".config", "coverage", "cache"]
@@ -165,7 +169,6 @@ namespace :doc do
 
   desc "rdoc to rubyforge"
   task :rubyforge do
-    # sh %{rake doc}
     sh %{#{sudo} chmod -R 755 doc} unless windows?
     sh %{/usr/bin/scp -r -p doc/rdoc/* ezmobius@rubyforge.org:/var/www/gforge-projects/merb}
   end
@@ -178,18 +181,14 @@ end
 desc "Run :specs, :rcov"
 task :aok => [:specs, :rcov]
 
-# desc "Run all specs"
-# Spec::Rake::SpecTask.new("specs") do |t|
-#   t.spec_opts = ["--format", "specdoc", "--colour"]
-#   t.spec_files = Dir["spec/**/*_spec.rb"].sort
-# end
-
 def setup_specs(name, spec_cmd='spec', run_opts = "-c")
   desc "Run all specs (#{name})"
   task "specs:#{name}" do
-    run_specs("spec/**/*_spec.rb", spec_cmd, ENV['RSPEC_OPTS'] || run_opts)
+    except = []
+    except += Dir["spec/**/memcache*_spec.rb"] if ENV['MEMCACHED'] == 'no'
+    run_specs("spec/**/*_spec.rb", spec_cmd, ENV['RSPEC_OPTS'] || run_opts, except)
   end
-
+  
   desc "Run private specs (#{name})"
   task "specs:#{name}:private" do
     run_specs("spec/private/**/*_spec.rb", spec_cmd, ENV['RSPEC_OPTS'] || run_opts)
@@ -199,7 +198,7 @@ def setup_specs(name, spec_cmd='spec', run_opts = "-c")
   task "specs:#{name}:public" do
     run_specs("spec/public/**/*_spec.rb", spec_cmd, ENV['RSPEC_OPTS'] || run_opts)
   end
-
+  
   # With profiling formatter
   desc "Run all specs (#{name}) with profiling formatter"
   task "specs:#{name}_profiled" do
@@ -214,7 +213,7 @@ def setup_specs(name, spec_cmd='spec', run_opts = "-c")
   desc "Run public specs (#{name}) with profiling formatter"
   task "specs:#{name}_profiled:public" do
     run_specs("spec/public/**/*_spec.rb", spec_cmd, "-c -f o")
-  end
+  end  
 end
 
 setup_specs("mri", "spec")
@@ -255,15 +254,6 @@ Spec::Rake::SpecTask.new("specs_html") do |t|
   t.spec_files = Dir["spec/**/*_spec.rb"].sort
 end
 
-# desc "RCov"
-# Spec::Rake::SpecTask.new("rcov") do |t|
-#   t.rcov_opts = ["--exclude", "gems", "--exclude", "spec"]
-#   t.spec_opts = ["--format", "specdoc", "--colour"]
-#   t.spec_files = Dir["spec/**/*_spec.rb"].sort
-#   t.libs = ["lib", "server/lib"]
-#   t.rcov = true
-# end
-
 STATS_DIRECTORIES = [
   ['Code', 'lib/'],
   ['Unit tests', 'spec']
@@ -335,7 +325,7 @@ def contributors(since_release = nil)
   git_log(since_release).split("\n").uniq.sort
 end
 
-PREVIOUS_RELEASE = '0.9.4'
+PREVIOUS_RELEASE = '0.9.5'
 namespace :history do
   namespace :update do
     desc "updates contributors list"

data/bin/merb

@@ -1,12 +1,41 @@
 #!/usr/bin/env ruby
-require "merb-core"
 
-if ARGV[0] && ARGV[0] =~ /^[^-]/
-  ARGV.push "-H"
-end 
+# See also: merb-gen scripts and script/merb
 
+# Try to use minigems instead of the fully rubygems library
+begin
+  require 'minigems'
+rescue LoadError
+  require 'rubygems'
+end
+
+# Load script helpers if available - either local or system-wide.
+begin
+  # Figure out the merb root - defaults to the current directory.
+  root_key = %w[-m --merb-root].detect { |o| ARGV.index(o) }
+  root = ARGV[ARGV.index(root_key) + 1] if root_key
+  __DIR__ = root.to_a.empty? ? Dir.getwd : root
+  
+  # Piggyback on the merb-core rubygem for initial setup scripts.
+  # Requiring it doesn't affect the local gem version of merb-core
+  # we might effectively want to load here after.
+  if merb_core_dir = Dir[File.join(__DIR__, 'gems', 'gems', 'merb-core-*')].last
+    require File.join(merb_core_dir, 'lib', 'merb-core', 'script')
+  else
+    require 'merb-core/script'
+  end
+  # Now setup local gems to be incorporated into the normal loaded gems.
+  # Unless the option --no-bundle is given, bundled gems are enabled.
+  include Merb::ScriptHelpers
+  setup_local_gems!(__DIR__)
+rescue LoadError
+end
+
+require 'merb-core'
+
+ARGV.push '-H' if ARGV[0] && ARGV[0] =~ /^[^-]/
 unless %w[-a --adapter -i --irb-console -r --script-runner].any? { |o| ARGV.index(o) }
   ARGV.push *%w[-a mongrel]
 end
 
-Merb.start
+Merb.start

data/lib/merb-core/autoload.rb

@@ -3,9 +3,9 @@ module Merb
   autoload :BootLoader,               "merb-core/bootloader"
   autoload :Config,                   "merb-core/config"
   autoload :Const,                    "merb-core/constants"
+  autoload :ConditionalGetMixin,      "merb-core/controller/mixins/conditional_get"
   autoload :ControllerMixin,          "merb-core/controller/mixins/controller"
   autoload :ControllerExceptions,     "merb-core/controller/exceptions"
-  autoload :Cookies,                  "merb-core/dispatch/cookies"
   autoload :Dispatcher,               "merb-core/dispatch/dispatcher"
   autoload :AuthenticationMixin,      "merb-core/controller/mixins/authentication"
   autoload :BasicAuthenticationMixin, "merb-core/controller/mixins/authentication/basic"
@@ -16,7 +16,6 @@ module Merb
   autoload :Request,                  "merb-core/dispatch/request"
   autoload :ResponderMixin,           "merb-core/controller/mixins/responder"
   autoload :Router,                   "merb-core/dispatch/router"
-  autoload :SessionMixin,             "merb-core/dispatch/session"
   autoload :Test,                     "merb-core/test"
   autoload :Worker,                   "merb-core/dispatch/worker"
 end
@@ -29,4 +28,4 @@ require "merb-core/controller/merb_controller"
 
 module Merb
   module InlineTemplates; end
-end
+end

data/lib/merb-core/bootloader.rb

@@ -58,6 +58,7 @@ module Merb
 
       # Runs all boot loader classes by calling their run methods.
       def run
+        Merb.started = true
         subklasses = subclasses.dup
         until subclasses.empty?
           time = Time.now.to_i
@@ -261,7 +262,6 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
     enable_json_gem unless Merb::disabled?(:json)
     load_dependencies
     update_logger
-    update_session_cookie_attributes
   end
 
   def self.load_dependencies
@@ -279,11 +279,6 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
     Merb::BootLoader::Logger.run if updated_logger_options != Merb.logger.init_args
   end
 
-  def self.update_session_cookie_attributes
-    Merb::Controller._session_expiry = Merb::Config[:session_expiry] || Merb::Const::WEEK * 2
-    Merb::Controller._session_cookie_domain = Merb::Config[:session_cookie_domain]
-  end
-
   private
 
     # Determines the path for the environment configuration file
@@ -318,6 +313,23 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
 
 end
 
+class Merb::BootLoader::MixinSession < Merb::BootLoader
+
+  # Mixin the session functionality; this is done before BeforeAppLoads
+  # so that SessionContainer and SessionStoreContainer can be subclassed by
+  # plugin session stores for example - these need to be loaded in a
+  # before_app_loads block or a BootLoader that runs after MixinSession.
+  #
+  # Note: access to Merb::Config is needed, so it needs to run after 
+  # Merb::BootLoader::Dependencies is done.
+  def self.run
+    require 'merb-core/dispatch/session'
+    Merb::Controller.send(:include, ::Merb::SessionMixin)
+    Merb::Request.send(:include, ::Merb::SessionMixin::RequestMixin)
+  end
+
+end
+
 class Merb::BootLoader::BeforeAppLoads < Merb::BootLoader
 
   # Call any before_app_loads hooks that were registered via before_app_loads
@@ -548,6 +560,48 @@ class Merb::BootLoader::MimeTypes < Merb::BootLoader
   end
 end
 
+class Merb::BootLoader::Cookies < Merb::BootLoader
+  
+  def self.run
+    require 'merb-core/dispatch/cookies'
+    Merb::Controller.send(:include, Merb::CookiesMixin)
+    Merb::Request.send(:include, Merb::CookiesMixin::RequestMixin)
+  end
+  
+end
+
+class Merb::BootLoader::SetupSession < Merb::BootLoader
+
+  # Enable the configured session container(s); any class that inherits from
+  # SessionContainer will be considered by its session_store_type attribute.
+  def self.run
+    # Require all standard session containers.
+    Dir[Merb.framework_root / "merb-core" / "dispatch" / "session" / "*.rb"].each do |file|
+      base_name = File.basename(file, ".rb")
+      require file unless base_name == "container" || base_name == "store_container"
+    end
+    
+    # Set some defaults.
+    Merb::Config[:session_id_key] ||= "_session_id"
+    
+    # List of all session_stores from :session_stores and :session_store config options.
+    config_stores = Merb::Config.session_stores
+    
+    # Register all configured session stores - any loaded session container class
+    # (subclassed from Merb::SessionContainer) will be available for registration.
+    Merb::SessionContainer.subclasses.each do |class_name|
+      if(store = Object.full_const_get(class_name)) && 
+        config_stores.include?(store.session_store_type)
+          Merb::Request.register_session_type(store.session_store_type, class_name)
+      end
+    end
+    
+    # Mixin the Merb::Session module to add app-level functionality to sessions
+    Merb::SessionContainer.send(:include, Merb::Session)
+  end
+
+end
+
 class Merb::BootLoader::AfterAppLoads < Merb::BootLoader
 
   # Call any after_app_loads hooks that were registered via after_app_loads in
@@ -573,66 +627,6 @@ class Merb::BootLoader::SetupStubClasses < Merb::BootLoader
   end
 end
 
-class Merb::BootLoader::MixinSessionContainer < Merb::BootLoader
-
-  # Mixin the correct session container.
-  def self.run
-    Merb.register_session_type('memory',
-      Merb.framework_root / "merb-core" / "dispatch" / "session" / "memory",
-      "Using in-memory sessions; sessions will be lost whenever the server stops.")
-
-    Merb.register_session_type('memcache',
-      Merb.framework_root /  "merb-core" / "dispatch" / "session" / "memcached",
-      "Using 'memcached' sessions")
-
-    Merb.register_session_type('cookie', # Last session type becomes the default
-      Merb.framework_root /  "merb-core" / "dispatch" / "session" / "cookie",
-      "Using 'share-nothing' cookie sessions (4kb limit per client)")
-
-
-
-    Merb::Controller.class_eval do
-      session_store = Merb::Config[:session_store].to_s
-      if ["", "false", "none"].include?(session_store)
-        Merb.logger.warn "Not Using Sessions"
-      elsif reg = Merb.registered_session_types[session_store]
-        Merb::BootLoader::MixinSessionContainer.check_for_secret_key if session_store == "cookie"
-        Merb::BootLoader::MixinSessionContainer.check_for_session_id_key
-        require reg[:file]
-        include ::Merb::SessionMixin
-        Merb.logger.warn reg[:description]
-      else
-        Merb.logger.warn "Session store not found, '#{Merb::Config[:session_store]}'."
-        Merb.logger.warn "Defaulting to CookieStore Sessions"
-        Merb::BootLoader::MixinSessionContainer.check_for_secret_key
-        Merb::BootLoader::MixinSessionContainer.check_for_session_id_key
-        require Merb.registered_session_types['cookie'][:file]
-        include ::Merb::SessionMixin
-        Merb.logger.warn "(plugin not installed?)"
-      end
-    end
-
-    Merb.logger.flush
-  end
-
-  # Sets the controller session ID key if it has been set in config.
-  def self.check_for_session_id_key
-    if Merb::Config[:session_id_key]
-      Merb::Controller._session_id_key = Merb::Config[:session_id_key]
-    end
-  end
-
-  # Attempts to set the session secret key. This method will exit if the key
-  # does not exist or is shorter than 16 charaters.
-  def self.check_for_secret_key
-    unless Merb::Config[:session_secret_key] && (Merb::Config[:session_secret_key].length >= 16)
-      Merb.logger.warn("You must specify a session_secret_key in your init file, and it must be at least 16 characters\nbailing out...")
-      exit!
-    end
-    Merb::Controller._session_secret_key = Merb::Config[:session_secret_key]
-  end
-end
-
 class Merb::BootLoader::ChooseAdapter < Merb::BootLoader
 
   # Choose the Rack adapter/server to use and set Merb.adapter.

data/lib/merb-core/config.rb

@@ -17,7 +17,6 @@ module Merb
           :environment            => "development",
           :merb_root              => Dir.pwd,
           :use_mutex              => true,
-          :session_id_key         => "_session_id",
           :log_delimiter          => " ~ ",
           :log_auto_flush         => false,
           :log_level              => :info,
@@ -116,6 +115,9 @@ module Merb
 
         # Environment variables always win
         options[:environment] = ENV["MERB_ENV"] if ENV["MERB_ENV"]
+        
+        # Enable bundled gems by default; used by bundled?
+        options[:bundle] = true
 
         # Build a parser for the command line arguments
         opts = OptionParser.new do |opts|
@@ -239,6 +241,10 @@ module Merb
           opts.on("-V", "--verbose", "Print extra information") do
             options[:verbose] = true
           end
+          
+          opts.on("-B", "--[no-]bundle", "Run application using bundled gems. Enabled by default.") do |b|
+            options[:bundle] = b
+          end
 
           opts.on("-?", "-H", "--help", "Show this help message") do
             puts opts