merb-core 1.0.1 → 1.0.2

data/Rakefile

@@ -103,7 +103,7 @@ task :gemspec do
   end
 end
 
-CLEAN.include ["**/.*.sw?", "pkg", "lib/*.bundle", "lib/*.so", "*.gem", "doc/rdoc", ".config", "coverage", "cache", "spec/**/*.log", "**/gems/*"]
+CLEAN.include ["**/.*.sw?", "pkg", "lib/*.bundle", "lib/*.so", "*.gem", "doc/rdoc", ".config", "coverage", "cache", "spec/**/*.log", "gems/*"]
 
 desc "Run the specs."
 task :default => :specs

data/lib/merb-core.rb

@@ -38,6 +38,7 @@ $MINIGEMS_SKIPPABLE = ['encoding/character/utf-8']
 module Merb
   # Create stub module for global controller helpers.
   module GlobalHelpers; end
+  class ReservedError < StandardError; end
   
   class << self
     attr_reader :exiting

data/lib/merb-core/bootloader.rb

@@ -434,7 +434,7 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader
     if Merb::Config[:log_file]
       raise "log file should be a string, got: #{Merb::Config[:log_file].inspect}" unless Merb::Config[:log_file].is_a?(String)
       STDOUT.puts "Logging to file at #{Merb::Config[:log_file]}" unless Merb.testing?
-      Merb::Config[:log_stream] = File.open(Merb::Config[:log_file], "w+")
+      Merb::Config[:log_stream] = File.open(Merb::Config[:log_file], "a")
     # but if it's not given, fallback to log stream or stdout
     else
       Merb::Config[:log_stream] ||= STDOUT

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

@@ -1,9 +1,12 @@
 class Merb::Controller < Merb::AbstractController
 
-  class_inheritable_accessor :_hidden_actions, :_shown_actions
+  class_inheritable_accessor :_hidden_actions, :_shown_actions, 
+                             :_overridable, :_override_bang
 
   self._hidden_actions ||= []
   self._shown_actions  ||= []
+  self._overridable    ||= []
+  self._override_bang  ||= []
 
   cattr_accessor :_subclasses
   self._subclasses = Set.new
@@ -27,6 +30,61 @@ class Merb::Controller < Merb::AbstractController
     klass._template_root = Merb.dir_for(:view) unless self._template_root
   end
 
+  # ==== Parameters
+  # *names<Array[Symbol]>::
+  #   an Array of method names that should be overridable in application
+  #   controllers.
+  # 
+  # ==== Returns
+  # Array:: The list of methods that are overridable
+  #
+  # :api: plugin
+  def self.overridable(*names)
+    self._overridable.push(*names)
+  end
+  
+  # In an application controller, call override! before a method to indicate
+  # that you want to override a method in Merb::Controller that is not
+  # normally overridable.
+  #
+  # Doing this may potentially break your app in a future release of Merb,
+  # and this is provided for users who are willing to take that risk.
+  # Without using override!, Merb will raise an error if you attempt to
+  # override a method defined on Merb::Controller.
+  #
+  # This is to help users avoid a common mistake of defining an action
+  # that overrides a core method on Merb::Controller.
+  #
+  # ==== Parameters
+  # *names<Array[Symbol]>:: 
+  #   An Array of methods that will override Merb core classes on purpose
+  #
+  # ==== Example
+  #     
+  #     class Kontroller < Application
+  #       def status
+  #         render
+  #       end
+  #     end
+  # 
+  # will raise a Merb::ReservedError, because #status is a method on
+  # Merb::Controller.
+  # 
+  #     class Kontroller < Application
+  #       override! :status
+  #       def status
+  #         some_code || super
+  #       end
+  #     end
+  #
+  # will not raise a Merb::ReservedError, because the user specifically
+  # decided to override the status method.
+  #
+  # :api: public
+  def self.override!(*names)
+    self._overrride_bang.push(*names)
+  end
+
   # Hide each of the given methods from being callable as actions.
   #
   # ==== Parameters
@@ -97,6 +155,7 @@ class Merb::Controller < Merb::AbstractController
   def self._filter_params(params)
     params
   end
+  overridable :_filter_params
 
   # All methods that are callable as actions.
   #
@@ -135,6 +194,7 @@ class Merb::Controller < Merb::AbstractController
   def _template_location(context, type, controller)
     _conditionally_append_extension(controller ? "#{controller}/#{context}" : "#{context}", type)
   end
+  overridable :_template_location
 
   # The location to look for a template and mime-type. This is overridden
   # from AbstractController, which defines a version of this that does not
@@ -171,6 +231,7 @@ class Merb::Controller < Merb::AbstractController
     super()
     @request, @_status, @headers = request, status, headers
   end
+  overridable :initialize
 
   # Dispatch the action.
   #
@@ -389,4 +450,35 @@ class Merb::Controller < Merb::AbstractController
   def _conditionally_append_extension(template, type)
     type && !template.match(/\.#{type.to_s.escape_regexp}$/) ? "#{template}.#{type}" : template
   end
+  
+  # When a method is added to a subclass of Merb::Controller (i.e. an app controller) that
+  # is defined on Merb::Controller, raise a Merb::ReservedError. An error will not be raised
+  # if the method is defined as overridable in the Merb API.
+  #
+  # This behavior can be overridden by using override! method_name before attempting to
+  # override the method.
+  #
+  # ==== Parameters
+  # meth<~to_sym> The method that is being added
+  #
+  # ==== Raises
+  # Merb::ReservedError::
+  #   If the method being added is in a subclass of Merb::Controller,
+  #   the method is defined on Merb::Controller, it is not defined
+  #   as overridable in the Merb API, and the user has not specified
+  #   that it can be overridden.
+  #
+  # ==== Returns
+  # nil
+  # 
+  # :api: private
+  def self.method_added(meth)
+    if self < Merb::Controller && Merb::Controller.method_defined?(meth) && 
+      !self._overridable.include?(meth.to_sym) && !self._override_bang.include?(meth.to_sym)
+
+      raise Merb::ReservedError, "You tried to define #{meth} on " \
+        "#{self.name} but it was already defined on Merb::Controller. " \
+        "If you meant to override a core method, use override!"
+    end
+  end
 end

data/lib/merb-core/dispatch/router/route.rb

@@ -321,9 +321,9 @@ module Merb
             condition = "(cached_#{segment} = params[#{segment.inspect}] || include_defaults && defaults[#{segment.inspect}])"
 
             if @symbol_conditions[segment] && @symbol_conditions[segment].is_a?(Regexp)
-              condition << " =~ #{@symbol_conditions[segment].inspect}"
+              condition << " && cached_#{segment}.to_s =~ #{@symbol_conditions[segment].inspect}"
             elsif @symbol_conditions[segment]
-              condition << " == #{@symbol_conditions[segment].inspect}"
+              condition << " && cached_#{segment}.to_s == #{@symbol_conditions[segment].inspect}"
             end
 
             condition

data/lib/merb-core/test.rb

@@ -9,7 +9,12 @@ begin
   require 'webrat'
   require 'webrat/merb'
 rescue LoadError => e
-  Merb.fatal! "Couldn't load Webrat. You should run: sudo gem install webrat", e
+  if Merb.testing?
+    Merb.fatal! "Couldn't load Webrat. You should run: sudo gem install webrat", e
+  else
+    Merb.logger.warn! "Couldn't load Webrat, so some features, like `visit' will not " \
+                      "be available. Please install webrat if you want these features."
+  end
 end
 
 if Merb.test_framework.to_s == "rspec"

data/lib/merb-core/test/helpers/cookie_jar.rb

@@ -112,7 +112,7 @@ module Merb
           cookies[cookie.name] = cookie.raw if cookie.matches?(uri)
         end
         
-        cookies.values.join
+        cookies.values.join(';')
       end
       
     end

data/lib/merb-core/version.rb

@@ -1,3 +1,4 @@
 module Merb
-  VERSION = '1.0.1' unless defined?(Merb::VERSION)
+  VERSION = '1.0.2' unless defined?(Merb::VERSION)
+  DM_VERSION = '0.9.7' unless defined?(Merb::DM_VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-core
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-18 00:00:00 -08:00
+date: 2008-11-24 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency