sax · April 6, 2010 16:38 · Apr 6, 2010 · Jun 2, 2009 · Jun 2, 2009 · May 29, 2009
diff --git a/partials.rb b/partials.rb
@@ -2,19 +2,26 @@
 #   and made a lot more robust by me
 # this implementation uses erb by default. if you want to use any other template mechanism
 #   then replace `erb` on line 13 and line 17 with `haml` or whatever 
-module Sinatra::Partials
-  def partial(template, *args)
-    template_array = template.to_s.split('/')
-    template = template_array[0..-2].join('/') + "/_#{template_array[-1]}"
-    options = args.last.is_a?(Hash) ? args.pop : {}
-    options.merge!(:layout => false)
-    if collection = options.delete(:collection) then
-      collection.inject([]) do |buffer, member|
-        buffer << erb(:"#{template}", options.merge(:layout =>
-        false, :locals => {template_array[-1].to_sym => member}))
-      end.join("\n")
-    else
-      erb(:"#{template}", options)
+
+require 'sinatra/base'
+
+module Sinatra
+  module Partials
+    def partial(template, *args)
+      template_array = template.to_s.split('/')
+      template = template_array[0..-2].join('/') + "/_#{template_array[-1]}"
+      options = args.last.is_a?(Hash) ? args.pop : {}
+      options.merge!(:layout => false)
+      if collection = options.delete(:collection) then
+        collection.inject([]) do |buffer, member|
+          buffer << erb(:"#{template}", options.merge(:layout =>
+          false, :locals => {template_array[-1].to_sym => member}))
+        end.join("\n")
+      else
+        erb(:"#{template}", options)
+      end
     end
   end
+
+  helpers Partials
 end
diff --git a/partials.rb b/partials.rb
@@ -1,7 +1,7 @@
 # stolen from http://github.com/cschneid/irclogger/blob/master/lib/partials.rb
 #   and made a lot more robust by me
 # this implementation uses erb by default. if you want to use any other template mechanism
-#   then replace `erb` on line 14 and line 18 with `haml` or whatever 
+#   then replace `erb` on line 13 and line 17 with `haml` or whatever 
 module Sinatra::Partials
   def partial(template, *args)
     template_array = template.to_s.split('/')

diff --git a/partials.rb b/partials.rb
@@ -1,16 +1,19 @@
 # stolen from http://github.com/cschneid/irclogger/blob/master/lib/partials.rb
+#   and made a lot more robust by me
+# this implementation uses erb by default. if you want to use any other template mechanism
+#   then replace `erb` on line 14 and line 18 with `haml` or whatever 
 module Sinatra::Partials
   def partial(template, *args)
+    template_array = template.to_s.split('/')
+    template = template_array[0..-2].join('/') + "/_#{template_array[-1]}"
     options = args.last.is_a?(Hash) ? args.pop : {}
     options.merge!(:layout => false)
     if collection = options.delete(:collection) then
       collection.inject([]) do |buffer, member|
-        buffer << erb(template, options.merge(:layout =>
-        false, :locals => {template.to_sym => member}))
+        buffer << erb(:"#{template}", options.merge(:layout =>
+        false, :locals => {template_array[-1].to_sym => member}))
       end.join("\n")
     else
-      template_array = template.to_s.split('/')
-      template = template_array[0..-2].join('/') + "/_#{template_array[-1]}"
       erb(:"#{template}", options)
     end
   end

diff --git a/partials.rb b/partials.rb
@@ -9,7 +9,8 @@ def partial(template, *args)
         false, :locals => {template.to_sym => member}))
       end.join("\n")
     else
-      template = template.to_s.split('/')[0..-2].join('/') + "/_#{template.to_s.split('/')[-1]}"
+      template_array = template.to_s.split('/')
+      template = template_array[0..-2].join('/') + "/_#{template_array[-1]}"
       erb(:"#{template}", options)
     end
   end

diff --git a/partials.rb b/partials.rb
@@ -9,7 +9,7 @@ def partial(template, *args)
         false, :locals => {template.to_sym => member}))
       end.join("\n")
     else
-      template = template.split('/')[0..-2].join('/') + "/_#{template.split('/')[-1]}"
+      template = template.to_s.split('/')[0..-2].join('/') + "/_#{template.to_s.split('/')[-1]}"
       erb(:"#{template}", options)
     end
   end

diff --git a/partials.rb b/partials.rb
@@ -13,4 +13,4 @@ def partial(template, *args)
       erb(:"#{template}", options)
     end
   end
-en
+end
diff --git a/partials.rb b/partials.rb
@@ -9,7 +9,7 @@ def partial(template, *args)
         false, :locals => {template.to_sym => member}))
       end.join("\n")
     else
-      template = template.split('/')[0..-2] + "_#{template.split('/')[-1]}"
+      template = template.split('/')[0..-2].join('/') + "/_#{template.split('/')[-1]}"
       erb(:"#{template}", options)
     end
   end

diff --git a/partials.rb b/partials.rb
@@ -0,0 +1,16 @@
+# stolen from http://github.com/cschneid/irclogger/blob/master/lib/partials.rb
+module Sinatra::Partials
+  def partial(template, *args)
+    options = args.last.is_a?(Hash) ? args.pop : {}
+    options.merge!(:layout => false)
+    if collection = options.delete(:collection) then
+      collection.inject([]) do |buffer, member|
+        buffer << erb(template, options.merge(:layout =>
+        false, :locals => {template.to_sym => member}))
+      end.join("\n")
+    else
+      template = template.split('/')[0..-2] + "_#{template.split('/')[-1]}"
+      erb(:"#{template}", options)
+    end
+  end
+en