curly-templates 2.0.0.beta1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f70027aee738dbd7ac5cc496cce7017943304833
-  data.tar.gz: 68947fc8e15e97945fcba195b0c278e14930d9dd
+  metadata.gz: 2818caa59f5bef7c626637f7836e1af656b7e80f
+  data.tar.gz: 4ca1146d648950e76512b621161f83b4af455829
 SHA512:
-  metadata.gz: d3d6816a0d6fb0e6125cc89845bea00ef363e03012f9bc96e083d0d0951febb032b31472a8bcb23271c16333a470a881e2bf0c4129b8712f06e4f5c24aa86c4b
-  data.tar.gz: 141f19f518dc381ecde8ac6d451bde20551bdcc711c4a9d1a7aa0f981cb100e1e840feb603a01eed956d5e865c3e6c7ef95d736f6302921fb29d3ad858c3150b
+  metadata.gz: 80c963f1466c87b64c3a34af2a60c1a9be706623513688226ce2c3cb62aedae3abcaf8947d39620966960570aed0b3867d3fd4e5c72140405c061d4b62892bc8
+  data.tar.gz: 8fbbaf7cf446034b96343ee77f766bafc473d62e01a4010fa412fe4806538505929ee30843685f46b969a2fade65d2b43ad303aa9ace72d0cf0d64627229aa3a

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ### Unreleased
 
+### Curly 2.0.0 (July 1, 2014)
+
+* Rename Curly::CompilationError to Curly::PresenterNotFound.
+
+  *Daniel Schierbeck*
+
 ### Curly 2.0.0.beta1 (June 27, 2014)
 
 * Add support for collection blocks.

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.0.0.beta1'
-  s.date              = '2014-06-27'
+  s.version           = '2.0.0'
+  s.date              = '2014-07-01'
 
   s.summary     = "Free your views!"
   s.description = "A view layer for your Rails apps that separates structure and logic."
@@ -37,7 +37,6 @@ Gem::Specification.new do |s|
     lib/curly-templates.rb
     lib/curly.rb
     lib/curly/attribute_parser.rb
-    lib/curly/compilation_error.rb
     lib/curly/compiler.rb
     lib/curly/component_compiler.rb
     lib/curly/component_parser.rb
@@ -47,6 +46,7 @@ Gem::Specification.new do |s|
     lib/curly/incorrect_ending_error.rb
     lib/curly/invalid_component.rb
     lib/curly/presenter.rb
+    lib/curly/presenter_not_found.rb
     lib/curly/railtie.rb
     lib/curly/scanner.rb
     lib/curly/syntax_error.rb
@@ -61,6 +61,9 @@ Gem::Specification.new do |s|
     spec/component_compiler_spec.rb
     spec/generators/controller_generator_spec.rb
     spec/incorrect_ending_error_spec.rb
+    spec/integration/collection_blocks_spec.rb
+    spec/integration/components_spec.rb
+    spec/integration/conditional_blocks_spec.rb
     spec/presenter_spec.rb
     spec/scanner_spec.rb
     spec/spec_helper.rb

data/lib/curly.rb

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

data/lib/curly/compiler.rb

@@ -165,6 +165,10 @@ module Curly
       name, identifier, attributes = ComponentParser.parse(component)
       last_block = @blocks.pop
 
+      if last_block.nil?
+        raise Curly::Error, "block ending not expected"
+      end
+
       unless last_block == [name, identifier]
         raise Curly::IncorrectEndingError.new([name, identifier], last_block)
       end

data/lib/curly/{compilation_error.rb → presenter_not_found.rb}

@@ -1,7 +1,7 @@
 require 'curly/error'
 
 module Curly
-  class CompilationError < Error
+  class PresenterNotFound < Error
     attr_reader :path
 
     def initialize(path)

data/lib/curly/template_handler.rb

@@ -1,7 +1,7 @@
 require 'active_support'
 require 'action_view'
 require 'curly'
-require 'curly/compilation_error'
+require 'curly/presenter_not_found'
 
 class Curly::TemplateHandler
   class << self
@@ -48,7 +48,7 @@ class Curly::TemplateHandler
       path = template.virtual_path
       presenter_class = Curly::Presenter.presenter_for_path(path)
 
-      raise Curly::CompilationError.new(path) if presenter_class.nil?
+      raise Curly::PresenterNotFound.new(path) if presenter_class.nil?
 
       source = Curly.compile(template.source, presenter_class)
 

data/spec/integration/collection_blocks_spec.rb

@@ -0,0 +1,88 @@
+require 'spec_helper'
+
+describe "Collection block components" do
+  include RenderingSupport
+
+  before do
+    item_presenter do
+      presents :item
+
+      def name
+        @item
+      end
+    end
+  end
+
+  example "with neither identifier nor attributes" do
+    presenter do
+      def items
+        ["one", "two", "three"]
+      end
+    end
+
+    render("{{*items}}<{{name}}>{{/items}}").should == "<one><two><three>"
+  end
+
+  example "with an identifier" do
+    presenter do
+      def items(filter = nil)
+        if filter == "even"
+          ["two"]
+        elsif filter == "odd"
+          ["one", "three"]
+        else
+          ["one", "two", "three"]
+        end
+      end
+    end
+
+    render("{{*items.even}}<{{name}}>{{/items.even}}").should == "<two>"
+    render("{{*items.odd}}<{{name}}>{{/items.odd}}").should == "<one><three>"
+    render("{{*items}}<{{name}}>{{/items}}").should == "<one><two><three>"
+  end
+
+  example "with attributes" do
+    presenter do
+      def items(length: "1")
+        ["x"] * length.to_i
+      end
+    end
+
+    render("{{*items length=3}}<{{name}}>{{/items}}").should == "<x><x><x>"
+    render("{{*items}}<{{name}}>{{/items}}").should == "<x>"
+  end
+
+  example "with nested collection blocks" do
+    presenter do
+      def items
+        [{ parts: [1, 2] }, { parts: [3, 4] }]
+      end
+    end
+
+    item_presenter do
+      presents :item
+
+      def parts
+        @item[:parts]
+      end
+    end
+
+    part_presenter do
+      presents :part
+
+      def number
+        @part
+      end
+    end
+
+    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/integration/components_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe "Components" do
+  include RenderingSupport
+
+  example "with neither identifier nor attributes" do
+    presenter do
+      def title
+        "A Clockwork Orange"
+      end
+    end
+
+    render("{{title}}").should == "A Clockwork Orange"
+  end
+
+  example "with an identifier" do
+    presenter do
+      def reverse(str)
+        str.reverse
+      end
+    end
+
+    render("{{reverse.123}}").should == "321"
+  end
+
+  example "with attributes" do
+    presenter do
+      def double(number:)
+        number.to_i * 2
+      end
+    end
+
+    render("{{double number=3}}").should == "6"
+  end
+
+  example "with both identifier and attributes" do
+    presenter do
+      def a(href:, title:)
+        content_tag :a, nil, href: href, title: title
+      end
+    end
+
+    render(%({{a href="/welcome.html" title="Welcome!"}})).should == %(<a href="/welcome.html" title="Welcome!"></a>)
+  end
+end

data/spec/integration/conditional_blocks_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+describe "Conditional block components" do
+  include RenderingSupport
+
+  example "with neither identifier nor attributes" do
+    presenter do
+      def high?
+        true
+      end
+
+      def low?
+        false
+      end
+    end
+
+    render("{{#high?}}yup{{/high?}}").should == "yup"
+    render("{{#low?}}nah{{/low?}}").should == ""
+  end
+
+  example "with an identifier" do
+    presenter do
+      def even?(number)
+        number.to_i % 2 == 0
+      end
+    end
+
+    render("{{#even.42?}}even{{/even.42?}}").should == "even"
+    render("{{#even.13?}}even{{/even.13?}}").should == ""
+  end
+
+  example "with attributes" do
+    presenter do
+      def square?(width:, height:)
+        width.to_i == height.to_i
+      end
+    end
+
+    render("{{#square? width=2 height=2}}square{{/square?}}").should == "square"
+    render("{{#square? width=3 height=2}}square{{/square?}}").should == ""
+  end
+end

data/spec/spec_helper.rb

@@ -11,6 +11,24 @@ end
 
 require 'curly'
 
+module RenderingSupport
+  def presenter(&block)
+    @presenter = block
+  end
+
+  def render(source)
+    stub_const("TestPresenter", Class.new(Curly::Presenter, &@presenter))
+    identifier = "test"
+    handler = Curly::TemplateHandler
+    details = { virtual_path: 'test' }
+    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)

data/spec/template_handler_spec.rb

@@ -105,7 +105,7 @@ describe Curly::TemplateHandler do
   it "should fail if there's no matching presenter class" do
     template.stub(:virtual_path) { "missing" }
     template.stub(:source) { " FOO " }
-    expect { output }.to raise_exception(Curly::CompilationError)
+    expect { output }.to raise_exception(Curly::PresenterNotFound)
   end
 
   it "allows calling public methods on the presenter" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curly-templates
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0
 platform: ruby
 authors:
 - Daniel Schierbeck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -107,7 +107,6 @@ files:
 - lib/curly-templates.rb
 - lib/curly.rb
 - lib/curly/attribute_parser.rb
-- lib/curly/compilation_error.rb
 - lib/curly/compiler.rb
 - lib/curly/component_compiler.rb
 - lib/curly/component_parser.rb
@@ -117,6 +116,7 @@ files:
 - lib/curly/incorrect_ending_error.rb
 - lib/curly/invalid_component.rb
 - lib/curly/presenter.rb
+- lib/curly/presenter_not_found.rb
 - lib/curly/railtie.rb
 - lib/curly/scanner.rb
 - lib/curly/syntax_error.rb
@@ -131,6 +131,9 @@ files:
 - spec/component_compiler_spec.rb
 - spec/generators/controller_generator_spec.rb
 - spec/incorrect_ending_error_spec.rb
+- spec/integration/collection_blocks_spec.rb
+- spec/integration/components_spec.rb
+- spec/integration/conditional_blocks_spec.rb
 - spec/presenter_spec.rb
 - spec/scanner_spec.rb
 - spec/spec_helper.rb
@@ -152,9 +155,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -168,6 +171,9 @@ test_files:
 - spec/component_compiler_spec.rb
 - spec/generators/controller_generator_spec.rb
 - spec/incorrect_ending_error_spec.rb
+- spec/integration/collection_blocks_spec.rb
+- spec/integration/components_spec.rb
+- spec/integration/conditional_blocks_spec.rb
 - spec/presenter_spec.rb
 - spec/scanner_spec.rb
 - spec/syntax_error_spec.rb