curly-templates 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdd7bc20cc76f95d2375221dcd42a0b195df7757
-  data.tar.gz: 3ad84f498e084560f579bbe91fde2684bbb7c53b
+  metadata.gz: d5d6cde1c07741229dc8ea78114e54af3f8203c1
+  data.tar.gz: c06295601f10d2b265334ef2e3a67255fd00b3f6
 SHA512:
-  metadata.gz: 3998fc0caa17d607e4a13a3adc5bc17da44c6d8530d5c1910b273f16fca3ede99e352f2ddc44c318bda5040fa9a4f2b92eebb806f600b47679f937dcdd28c0f0
-  data.tar.gz: 126b53d760f5b3c10e99e16b219b7f76f9f842bbc289d4b9e4848d716fc5ba038796bc7f0bbffaa1af17a325fa8dfe8841855187675261b2136a2e44bc58f034
+  metadata.gz: bff53c1b1165f5fbbf2882a172ac47b274bae2b9a635c757870b226e0087ebaeab035b856c55c33cde288d74999d9d5d5dd034d272faecaba8eb0b5319a2b30c
+  data.tar.gz: 3907be2a2506af3b65c0d2cdb787b83472f2b35d60f3dcef649fb1234585d9eca08714875b7ab975c9bacd16ec17f7aabf80a1e795b57e75626d0b511d2ed0a6

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ### Unreleased
 
+### Curly 2.3.2 (January 13, 2015)
+
+* Fix an issue that caused presenter parameters to get mixed up.
+
+  *Cristian Planas*
+
+* Clean up the testing code.
+
+  *Daniel Schierbeck*
+
 ### Curly 2.3.1 (January 7, 2015)
 
 * Fix an issue with nested context blocks.

data/Gemfile

@@ -7,7 +7,6 @@ platform :ruby do
   gem 'yard-tomdoc'
   gem 'redcarpet'
   gem 'github-markup'
-  gem 'coveralls', require: false
   gem 'rails', '~> 4.2.0', require: false
   gem 'rspec-rails', require: false
 end

data/curly-templates.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'curly-templates'
-  s.version           = '2.3.1'
-  s.date              = '2015-01-07'
+  s.version           = '2.3.2'
+  s.date              = '2015-01-13'
 
   s.summary     = "Free your views!"
   s.description = "A view layer for your Rails apps that separates structure and logic."

data/lib/curly.rb

@@ -25,7 +25,7 @@
 #
 # See Curly::Presenter for more information on presenters.
 module Curly
-  VERSION = "2.3.1"
+  VERSION = "2.3.2"
 
   # Compiles a Curly template to Ruby code.
   #

data/lib/curly/compiler.rb

@@ -67,6 +67,7 @@ module Curly
         buffer = ActiveSupport::SafeBuffer.new
         buffers = []
         presenters = []
+        options_stack = []
         #{@parts.join("\n")}
         buffer
       RUBY
@@ -102,6 +103,7 @@ module Curly
 
       output <<-RUBY
         presenters << presenter
+        options_stack << options
         items = Array(#{method_call})
         items.each_with_index do |item, index|
           options = options.merge("#{name}" => item, "#{counter}" => index + 1)
@@ -114,6 +116,7 @@ module Curly
 
       output <<-RUBY
         end
+        options = options_stack.pop
         presenter = presenters.pop
       RUBY
     end
@@ -151,6 +154,7 @@ module Curly
       end
 
       output <<-RUBY
+        options_stack << options
         presenters << presenter
         buffers << buffer
         buffer << #{method_call} do |item|
@@ -168,6 +172,7 @@ module Curly
         end
         buffer = buffers.pop
         presenter = presenters.pop
+        options = options_stack.pop
       RUBY
     end
 

data/spec/attribute_scanner_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Curly::AttributeScanner do
   it "scans attributes" do
     scan("width=10px height=20px").should == {

data/spec/collection_blocks_spec.rb

@@ -1,10 +1,8 @@
-require 'spec_helper'
-
 describe "Collection block components" do
-  include RenderingSupport
+  include CompilationSupport
 
   before do
-    item_presenter do
+    define_presenter "ItemPresenter" do
       presents :item
 
       def name
@@ -14,7 +12,7 @@ describe "Collection block components" do
   end
 
   example "with neither identifier nor attributes" do
-    presenter do
+    define_presenter do
       def items
         ["one", "two", "three"]
       end
@@ -24,7 +22,7 @@ describe "Collection block components" do
   end
 
   example "with an identifier" do
-    presenter do
+    define_presenter do
       def items(filter = nil)
         if filter == "even"
           ["two"]
@@ -42,7 +40,7 @@ describe "Collection block components" do
   end
 
   example "with attributes" do
-    presenter do
+    define_presenter do
       def items(length: "1")
         ["x"] * length.to_i
       end
@@ -53,13 +51,13 @@ describe "Collection block components" do
   end
 
   example "with nested collection blocks" do
-    presenter do
+    define_presenter do
       def items
         [{ parts: [1, 2] }, { parts: [3, 4] }]
       end
     end
 
-    item_presenter do
+    define_presenter "ItemPresenter" do
       presents :item
 
       def parts
@@ -67,7 +65,7 @@ describe "Collection block components" do
       end
     end
 
-    part_presenter do
+    define_presenter "PartPresenter" do
       presents :part
 
       def number
@@ -77,12 +75,4 @@ describe "Collection block components" do
 
     render("{{*items}}<{{*parts}}[{{number}}]{{/parts}}>{{/items}}").should == "<[1][2]><[3][4]>"
   end
-
-  def item_presenter(&block)
-    stub_const("ItemPresenter", Class.new(Curly::Presenter, &block))
-  end
-
-  def part_presenter(&block)
-    stub_const("ItemPresenter::PartPresenter", Class.new(Curly::Presenter, &block))
-  end
 end

data/spec/compiler/collections_spec.rb

@@ -1,153 +1,202 @@
-require 'spec_helper'
-
 describe Curly::Compiler do
   include CompilationSupport
 
-  let(:presenter_class) do
-    Class.new(Curly::Presenter) do
-      presents :list
-
-      def title
-        @list.title
+  context "normal rendering" do
+    before do
+      define_presenter "ItemPresenter" do
+        presents :item
+        delegate :name, to: :@item
       end
+    end
 
-      def items(status: nil)
-        if status
-          @list.items.select {|item| item.status == status }
-        else
-          @list.items
-        end
+    it "compiles collection blocks" do
+      define_presenter do
+        presents :items
+        attr_reader :items
       end
 
-      def companies
-        "Nike, Adidas"
-      end
+      item1 = double("item1", name: "foo")
+      item2 = double("item2", name: "bar")
 
-      def numbers
-        "one, two, three"
-      end
+      template = "<ul>{{*items}}<li>{{name}}</li>{{/items}}</ul>"
+      expect(render(template, items: [item1, item2])).to eql "<ul><li>foo</li><li>bar</li></ul>"
     end
-  end
 
-  let(:simple_presenter_class) do
-    Class.new(Curly::Presenter) do
-      presents :company
+    it "allows attributes on collection blocks" do
+      define_presenter do
+        presents :items
 
-      def name
-        @company
+        def items(status: nil)
+          if status
+            @items.select {|item| item.status == status }
+          else
+            @items
+          end
+        end
       end
-    end
-  end
 
-  let(:inner_presenter_class) do
-    Class.new(Curly::Presenter) do
-      presents :item, :item_counter
-      presents :list, default: nil
+      item1 = double("item1", name: "foo", status: "active")
+      item2 = double("item2", name: "bar", status: "inactive")
 
-      attr_reader :item_counter
+      template = "<ul>{{*items status=active}}<li>{{name}}</li>{{/items}}</ul>"
+      expect(render(template, items: [item1, item2])).to eql "<ul><li>foo</li></ul>"
+    end
 
-      def name
-        @item.name
-      end
+    it "fails if the component doesn't support enumeration" do
+      template = "<ul>{{*numbers}}<li>{{name}}</li>{{/numbers}}</ul>"
+      expect { render(template) }.to raise_exception(Curly::Error)
+    end
 
-      def list_title
-        @list.title
+    it "works even if the component method doesn't return an Array" do
+      define_presenter do
+        def companies
+          "Arla"
+        end
       end
 
-      def parts
-        @item.parts
+      define_presenter "CompanyPresenter" do
+        presents :company
+
+        def name
+          @company
+        end
       end
+
+      template = "<ul>{{*companies}}<li>{{name}}</li>{{/companies}}</ul>"
+      expect(render(template)).to eql "<ul><li>Arla</li></ul>"
     end
-  end
 
-  let(:inner_inner_presenter_class) do
-    Class.new(Curly::Presenter) do
-      presents :part
+    it "passes the index of the current item to the nested presenter" do
+      define_presenter do
+        presents :items
+        attr_reader :items
+      end
+
+      define_presenter "ItemPresenter" do
+        presents :item_counter
 
-      def identifier
-        @part.identifier
+        def index
+          @item_counter
+        end
       end
+
+      item1 = double("item1")
+      item2 = double("item2")
+
+      template = "<ul>{{*items}}<li>{{index}}</li>{{/items}}</ul>"
+      expect(render(template, items: [item1, item2])).to eql "<ul><li>1</li><li>2</li></ul>"
     end
-  end
 
-  let(:list) { double("list", title: "Inventory") }
-  let(:context) { double("context") }
-  let(:presenter) { presenter_class.new(context, "list" => list) }
+    it "restores the previous scope after exiting the collection block" do
+      define_presenter do
+        presents :items
+        attr_reader :items
 
-  before do
-    stub_const("ItemPresenter", inner_presenter_class)
-    stub_const("PartPresenter", inner_inner_presenter_class)
-  end
+        def title
+          "Inventory"
+        end
+      end
+
+      define_presenter "ItemPresenter" do
+        presents :item
+        delegate :name, :parts, to: :@item
+      end
 
-  it "compiles collection blocks" do
-    item1 = double("item1", name: "foo")
-    item2 = double("item2", name: "bar")
+      define_presenter "PartPresenter" do
+        presents :part
+        delegate :identifier, to: :@part
+      end
 
-    list.stub(:items) { [item1, item2] }
+      part = double("part", identifier: "X")
+      item = double("item", name: "foo", parts: [part])
 
-    template = "<ul>{{*items}}<li>{{name}}</li>{{/items}}</ul>"
-    expect(evaluate(template)).to eql "<ul><li>foo</li><li>bar</li></ul>"
-  end
+      template = "{{*items}}{{*parts}}{{identifier}}{{/parts}}{{name}}{{/items}}{{title}}"
+      expect(render(template, items: [item])).to eql "XfooInventory"
+    end
 
-  it "allows attributes on collection blocks" do
-    item1 = double("item1", name: "foo", status: "active")
-    item2 = double("item2", name: "bar", status: "inactive")
+    it "passes the parent presenter's options to the nested presenter" do
+      define_presenter do
+        presents :items, :prefix
+        attr_reader :items
+      end
 
-    list.stub(:items) { [item1, item2] }
+      define_presenter "ItemPresenter" do
+        presents :item, :prefix
+        delegate :name, to: :@item
+        attr_reader :prefix
+      end
 
-    template = "<ul>{{*items status=active}}<li>{{name}}</li>{{/items}}</ul>"
-    expect(evaluate(template)).to eql "<ul><li>foo</li></ul>"
-  end
+      item1 = double(name: "foo")
+      item2 = double(name: "bar")
 
-  it "fails if the component isn't available" do
-    template = "<ul>{{*doodads}}<li>{{name}}</li>{{/doodads}}</ul>"
-    expect { evaluate(template) }.to raise_exception(Curly::Error)
-  end
+      template = "{{*items}}{{prefix}}: {{name}}; {{/items}}"
+      expect(render(template, prefix: "SKU", items: [item1, item2])).to eql "SKU: foo; SKU: bar; "
+    end
 
-  it "fails if the component doesn't support enumeration" do
-    template = "<ul>{{*numbers}}<li>{{name}}</li>{{/numbers}}</ul>"
-    expect { evaluate(template) }.to raise_exception(Curly::Error)
-  end
+    it "compiles nested collection blocks" do
+      define_presenter do
+        presents :items
+        attr_reader :items
+      end
 
-  it "works even if the component method doesn't return an Array" do
-    stub_const("CompanyPresenter", simple_presenter_class)
-    template = "<ul>{{*companies}}<li>{{name}}</li>{{/companies}}</ul>"
-    expect(evaluate(template)).to eql "<ul><li>Nike, Adidas</li></ul>"
-  end
+      define_presenter "ItemPresenter" do
+        presents :item
+        delegate :name, :parts, to: :@item
+      end
 
-  it "passes the index of the current item to the nested presenter" do
-    item1 = double("item1")
-    item2 = double("item2")
+      define_presenter "PartPresenter" do
+        presents :part
+        delegate :identifier, to: :@part
+      end
 
-    list.stub(:items) { [item1, item2] }
+      item1 = double("item1", name: "item1", parts: [double(identifier: "A"), double(identifier: "B")])
+      item2 = double("item2", name: "item2", parts: [double(identifier: "C"), double(identifier: "D")])
 
-    template = "<ul>{{*items}}<li>{{item_counter}}</li>{{/items}}</ul>"
-    expect(evaluate(template)).to eql "<ul><li>1</li><li>2</li></ul>"
+      template = "{{*items}}{{name}}: {{*parts}}{{identifier}}{{/parts}}; {{/items}}"
+      expect(render(template, items: [item1, item2])).to eql "item1: AB; item2: CD; "
+    end
   end
 
-  it "restores the previous scope after exiting the collection block" do
-    part = double("part", identifier: "X")
-    item = double("item", name: "foo", parts: [part])
-    list.stub(:items) { [item] }
+  context "re-using assign names" do
+    before do
+      define_presenter do
+        presents :comment
 
-    template = "{{*items}}{{*parts}}{{identifier}}{{/parts}}{{name}}{{/items}}{{title}}"
-    expect(evaluate(template)).to eql "XfooInventory"
-  end
+        attr_reader :comment
 
-  it "passes the parent presenter's options to the nested presenter" do
-    list.stub(:items) { [double(name: "foo"), double(name: "bar")] }
+        def comments
+          ["yolo", "xoxo"]
+        end
 
-    template = "{{*items}}{{list_title}}: {{name}}. {{/items}}"
-    expect(evaluate(template, list: list)).to eql "Inventory: foo. Inventory: bar. "
-  end
+        def comment(&block)
+          block.call("viagra!")
+        end
+
+        def form(&block)
+          block.call
+        end
+      end
 
-  it "compiles nested collection blocks" do
-    item1 = double("item1", name: "item1", parts: [double(identifier: "A"), double(identifier: "B")])
-    item2 = double("item2", name: "item2", parts: [double(identifier: "C"), double(identifier: "D")])
+      define_presenter "CommentPresenter" do
+        presents :comment
+      end
 
-    list.stub(:items) { [item1, item2] }
+      define_presenter "FormPresenter" do
+        presents :comment
+        attr_reader :comment
+      end
+    end
 
-    template = "{{title}}: {{*items}}{{name}} - {{*parts}}{{identifier}}{{/parts}}. {{/items}}"
-    expect(evaluate(template)).to eql "Inventory: item1 - AB. item2 - CD. "
+    it "allows re-using assign names in collection blocks" do
+      options = { "comment" => "first post!" }
+      template = "{{*comments}}{{/comments}}{{@form}}{{comment}}{{/form}}"
+      expect(render(template, options)).to eql "first post!"
+    end
+
+    it "allows re-using assign names in context blocks" do
+      options = { "comment" => "first post!" }
+      template = "{{@comment}}{{/comment}}{{@form}}{{comment}}{{/form}}"
+      expect(render(template, options)).to eql "first post!"
+    end
   end
 end

data/spec/compiler/context_blocks_spec.rb

@@ -1,53 +1,51 @@
-require 'spec_helper'
-
 describe Curly::Compiler do
   include CompilationSupport
 
-  let(:presenter_class) do
-    Class.new(Curly::Presenter) do
+  it "compiles context blocks" do
+    define_presenter do
       def form(&block)
         "<form>".html_safe + block.call("yo") + "</form>".html_safe
       end
-
-      def invalid
-        "uh oh!"
-      end
     end
-  end
 
-  let(:context_presenter_class) do
-    Class.new(Curly::Presenter) do
+    define_presenter "FormPresenter" do
       presents :form
 
       def text_field(&block)
         block.call(@form)
       end
     end
-  end
 
-  let(:inner_context_presenter_class) do
-    Class.new(Curly::Presenter) do
+    define_presenter "TextFieldPresenter" do
       presents :text_field
 
       def field
         %(<input type="text" value="#{@text_field.upcase}">).html_safe
       end
     end
+
+    render('{{@form}}{{@text_field}}{{field}}{{/text_field}}{{/form}}').should == '<form><input type="text" value="YO"></form>'
   end
 
-  let(:context) { double("context") }
-  let(:presenter) { presenter_class.new(context, {}) }
+  it "fails if the component is not a context block" do
+    define_presenter do
+      def form
+      end
+    end
 
-  before do
-    stub_const("FormPresenter", context_presenter_class)
-    stub_const("TextFieldPresenter", inner_context_presenter_class)
+    expect {
+      render('{{@form}}{{/form}}')
+    }.to raise_exception(Curly::Error)
   end
 
-  it "compiles context blocks" do
-    evaluate('{{@form}}{{@text_field}}{{field}}{{/text_field}}{{/form}}').should == '<form><input type="text" value="YO"></form>'
-  end
+  it "fails if the component doesn't match a presenter class" do
+    define_presenter do
+      def dust(&block)
+      end
+    end
 
-  it "fails if the component is not a context block" do
-    expect { evaluate('{{@invalid}}yo{{/invalid}}') }.to raise_exception(Curly::Error)
+    expect {
+      render('{{@dust}}{{/dust}}')
+    }.to raise_exception(Curly::Error)
   end
 end

data/spec/compiler_spec.rb

@@ -1,69 +1,7 @@
-require 'spec_helper'
-
 describe Curly::Compiler do
   include CompilationSupport
 
-  let :presenter_class do
-    Class.new do
-      def foo
-        "FOO"
-      end
-
-      def high_yield
-        "#{yield}, motherfucker!"
-      end
-
-      def yield_value
-        "#{yield :foo}, please?"
-      end
-
-      def hello?(value)
-        value == "world"
-      end
-
-      def unicorns
-        "UNICORN"
-      end
-
-      def dirty
-        nil
-      end
-
-      def square?(width:, height:)
-        width.to_i == height.to_i
-      end
-
-      def false?
-        false
-      end
-
-      def true?
-        true
-      end
-
-      def self.component_available?(method)
-        %w[foo high_yield yield_value dirty false? true? hello? square?].include?(method)
-      end
-
-      def self.available_components
-        public_instance_methods
-      end
-
-      private
-
-      def method_missing(*args)
-        "BAR"
-      end
-    end
-  end
-
-  let(:presenter) { presenter_class.new }
-
   describe ".compile" do
-    it "compiles Curly templates to Ruby code" do
-      evaluate("{{foo}}").should == "FOO"
-    end
-
     it "raises ArgumentError if the presenter class is nil" do
       expect do
         Curly::Compiler.compile("foo", nil)
@@ -71,12 +9,12 @@ describe Curly::Compiler do
     end
 
     it "makes sure only public methods are called on the presenter object" do
-      expect { evaluate("{{bar}}") }.to raise_exception(Curly::InvalidComponent)
+      expect { render("{{bar}}") }.to raise_exception(Curly::InvalidComponent)
     end
 
     it "includes the invalid component when failing to compile" do
       begin
-        evaluate("{{bar}}")
+        render("{{bar}}")
         fail
       rescue Curly::InvalidComponent => e
         e.component.should == "bar"
@@ -84,107 +22,171 @@ describe Curly::Compiler do
     end
 
     it "propagates yields to the caller" do
-      evaluate("{{high_yield}}") { "$$$" }.should == "$$$, motherfucker!"
+      define_presenter do
+        def i_want
+          "I want #{yield}!"
+        end
+      end
+
+      render("{{i_want}}") { "$$$" }.should == "I want $$$!"
     end
 
     it "sends along arguments passed to yield" do
-      evaluate("{{yield_value}}") {|v| v.upcase }.should == "FOO, please?"
+      define_presenter do
+        def hello(&block)
+          "Hello, #{block.call('world')}!"
+        end
+      end
+
+      render("{{hello}}") {|v| v.upcase }.should == "Hello, WORLD!"
     end
 
     it "escapes non HTML safe strings returned from the presenter" do
-      presenter.stub(:dirty) { "<p>dirty</p>" }
-      evaluate("{{dirty}}").should == "&lt;p&gt;dirty&lt;/p&gt;"
+      define_presenter do
+        def dirty
+          "<p>dirty</p>"
+        end
+      end
+
+      render("{{dirty}}").should == "&lt;p&gt;dirty&lt;/p&gt;"
     end
 
     it "does not escape HTML safe strings returned from the presenter" do
-      presenter.stub(:dirty) { "<p>dirty</p>".html_safe }
-      evaluate("{{dirty}}").should == "<p>dirty</p>"
+      define_presenter do
+        def dirty
+          "<p>dirty</p>".html_safe
+        end
+      end
+
+      render("{{dirty}}").should == "<p>dirty</p>"
     end
 
     it "does not escape HTML in the template itself" do
-      evaluate("<div>").should == "<div>"
+      render("<div>").should == "<div>"
     end
 
     it "treats all values returned from the presenter as strings" do
-      presenter.stub(:foo) { 42 }
-      evaluate("{{foo}}").should == "42"
+      define_presenter do
+        def foo; 42; end
+      end
+
+      render("{{foo}}").should == "42"
     end
 
     it "removes comments from the output" do
-      evaluate("HELO{{! I'm a comment, yo }}WORLD").should == "HELOWORLD"
+      render("hello{{! I'm a comment, yo }}world").should == "helloworld"
     end
 
     it "removes text in false blocks" do
-      evaluate("test{{#false?}}bar{{/false?}}").should == "test"
+      define_presenter do
+        def false?
+          false
+        end
+      end
+
+      render("{{#false?}}wut{{/false?}}").should == ""
     end
 
     it "keeps text in true blocks" do
-      evaluate("test{{#true?}}bar{{/true?}}").should == "testbar"
+      define_presenter do
+        def true?
+          true
+        end
+      end
+
+      render("{{#true?}}yello{{/true?}}").should == "yello"
     end
 
     it "removes text in inverse true blocks" do
-      evaluate("test{{^true?}}bar{{/true?}}").should == "test"
+      define_presenter do
+        def true?
+          true
+        end
+      end
+
+      render("{{^true?}}bar{{/true?}}").should == ""
     end
 
-    it "keeps kext in inverse false blocks" do
-      evaluate("test{{^false?}}bar{{/false?}}").should == "testbar"
+    it "keeps text in inverse false blocks" do
+      define_presenter do
+        def false?
+          false
+        end
+      end
+
+      render("{{^false?}}yeah!{{/false?}}").should == "yeah!"
     end
 
     it "passes an argument to blocks" do
-      evaluate("{{#hello.world?}}foo{{/hello.world?}}{{#hello.foo?}}bar{{/hello.foo?}}").should == "foo"
+      define_presenter do
+        def hello?(value)
+          value == "world"
+        end
+      end
+
+      render("{{#hello.world?}}foo{{/hello.world?}}").should == "foo"
+      render("{{#hello.mars?}}bar{{/hello.mars?}}").should == ""
     end
 
     it "passes attributes to blocks" do
-      evaluate("{{#square? width=2 height=2}}yeah!{{/square?}}").should == "yeah!"
-    end
+      define_presenter do
+        def square?(width:, height:)
+          width.to_i == height.to_i
+        end
+      end
 
-    it "gives an error on mismatching blocks" do
-      expect do
-        evaluate("test{{#false?}}bar{{/true?}}")
-      end.to raise_exception(Curly::IncorrectEndingError)
+      render("{{#square? width=2 height=2}}yeah!{{/square?}}").should == "yeah!"
     end
 
     it "gives an error on incomplete blocks" do
       expect do
-        evaluate("test{{#false?}}bar")
+        render("{{#hello?}}")
       end.to raise_exception(Curly::IncompleteBlockError)
     end
 
+    it "gives an error when closing unopened blocks" do
+      expect do
+        render("{{/goodbye?}}")
+      end.to raise_exception(Curly::IncorrectEndingError)
+    end
+
     it "gives an error on mismatching block ends" do
       expect do
-        evaluate("{{#true?}}test{{#false?}}bar{{/true?}}{{/false?}}")
+        render("{{#x?}}{{#y?}}{{/x?}}{{/y?}}")
       end.to raise_exception(Curly::IncorrectEndingError)
     end
 
     it "does not execute arbitrary Ruby code" do
-      evaluate('#{foo}').should == '#{foo}'
+      render('#{foo}').should == '#{foo}'
     end
   end
 
   describe ".valid?" do
     it "returns true if only available methods are referenced" do
+      define_presenter do
+        def foo; end
+      end
+
       validate("Hello, {{foo}}!").should == true
     end
 
     it "returns false if a missing method is referenced" do
+      define_presenter
       validate("Hello, {{i_am_missing}}").should == false
     end
 
     it "returns false if an unavailable method is referenced" do
-      presenter_class.stub(:available_components) { [:foo] }
-      validate("Hello, {{inspect}}").should == false
-    end
-
-    it "returns true with a block" do
-      validate("Hello {{#true?}}world{{/true?}}").should == true
-    end
+      define_presenter do
+        def self.available_components
+          []
+        end
+      end
 
-    it "returns false with an incomplete block" do
-      validate("Hello {{#true?}}world").should == false
+      validate("Hello, {{inspect}}").should == false
     end
 
     def validate(template)
-      Curly.valid?(template, presenter_class)
+      Curly.valid?(template, ShowPresenter)
     end
   end
 end

data/spec/component_compiler_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Curly::ComponentCompiler do
   describe ".compile" do
     let(:presenter_class) do

data/spec/component_scanner_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Curly::ComponentScanner do
   it "scans the component name, identifier, and attributes" do
     scan('hello.world weather="sunny"').should == [

data/spec/components_spec.rb

@@ -1,10 +1,8 @@
-require 'spec_helper'
-
 describe "Components" do
-  include RenderingSupport
+  include CompilationSupport
 
   example "with neither identifier nor attributes" do
-    presenter do
+    define_presenter do
       def title
         "A Clockwork Orange"
       end
@@ -14,7 +12,7 @@ describe "Components" do
   end
 
   example "with an identifier" do
-    presenter do
+    define_presenter do
       def reverse(str)
         str.reverse
       end
@@ -24,7 +22,7 @@ describe "Components" do
   end
 
   example "with attributes" do
-    presenter do
+    define_presenter do
       def double(number:)
         number.to_i * 2
       end
@@ -34,7 +32,7 @@ describe "Components" do
   end
 
   example "with both identifier and attributes" do
-    presenter do
+    define_presenter do
       def a(href:, title:)
         content_tag :a, nil, href: href, title: title
       end

data/spec/conditional_blocks_spec.rb

@@ -1,10 +1,8 @@
-require 'spec_helper'
-
 describe "Conditional block components" do
-  include RenderingSupport
+  include CompilationSupport
 
   example "with neither identifier nor attributes" do
-    presenter do
+    define_presenter do
       def high?
         true
       end
@@ -19,7 +17,7 @@ describe "Conditional block components" do
   end
 
   example "with an identifier" do
-    presenter do
+    define_presenter do
       def even?(number)
         number.to_i % 2 == 0
       end
@@ -30,7 +28,7 @@ describe "Conditional block components" do
   end
 
   example "with attributes" do
-    presenter do
+    define_presenter do
       def square?(width:, height:)
         width.to_i == height.to_i
       end

data/spec/dummy/config/environments/test.rb

@@ -13,7 +13,7 @@ Rails.application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files  = true
   config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.

data/spec/generators/controller_generator_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'genspec'
 require 'generators/curly/controller/controller_generator'
 

data/spec/integration/application_layout_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe "Using Curly for the application layout", type: :request do
   example "A simple layout view" do
     get '/'

data/spec/integration/collection_blocks_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe "Collection blocks", type: :request do
   example "Rendering collections" do
     get '/collection'

data/spec/integration/context_blocks_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'matchers/have_structure'
 
 describe "Context blocks", type: :request do

data/spec/integration/partials_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe "Using Curly for Rails partials", type: :request do
   example "Rendering a partial" do
     get '/partials'

data/spec/parser_spec.rb

@@ -1,6 +1,3 @@
-require 'spec_helper'
-require 'curly/parser'
-
 describe Curly::Parser do
   it "parses component tokens" do
     tokens = [

data/spec/presenter_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Curly::Presenter do
   class CircusPresenter < Curly::Presenter
     module MonkeyComponents

data/spec/scanner_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Curly::Scanner, ".scan" do
   it "returns the tokens in the source" do
     scan("foo {{bar}} baz").should == [

data/spec/spec_helper.rb

@@ -3,44 +3,36 @@ ENV["RAILS_ENV"] = "test"
 require 'dummy/config/environment'
 require 'rspec/rails'
 
-if ENV['CI']
-  begin
-    require 'coveralls'
-    Coveralls.wear!
-  rescue LoadError
-    STDERR.puts "Failed to load Coveralls"
-  end
+RSpec.configure do |config|
+  config.infer_spec_type_from_file_location!
 end
 
-module RenderingSupport
-  def presenter(&block)
-    @presenter = block
+module CompilationSupport
+  def define_presenter(name = "ShowPresenter", &block)
+    presenter_class = Class.new(Curly::Presenter, &block)
+    stub_const(name, presenter_class)
+    presenter_class
   end
 
-  def render(source)
-    stub_const("TestPresenter", Class.new(Curly::Presenter, &@presenter))
-    identifier = "test"
+  def render(source, locals = {}, presenter_class = nil, &block)
+    if presenter_class.nil?
+      unless defined?(ShowPresenter)
+        define_presenter("ShowPresenter")
+      end
+
+      presenter_class = ShowPresenter
+    end
+
+    identifier = "show"
     handler = Curly::TemplateHandler
-    details = { virtual_path: 'test' }
+    details = { virtual_path: 'show' }
     template = ActionView::Template.new(source, identifier, handler, details)
-    locals = {}
     view = ActionView::Base.new
 
-    template.render(view, locals)
-  end
-end
-
-module CompilationSupport
-  def evaluate(template, options = {}, &block)
-    code = Curly::Compiler.compile(template, presenter_class)
-    context = double("context")
-
-    context.instance_eval(<<-RUBY)
-      def self.render(presenter, options)
-        #{code}
-      end
-    RUBY
-
-    context.render(presenter, options, &block)
+    begin
+      template.render(view, locals, &block)
+    rescue ActionView::Template::Error => e
+      raise e.original_exception
+    end
   end
 end

data/spec/syntax_error_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Curly::SyntaxError, "#message" do
   it "includes the context of the error in the message" do
     source = "I am a very bad error that has snuck in"

data/spec/template_handler_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Curly::TemplateHandler do
   let :presenter_class do
     Class.new do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curly-templates
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Daniel Schierbeck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack