temple 0.6.9 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bcc7e8bd7f61ec9c8e2f023f0fb53688b0df1c2
-  data.tar.gz: 6b409c3649bf823b1cf844c9604929ee51b42dab
+  metadata.gz: ae954824af20378733a4583f79f7e25fe6493bf5
+  data.tar.gz: 71463f0834e907f81591ad89e262ac56a0b7ecc6
 SHA512:
-  metadata.gz: a3a07bb7ec8d123a48c659771f3c59d09e183519cefcb47b9fc7af5c869d77271da4773906652e97cf5d6c6b3b6b6d937641fcacd00a491a02fdfebbd33899c6
-  data.tar.gz: 5061b599c57d49d77f48bde5b89c8aac6b20df3038de15386f12913e2c7122f107af38500073fd76ff76c77001b55312fbd9629c447a3399a81a90121f1b3758
+  metadata.gz: bd44ebc6d99334bea744709cc2297e6eb3f9fb9824439676cb04c093a2fe5e3ce5c5820951c86d7f5a7f4cf96c3951cfc1669106d127cd06d40b38dc357c53e3
+  data.tar.gz: a0f479de080332970d17b05fca137d60aa61e68ae3112fdfc8e0996c3a1dea9e0b8cc80ba5f61c9d786ca7950d805a88e1deaffb9afd94b41c770df00c658b34

data/CHANGES

@@ -1,3 +1,7 @@
+0.6.10
+
+  * Tilt template: Support :outvar and save/restore buffer to make the behaviour compatible with ERB
+
 0.6.9
 
   * HTML::Pretty: Fix wrong line numbers

data/lib/temple/engine.rb

@@ -33,7 +33,7 @@ module Temple
     include Mixins::EngineDSL
     extend  Mixins::EngineDSL
 
-    define_options :file, :streaming, :buffer
+    define_options :file, :streaming, :buffer, :save_buffer
 
     attr_reader :chain
 

data/lib/temple/generator.rb

@@ -5,21 +5,39 @@ module Temple
   #
   # @api public
   class Generator
+    include Utils
     include Mixins::CompiledDispatcher
     include Mixins::Options
 
     define_options :capture_generator => 'StringBuffer',
-                   :buffer => '_buf'
+                   :buffer => '_buf',
+                   :save_buffer => false
+
+    def call(exp)
+      [preamble, compile(exp), postamble].flatten.compact.join('; ')
+    end
 
     def preamble
+      [save_buffer, create_buffer]
     end
 
     def postamble
-      'nil'
+      [return_buffer, restore_buffer]
     end
 
-    def call(exp)
-      [preamble, compile(exp), postamble].join('; ')
+    def save_buffer
+      "begin; #{@original_buffer = unique_name} = #{buffer} if defined?(#{buffer})" if options[:save_buffer]
+    end
+
+    def restore_buffer
+      "ensure; #{buffer} = #{@original_buffer}; end" if options[:save_buffer]
+    end
+
+    def create_buffer
+    end
+
+    def return_buffer
+      'nil'
     end
 
     def on(*exp)

data/lib/temple/generators/array.rb

@@ -9,11 +9,11 @@ module Temple
     #
     # @api public
     class Array < Generator
-      def preamble
+      def create_buffer
         "#{buffer} = []"
       end
 
-      def postamble
+      def return_buffer
         buffer
       end
     end

data/lib/temple/generators/array_buffer.rb

@@ -12,15 +12,15 @@ module Temple
       def call(exp)
         case exp.first
         when :static
-          "#{buffer} = #{exp.last.inspect}"
+          [save_buffer, "#{buffer} = #{exp.last.inspect}", restore_buffer].compact.join('; ')
         when :dynamic
-          "#{buffer} = (#{exp.last}).to_s"
+          [save_buffer, "#{buffer} = (#{exp.last}).to_s", restore_buffer].compact.join('; ')
         else
           super
         end
       end
 
-      def postamble
+      def return_buffer
         "#{buffer} = #{buffer}.join"
       end
     end

data/lib/temple/generators/rails_output_buffer.rb

@@ -16,10 +16,10 @@ module Temple
                      :capture_generator => RailsOutputBuffer
 
       def call(exp)
-        [preamble, compile(exp), postamble].join('; ')
+        [preamble, compile(exp), postamble].flatten.compact.join('; ')
       end
 
-      def preamble
+      def create_buffer
         if options[:streaming] && options[:buffer] == '@output_buffer'
           "#{buffer} = output_buffer || #{options[:buffer_class]}.new"
         else

data/lib/temple/generators/string_buffer.rb

@@ -9,11 +9,11 @@ module Temple
     #
     # @api public
     class StringBuffer < ArrayBuffer
-      def preamble
+      def create_buffer
         "#{buffer} = ''"
       end
 
-      def postamble
+      def return_buffer
         buffer
       end
 

data/lib/temple/templates/tilt.rb

@@ -23,7 +23,10 @@ module Temple
       def prepare
         opts = {}.update(self.class.default_options).update(options).update(:file => eval_file)
         opts.delete(:mime_type)
-        opts[:buffer] ||= opts.delete(:outvar) if opts.include?(:outvar) # HACK Sinatra gives us outvar instead of buffer
+        if opts.include?(:outvar)
+          opts[:buffer] = opts.delete(:outvar)
+          opts[:save_buffer] = true
+        end
         @src = self.class.compile(data, opts)
       end
 

data/lib/temple/version.rb

@@ -1,3 +1,3 @@
 module Temple
-  VERSION = '0.6.9'
+  VERSION = '0.6.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: temple
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.10
 platform: ruby
 authors:
 - Magnus Holm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2014-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt