merb-core 1.0.4 → 1.0.5

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

@@ -326,7 +326,7 @@ module Merb
     # 
     # :api: public
     def escape_xml(obj)
-      Erubis::XmlHelper.escape_xml(obj.to_s)
+      Merb::Parse.escape_xml(obj.to_s)
     end
     alias h escape_xml
     alias escape_html escape_xml

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

@@ -32,27 +32,29 @@ module Merb::Template
       path.gsub(/[^\.a-zA-Z0-9]/, "__").gsub(/\./, "_")
     end
 
-    # For a given path, get an IO object that responds to #path.
-    #
-    # This is so that plugins can override this if they provide
-    # mechanisms for specifying templates that are not just simple
-    # files. The plugin is responsible for ensuring that the fake
-    # path provided will work with #template_for, and thus the
-    # RenderMixin in general.
-    #
-    # ==== Parameters
-    # path<String>:: A full path to find a template for. This is the
-    #   path that the RenderMixin assumes it should find the template
-    #   in.
-    # 
-    # ==== Returns
-    # IO#path:: An IO object that responds to path (File or VirtualFile).
-    #
-    # :api: plugin
-    # @overridable
-    def load_template_io(path)
-      file = Dir["#{path}.{#{template_extensions.join(',')}}"].first
-      File.open(file, "r") if file
+    chainable do
+      # For a given path, get an IO object that responds to #path.
+      #
+      # This is so that plugins can override this if they provide
+      # mechanisms for specifying templates that are not just simple
+      # files. The plugin is responsible for ensuring that the fake
+      # path provided will work with #template_for, and thus the
+      # RenderMixin in general.
+      #
+      # ==== Parameters
+      # path<String>:: A full path to find a template for. This is the
+      #   path that the RenderMixin assumes it should find the template
+      #   in.
+      # 
+      # ==== Returns
+      # IO#path:: An IO object that responds to path (File or VirtualFile).
+      #
+      # :api: plugin
+      # @overridable
+      def load_template_io(path)
+        file = Dir["#{path}.{#{template_extensions.join(',')}}"].first
+        File.open(file, "r") if file
+      end
     end
 
     # Get the name of the template method for a particular path.

data/lib/merb-core/core_ext.rb

@@ -7,3 +7,4 @@ end
 
 require File.dirname(__FILE__) / "core_ext" / "kernel"
 require File.dirname(__FILE__) / "core_ext" / "hash"
+require File.dirname(__FILE__) / "core_ext" / "class"

data/lib/merb-core/core_ext/class.rb

@@ -0,0 +1,34 @@
+class Class
+  # Allows the definition of methods on a class that will be available via
+  # super.
+  # 
+  # ==== Examples
+  #     class Foo
+  #       chainable do
+  #         def hello
+  #           "hello"
+  #         end
+  #       end
+  #     end
+  #
+  #     class Foo
+  #       def hello
+  #         super + " Merb!"
+  #       end
+  #     end
+  #
+  # Foo.new.hello #=> "hello Merb!"
+  # 
+  # ==== Parameters
+  # &blk:: 
+  #   a block containing method definitions that should be
+  #   marked as chainable
+  #
+  # ==== Returns
+  # Module:: The anonymous module that was created
+  def chainable(&blk)
+    mod = Module.new(&blk)
+    include mod
+    mod
+  end
+end

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

@@ -194,6 +194,17 @@ module Merb
       }
     end
 
+    # ==== Parameters
+    # s<String>:: String to XML escape.
+    #
+    # ==== returns
+    # String:: The escaped string.
+    #
+    # :api: public
+    def self.escape_xml(s)
+      Erubis::XmlHelper.escape_xml(s)
+    end
+
     private
 
     # Converts a query string snippet to a hash and adds it to existing

data/lib/merb-core/rack/middleware/profiler.rb

@@ -1,21 +1,55 @@
+begin
+  require "ruby-prof"
+rescue LoadError => e
+  Merb.fatal! "You need ruby-prof installed to use the profiler middleware", e
+end
+
 module Merb
   module Rack
     class Profiler < Merb::Rack::Middleware
 
       # :api: private
-      def initialize(app, min=1, iter=1)
+      def initialize(app, types = [RubyProf::ALLOCATIONS, RubyProf::PROCESS_TIME])
         super(app)
-        @min, @iter = min, iter
+        @types = types
       end
 
       # :api: plugin
       def call(env)
-        __profile__("profile_output", @min, @iter) do
-          @app.call(env)
+        measure_names = { RubyProf::ALLOCATIONS => 'allocations', 
+          RubyProf::PROCESS_TIME => 'time', RubyProf::MEMORY => "memory" }
+
+        ret = nil
+
+        GC.disable
+        @types.each do |type|
+          next if type.nil?
+          
+          if GC.respond_to?(:enable_stats)
+            GC.enable_stats || GC.clear_stats
+          end
+
+          RubyProf.measure_mode = type
+          RubyProf.start
+          100.times do
+            ret = super
+          end
+          result = RubyProf.stop
+          printer = RubyProf::CallTreePrinter.new(result)
+          path = "merb_profile_results" / env["PATH_INFO"]
+          FileUtils.mkdir_p(path)
+          printer.print(
+            File.open(
+              "#{path}/callgrind.out.#{measure_names[RubyProf::measure_mode]}",     
+              'w'))
+
+          GC.disable_stats if GC.respond_to?(:disable_stats)
         end
+        GC.enable
+        ret
       end
 
       
     end
   end
-end
+end

data/lib/merb-core/version.rb

@@ -1,4 +1,4 @@
 module Merb
-  VERSION = '1.0.4' unless defined?(Merb::VERSION)
+  VERSION = '1.0.5' unless defined?(Merb::VERSION)
   DM_VERSION = '0.9.8' 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.4
+  version: 1.0.5
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-08 00:00:00 -08:00
+date: 2008-12-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,7 +90,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.7
+        version: 0.9.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: webrat
@@ -140,6 +140,7 @@ files:
 - lib/merb-core/controller/mixins/responder.rb
 - lib/merb-core/controller/template.rb
 - lib/merb-core/core_ext
+- lib/merb-core/core_ext/class.rb
 - lib/merb-core/core_ext/hash.rb
 - lib/merb-core/core_ext/kernel.rb
 - lib/merb-core/core_ext.rb