html_mockup 0.8.4 → 0.9.0

data/roger.gemspec

@@ -0,0 +1,29 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "roger"
+  s.version = "0.0.1"
+  
+  s.authors = ["Flurin Egger", "Edwin van der Graaf", "Joran Kapteijns"]
+  s.email = ["info@digitpaint.nl", "flurin@digitpaint.nl"]  
+  s.homepage = "http://github.com/digitpaint/html_mockup"
+  s.summary = "Roger is a set of tools to create self-containing HTML mockups."
+  s.licenses = ["MIT"]
+
+  s.date = Time.now.strftime("%Y-%m-%d")
+  
+  s.files = []
+  s.test_files = []
+  s.executables   = []
+  s.require_paths = ["lib"]  
+  
+  s.extra_rdoc_files = [
+    "README.md"
+  ]
+  
+  s.rdoc_options = ["--charset=UTF-8"]
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+
+  s.add_dependency("html_mockup", ["~> 0.8.4"])
+end

data/test/project/Gemfile

@@ -3,4 +3,5 @@ source "https://rubygems.org"
 gem "html_mockup", :path => File.dirname(__FILE__) + "/../../"
 gem "sass"
 gem "yui-compressor"
-gem "redcarpet"
+gem "redcarpet"
+gem "pry"

data/test/project/Gemfile.lock

@@ -1,35 +1,40 @@
 PATH
   remote: /Users/flurin/Projects.local/libraries/html_mockup
   specs:
-    html_mockup (0.8.2)
+    html_mockup (0.8.4)
       hpricot (>= 0.6.4)
+      mime-types (~> 2.2)
       rack (>= 1.0.0)
       sass
       thor (~> 0.16.0)
-      tilt (~> 1.4.0)
+      tilt (~> 2.0.1)
+      yui-compressor
 
 GEM
   remote: https://rubygems.org/
   specs:
-    POpen4 (0.1.4)
-      Platform (>= 0.4.0)
-      open4
-    Platform (0.4.0)
+    coderay (1.1.0)
     hpricot (0.8.6)
-    open4 (1.3.0)
+    method_source (0.8.2)
+    mime-types (2.2)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
     rack (1.5.2)
-    redcarpet (2.2.2)
-    sass (3.2.9)
+    redcarpet (3.1.1)
+    sass (3.3.5)
+    slop (3.5.0)
     thor (0.16.0)
-    tilt (1.4.1)
-    yui-compressor (0.9.6)
-      POpen4 (>= 0.1.4)
+    tilt (2.0.1)
+    yui-compressor (0.12.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   html_mockup!
+  pry
   redcarpet
   sass
   yui-compressor

data/test/project/Mockupfile

@@ -1,6 +1,9 @@
+require File.dirname(__FILE__) + "/lib/generators/test"
 
 mockup.project.options[:verbose] = true;
 
+mockup.project.partial_path = [mockup.project.path + "partials", mockup.project.path + "partials2"]
+
 mockup.serve do |s|
 end
 

data/test/project/html/formats/index.html

@@ -0,0 +1 @@
+Just an index.html

data/test/project/html/layouts/content-for.html.erb

@@ -0,0 +1,17 @@
+---
+layout : "test"
+title : "Content for"
+---
+Normal Yield
+
+<% content_for :one do %>
+  Yield for one <%= "bla" %>
+<% end %>
+
+And more normal stuff
+
+<% content_for :two do %>
+  Yield for two <%= "bla" %>
+<% end %>
+
+And the end of the normal stuff

data/test/project/html/mockup/encoding.html

@@ -0,0 +1,3 @@
+Some special characterrrs
+
+éᙀ

data/test/project/html/partials/load_path.html.erb

@@ -0,0 +1,3 @@
+<%= partial "partials-test" %>
+
+<%= partial "partials2-test" %>

data/test/project/layouts/test.html.erb

@@ -22,6 +22,13 @@
     
     <h3>MD</h3>
     <%= partial "test/markdown" %>
-    
+
+    <h3>Content for "one"</h3>
+    <%= yield :one %>
+
+
+    <h3>Content for "two"</h3>
+    <%= yield :two %>
+
   </body>
 </html>

data/test/project/layouts/yield.html.erb

@@ -0,0 +1 @@
+<%= yield %><%= yield :one %>

data/test/project/lib/generators/test.rb

@@ -0,0 +1,9 @@
+class TestGenerator < HtmlMockup::Generators::Base
+
+  def do
+    puts "Done!"
+  end
+
+end
+
+HtmlMockup::Generators::Base.register TestGenerator

data/test/project/partials/formats/erb.html.erb

@@ -0,0 +1 @@
+<%= "erb" %>

data/test/project/partials/partials-test.html.erb

@@ -0,0 +1 @@
+partials/partial-test.html.erb

data/test/project/partials/test/front_matter.html.erb

@@ -0,0 +1 @@
+<%= document.test %>

data/test/project/partials/test/json.json.erb

@@ -0,0 +1 @@
+{ key: <%= "value" %> }

data/test/project/partials/test/simple.html.erb

@@ -0,0 +1 @@
+ERB

data/test/project/partials2/partials2-test.html.erb

@@ -0,0 +1 @@
+partials2/partials2-test.html.erb

data/test/unit/cli_test.rb

@@ -0,0 +1,12 @@
+require "./lib/html_mockup/cli.rb"
+require "test/unit"
+
+module HtmlMockup
+  class CliTest < Test::Unit::TestCase
+
+    def test_register_generators
+      assert_includes Cli::Base.subcommands, "generate"
+    end
+
+  end
+end

data/test/unit/generators_test.rb

@@ -0,0 +1,75 @@
+# Generators register themself on the CLI module
+require "./lib/html_mockup/generators.rb"
+require "test/unit"
+
+module CustomGens
+  module Generators
+
+    class MockedGenerator < HtmlMockup::Generators::Base
+
+      desc "@mocked description"
+      argument :path, :type => :string, :required => false, :desc => "Path to generate mockup into"
+      argument :another_arg, :type => :string, :required => false, :desc => "Mocked or what?!"
+
+      def test
+        # Somewhat ugly way of checking
+        raise NotImplementedError
+      end
+    end
+
+    class MockedWithProjectGenerator < HtmlMockup::Generators::Base
+
+      desc "Returns a project"
+      def test
+        # Somewhat ugly way of checking
+        raise StandardError if @project
+      end
+    end    
+
+  end
+end
+
+module HtmlMockup
+  class GeneratorTest < Test::Unit::TestCase
+    def setup
+      @cli = Cli::Base.new
+    end
+
+    def test_working_project
+      HtmlMockup::Generators::Base.register CustomGens::Generators::MockedWithProjectGenerator
+      generators = Cli::Generate.new
+
+      assert_raise StandardError do
+        generators.invoke "mockedwithproject"
+      end
+    end
+
+    def test_register_generator
+      HtmlMockup::Generators::Base.register CustomGens::Generators::MockedGenerator
+      assert_includes Cli::Generate.tasks, "mocked"
+      assert_equal Cli::Generate.tasks["mocked"].description, "@mocked description"
+      assert_equal Cli::Generate.tasks["mocked"].usage, "mocked PATH ANOTHER_ARG"
+    end
+
+    def test_default_generator
+      assert_includes Cli::Generate.tasks, "new"
+    end
+
+    def test_generator_generator
+      generators = Cli::Generate.new
+      name = "tralal"
+      path = "./tmp"
+      generators.invoke :generator, [name, path]
+      assert File.exist? "#{path}/#{name}_generator.rb"
+    end
+
+    def test_invoke_mocked_generator
+      HtmlMockup::Generators::Base.register CustomGens::Generators::MockedGenerator
+      
+      generators = Cli::Generate.new
+      assert_raise NotImplementedError do
+        generators.invoke :mocked
+      end
+    end
+  end
+end

data/test/unit/release/cleaner_test.rb

@@ -4,29 +4,34 @@ require "test/unit"
 
 class CleanerTest < Test::Unit::TestCase
 
+  def setup
+    @base = File.dirname(__FILE__) + "/../../project"
+  end
+
   def test_only_clean_inside_build_path_relative
-    path = "processors"
-    cleaner = HtmlMockup::Release::Cleaner.new(path)
-    inside_build_path = cleaner.send :is_inside_build_path, File.dirname(__FILE__), path
+  
+    cleaner = HtmlMockup::Release::Cleaner.new(@base)
+    inside_build_path = cleaner.send :is_inside_build_path, @base, @base + "/html/formats"
 
     assert(inside_build_path, "Only delete content inside build_path")
   end  
 
   def test_only_clean_inside_build_path_absolute
-    path = Pathname.new(File.dirname(__FILE__) + "/processors").realpath.to_s
+    path = Pathname.new(@base).realpath.to_s
     cleaner = HtmlMockup::Release::Cleaner.new(path)
-    inside_build_path = cleaner.send :is_inside_build_path, File.dirname(__FILE__), path
+
+    inside_build_path = cleaner.send :is_inside_build_path, path, @base + "/html/formats"
 
     assert(inside_build_path, "Only delete content inside build_path")
   end  
 
   
   def test_dont_clean_outside_build_path
-    path = "../../../lib"
+    path = File.dirname(__FILE__)
     cleaner = HtmlMockup::Release::Cleaner.new(path)
 
     assert_raise RuntimeError do
-      inside_build_path = cleaner.send :is_inside_build_path, File.dirname(__FILE__), path
+      inside_build_path = cleaner.send :is_inside_build_path, path, @base + "/html/formats"
     end
 
   end
@@ -35,7 +40,7 @@ class CleanerTest < Test::Unit::TestCase
     path = "bla"
     cleaner = HtmlMockup::Release::Cleaner.new(path)
 
-    assert !cleaner.send(:is_inside_build_path, File.dirname(__FILE__), path), "Failed on nonexistent directories/files"
+    assert !cleaner.send(:is_inside_build_path, @base + "/html/formats", path), "Failed on nonexistent directories/files"
 
   end  
 

data/test/unit/resolver_test.rb

@@ -0,0 +1,92 @@
+# Generators register themself on the CLI module
+require "./lib/html_mockup/resolver.rb"
+require "test/unit"
+
+module HtmlMockup
+  class ResolverTest < Test::Unit::TestCase
+    def setup
+      @base = Pathname.new(File.dirname(__FILE__) + "/../project/html")
+      @resolver = HtmlMockup::Resolver.new(@base)
+    end
+
+    def test_find_template_path
+      assert_equal @resolver.find_template("formats/mockup.html"), @base + "formats/mockup.html"
+
+      # This should not be found on it's own as it will be processed
+      assert_equal @resolver.find_template("formats/markdown.md"), nil
+    end
+
+    def test_find_template_index_path
+      assert_equal @resolver.find_template("formats"), @base + "formats/index.html"
+    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"
+    end
+
+    def test_find_template_with_template_extension
+      assert_equal @resolver.find_template("formats/markdown"), @base + "formats/markdown.md"
+    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_equal @resolver.find_template("formats/json.json"), @base + "formats/json.json.erb"
+    end    
+
+    def test_find_template_with_preferred_extension
+      assert_equal @resolver.find_template("formats/json", :preferred_extension => "json"), @base + "formats/json.json.erb"
+    end
+    
+    def test_find_template_exact_match
+      # TODO
+    end
+
+    def test_path_to_url
+      assert_equal @resolver.path_to_url(@base + "formats/erb.html.erb"), "/formats/erb.html.erb"
+    end
+
+    def test_path_to_url_relative_to_relative_path
+      assert_equal @resolver.path_to_url(@base + "formats/erb.html.erb", "../front_matter/erb.html.erb"), "../formats/erb.html.erb"
+    end
+
+    def test_path_to_url_relative_to_absolute_path
+      assert_equal @resolver.path_to_url(@base + "formats/erb.html.erb", @base.realpath + "front_matter/erb.html.erb"), "../formats/erb.html.erb"
+    end
+
+  end
+
+  class ResolverMultipleTest < Test::Unit::TestCase
+    def setup
+      @base = Pathname.new(File.dirname(__FILE__) + "/../project")
+      @resolver = HtmlMockup::Resolver.new([@base + "html", @base + "partials"])
+    end
+
+    def test_add_load_path
+      @resolver.load_paths << @base + "henk"
+
+      assert_equal @resolver.load_paths, [@base + "html", @base + "partials", @base + "henk"]
+    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"
+    end
+
+    def test_find_template_path_ordered
+      assert_equal @resolver.find_template("formats/erb"), @base + "html/formats/erb.html.erb"
+
+      @resolver.load_paths.reverse!
+
+      assert_equal @resolver.find_template("formats/erb"), @base + "partials/formats/erb.html.erb"
+    end
+
+
+
+
+
+  end
+
+end

data/test/unit/template_test.rb

@@ -0,0 +1,127 @@
+# encoding: UTF-8
+# Generators register themself on the CLI module
+require "./lib/html_mockup/template.rb"
+require "test/unit"
+
+module HtmlMockup
+  class TemplateTest < Test::Unit::TestCase
+    def setup
+      @base = Pathname.new(File.dirname(__FILE__) + "/../project")
+      @config = {
+        :partials_path => @base + "partials",
+        :layouts_path => @base + "layouts"
+      }
+      @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.update(:source_path => @base + "html/test.html.erb"))
+      assert_equal template.render, "yay!"
+    end    
+
+    # Partials
+
+    def test_encoding_in_partials
+    end
+
+    def test_partial
+      template = Template.new("<%= partial 'test/simple' %>", @config.update(:source_path => @base + "html/test.html.erb"))
+      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.update(:source_path => @base + "html/test.html.erb"))
+      assert_raise(ArgumentError) {
+        template.render
+      }
+
+      template = Template.new("<%= partial 'test/json' %>", @config.update(:source_path => @base + "html/test.json.erb"))
+      assert_equal template.render, "{ key: value }"
+
+    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---\nB<% content_for :one do %><%= \"one\" %><% end %>A"
+
+      template = Template.new(content_for_block, @config.update(:source_path => @base + "html/test.html.erb"))
+      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.update(:source_path => @base + "html/test.html.erb"))
+      assert_equal template.render, "BA"
+    end    
+
+
+  end
+end