express_templates 0.2.0 → 0.2.2

data/test/expander_test.rb

@@ -2,22 +2,16 @@ require 'test_helper'
 
 class ExpanderTest < ActiveSupport::TestCase
 
-  class Foo < ExpressTemplates::Component ; end
-  class Bar < ExpressTemplates::Component ; end
-  class Baz < ExpressTemplates::Component ; end
+  class Foo < ExpressTemplates::Markup::Tag ; end
+  class Bar < ExpressTemplates::Markup::Tag ; end
+  class Baz < ExpressTemplates::Markup::Tag ; end
 
   ExpressTemplates::Expander.register_macros_for(Foo,Bar,Baz)
 
-  test ".expand returns a string"  do
-    source = "foo"
-    result = ExpressTemplates::Expander.expand(nil, source)
-    assert_kind_of String, result
-  end
-
   test "#expand returns an array containing a component" do
     source = "foo"
     result = ExpressTemplates::Expander.new(nil).expand(source)
-    assert_kind_of ExpressTemplates::Component, result.first
+    assert_kind_of ExpressTemplates::Markup::Tag, result.first
   end
 
   test "#expand of 'foo { foo } returns a component with a child component" do
@@ -42,15 +36,63 @@ class ExpanderTest < ActiveSupport::TestCase
     assert_kind_of Baz, result.first.children.last
   end
 
-  test "#expand correctly allocated helpers and parameters xxx" do
+  test "#expand correctly allocated helpers and parameters" do
     source = 'helper ; foo { buzz }'
     result = ExpressTemplates::Expander.new(nil).expand(source)
     assert_equal 0, result.first.children.size
     assert_equal 1, result[1].children.size
-    assert_kind_of ExpressTemplates::Components::Wrapper, result.first
+    assert_kind_of ExpressTemplates::Markup::Wrapper, result.first
     assert_kind_of Foo, result[1]
-    assert_kind_of ExpressTemplates::Components::Wrapper, result[1].children.first
+    assert_kind_of ExpressTemplates::Markup::Wrapper, result[1].children.first
+  end
+
+  test "#expand works with css class specification syntax xxx" do
+    source = 'foo.active { baz }'
+    result = ExpressTemplates::Expander.new(nil).expand(source)
+    assert_equal 1, result[0].children.size
+  end
+
+  test "#expand doesn't yield [] for children" do
+    source = %Q(ul(class: 'title-area') {
+  li.name {
+    a("Something", href: '#', disabled: true)
+  }
+  li(class:"ugly markup") {
+    a(href: "#") { span "menu item" }
+  }
+})
+    result = ExpressTemplates::Expander.new(nil).expand(source)
+    child_of_first_child = result.first.children.first
+    assert_equal 1, child_of_first_child.children.size
+    assert_kind_of ExpressTemplates::Markup::Tag, child_of_first_child.children.first
   end
 
+  class Special
+    def self.render(label)
+      :dummy
+    end
+  end
+
+  test "initializer accepts special handlers hash" do
+    source = "render(:markup)"
+    assert_equal [:dummy], ExpressTemplates::Expander.new(nil, render: Special).expand(source)
+  end
+
+  test "helpers can take blocks" do
+    result = ExpressTemplates::Expander.new(nil).expand do
+      helper do
+        foo
+      end
+    end
+    assert_equal %q("#{helper do
+        foo
+      end}"), result.first.compile
+  end
+
+  test "non-interpolated string children containing string interpolations will interpolate in context" do
+    source = 'p %q(some text #{helper})'
+    result = ExpressTemplates::Expander.new(nil).expand(source)
+    assert_equal %q("<p>"+"some text #{helper}"+"</p>"), result.first.compile
+  end
 
 end

data/test/handler_test.rb

@@ -86,10 +86,10 @@ class HandlerTest < ActiveSupport::TestCase
     assert_equal "<p class=\"whatever another\">Lorum Ipsum</p>", render
   end
 
-  # test "string in block works" do
-  #   @template = new_template "h1 { 'foo' } "
-  #   assert_equal "<h1>foo</h1>", render
-  # end
+  test "string in block works" do
+    @template = new_template "h1 { 'foo' } "
+    assert_equal "<h1>foo</h1>", render
+  end
 
   # test "real document has doctype and newline" do
   #   @template = new_template("html { body { h1 \"hello\" } }")

data/test/indenter_test.rb

@@ -0,0 +1,25 @@
+require 'test_helper'
+
+class IndenterTest < ActiveSupport::TestCase
+
+  Indenter = ExpressTemplates::Indenter
+
+  test ".for(:name) takes a block receiving whitespace" do
+    assert_equal "\n  ", Indenter.for(:foo) { |indent, indent_with_newline| indent_with_newline }
+    assert_equal "  ", Indenter.for(:foo) { |indent, indent_with_newline| indent }
+  end
+
+  test "nesting blocks increases whitespace accordingly" do
+    nested_whitespace = Indenter.for(:foo) do |ws1|
+      Indenter.for(:foo) do |ws2|
+        ws2
+      end
+    end
+    assert_equal "    ", nested_whitespace
+  end
+
+  test ".for(:name) returns current indent without newline when block is not given" do
+    assert_equal "  ", Indenter.for(:foo) { |_| Indenter.for(:foo) }
+  end
+
+end

data/test/markup/tag_test.rb

@@ -0,0 +1,127 @@
+require 'test_helper'
+
+class TagTest < ActiveSupport::TestCase
+
+  class Bare < ExpressTemplates::Markup::Tag ; end
+  class Sub < ExpressTemplates::Markup::Tag ; end
+
+  def bare_tag(*args)
+    Bare.new(*args)
+  end
+
+  def sub_tag(*args)
+    Sub.new(*args)
+  end
+
+
+  test "#macro_name returns the name of the class" do
+    assert_equal 'bare', bare_tag.macro_name
+  end
+
+  test "#compile returns a string" do
+    assert_kind_of String, bare_tag.compile
+  end
+
+  test "has no children" do
+    assert_empty bare_tag.children
+  end
+
+  def bare_with_2_children
+    tag = bare_tag "child1", "child2"
+  end
+
+  test "can be created with children" do
+    assert_equal 2, bare_with_2_children.children.size
+    assert_equal "child2", bare_with_2_children.children.last
+  end
+
+  test "#compile on bare_with_2_children yields '\"<bare>\"+\"child1\"+\"child2\"+\"</bare>\"'" do
+    assert_equal '"<bare>"+"child1"+"child2"+"</bare>"', bare_with_2_children.compile
+  end
+
+  test "#start_tag is my macro_name as an xml start tag" do
+    assert_equal "<#{bare_tag.macro_name}>", bare_tag.start_tag
+  end
+
+  test "#close_tag is my macro_name as an xml close tag" do
+    assert_equal "</#{bare_tag.macro_name}>", bare_tag.close_tag
+  end
+
+  def tag_with_subtag
+    bare_tag sub_tag
+  end
+
+  test "#compile on tag_with_subtag returns a string which when eval'd looks like '<bare><sub /></bare>'" do
+    assert_equal '<bare><sub /></bare>', eval(tag_with_subtag.compile)
+  end
+
+  test "#to_template on bare_tag returns 'bare'" do
+    assert_equal 'bare', bare_tag.to_template
+  end
+
+  test "#to_template on tag_with_subtag returns 'bare {\n  sub\n}\n'" do
+    assert_equal "bare {\n  sub\n}\n", tag_with_subtag.to_template
+  end
+
+  test "#to_template on nested tags indents properly'" do
+    expected = %Q(bare {
+  sub {
+    sub
+  }
+}
+)
+    assert_equal expected, Bare.new(Sub.new(Sub.new)).to_template
+  end
+
+  test "double bracketed option values are substituted for evaluation in context" do
+    assert_equal '"<bare should_eval_in_context=\"#{foo}\" />"', bare_tag(should_eval_in_context: "{{foo}}").compile
+  end
+
+  test "double bracketed child values are substituted for evaluation in context" do
+    assert_equal '"<bare>"+"#{foo}"+"</bare>"', bare_tag("{{foo}}").compile
+  end
+
+  test "data option value hashes are converted to data attributes similar to haml" do
+    assert_equal %("<bare data-one=\\"two\\" data-three=\\"four\\" />"),
+                 bare_tag(data: {one: 'two', three: 'four'}).compile
+  end
+
+  test "data option value hashes can take immediate values" do
+    assert_equal %("<bare data-foo=\\"true\\" data-bar=\\"42\\" data-baz=\\"blah\\" />"),
+                 bare_tag(data: {foo: true, bar: 42, baz: 'blah'}).compile
+  end
+
+
+  # todo?
+  # test "proc option values are evaluated in context"
+
+  test "empty tags use abbreviated empty tag form" do
+    assert_equal '"<bare />"', bare_tag.compile
+  end
+
+  test "empty i tag does does not use abbreviated form since it is used for icons" do
+    assert_equal '"<i>"+"</i>"', ExpressTemplates::Markup::I.new.compile
+  end
+
+  test "method missing returns self" do
+    tag = bare_tag
+    assert_equal tag, tag.foo
+  end
+
+  # the block form of this is tested in expander
+  test "children still evaluated after css class provided via method syntax" do
+    assert_equal '"<bare class=\"foo\">"+"<sub />"+"</bare>"', (bare_tag.foo(sub_tag)).compile
+  end
+
+  test "CSS classes specified with underscored method get translated to dashed" do
+    assert_equal '"<bare class=\"foo-bar\" />"', bare_tag._foo_bar.compile
+  end
+
+  test "dom ID may be passed as a symbol" do
+    assert_equal '"<bare id=\"foo\" />"', bare_tag(:foo).compile
+  end
+
+  # test "proc option values are evaluated in context"
+
+
+end

data/test/markup/wrapper_test.rb

@@ -0,0 +1,42 @@
+require 'test_helper'
+
+class WrapperTest < ActiveSupport::TestCase
+
+  Wrapper = ExpressTemplates::Markup::Wrapper
+
+  test "name compiles to just name" do
+    assert_equal '"#{foo}"', Wrapper.new('foo').compile
+  end
+
+  test "simple args are preserved" do
+    wrapper =  Wrapper.new('foo', "xyzzy", 'bar', "baz", 1, false, 3)
+    assert_equal '"#{foo("xyzzy", "bar", "baz", 1, false, 3)}"', wrapper.compile
+  end
+
+  test "args are preserved" do
+    wrapper =  Wrapper.new('foo', "xyzzy", bar: "baz")
+    assert_equal '"#{foo("xyzzy", bar: "baz")}"', wrapper.compile
+  end
+
+  test "something returning nil when wrapped and compiled, evals to an empty string" do
+    assert_equal '', eval(Wrapper.new('nil').compile)
+  end
+
+  test "double-braced args are evaluated in context" do
+    wrapper = Wrapper.new('foo', "{{xyz}}", "{{zyx}}", bar: "baz")
+    assert_equal '"#{foo(xyz, zyx, bar: "baz")}"', wrapper.compile
+  end
+
+  test "initializer block is preserved in compile" do
+    wrapper = Wrapper.new('foo') { whatever }
+    assert_equal '"#{foo { whatever }}"', wrapper.compile
+    wrapper = Wrapper.new('foo', 'bar') { whatever }
+    assert_equal '"#{foo("bar") { whatever }}"', wrapper.compile
+  end
+
+  test "lambda option values are evaluated in context" do
+    wrapper = Wrapper.new('foo', bar: -> { something })
+    assert_equal '"#{foo(bar: (-> { something }).call)}"', wrapper.compile
+  end
+
+end

data/test/markup/yielder_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class YielderTest < ActiveSupport::TestCase
+
+  test "yielder preserves symbol args" do
+    assert_equal 'yield(:foo)', ExpressTemplates::Markup::Yielder.new(:foo).compile
+  end
+
+end

data/test/performance_test.rb

@@ -76,11 +76,11 @@ HAML
     assert_operator 1.0, :>, duration
   end
 
-  test "performance no more than 3x slower than erubis" do
+  test "performance no more than 3.5x slower than erubis" do
     eruby = Erubis::Eruby.new
     duration_erb = time(100) { eval(eruby.convert(ERB_EXAMPLE)) }
     duration_express_templates = time(100) { ExpressTemplates.render(self, "#{GARA_EXAMPLE}") }
-    assert_operator 3.0, :>, (duration_express_templates/duration_erb)
+    assert_operator 3.5, :>, (duration_express_templates/duration_erb)
   end
 
   test "performance better than haml" do

data/test/test_helper.rb

@@ -15,3 +15,9 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 if ActiveSupport::TestCase.method_defined?(:fixture_path=)
   ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
 end
+
+ECB = ExpressTemplates::Components::Base
+
+ET = ExpressTemplates
+
+Tag = ExpressTemplates::Markup::Tag

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: express_templates
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Steven Talcott Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -70,31 +84,33 @@ dependencies:
   name: better_errors
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: binding_of_caller
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Instead of Erb or HAML, write templates in plain Ruby.
+        version: '0.7'
+description: Replace Erb/HAML/Slim with ExpressTemplates and write templates in a
+  declartive style of Ruby.  With ExpressTemplates you may easily create a library
+  of components for use across projects.
 email:
 - steve@aelogica.com
 executables: []
@@ -104,19 +120,43 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- lib/core_extensions/proc.rb
 - lib/express_templates.rb
-- lib/express_templates/component.rb
+- lib/express_templates/compiler.rb
 - lib/express_templates/components.rb
-- lib/express_templates/components/html_tag.rb
-- lib/express_templates/components/wrapper.rb
-- lib/express_templates/components/yielder.rb
+- lib/express_templates/components/base.rb
+- lib/express_templates/components/capabilities/conditionality.rb
+- lib/express_templates/components/capabilities/configurable.rb
+- lib/express_templates/components/capabilities/iterating.rb
+- lib/express_templates/components/capabilities/parenting.rb
+- lib/express_templates/components/capabilities/rendering.rb
+- lib/express_templates/components/capabilities/templating.rb
+- lib/express_templates/components/capabilities/wrapping.rb
+- lib/express_templates/components/column.rb
+- lib/express_templates/components/container.rb
+- lib/express_templates/components/form_rails_support.rb
+- lib/express_templates/components/row.rb
 - lib/express_templates/expander.rb
-- lib/express_templates/html5_emitter.rb
+- lib/express_templates/indenter.rb
+- lib/express_templates/macro.rb
+- lib/express_templates/markup.rb
+- lib/express_templates/markup/html_tag.rb
+- lib/express_templates/markup/tag.rb
+- lib/express_templates/markup/wrapper.rb
+- lib/express_templates/markup/yielder.rb
 - lib/express_templates/renderer.rb
 - lib/express_templates/template/handler.rb
 - lib/express_templates/version.rb
-- lib/tasks/gara_tasks.rake
-- test/component_test.rb
+- lib/tasks/express_templates.rake
+- test/compiler_test.rb
+- test/components/base_test.rb
+- test/components/column_test.rb
+- test/components/conditionality_test.rb
+- test/components/configurable_test.rb
+- test/components/container_test.rb
+- test/components/iterating_test.rb
+- test/components/row_test.rb
+- test/core_extensions/proc_test.rb
 - test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
@@ -174,12 +214,15 @@ files:
 - test/dummy/tmp/cache/assets/test/sprockets/f7cbd26ba1d28d48de824f0e94586655
 - test/expander_stack_test.rb
 - test/expander_test.rb
+- test/express_templates_test.rb
 - test/fixtures/a_big_page.html
-- test/gara_test.rb
 - test/handler_test.rb
+- test/indenter_test.rb
+- test/markup/tag_test.rb
+- test/markup/wrapper_test.rb
+- test/markup/yielder_test.rb
 - test/performance_test.rb
 - test/test_helper.rb
-- test/wrapper_test.rb
 homepage: https://github.com/aelogica/express_templates
 licenses:
 - MIT
@@ -203,9 +246,17 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Write HTML templates in plain Ruby.
+summary: Write HTML templates in declarative Ruby.  Create reusable view components.
 test_files:
-- test/component_test.rb
+- test/compiler_test.rb
+- test/components/base_test.rb
+- test/components/column_test.rb
+- test/components/conditionality_test.rb
+- test/components/configurable_test.rb
+- test/components/container_test.rb
+- test/components/iterating_test.rb
+- test/components/row_test.rb
+- test/core_extensions/proc_test.rb
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
@@ -263,9 +314,12 @@ test_files:
 - test/dummy/tmp/cache/assets/test/sprockets/f7cbd26ba1d28d48de824f0e94586655
 - test/expander_stack_test.rb
 - test/expander_test.rb
+- test/express_templates_test.rb
 - test/fixtures/a_big_page.html
-- test/gara_test.rb
 - test/handler_test.rb
+- test/indenter_test.rb
+- test/markup/tag_test.rb
+- test/markup/wrapper_test.rb
+- test/markup/yielder_test.rb
 - test/performance_test.rb
 - test/test_helper.rb
-- test/wrapper_test.rb