roger 1.4.6 → 1.5.0

data/test/unit/resolver_test.rb

@@ -10,46 +10,63 @@ module Roger
       @resolver = Roger::Resolver.new(@base)
     end
 
-    def test_find_template_path
-      assert_equal @resolver.find_template("formats/index.html"), @base + "formats/index.html"
-
-      # This should not be found on it's own as it will be processed
-      assert_equal @resolver.find_template("formats/markdown.md"), nil
+    def assert_find(exp, search)
+      exp = @base + exp unless exp.nil?
+      assert_equal exp, @resolver.find_template(search)
     end
 
     def test_find_template_index_path
-      assert_equal @resolver.find_template("formats"), @base + "formats/index.html"
+      assert_find "formats/index.html", "formats"
     end
 
     def test_find_template_html_without_extension
-      assert_equal @resolver.find_template("formats/index"), @base + "formats/index.html"
-      assert_equal @resolver.find_template("formats/erb"), @base + "formats/erb.html.erb"
+      assert_find "formats/index.html", "formats/index"
+      assert_find "formats/erb.html.erb", "formats/erb"
     end
 
     def test_find_template_with_template_extension
-      assert_equal @resolver.find_template("formats/markdown"), @base + "formats/markdown.md"
+      assert_find "formats/markdown.md", "formats/markdown"
     end
 
     def test_find_template_with_double_extensions
-      assert_equal @resolver.find_template("formats/erb"), @base + "formats/erb.html.erb"
-      assert_equal @resolver.find_template("formats/erb.html"), @base + "formats/erb.html.erb"
+      assert_find "formats/erb.html.erb", "formats/erb"
+      assert_find "formats/erb.html.erb", "formats/erb.html"
+      assert_find "formats/erb.html.erb", "formats/erb.html.erb"
+
+      assert_find "formats/markdown-erb.md.erb", "formats/markdown-erb"
+      assert_find "formats/markdown-erb.md.erb", "formats/markdown-erb.md"
+      assert_find "formats/markdown-erb.md.erb", "formats/markdown-erb.md.erb"
+    end
 
-      assert_equal @resolver.find_template("formats/json.json"), @base + "formats/json.json.erb"
+    def test_not_find_template_with_non_matching_double_extension
+      assert_find "formats/json.json.erb", "formats/json.json"
+      assert_find nil, "formats/json.html"
+    end
+
+    def test_find_template_with_aliassed_extension
+      assert_find "formats/markdown-erb.md.erb", "formats/markdown-erb.html"
+      assert_find "formats/markdown.md", "formats/markdown.html"
+    end
+
+    def test_find_template_exact_match
+      assert_find "formats/index.html", "formats/index.html"
+      assert_find "formats/erb.html.erb", "formats/erb.html.erb"
     end
 
     def test_find_template_with_preferred_extension
       assert_equal(
-        @resolver.find_template("formats/json", preferred_extension: "json"),
-        @base + "formats/json.json.erb"
+        @resolver.find_template("formats/preferred", prefer: "html"),
+        @base + "formats/preferred.html.erb"
       )
-    end
 
-    def test_find_template_exact_match
-      # TODO
+      assert_equal(
+        @resolver.find_template("formats/preferred", prefer: "json"),
+        @base + "formats/preferred.json.erb"
+      )
     end
 
     def test_path_to_url
-      assert_equal @resolver.path_to_url(@base + "formats/erb.html.erb"), "/formats/erb.html.erb"
+      assert_equal "/formats/erb.html.erb", @resolver.path_to_url(@base + "formats/erb.html.erb")
     end
 
     def test_path_to_url_relative_to_relative_path
@@ -77,6 +94,10 @@ module Roger
       @resolver = Roger::Resolver.new([@base + "html", @base + "partials"])
     end
 
+    def assert_find(exp, search)
+      assert_equal @base + exp, @resolver.find_template(search)
+    end
+
     def test_add_load_path
       @resolver.load_paths << @base + "henk"
 
@@ -84,16 +105,16 @@ module Roger
     end
 
     def test_find_template_path
-      assert_equal @resolver.find_template("formats/index"), @base + "html/formats/index.html"
-      assert_equal @resolver.find_template("test/simple"), @base + "partials/test/simple.html.erb"
+      assert_find "html/formats/index.html", "formats/index"
+      assert_find "partials/test/simple.html.erb", "test/simple"
     end
 
     def test_find_template_path_ordered
-      assert_equal @resolver.find_template("formats/erb"), @base + "html/formats/erb.html.erb"
+      assert_find "html/formats/erb.html.erb", "formats/erb"
 
       @resolver.load_paths.reverse!
 
-      assert_equal @resolver.find_template("formats/erb"), @base + "partials/formats/erb.html.erb"
+      assert_find "partials/formats/erb.html.erb", "formats/erb"
     end
   end
 end

data/test/unit/template/template_base_test.rb

@@ -0,0 +1,29 @@
+# encoding: UTF-8
+# Generators register themself on the CLI module
+require "test_helper"
+require "./lib/roger/template.rb"
+
+module Roger
+  # Roger template tests
+  class TemplateTest < ::Test::Unit::TestCase
+    def setup
+      @base = Pathname.new(File.dirname(__FILE__) + "/../../project")
+      @config = {
+        partials_path: @base + "partials",
+        layouts_path: @base + "layouts",
+        source_path: @base + "html/test.html.erb"
+      }
+      @template_path = @base + "html"
+    end
+
+    def test_render
+      template = Template.new("<%= 'test' %>", {}, source_path: "test.erb")
+      assert_equal "test", template.render
+    end
+
+    def test_render_with_block
+      template = Template.new("<%= yield %>", {}, source_path: "test.erb")
+      assert_equal "inner", template.render { "inner" }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roger
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.5.0
 platform: ruby
 authors:
 - Flurin Egger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -30,14 +30,14 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
@@ -86,14 +86,14 @@ dependencies:
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.1
 - !ruby/object:Gem::Dependency
@@ -244,12 +244,14 @@ files:
 - lib/roger/release/scm.rb
 - lib/roger/release/scm/fixed.rb
 - lib/roger/release/scm/git.rb
+- lib/roger/renderer.rb
 - lib/roger/resolver.rb
 - lib/roger/rogerfile.rb
 - lib/roger/server.rb
 - lib/roger/template.rb
 - lib/roger/template/helpers/capture.rb
 - lib/roger/template/helpers/partial.rb
+- lib/roger/template/helpers/rendering.rb
 - lib/roger/template/template_context.rb
 - lib/roger/test.rb
 - lib/roger/testing/mock_project.rb
@@ -265,14 +267,20 @@ files:
 - test/project/html/formats/erb.html.erb
 - test/project/html/formats/index.html
 - test/project/html/formats/json.json.erb
+- test/project/html/formats/markdown-erb.md.erb
 - test/project/html/formats/markdown.md
+- test/project/html/formats/preferred.html.erb
+- test/project/html/formats/preferred.json.erb
 - test/project/html/front_matter/erb.html.erb
 - test/project/html/front_matter/markdown.md
 - test/project/html/layouts/content-for.html.erb
 - test/project/html/layouts/erb.html.erb
 - test/project/html/mockup/encoding.html
+- test/project/html/partials/_local.html.erb
 - test/project/html/partials/erb.html.erb
 - test/project/html/partials/load_path.html.erb
+- test/project/html/renderer/file.html.erb
+- test/project/html/renderer/recursive.html.erb
 - test/project/html/static/non-relative.html.erb
 - test/project/html/static/relative.html.erb
 - test/project/layouts/test.html.erb
@@ -285,10 +293,13 @@ files:
 - test/project/lib/tests/succeed/succeed.rb
 - test/project/partials/formats/erb.html.erb
 - test/project/partials/partials-test.html.erb
+- test/project/partials/test/_underscored.html.erb
+- test/project/partials/test/deep_recursive.html.erb
 - test/project/partials/test/erb.html.erb
 - test/project/partials/test/front_matter.html.erb
 - test/project/partials/test/json.json.erb
 - test/project/partials/test/markdown.md
+- test/project/partials/test/recursive.html.erb
 - test/project/partials/test/simple.html.erb
 - test/project/partials/test/yield.html.erb
 - test/project/partials2/partials2-test.html.erb
@@ -315,9 +326,13 @@ files:
 - test/unit/release/scm/fixed_test.rb
 - test/unit/release/scm/git_test.rb
 - test/unit/release_test.rb
+- test/unit/renderer/renderer_base_test.rb
+- test/unit/renderer/renderer_content_for_test.rb
+- test/unit/renderer/renderer_helper_test.rb
+- test/unit/renderer/renderer_partial_test.rb
 - test/unit/resolver_test.rb
 - test/unit/server_test.rb
-- test/unit/template_test.rb
+- test/unit/template/template_base_test.rb
 - test/unit/test_helper.rb
 - test/unit/test_test.rb
 homepage: http://github.com/digitpaint/roger
@@ -331,17 +346,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Roger is a set of tools to create self-containing HTML mockups.
@@ -355,14 +370,20 @@ test_files:
 - test/project/html/formats/erb.html.erb
 - test/project/html/formats/index.html
 - test/project/html/formats/json.json.erb
+- test/project/html/formats/markdown-erb.md.erb
 - test/project/html/formats/markdown.md
+- test/project/html/formats/preferred.html.erb
+- test/project/html/formats/preferred.json.erb
 - test/project/html/front_matter/erb.html.erb
 - test/project/html/front_matter/markdown.md
 - test/project/html/layouts/content-for.html.erb
 - test/project/html/layouts/erb.html.erb
 - test/project/html/mockup/encoding.html
+- test/project/html/partials/_local.html.erb
 - test/project/html/partials/erb.html.erb
 - test/project/html/partials/load_path.html.erb
+- test/project/html/renderer/file.html.erb
+- test/project/html/renderer/recursive.html.erb
 - test/project/html/static/non-relative.html.erb
 - test/project/html/static/relative.html.erb
 - test/project/layouts/test.html.erb
@@ -375,10 +396,13 @@ test_files:
 - test/project/lib/tests/succeed/succeed.rb
 - test/project/partials/formats/erb.html.erb
 - test/project/partials/partials-test.html.erb
+- test/project/partials/test/_underscored.html.erb
+- test/project/partials/test/deep_recursive.html.erb
 - test/project/partials/test/erb.html.erb
 - test/project/partials/test/front_matter.html.erb
 - test/project/partials/test/json.json.erb
 - test/project/partials/test/markdown.md
+- test/project/partials/test/recursive.html.erb
 - test/project/partials/test/simple.html.erb
 - test/project/partials/test/yield.html.erb
 - test/project/partials2/partials2-test.html.erb
@@ -405,8 +429,12 @@ test_files:
 - test/unit/release/scm/fixed_test.rb
 - test/unit/release/scm/git_test.rb
 - test/unit/release_test.rb
+- test/unit/renderer/renderer_base_test.rb
+- test/unit/renderer/renderer_content_for_test.rb
+- test/unit/renderer/renderer_helper_test.rb
+- test/unit/renderer/renderer_partial_test.rb
 - test/unit/resolver_test.rb
 - test/unit/server_test.rb
-- test/unit/template_test.rb
+- test/unit/template/template_base_test.rb
 - test/unit/test_helper.rb
 - test/unit/test_test.rb

data/test/unit/template_test.rb

@@ -1,208 +0,0 @@
-# encoding: UTF-8
-# Generators register themself on the CLI module
-require "test_helper"
-require "./lib/roger/template.rb"
-
-module Roger
-  # A simple template helper to use for testing
-  module TemplateHelper
-    def a
-      "a"
-    end
-
-    def from_env(key)
-      env[key]
-    end
-  end
-
-  # Roger template tests
-  class TemplateTest < ::Test::Unit::TestCase
-    def setup
-      @base = Pathname.new(File.dirname(__FILE__) + "/../project")
-      @config = {
-        partials_path: @base + "partials",
-        layouts_path: @base + "layouts",
-        source_path: @base + "html/test.html.erb"
-      }
-      @template_path = @base + "html"
-    end
-
-    def test_encoding
-    end
-
-    # Extension
-    def test_source_extension
-      mime_types = {
-        "html" => "html",
-        "html.erb" => "html.erb",
-        "css.erb" => "css.erb",
-        "json.erb" => "json.erb",
-        "sjon.json.erb" => "json.erb",
-        "js.erb" => "js.erb"
-      }
-
-      mime_types.each do |ext, ext_out|
-        assert_equal(
-          ext_out,
-          Template.new("", @config.update(source_path: @base + "html/file.#{ext}")).source_extension
-        )
-      end
-    end
-
-    def test_target_extension
-      mime_types = {
-        "html" => "html",
-        "html.erb" => "html",
-        "css.erb" => "css",
-        "json.erb" => "json",
-        "js.erb" => "js"
-      }
-
-      mime_types.each do |ext, ext_out|
-        assert_equal(
-          ext_out,
-          Template.new("", @config.update(source_path: @base + "html/file.#{ext}")).target_extension
-        )
-      end
-    end
-
-    # Mime type
-    def test_target_mime_type
-      mime_types = {
-        "html" => "text/html",
-        "html.erb" => "text/html",
-        "css.erb" => "text/css",
-        "json.erb" => "application/json"
-      }
-
-      mime_types.each do |ext, mime|
-        assert_equal(
-          mime,
-          Template.new("", @config.update(source_path: @base + "html/file.#{ext}")).target_mime_type
-        )
-      end
-    end
-
-    # Front-matter
-
-    def test_front_matter_partial_access
-      template = Template.new("---\ntest: yay!\n---\n<%= partial 'test/front_matter' %>", @config)
-      assert_equal template.render, "yay!"
-    end
-
-    # Partials
-
-    def test_encoding_in_partials
-    end
-
-    def test_partial
-      template = Template.new("<%= partial 'test/simple' %>", @config)
-      assert_equal template.render, "ERB"
-
-      template = Template.new(
-        "<%= partial 'test/simple.html' %>",
-        @config.update(source_path: @base + "html/test.erb")
-      )
-      assert_equal template.render, "ERB"
-    end
-
-    def test_partial_with_double_template_extensions
-      template = Template.new(
-        "<%= partial 'test/json.json' %>",
-        @config.update(source_path: @base + "html/test.erb")
-      )
-      assert_equal template.render, "{ key: value }"
-    end
-
-    def test_partial_with_preferred_extension
-      template = Template.new("<%= partial 'test/json' %>", @config)
-      assert_raise(ArgumentError) do
-        template.render
-      end
-      template = Template.new(
-        "<%= partial 'test/json' %>",
-        @config.update(source_path: @base + "html/test.json.erb")
-      )
-      assert_equal template.render, "{ key: value }"
-    end
-
-    def test_partial_with_block
-      template = Template.new("<% partial 'test/yield' do %>CONTENT<% end %>", @config)
-      assert_equal template.render, "B-CONTENT-A"
-
-      template = Template.new("<% partial 'test/yield' do %><%= 'CONTENT' %><% end %>", @config)
-      assert_equal template.render, "B-CONTENT-A"
-    end
-
-    def test_partial_with_block_without_yield
-      template = Template.new("<% partial 'test/simple' do %>CONTENT<% end %>", @config)
-      assert_equal template.render, "ERB"
-    end
-
-    # Content for parts
-
-    def test_content_for_not_returning_in_template
-      content_for_block = 'B<% content_for :one do %><%= "one" %><% end %>A'
-
-      template = Template.new(
-        content_for_block,
-        @config.update(source_path: @base + "html/test.erb")
-      )
-      assert_equal template.render, "BA"
-    end
-
-    def test_content_for_yield_in_layout
-      content_for_block = "---\nlayout: \"yield\"\n---\n"
-      content_for_block << "B<% content_for :one do %><%= \"one\" %><% end %>A"
-
-      template = Template.new(content_for_block, @config)
-      assert_equal template.render, "BAone"
-    end
-
-    def test_content_for_yield_in_layout_without_content_for
-      content_for_block = "---\nlayout: \"yield\"\n---\nBA"
-
-      template = Template.new(content_for_block, @config)
-      assert_equal template.render, "BA"
-    end
-
-    def test_content_for_yield_with_partial_with_block
-      template_string = "---\nlayout: \"yield\"\n---\nB"
-      template_string << "<% content_for :one do %>"
-      template_string << "<% partial 'test/yield' do %>CONTENT<% end %>"
-      template_string << "<% end %>A"
-
-      template = Template.new(template_string, @config)
-      assert_equal template.render, "BAB-CONTENT-A"
-    end
-
-    # Environment
-
-    def test_template_env
-      template = Template.new("<%= env[:test] %>", @config)
-      assert_equal template.render(test: "test"), "test"
-    end
-
-    # Helpers
-
-    def test_register_helper
-      Roger::Template.helper TemplateHelper
-
-      assert Roger::Template.helpers.include?(TemplateHelper)
-    end
-
-    def test_helper_works
-      Roger::Template.helper TemplateHelper
-
-      template = Roger::Template.new("<%= a %>", @config)
-      assert_equal template.render, "a"
-    end
-
-    def test_helper_has_access_to_env
-      Roger::Template.helper TemplateHelper
-
-      template = Roger::Template.new("<%= from_env(:test) %>", @config)
-      assert_equal template.render(test: "test"), "test"
-    end
-  end
-end