curly-templates 1.0.1 → 2.0.0.beta1

data/spec/incorrect_ending_error_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe Curly::IncorrectEndingError do
+  it "has a nice error message" do
+    error = Curly::IncorrectEndingError.new(["bar", nil], ["foo", nil])
+    error.message.should == "compilation error: expected `{{/foo}}`, got `{{/bar}}`"
+  end
+
+  it "handles components with an identifier" do
+    error = Curly::IncorrectEndingError.new(["foo", "y"], ["foo", "x"])
+    error.message.should == "compilation error: expected `{{/foo.x}}`, got `{{/foo.y}}`"
+  end
+end

data/spec/presenter_spec.rb

@@ -23,10 +23,13 @@ describe Curly::Presenter do
     presents :champagne
   end
 
+  class CircusPresenter::MonkeyPresenter < Curly::Presenter
+  end
+
   describe "#initialize" do
     let(:context) { double("context") }
 
-    it "sets the presented parameters as instance variables" do
+    it "sets the presented identifiers as instance variables" do
       presenter = CircusPresenter.new(context,
         midget: "Meek Harolson",
         clown: "Bubbles"
@@ -36,13 +39,13 @@ describe Curly::Presenter do
       presenter.clown.should == "Bubbles"
     end
 
-    it "raises an exception if a required parameter is not specified" do
+    it "raises an exception if a required identifier is not specified" do
       expect {
         FancyCircusPresenter.new(context, {})
-      }.to raise_exception(ArgumentError, "required parameter `champagne` missing")
+      }.to raise_exception(ArgumentError, "required identifier `champagne` missing")
     end
 
-    it "allows specifying default values for parameters" do
+    it "allows specifying default values for identifiers" do
       # Make sure subclasses can change default values.
       french_presenter = FrenchCircusPresenter.new(context)
       french_presenter.elephant.should == "Babar"
@@ -75,23 +78,37 @@ describe Curly::Presenter do
     end
   end
 
-  describe ".available_methods" do
+  describe ".presenter_for_name" do
+    it "returns the presenter class for the given name" do
+      CircusPresenter.presenter_for_name("monkey").should == CircusPresenter::MonkeyPresenter
+    end
+
+    it "looks in the namespace" do
+      CircusPresenter.presenter_for_name("french_circus").should == FrenchCircusPresenter
+    end
+
+    it "returns NameError if the presenter class doesn't exist" do
+      expect { CircusPresenter.presenter_for_name("clown") }.to raise_exception(NameError)
+    end
+  end
+
+  describe ".available_components" do
     it "includes the methods on the presenter" do
-      CircusPresenter.available_methods.should include(:midget)
+      CircusPresenter.available_components.should include("midget")
     end
 
     it "does not include methods on the Curly::Presenter base class" do
-      CircusPresenter.available_methods.should_not include(:cache_key)
+      CircusPresenter.available_components.should_not include("cache_key")
     end
   end
 
-  describe ".method_available?" do
+  describe ".component_available?" do
     it "returns true if the method is available" do
-      CircusPresenter.method_available?(:midget).should be_true
+      CircusPresenter.component_available?("midget").should == true
     end
 
     it "returns false if the method is not available" do
-      CircusPresenter.method_available?(:bear).should be_false
+      CircusPresenter.component_available?("bear").should == false
     end
   end
 

data/spec/scanner_spec.rb

@@ -4,20 +4,20 @@ describe Curly::Scanner, ".scan" do
   it "returns the tokens in the source" do
     scan("foo {{bar}} baz").should == [
       [:text, "foo "],
-      [:reference, "bar"],
+      [:component, "bar"],
       [:text, " baz"]
     ]
   end
 
-  it "scans parameterized references" do
+  it "scans components with identifiers" do
     scan("{{foo.bar}}").should == [
-      [:reference, "foo.bar"]
+      [:component, "foo.bar"]
     ]
   end
 
-  it "allows references with whitespace" do
+  it "allows components with whitespace" do
     scan("{{ foo bar}}").should == [
-      [:reference, " foo bar"]
+      [:component, " foo bar"]
     ]
   end
 
@@ -59,21 +59,30 @@ describe Curly::Scanner, ".scan" do
     ]
   end
 
-  it "scans block tags" do
-    scan('foo {{#bar}} hello {{/bar}}').should == [
+  it "scans conditional block tags" do
+    scan('foo {{#bar?}} hello {{/bar?}}').should == [
       [:text, "foo "],
-      [:block_start, "bar"],
+      [:conditional_block_start, "bar?"],
       [:text, " hello "],
-      [:block_end, "bar"]
+      [:conditional_block_end, "bar?"]
     ]
   end
 
   it "scans inverse block tags" do
-    scan('foo {{^bar}} hello {{/bar}}').should == [
+    scan('foo {{^bar?}} hello {{/bar?}}').should == [
       [:text, "foo "],
-      [:inverse_block_start, "bar"],
+      [:inverse_conditional_block_start, "bar?"],
       [:text, " hello "],
-      [:block_end, "bar"]
+      [:conditional_block_end, "bar?"]
+    ]
+  end
+
+  it "scans collection block tags" do
+    scan('foo {{*bar}} hello {{/bar}}').should == [
+      [:text, "foo "],
+      [:collection_block_start, "bar"],
+      [:text, " hello "],
+      [:collection_block_end, "bar"]
     ]
   end
 
@@ -89,7 +98,7 @@ describe Curly::Scanner, ".scan" do
     ]
   end
 
-  it "raises Curly::SyntaxError on unclosed references" do
+  it "raises Curly::SyntaxError on unclosed components" do
     ["{{", "{{yolo"].each do |template|
       expect { scan(template) }.to raise_error(Curly::SyntaxError)
     end

data/spec/spec_helper.rb

@@ -10,3 +10,18 @@ if ENV['CI']
 end
 
 require 'curly'
+
+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)
+  end
+end

data/spec/template_handler_spec.rb

@@ -29,7 +29,7 @@ describe Curly::TemplateHandler do
         @cache_duration
       end
 
-      def self.method_available?(method)
+      def self.component_available?(method)
         true
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curly-templates
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Daniel Schierbeck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -106,13 +106,16 @@ files:
 - curly-templates.gemspec
 - 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
 - lib/curly/dependency_tracker.rb
 - lib/curly/error.rb
 - lib/curly/incomplete_block_error.rb
 - lib/curly/incorrect_ending_error.rb
-- lib/curly/invalid_reference.rb
+- lib/curly/invalid_component.rb
 - lib/curly/presenter.rb
 - lib/curly/railtie.rb
 - lib/curly/scanner.rb
@@ -122,8 +125,12 @@ files:
 - lib/generators/curly/controller/templates/presenter.rb.erb
 - lib/generators/curly/controller/templates/view.html.curly.erb
 - lib/rails/projections.json
+- spec/attribute_parser_spec.rb
+- spec/compiler/collections_spec.rb
 - spec/compiler_spec.rb
+- spec/component_compiler_spec.rb
 - spec/generators/controller_generator_spec.rb
+- spec/incorrect_ending_error_spec.rb
 - spec/presenter_spec.rb
 - spec/scanner_spec.rb
 - spec/spec_helper.rb
@@ -145,9 +152,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -155,8 +162,12 @@ signing_key:
 specification_version: 2
 summary: Free your views!
 test_files:
+- spec/attribute_parser_spec.rb
+- spec/compiler/collections_spec.rb
 - spec/compiler_spec.rb
+- spec/component_compiler_spec.rb
 - spec/generators/controller_generator_spec.rb
+- spec/incorrect_ending_error_spec.rb
 - spec/presenter_spec.rb
 - spec/scanner_spec.rb
 - spec/syntax_error_spec.rb

data/lib/curly/invalid_reference.rb

@@ -1,13 +0,0 @@
-module Curly
-  class InvalidReference < Error
-    attr_reader :reference
-
-    def initialize(reference)
-      @reference = reference
-    end
-
-    def message
-      "invalid reference `{{#{reference}}}'"
-    end
-  end
-end