merbiful-release 0.2.2 → 0.2.3

data/Rakefile

@@ -5,7 +5,7 @@ require 'pathname'
 
 PLUGIN = "merbiful-release"
 NAME = "merbiful-release"
-GEM_VERSION = "0.2.2"
+GEM_VERSION = "0.2.3"
 AUTHOR = "Martin Kihlgren"
 EMAIL = "martin@wemind.se"
 HOMEPAGE = ""

data/lib/merbiful-release/body.rb

@@ -14,9 +14,19 @@ module Merbiful
                self.body
              else
                controller.send(Merb::Template::METHOD_LIST[render_id] ||=
-                               Merb::Template::EXTENSIONS[self.filter].compile_template(FAKE_IO_CLASS.new(self.body, render_id), 
-                                                                                        render_id,
-                                                                                        Merb::InlineTemplates))
+                               begin
+                                 filter = Merb::Template::EXTENSIONS[self.filter]
+                                 if filter.method(:compile_template).arity == 3
+                                   Merb::Template::EXTENSIONS[self.filter].compile_template(FAKE_IO_CLASS.new(self.body, render_id), 
+                                                                                            render_id,
+                                                                                            Merb::InlineTemplates)
+                                 elsif filter.method(:compile_template).arity == 4
+                                   Merb::Template::EXTENSIONS[self.filter].compile_template(FAKE_IO_CLASS.new(self.body, render_id), 
+                                                                                            render_id,
+                                                                                            [],
+                                                                                            Merb::InlineTemplates)
+                                 end
+                               end)
              end
       unless Merb.environment == "development"
         caches.each do |destination, to_cache|

data/lib/merbiful-release/body.rb~

@@ -3,17 +3,26 @@ module Merbiful
 
   module Body
 
+    FAKE_IO_CLASS = Struct.new(:read, :path)
+
+    def render_id
+      Merb::Template.template_name("#{self.class}##{self.id}")
+    end
+
     def render(controller, caches = {})
       rval = if self.filter.blank?
                self.body
              else
-               filter_class = Merbiful.const_get(self.filter.to_sym)
-               filter_class.new.render(self.body, controller)
+               controller.send(Merb::Template::METHOD_LIST[render_id] ||=
+                               Merb::Template::EXTENSIONS[self.filter].compile_template(FAKE_IO_CLASS.new(self.body, render_id), 
+                                                                                        render_id,
+                                                                                        [],
+                                                                                        Merb::InlineTemplates))
              end
       unless Merb.environment == "development"
         caches.each do |destination, to_cache|
           if to_cache
-            path = Pathname.new(File.join(Merb.root, "public", destination))
+            path = destination.cached_path
             Merb.logger.info("Flushing to #{path.inspect}")
             path.parent.mkpath
             path.open("w") do |out|
@@ -25,12 +34,6 @@ module Merbiful
       return rval
     end
 
-    def clear_cache(target)
-      return if target == "/"
-      path = Pathname.new(File.join(Merb.root, "public", target))
-      path.unlink if path.exist?
-    end
-
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merbiful-release
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Martin Kihlgren