minimal 0.0.6 → 0.0.7

data/lib/minimal/template/handler.rb

@@ -3,9 +3,9 @@ class Minimal::Template
     include ActionView::Template::Handlers::Compilable
 
     def compile(template)
+      require_dependency template.identifier
       <<-code
         @output_buffer = ActiveSupport::SafeBuffer.new
-        require_dependency "#{template.identifier}"
         #{template_class_name(template.identifier)}.new(self)._render(local_assigns)
       code
     end

data/lib/minimal/template.rb

@@ -8,10 +8,10 @@ class Minimal::Template
     link ol option p pre script select span strong table thead tbody tfoot td th tr ul)
 
   module Base
-    attr_reader :view, :buffers, :locals
+    attr_accessor :view, :locals
 
     def initialize(view = nil)
-      @view, @buffers, @locals = view, [], {}
+      @view, @locals, @_buffer = view, {}, {}
     end
 
     def _render(locals = nil)
@@ -26,24 +26,27 @@ class Minimal::Template
     end
 
     def <<(output)
-      view.output_buffer << output
+      view.output_buffer << output.to_s
     end
 
     def respond_to?(method)
-      locals.key?(method) || view.instance_variable_defined?("@#{method}") || view.respond_to?(method)
+      view.respond_to?(method) || locals.key?(method) || view.instance_variable_defined?("@#{method}")
     end
 
     protected
 
       def method_missing(method, *args, &block)
-        locals.key?(method) ? locals[method] :
+        view.respond_to?(method) ? call_view(method, *args, &block) :
           view.instance_variable_defined?("@#{method}") ? view.instance_variable_get("@#{method}") :
-          view.respond_to?(method) ? call_view(method, *args, &block) : super
+          locals.key?(method) ? locals[method] : super
       end
 
       def call_view(method, *args, &block)
-        block = lambda { |*a| self << view.with_output_buffer { yield(*a) } } if block
-        view.send(method, *args, &block).tap { |result| self << result if AUTO_BUFFER =~ method.to_s }
+        view.send(method, *args, &block).tap { |result| self << result if auto_buffer?(method) }
+      end
+
+      def auto_buffer?(method)
+        @_buffer.key?(method) ? @_buffer[method] : @_buffer[method] = AUTO_BUFFER =~ method.to_s
       end
   end
   include Base

data/lib/minimal/version.rb

@@ -1,3 +1,3 @@
 module Minimal
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Sven Fuchs