inline_templates 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1391230187758595f59ccb744dbb3ccb124aef1d
-  data.tar.gz: ade328c124f06942ada52b3f6198f5038ec90a9e
+  metadata.gz: e4320779b14a6754c8f5f27a94d3b7bf4c273057
+  data.tar.gz: 655e669a9c98ea55ef06aa808b4048970aecaf70
 SHA512:
-  metadata.gz: 19f7c6edded139cd6b9e8fa0534ea9725bbff35f07e5c526ea901469a947183998845a3bc3e1c77592407a8205b39cbc7002fc11d0bb5fc9af6e5a8e7bd1dde1
-  data.tar.gz: b8f383aec61fd96b5a25a121c57f7cf70de16597af31735eaeb9cce2d09ee127e09cf4820fd1a5689dd9a30b5898a723a459787252764bf50afdb533f0b7b7a4
+  metadata.gz: bef27f4d814a5da7585f5f80e07765550eefcf5374c8151019bc28e56c3b843669b34c125b05b8df2c171dd11affa2c3f1a24ff5cc7c7edf81f5773da99d1d76
+  data.tar.gz: cd4cc209772778510e88765dd149a82a507a368c0bd8479d709842528d816f18d17430c145522bdcf09fe35c8a903b0aa67e5140fbada0fb1bfb2e787ff764b3

data/lib/inline_templates/buffer_wrapper.rb

@@ -10,12 +10,13 @@ module InlineTemplates
     def __inline_templates_object; @object; end
  
     def ~
-      @buffer.append = @object
+      @buffer.instance_variable_get(:@_inlinetemplates_context).output_buffer.append = @object
       @object
     end
 
     def method_missing(name, *args, &block)
       args.map! &BufferWrapper.method(:unwrap)
+      block = BufferWrapper.create_proxy_proc(block, @buffer) unless block.nil?
 
       BufferWrapper.wrap @object.__send__(name, *args, &block), @buffer
     end
@@ -39,5 +40,18 @@ module InlineTemplates
         obj
       end
     end
+
+    def self.create_proxy_proc(nested, buffer)
+      proc do |*args, &block|
+        unless @_inlinetemplates_context.nil?
+          ::Kernel.puts "OH! block in context!"
+        end
+
+        args.map! { |arg| BufferWrapper.wrap arg, buffer }
+        block = BufferWrapper.create_proxy_proc(block, buffer) unless block.nil?
+
+        nested.call *args, &block
+      end
+    end
   end
 end

data/lib/inline_templates/rendering_context.rb

@@ -1,28 +1,28 @@
 module InlineTemplates
   class RenderingContext < BlankObject
-    make_blank :instance_exec, :instance_variable_set
+    make_blank :instance_exec, :instance_variable_get, :instance_variable_set
 
     def initialize(context, locals, builder)
       @_inlinetemplates_context = context
       @_inlinetemplates_locals = locals
-      @_inlinetemplates_evaluating = true
       @_inlinetemplates_builder = builder
 
       context.instance_variables.each do |var|
-        instance_variable_set var, context.instance_variable_get(var)
+        instance_variable_set var, BufferWrapper.wrap(context.instance_variable_get(var), self)
       end
     end
  
     def t(obj)
-      BufferWrapper.wrap obj.to_s, @_inlinetemplates_context.output_buffer
+      BufferWrapper.wrap obj.to_s, self
     end
 
     def h(obj)
-      BufferWrapper.wrap obj.to_s.html_safe, @_inlinetemplates_context.output_buffer
+      BufferWrapper.wrap obj.to_s.html_safe, self
     end
  
     def method_missing(name, *args, &block)
       args.map! &BufferWrapper.method(:unwrap)
+      block = BufferWrapper.create_proxy_proc(block, self) unless block.nil?
 
       if @_inlinetemplates_locals.include?(name) && args.length == 0
         result = @_inlinetemplates_locals[name]
@@ -37,7 +37,7 @@ module InlineTemplates
         super
       end
  
-      BufferWrapper.wrap result, @_inlinetemplates_context.output_buffer
+      BufferWrapper.wrap result, self
     end
   end
 end

data/lib/inline_templates/version.rb

@@ -1,3 +1,3 @@
 module InlineTemplates
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/inline_templates_spec.rb

@@ -77,8 +77,16 @@ describe InlineTemplates do
 
     it 'passes instance variables' do
       test_rit do
-        ~ t(@virtual_path)
+        ~ @virtual_path
       end.should == "(inline)"
     end
+
+    it 'wraps output of builders' do
+      test_rit do
+        ~ form_for(:foo, :url => "foo", :authenticity_token => false) do |f|
+          ~ f.submit
+        end
+      end.should == "<form accept-charset=\"UTF-8\" action=\"foo\" method=\"post\"><div style=\"margin:0;padding:0;display:inline\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /></div><input name=\"commit\" type=\"submit\" value=\"Save Foo\" /></form>"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_templates
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Sergey Gridasov