merb-core 1.0.2 → 1.0.3

data/lib/merb-core.rb

@@ -780,6 +780,9 @@ module Merb
       RUBY_PLATFORM =~ Merb::Const::WIN_PLATFORM_REGEXP
     end
 
+    def run_later(&blk)
+      Merb::Dispatcher.work_queue << blk
+    end
   end
 end
 

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

@@ -82,7 +82,7 @@ class Merb::Controller < Merb::AbstractController
   #
   # :api: public
   def self.override!(*names)
-    self._overrride_bang.push(*names)
+    self._override_bang.push(*names)
   end
 
   # Hide each of the given methods from being callable as actions.

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

@@ -15,7 +15,7 @@ module Merb
     # 
     # :api: public
     def run_later(&blk)
-      Merb::Dispatcher.work_queue << blk
+      Merb.run_later(&blk)
     end
     
     # Renders the block given as a parameter using chunked encoding.

data/lib/merb-core/controller/mixins/render.rb

@@ -122,7 +122,7 @@ module Merb::RenderMixin
       # Raise an error if there's no template
       unless template_method && self.respond_to?(template_method)
         template_files = Merb::Template.template_extensions.map { |ext| "#{template_location}.#{ext}" }
-        raise TemplateNotFound, "Oops! No template found. Merb was looking for #{template_files.join(', ')}" + 
+        raise TemplateNotFound, "Oops! No template found. Merb was looking for #{template_files.join(', ')} " + 
           "for content type '#{content_type}'. You might have mispelled the template or file name. " + 
           "Registered template extensions: #{Merb::Template.template_extensions.join(', ')}. " +
           "If you use Haml or some other template plugin, make sure you required Merb plugin dependency " + 

data/lib/merb-core/version.rb

@@ -1,4 +1,4 @@
 module Merb
-  VERSION = '1.0.2' unless defined?(Merb::VERSION)
+  VERSION = '1.0.3' 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.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-24 00:00:00 -08:00
+date: 2008-11-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency