inline_templates 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4320779b14a6754c8f5f27a94d3b7bf4c273057
-  data.tar.gz: 655e669a9c98ea55ef06aa808b4048970aecaf70
+  metadata.gz: cdaa377c8da57c63aa268b4173579fe4b50e6f29
+  data.tar.gz: a38406882ed495ef4349f39755ee35701ceaad35
 SHA512:
-  metadata.gz: bef27f4d814a5da7585f5f80e07765550eefcf5374c8151019bc28e56c3b843669b34c125b05b8df2c171dd11affa2c3f1a24ff5cc7c7edf81f5773da99d1d76
-  data.tar.gz: cd4cc209772778510e88765dd149a82a507a368c0bd8479d709842528d816f18d17430c145522bdcf09fe35c8a903b0aa67e5140fbada0fb1bfb2e787ff764b3
+  metadata.gz: 78a33c47e1f38aa055353a7e7d80b55cbba1acff724803d4ed365f1625d79886ce324db3b67bef5363d0997ad5e70847a6dee57578aa184218898f871fe4d4cb
+  data.tar.gz: 1974e3083ba7b0f2c37e2bc44404733b076c234554a03c7a6647902914f2309b3029cb7dd83bcc895c8d2428fa7894f7ca659c60828dcae880985e92d4ad17c8

data/lib/inline_templates/buffer_wrapper.rb

@@ -10,7 +10,7 @@ module InlineTemplates
     def __inline_templates_object; @object; end
  
     def ~
-      @buffer.instance_variable_get(:@_inlinetemplates_context).output_buffer.append = @object
+      @buffer.inlinetemplates_append @object
       @object
     end
 
@@ -42,6 +42,8 @@ module InlineTemplates
     end
 
     def self.create_proxy_proc(nested, buffer)
+      original_self = self
+
       proc do |*args, &block|
         unless @_inlinetemplates_context.nil?
           ::Kernel.puts "OH! block in context!"
@@ -50,7 +52,11 @@ module InlineTemplates
         args.map! { |arg| BufferWrapper.wrap arg, buffer }
         block = BufferWrapper.create_proxy_proc(block, buffer) unless block.nil?
 
-        nested.call *args, &block
+        if self.equal? original_self
+          nested.call *args, &block
+        else
+          buffer.inlinetemplates_instance_exec self, *args, &nested
+        end
       end
     end
   end

data/lib/inline_templates/rendering_context.rb

@@ -2,10 +2,11 @@ module InlineTemplates
   class RenderingContext < BlankObject
     make_blank :instance_exec, :instance_variable_get, :instance_variable_set
 
-    def initialize(context, locals, builder)
+    def initialize(context, locals, builder, view = nil)
       @_inlinetemplates_context = context
       @_inlinetemplates_locals = locals
       @_inlinetemplates_builder = builder
+      @_inlinetemplates_view = view || context
 
       context.instance_variables.each do |var|
         instance_variable_set var, BufferWrapper.wrap(context.instance_variable_get(var), self)
@@ -19,6 +20,14 @@ module InlineTemplates
     def h(obj)
       BufferWrapper.wrap obj.to_s.html_safe, self
     end
+
+    def inlinetemplates_append(obj)
+      @_inlinetemplates_view.output_buffer.append = obj
+    end
+
+    def inlinetemplates_instance_exec(new_self, *args, &block)
+      RenderingContext.new(new_self, @_inlinetemplates_locals, @_inlinetemplates_builder, @_inlinetemplates_view).instance_exec(*args, &block)
+    end
  
     def method_missing(name, *args, &block)
       args.map! &BufferWrapper.method(:unwrap)
@@ -31,7 +40,7 @@ module InlineTemplates
         result = @_inlinetemplates_context.__send__ name, *args, &block
  
       elsif @_inlinetemplates_builder.can_build?(name)
-        result = @_inlinetemplates_builder.build @_inlinetemplates_context, name, *args, &block
+        result = @_inlinetemplates_builder.build @_inlinetemplates_view, name, *args, &block
  
       else
         super

data/lib/inline_templates/version.rb

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

data/spec/inline_templates_spec.rb

@@ -88,5 +88,36 @@ describe InlineTemplates do
         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
+
+    it 'supports instance_exec of blocks' do
+      test_class = Class.new do
+        def initialize(template, &block)
+          @template = template
+          @buffer = ""
+          instance_exec &block
+        end
+
+        def to_s
+          @buffer.html_safe
+        end
+
+        def foo
+          @buffer << "test"
+        end
+
+        def bar(&block)
+          @buffer << @template.capture('foo', &block)
+        end
+      end
+
+      test_rit do
+        ~ invoke_helper_like_class(test_class) do
+          foo
+          bar do |arg|
+            ~ strong(arg)
+          end
+        end
+      end.to_s.should == 'test<strong>foo</strong>'
+    end
   end
 end

data/spec/spec_helper.rb

@@ -18,6 +18,10 @@ def test_rit(locals = {}, &template)
    
   view = ActionView::Base.new inner_context, assigns, controller, formats
 
+  def view.invoke_helper_like_class(klass, *args, &block)
+    klass.new(self, *args, &block).to_s
+  end
+
   InlineTemplates.render view, { virtual_path: "(inline)" }, locals, &template
 end
 

metadata

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