merb-core 0.9.6 → 0.9.7

data/CHANGELOG

@@ -1,3 +1,70 @@
+== 0.9.7 "Universe In A Bundle" 2008-09-13
+
+* Made the post body available to the routing when testing a request.
+* Better local gems dir detection and end-user feedback
+* Updated PUBLIC_CHANGELOG regarding gem management and merb.thor
+* Fixed compatibility with the *new* bundle logic
+* Made request('/path', {}, {:post_body => 'some XML'}) not setting the post body to nil.
+* Added two specs for setting request.raw_post. Passes for #dispatch_to, fails for #request.
+* You can now use request_to with a post body:
+* It's official: Thor is now a dependency
+* Removed MerbScriptHelper - simplified loading bundled gems - see merb.thor
+* Bug Fix: Cookie headers not being formatted correctly
+* Added request.session.clear! method to clear and destroy the session (including the _session_id cookie itself)
+* Both memcache-client and memcached gems are supported by the session store
+* Added better query param parsing (naive but adequate) for nested params
+* Added specs to make sure blank cookie options aren't used for Set-Cookie
+* Fixed cookie issues in WebKit/Safari browsers
+* Log ControllerExceptions with error level and only ServerErrors with info.
+* Modified absolute_url to handle an object as well as a Hash
+* Touches to new sessions: doc and minor code improvements.
+* More meaningful exception message when no session container is configured.
+* Make it clear how session mixin makes it's way into controller.
+* Leave a note where new sessions doc needs to be improved.
+* Fix smart formatting.
+* Give smart people proper credit when you use their work.
+* Loosen extlib dependency a bit.
+* Meaningful message when Memcached session store can't be loaded because of load error.
+* Remove libxml-ruby and memcache-client dev dependencies.
+* Require memcached gem where memcached session store is defined (it's lazy loaded).
+* 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
+
+* Merge in simple conditional get support at controller level.
+* Merged in new bundling (aka freezer) branch
+* Merged in new-sessions branch
+* Simplify one more clever line.
+* Trenary operator is always hard to read.
+* Added PUBLIC_CHANGELOG note on Language::English::Inflector => English::Inflect
+* Filters with procs created via class methods have identical signatures regardless if they handle content differently or not. So modified add_filter to just append procs to the filter list.
+* Consolidating raw Rakefile commands to merb-core/tasks/merb_rake_helper.rb
+* Update contributors list.
+* Ticket #461 - This simply adds output for what host and port the adapter has started on.
+* More Language::English::Inflect to English::Inflect changes - getting ready for Extlib move soon
+* Language::English::Inflect => English::Inflect name changes
+* Use frozen strings where possible.
+* First pass at adding in CSRF protection in to Rack middleware.
+* Query string of the format "foo=bar&foo=baz" should return params {"foo" => "baz"}
+* Fixed multiple select not honored in params bug
+* Public specs for 'fragment' changes in url.
+* AbstractController now uniformly uses instance_eval for Procs where previously
+* Renamed anchor to fragment along with some minor tweeks to follow rfc2396 better.
+* Add support for :anchor when generating url's. Ex. url(:root, :anchor => :lower_half).
+* Revert "Make Merb::Request#protocol return valid protocol names (http, not http://)."
+* Adds specs for previous commit
+* Fixes display @object, :template => "path/to/foo"
+* Clean up Rakefile.
+* Remove a line of extra code
+* Set cookie expires to nil when session_expiry is set to 0.
+* ConditionalGet refactoring.
+* Fix: ConditionalGet should not return the message body when the status code is 304.
+* Rescue Exception subclasses, not only StandardError subclasses.
+* Make Merb::Request#protocol return valid protocol names (http, not http://).
+* Add :protocol and :host options to absolute_url
+* extends basic authentication a bit to allow usage outside of before filters
+
 == 0.9.5 "Knife and Spoons" 2008-26-08
 * Add Hpricot to dependencies: provided RSpec matchers depend on it.
 * Documentation fixes

data/CONTRIBUTORS

@@ -63,6 +63,7 @@ Michael Sheakoski
 Mirko Froehlich
 Nathan Weizenbaum
 Oliver Jakubiec
+Paul Barry
 Paul Boone
 Paul Carey
 Ray Morgan

data/PUBLIC_CHANGELOG

@@ -1,3 +1,37 @@
+9/13/2008:
+* Merb apps will always give priority to gems that are available locally in
+  Merb.root / gems. Because of the specific load order, you will need to use
+  bin/merb to load merb-core from local gems, as detailed below. This is also
+  the case for bin/merb-gen, bin/rake and bin/spec for example. The added 
+  advantage is that your app will be completely independent from system gems.
+
+* Thor tasks 'merb.thor' have been added for newly generated apps; regenerate
+  your app to get them; alternatively these are available on merbivore.com:
+  
+  http://merbivore.com/merb.thor
+  
+* Release 0.9.6 introduced 'merb-gen scripts' which added script/merb and
+  script/merb-gen. However, now that merb.thor provides tasks to manage
+  bundled gems, we can directly extract the correct executables. To follow the
+  standard convention, these will be installed in ./bin instead of ./script.
+  
+  With merb.thor installed, run the following to get started:
+  
+  $ thor merb:tasks:setup # adds bin/thor, bin/rake etc.
+  
+  As soon as you install other gems using merb.thor you'll have the required
+  bin executables available; these are setup so that running them will load
+  merb-core from the local gems dir, not from the system-wide rubygems.
+  
+  To get bin/merb and bin/merb-gen for a fresh application, you can use:
+  
+  $ thor merb:stable -a mongrel # install a full merb stack from stable rubygems
+  
+  Alternatively, you can install from the bleeding edge:
+  
+  $ thor merb:edge --install # install a full merb stack from github
+  $ thor merb:gems:install mongrel # or ebb, thin...
+  
 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 

data/Rakefile

@@ -58,16 +58,19 @@ spec = Gem::Specification.new do |s|
   s.extra_rdoc_files = %w( README LICENSE TODO )
 
   # Dependencies
-  s.add_dependency "extlib", ">= 0.9.5"
+  s.add_dependency "extlib", ">= 0.9.6"
   s.add_dependency "erubis"
   s.add_dependency "rake"
   s.add_dependency "json_pure"
   s.add_dependency "rspec"
   s.add_dependency "rack"
   s.add_dependency "mime-types"
-  s.add_dependency "hpricot"  
-  s.add_development_dependency "libxml-ruby"
-  s.add_development_dependency "memcache-client"
+  s.add_dependency "hpricot"
+  s.add_dependency "thor", ">= 0.9.6"
+  # this escalates to "regular" dependencies, comment it out
+  # for now. RubyGems need some love.
+  #s.add_development_dependency "libxml-ruby"
+  #s.add_development_dependency "memcache-client"
   # Requirements
   s.requirements << "install the json gem to get faster json parsing"
   s.required_ruby_version = ">= 1.8.6"

data/bin/merb

@@ -1,36 +1,6 @@
 #!/usr/bin/env ruby
 
-# 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 'rubygems'
 require 'merb-core'
 
 ARGV.push '-H' if ARGV[0] && ARGV[0] =~ /^[^-]/

data/lib/merb-core.rb

@@ -1,6 +1,21 @@
 #---
 # require 'merb' must happen after Merb::Config is instantiated
 require 'rubygems'
+
+# Add the local gems dir if found within the app root; any dependencies loaded
+# hereafter will try to load from the local gems before loading system gems.
+root_key = %w[-m --merb-root].detect { |o| ARGV.index(o) }
+root = ARGV[ARGV.index(root_key) + 1] if root_key
+root = root.to_a.empty? ? Dir.getwd : root
+if File.directory?(gems_dir = File.join(root, 'gems'))
+  $BUNDLE = true; Gem.clear_paths; Gem.path.unshift(gems_dir)
+  # Warn if local merb-core is available but not loaded.
+  if !($0 =~ /^(\.\/)?bin\/merb$/) && 
+    (local_mc = Dir[File.join(gems_dir, 'specifications', 'merb-core-*.gemspec')].last)
+    puts "Warning: please use bin/merb to load #{File.basename(local_mc, '.gemspec')} from ./gems"
+  end
+end
+
 require 'set'
 require 'fileutils'
 require 'socket'
@@ -356,12 +371,8 @@ module Merb
 
     Merb.klass_hashes = []
 
-    attr_accessor :frozen
-
     # ==== Returns
     # Boolean:: True if Merb is running as an application with bundled gems.
-    # Can only be disabled by --no-bundle option on startup (or for Rakefile
-    # use NO_BUNDLE=true to disable local gems).
     #
     # ==== Notes
     # Bundling required gems makes your application independent from the 
@@ -369,7 +380,7 @@ module Merb
     # framework and gems it uses and very useful when application is run in 
     # some sort of sandbox, for instance, shared hosting with preconfigured gems.
     def bundled?
-      ENV.key?("BUNDLE") || Merb::Config[:bundle] || ENV.key?("NO_BUNDLE")
+      $BUNDLE || ENV.key?("BUNDLE")
     end
 
     # Load configuration and assign logger.
@@ -577,4 +588,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')

data/lib/merb-core/config.rb

@@ -116,9 +116,6 @@ 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|
           opts.version = Merb::VERSION
@@ -242,10 +239,6 @@ module Merb
             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
             exit

data/lib/merb-core/controller/abstract_controller.rb

@@ -461,11 +461,14 @@ class Merb::AbstractController
   def absolute_url(name, rparams={})
     # FIXME: arrgh, why request.protocol returns http://?
     # :// is not part of protocol name
-    protocol = rparams.delete(:protocol)
-    protocol << "://" if protocol
+    if rparams.is_a?(Hash)
+      protocol = rparams.delete(:protocol)
+      protocol << "://" if protocol
+      host = rparams.delete(:host)
+    end
     
     (protocol || request.protocol) +
-      (rparams.delete(:host) || request.host) +
+      (host || request.host) +
       url(name, rparams)
   end
 

data/lib/merb-core/dispatch/cookies.rb

@@ -2,9 +2,9 @@ module Merb
 
   class Cookies < Mash
   
-    def initialize(constructor = {}, cookie_defaults = {})
-      @_options_lookup = Mash.new
-      @_cookie_defaults = cookie_defaults
+    def initialize(constructor = {})
+      @_options_lookup  = Mash.new
+      @_cookie_defaults = { "domain" => Merb::Controller._default_cookie_domain, "path" => '/' }
       super constructor
     end
     
@@ -50,7 +50,7 @@ module Merb
     # name<~to_s>:: Name of the cookie to delete.
     # options<Hash>:: Additional options to pass to +set_cookie+.
     def delete(name, options = {})
-      set_cookie(name, "", options.merge(:expires => Time.at(0)))
+      set_cookie(name, "", options.merge("expires" => Time.at(0)))
     end
     
     # Generate any necessary headers.
@@ -64,12 +64,13 @@ module Merb
         # Only set cookies that marked for inclusion in the response header. 
         next unless @_options_lookup[name]
         options = defaults.merge(@_options_lookup[name])
-        if (expiry = options[:expires]).respond_to?(:gmtime)
-          options[:expires] = expiry.gmtime.strftime(Merb::Const::COOKIE_EXPIRATION_FORMAT)
+        if (expiry = options["expires"]).respond_to?(:gmtime)
+          options["expires"] = expiry.gmtime.strftime(Merb::Const::COOKIE_EXPIRATION_FORMAT)
         end
-        secure  = options.delete(:secure)
+        secure  = options.delete("secure")
         kookie  = "#{name}=#{Merb::Request.escape(value)}; "
-        options.each { |k, v| kookie << "#{k}=#{v}; " }
+        # WebKit in particular doens't like empty cookie options - skip them.
+        options.each { |k, v| kookie << "#{k}=#{v}; " unless v.blank? }
         kookie  << 'secure' if secure
         cookies << kookie.rstrip
       end
@@ -87,7 +88,7 @@ module Merb
       
       # Add a callback to enable Set-Cookie headers
       base._after_dispatch_callbacks << lambda do |c|
-        headers = c.request.cookies.extract_headers(:domain => c._default_cookie_domain)
+        headers = c.request.cookies.extract_headers("domain" => c._default_cookie_domain)
         c.headers.update(headers)
       end
     end
@@ -116,7 +117,7 @@ module Merb
       def cookies
         @cookies ||= begin
           values  = self.class.query_parse(@env[Merb::Const::HTTP_COOKIE], ';,')
-          cookies = Merb::Cookies.new(values, :domain => Merb::Controller._default_cookie_domain, :path => '/')
+          cookies = Merb::Cookies.new(values)
           cookies.update(default_cookies) if respond_to?(:default_cookies)
           cookies
         end

data/lib/merb-core/dispatch/dispatcher.rb

@@ -139,12 +139,18 @@ module Merb
     # Exceptions::
     #   The Merb::Controller that was dispatched to. 
     def dispatch_exception(exception)
-      Merb.logger.error(Merb.exception(exception))
+      if(exception.is_a?(Merb::ControllerExceptions::Base) &&
+         !exception.is_a?(Merb::ControllerExceptions::ServerError))
+        Merb.logger.info(Merb.exception(exception))
+      else
+        Merb.logger.error(Merb.exception(exception))
+      end
+
       self.exceptions = [exception]
-      
+
       begin
         e = exceptions.first
-        
+
         if action_name = e.action_name
           dispatch_action(Exceptions, action_name, e.class.status)
         else
@@ -156,11 +162,11 @@ module Merb
         else
           Merb.logger.error("Dispatching #{e.class} raised another error.")
           Merb.logger.error(Merb.exception(dispatch_issue))
-          
+
           exceptions.unshift dispatch_issue
           retry
         end
       end
     end
   end
-end
+end

data/lib/merb-core/dispatch/request.rb

@@ -652,9 +652,14 @@ module Merb
           parms[key] = val
         elsif after == "[]"
           (parms[key] ||= []) << val
-        elsif after =~ %r(^\[\])
+        elsif after =~ %r(^\[\]\[([^\[\]]+)\]$)
+          child_key = $1
           parms[key] ||= []
-          parms[key] << normalize_params({}, after, val)
+          if parms[key].last.is_a?(Hash) && !parms[key].last.key?(child_key)
+            parms[key].last.update(child_key => val)
+          else
+            parms[key] << { child_key => val }
+          end
         else
           parms[key] ||= {}
           parms[key] = normalize_params(parms[key], after, val)

data/lib/merb-core/dispatch/session.rb

@@ -2,10 +2,10 @@ require 'merb-core/dispatch/session/container'
 require 'merb-core/dispatch/session/store_container'
 
 module Merb
-
   class Config
-
-    # List of all session_stores taken from :session_stores or :session_store
+    # Returns stores list constructed from
+    # configured session stores (:session_stores config option)
+    # or default one (:session_store config option).
     def self.session_stores
       @session_stores ||= begin
         config_stores = Array(
@@ -14,16 +14,20 @@ module Merb
         config_stores.map { |name| name.to_sym }
       end
     end
-
-  end
+  end # Config
 
   # The Merb::Session module gets mixed into Merb::SessionContainer to allow
-  # app-level functionality (usually found in app/models/merb/session.rb)
+  # app-level functionality (usually found in app/models/merb/session.rb) for
+  # session.
+  #
+  # You can use this module to implement additional methods to simplify
+  # building wizard-like application components,
+  # authentication frameworks, etc.
   module Session
   end
 
+  # This is mixed into Merb::Controller on framework boot.
   module SessionMixin
-
     # Raised when no suitable session store has been setup.
     class NoSessionContainer < StandardError; end
 
@@ -42,7 +46,6 @@ module Merb
     #                           session data; min. 16 chars
     #
     # :default_cookie_domain    The default domain to write cookies for.
-
     def self.included(base)
       # Register a callback to finalize sessions - needs to run before the cookie
       # callback extracts Set-Cookie headers from request.cookies.
@@ -54,7 +57,9 @@ module Merb
     #
     # ==== Returns
     # SessionContainer:: The session that was extracted from the request object.
-    def session(session_store = nil) request.session(session_store) end
+    def session(session_store = nil)
+      request.session(session_store)
+    end
 
     # Module methods
 
@@ -125,6 +130,9 @@ module Merb
         @session_stores ||= {}
       end
 
+      # Returns session container. Merb is able to handle multiple session
+      # stores, hence a parameter to pick it.
+      #
       # ==== Parameters
       # session_store<String>:: The type of session store to access,
       # defaults to default_session_store.
@@ -137,12 +145,13 @@ module Merb
         if class_name = self.class.registered_session_types[session_store]
           session_stores[session_store] ||= Object.full_const_get(class_name).setup(self)
         elsif fallback = self.class.registered_session_types.keys.first
-          Merb.logger.warn "Session store not found, '#{session_store}'."
-          Merb.logger.warn "Defaulting to #{fallback} sessions."
+          Merb.logger.warn "Session store '#{session_store}' not found. Check your configuration in init file."
+          Merb.logger.warn "Falling back to #{fallback} session store."
           session(fallback)
         else
-          Merb.logger.error "Can't use sessions because no session store is available."
-          raise NoSessionContainer, "No session store configured."
+          msg = "No session store set. Set it in init file like this: c[:session_store] = 'activerecord'"
+          Merb.logger.error!(msg)
+          raise NoSessionContainer, msg            
         end
       end
 
@@ -184,12 +193,13 @@ module Merb
         defaults
       end
 
+      # Sets session cookie value.
+      #
       # ==== Parameters
       # value<String>:: The value of the session cookie; either the session id or the actual encoded data.
-      def set_session_cookie_value(value)
-        options = {}
-        options[:expires] = Time.now + _session_expiry
-        cookies.set_cookie(_session_id_key, value, options)
+      # options<Hash>:: Cookie options like domain, path and expired.
+      def set_session_cookie_value(value, options = {})
+        cookies.set_cookie(_session_id_key, value, { :expires => Time.now + _session_expiry }.merge(options))
       end
       alias :set_session_id_cookie :set_session_cookie_value
 
@@ -199,6 +209,12 @@ module Merb
         cookies[_session_id_key]
       end
       alias :session_id :session_cookie_value
+      
+      # Destroy the session cookie.
+      def destroy_session_cookie
+        cookies.delete(_session_id_key)
+      end
+      
     end
   end
 end