hydeweb 0.0.1.pre3 → 0.0.1.pre4

data/.gitignore

@@ -22,3 +22,4 @@ pkg
 .rvmrc
 .yardoc
 doc
+www

data/README.md

@@ -4,7 +4,7 @@ Hyde
 Installation
 ------------
 
-    gem install hydeweb
+    gem install hydeweb --pre
 
 Usage
 -----
@@ -18,16 +18,14 @@ To do
 -----
 
  - partials support
- - more renderers
-   - less
-   - markdown
-   - textile
-
  - extensions support
-
  - _meta.yml 
 
 Done:
 
  - hyde build
  - hyde gen
+ - more renderers
+   - less
+   - markdown
+   - textile

data/VERSION

@@ -1 +1 @@
-0.0.1.pre3
+0.0.1.pre4

data/bin/hyde

@@ -50,8 +50,8 @@ elsif options[:action] == 'create'
 
   else
     site_name = options[:params][0]
-    if Dir.exists? site_name
-      ostream << "This director already exists!\n"
+    if File.directory? site_name
+      ostream << "This directory already exists!\n"
       exit
     end
 

data/data/new_site/.gitignore

@@ -0,0 +1,24 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+*.swo
+*.swn
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## PROJECT::SPECIFIC
+public

data/data/new_site/_config.yml

@@ -14,4 +14,4 @@ layouts_path: layouts
 extensions_path: extensions
 
 # The folder where the HTML files are to be built when typing `hyde build`.
-output_path: output
+output_path: public

data/data/new_site/layouts/default.haml

@@ -3,7 +3,7 @@
   %head
     %title= title
   %body
-    =content
+    =yield
     %div#footer
       %hr
       %p Generated by Hyde

data/data/new_site/site/index.html.haml

@@ -0,0 +1,5 @@
+layout: default
+title: Your new Hyde site
+--
+%h1 It works!
+%p This is your new site. Feel free to take a look around!

data/lib/hyde/init.rb

@@ -5,6 +5,11 @@ require "logger"
 $:.unshift File.dirname(__FILE__) + "/.."
 require 'hyde'
 
+puts "Starting server..."
+puts "  http://127.0.0.1:4567      Homepage"
+puts "  http://127.0.0.1:4567/-    File list"
+puts ""
+
 class Main < Sinatra::Base
   @@project ||= Hyde::Project.new
 
@@ -18,6 +23,8 @@ class Main < Sinatra::Base
   get '/*' do
     begin
       path = params[:splat][0]
+      type = File.extname(path)[1..-1]
+      content_type type.to_sym  if type.is_a? String
       @@project.render path
     rescue Hyde::NotFound
       raise Sinatra::NotFound

data/lib/hyde/ostruct.rb

@@ -6,6 +6,10 @@ module Hyde
       hash.each_pair { |k, v| self.set!(k, v) }
     end
 
+    def include?(key)
+      @table.keys.include? key
+    end
+
     protected
     def set!(key, value)
       self.send "#{key.to_s}=".to_sym, value

data/lib/hyde/page.rb

@@ -1,7 +1,11 @@
 module Hyde
   class Page 
-    attr :filename, :renderer, :meta,
-         :page, :layout, :project
+    attr :filename
+    attr :renderer
+    attr :meta
+    attr :page
+    attr :layout
+    attr :project
 
     # The filename of the source file.
     # @example
@@ -22,19 +26,35 @@ module Hyde
     attr_reader :project
 
     # Factory
+    # Try {Project#get_page} instead
     def self.create(path, project, page_class = Page)
       info = get_page_info(path, project)
       page = page_class.new(path, project, info[:renderer], info[:filename])
     end
 
     # Returns the rendered output.
-    def render( data = {} )
-       output = @renderer.render(@meta.merge(data))
-       unless @layout.nil?
-         hash = @meta.merge({ "content" => output })
-         output = @layout.render hash
-       end
-       output
+    def render(data = {}, &block)
+      if self.is_a? Layout
+        # puts debug
+      end
+      output = @renderer.render(data, &block)
+      # BUG: @layout should build on top of that data
+      output = @layout.render(@meta.merge data) { output }  unless @layout.nil?
+      output
+    end
+
+    def method_missing(meth, *args, &blk)
+      if meta.keys.include?(meth.to_s)
+        meta[meth.to_s]
+      elsif meta.keys.include?(meth.to_sym)
+        meta[meth.to_sym]
+      else
+        raise NoMethodError.new "Undefined method `#{self.class}::#{meth}`"
+      end
+    end
+
+    def get_binding
+      binding
     end
 
     # Sets the meta data as read from the file.
@@ -87,14 +107,18 @@ module Hyde
         matches.each do |match|
           begin
             ext      = File.extname(match)[1..-1].capitalize.to_sym
+            exts     << File.extname(match)
             r_class  = Hyde::Renderers.const_get(ext)
-            exts     << ext
             renderer ||= r_class
             filename = match
-          rescue NoMethodError; end
+          rescue NoMethodError
+            # pass
+          rescue NameError # Renderer not found
+            # pass
+          end
         end
 
-        raise NotFound.new("No matching renderers found: " + exts.inspect) \
+        raise NotFound.new("No matching (#{exts.join(", ")}) renderers found for `#{path}`") \
           if renderer.nil?
       end
 

data/lib/hyde/project.rb

@@ -20,17 +20,22 @@ module Hyde
     attr_accessor :config
 
     def initialize( root = Dir.pwd )
+      @config = OStruct.new defaults
+
+      # find_root
       @root = root
       @config_file ||= "#{@root}/_config.yml"
 
-      @config = OStruct.new defaults
       @config.merge! YAML::load_file(@config_file)  if File.exists? @config_file
     end
 
     def method_missing(meth, *args, &blk)
-      @config.send meth # SHOULD SEND AND ERROR!!
+      raise NoMethodError, "No method `#{meth}`"  unless @config.include?(meth)
+      @config.send meth
     end
 
+    # Returns a page in a certain URL path.
+    # @return {Page} or a subclass of it
     def get_page(path)
       path = "index.html"  if path.empty?
       Page.create path, self
@@ -45,19 +50,26 @@ module Hyde
       get_page(path).render
     end
 
+    # Writes the output files.
+    # @param
+    #   ostream    - (Stream) Where to send the messages
     def build(ostream = nil)
-      raise Errno::EEXISTS  if File.exists? root(:output) and not Dir.exists? root(:output)
-      Dir.mkdir root(:output)  unless Dir.exists? root(:output)
-
-      files.each do |path|
-        ostream << " * #{output_path}/#{path}\n"  if ostream
-        mfile = force_file_open(root(:output, path))
-        mfile << render(path)
-        mfile.close
+      raise Errno::EEXISTS  if File.exists? root(:output) and not File.directory? root(:output)
+      Dir.mkdir root(:output)  unless File.directory? root(:output)
+
+      begin
+        files.each do |path|
+          ostream << " * #{output_path}/#{path}\n"  if ostream
+          mfile = force_file_open(root(:output, path))
+          mfile << render(path)
+          mfile.close
+        end
+      rescue NoGemError => e
+        ostream << "Error: #{e.message}\n"
       end
     end
 
-    # Returns a list of all URLs
+    # Returns a list of all URL paths
     def files
       @file_list ||= Dir[File.join(root(:site), '**', '*')].inject([]) do |a, match|
         # Make sure its the canonical name
@@ -65,7 +77,7 @@ module Hyde
         file = path.gsub /^#{Regexp.escape root(:site)}\/?/, ''
         ext  = File.extname(file)[1..-1]
         
-        if ignored_files.include?(path) or Dir.exists?(match)
+        if ignored_files.include?(path) or File.directory?(match)
           # pass
         elsif not get_renderer(ext).nil? # Has a renderer associated
           a << file.chomp(".#{ext}")
@@ -77,7 +89,7 @@ module Hyde
     end
 
     def ignore_list
-      @ignote_list ||= [
+      @ignore_list ||= [
         root(:layouts, '**/*'),
         root(:extensions, '**/*'),
         root(:output, '**/*'),
@@ -85,6 +97,8 @@ module Hyde
       ]
     end
 
+    # Returns a list of ignored files.
+    # TODO: This is innefficient... do it another way
     def ignored_files
       @ignored_files ||= ignore_list.inject([]) { |a, spec|
         Dir[spec].each { |file| a << File.expand_path(file) }; a
@@ -96,14 +110,15 @@ module Hyde
       { 'layouts_path'    => 'layouts',
         'extensions_path' => 'extensions',
         'site_path'       => 'site',
-        'output_path'     => 'output'
+        'output_path'     => 'public'
       }
     end
 
+    # Returns the renderer associated with the given file extension.
     def get_renderer(name)
       begin
         class_name = name.to_s.capitalize.to_sym
-        renderer = Renderers.const_get(class_name)
+        renderer = ::Hyde::Renderers.const_get(class_name)
       rescue NameError
         renderer = nil
       end

data/lib/hyde/renderer.rb

@@ -14,15 +14,56 @@ module Hyde
         @filename = filename
       end
 
-      def render( data = {} )
+      def render(data, &block)
+        scope = build_scope(page, data)
+        evaluate scope, data, &block
+      end
+
+      def markup
+        File.open(filename) { |f| @markup = f.read }  unless @markup
+        @markup
+      end
+
+      protected
+      def require_lib(lib, gem=lib)
+        begin
+          require lib
+        rescue LoadError
+          class_name = self.class.to_s.downcase
+          ext = /[^:]*$/.match(class_name)
+          raise NoGemError.new("To use .#{ext} files, type: `gem install #{gem}`")
+        end
+      end
+
+      def build_scope(page, data)
+        # Page is the scope
+        scope = page.get_binding
+        scope_object = eval("self", scope)
+
+        # Inherit local vars
+        scope_object.send(:instance_variable_set, '@_locals', data)
+        f_set_locals = data.keys.map { |k| "#{k} = @_locals[#{k.inspect}];" }.join("\n")
+        eval(f_set_locals, scope)
+
+        scope_object.instance_eval do
+          def eval_block(src, &block)
+            # This will let you eval something, and `yield` within that block.
+            eval src
+          end
+          extend Hyde::TemplateHelpers
+        end
+
+        scope
+      end
+
+      # Override me
+      def evaluate(scope, data, &block)
         ""
       end
     end
 
     # Any filetype that is split with the -- separator
     class Parsable < Base
-      @markup = ""
-
       def initialize(page, filename)
         super page, filename
         
@@ -37,6 +78,10 @@ module Hyde
         end
       end
 
+      def markup
+        @markup
+      end
+
       protected
       def get_file_parts(filename, *args)
         options = { :max_parts => -1 }
@@ -57,10 +102,10 @@ module Hyde
     end
 
     class Passthru < Base
-      def render( data = {} )
-        data = ""
-        File.open(@page.filename, "r").each_line { |line| data << line }
-        data
+      def render(data = 0, &block)
+        output = ''
+        File.open(@page.filename, "r") { |f| output = f.read }
+        output
       end
     end
   end

data/lib/hyde/renderers.rb

@@ -1,16 +1,48 @@
-require 'haml'
-
 module Hyde
   module Renderers
     class Haml < Renderer::Parsable
-      def render( data = {} )
-        @engine = ::Haml::Engine.new(@markup, {})
+      def evaluate(scope, data={}, &block)
+        require_lib 'haml'
+        @engine = ::Haml::Engine.new(markup, {})
+        @engine.render scope, data, &block
+      end
+    end
+
+    class Erb < Renderer::Parsable
+      def evaluate(scope, data={}, &block)
+        require_lib 'erb'
+        @engine = ::ERB.new markup
+        # So that we can yield!
+        eval("self", scope).eval_block @engine.src, &block
+      end
+    end
+
+    class Less < Renderer::Base
+      def evaluate(scope, data={}, &block)
+        require_lib 'less'
+        @engine = ::Less::Engine.new(File.open(filename))
+        @engine.to_css
+      end
+    end
+
+    #class Sass < Renderer::Base
+    #  def evaluate(scope, data={}, &block)
+    #    require 'haml'
+    #    @engine = ::Sass::Engine.new(File.open(filename))
+    #  end
+    #end
+
+    class Md < Renderer::Parsable
+      def evaluate(s, d={}, &block)
+        require_lib 'maruku'
+        Maruku.new(markup).to_html
+      end
+    end
 
-        if data.is_a? Hash
-          @engine.render OpenStruct.new data
-        else
-          @engine.render data
-        end
+    class Textile < Renderer::Parsable
+      def evaluate(s, d={}, &block)
+        require_lib 'redcloth', 'RedCloth'
+        RedCloth.new(markup).to_html
       end
     end
   end

data/lib/hyde/scope.rb

@@ -0,0 +1,12 @@
+module Hyde
+  # HAXXX... to be deprecated
+  class Scope
+    def data=(data)
+      @data = OpenStruct.new(data)
+    end
+
+    def method_missing(meth, *args, &blk)
+      @data.send meth
+    end
+  end
+end

data/lib/hyde/template_helpers.rb

@@ -0,0 +1,6 @@
+module Hyde
+  module TemplateHelpers
+    # def render # partial support
+    # end
+  end
+end

data/lib/hyde.rb

@@ -9,7 +9,15 @@ module Hyde
   autoload :Renderer,   "#{prefix}/hyde/renderer"
   autoload :Renderers,  "#{prefix}/hyde/renderers"
   autoload :Utils,      "#{prefix}/hyde/utils"
+  autoload :Scope,      "#{prefix}/hyde/scope"
+  autoload :TemplateHelpers,"#{prefix}/hyde/template_helpers"
+
+  class Exception < ::Exception
+  end
 
   class NotFound < Exception
   end
+
+  class NoGemError < Exception
+  end
 end

data/test/fixtures/custom/layouts/default.haml

@@ -1,5 +1,7 @@
+title: Site
+--
 %title= title
 != "<!-- (default layout) -->"
 %h2 Template
 %div
-  =content
+  =yield

data/test/fixtures/custom/layouts/erbtest.erb

@@ -0,0 +1,2 @@
+Hello
+<%= yield %>

data/test/fixtures/custom/site/assets/common.css.less

@@ -0,0 +1 @@
+body { background: white; }

data/test/fixtures/custom/site/assets/style.css.less

@@ -0,0 +1,3 @@
+@import "common.css.less";
+.test { outline: 0; }
+#menu { color: red; .test; }

data/test/fixtures/custom/site/lol.html.erb

@@ -0,0 +1,7 @@
+yay: 444
+layout: erbtest
+title: This is from lol.html
+--
+Hey there!
+<%= self.inspect %>
+<%= yay %>

data/test/fixtures/custom/site/markdown.html.md

@@ -0,0 +1,8 @@
+layout: default
+--
+Markdown test
+=============
+
+ * This file is generated from Markdown.
+ * ...
+

data/test/fixtures/custom/www_control/assets/common.css

@@ -0,0 +1 @@
+body { background: white; }

data/test/fixtures/custom/www_control/assets/style.css

@@ -0,0 +1,6 @@
+body { background: white; }
+.test { outline: 0; }
+#menu {
+  color: red;
+  outline: 0;
+}

data/test/fixtures/custom/www_control/lol.html

@@ -0,0 +1,5 @@
+Hello
+Hey there!
+#<Hyde::Page:0x0000010126a930 @project=#<Hyde::Project:0x00000100b35058 @config=#<Hyde::OStruct layouts_path="layouts", extensions_path="extensions", site_path="site", output_path="www", ignore=["hyde", "_*"]>, @root="/Users/rsc/Workdesk/hyde/test/fixtures/custom", @config_file="/Users/rsc/Workdesk/hyde/test/fixtures/custom/_config.yml", @ignore_list=["/Users/rsc/Workdesk/hyde/test/fixtures/custom/layouts/**/*", "/Users/rsc/Workdesk/hyde/test/fixtures/custom/extensions/**/*", "/Users/rsc/Workdesk/hyde/test/fixtures/custom/www/**/*", "/Users/rsc/Workdesk/hyde/test/fixtures/custom/_config.yml"], @ignored_files=["/Users/rsc/Workdesk/hyde/test/fixtures/custom/layouts/default.haml", "/Users/rsc/Workdesk/hyde/test/fixtures/custom/layouts/erbtest.erb", "/Users/rsc/Workdesk/hyde/test/fixtures/custom/_config.yml"], @file_list=["about/index.html", "assets/common.css", "assets/style.css", "foo.html", "index.html", "layout_test.html", "lol.html", "markdown.html", "yes.html"]>, @name="lol.html", @meta={"yay"=>444, "layout"=>"erbtest", "title"=>"This is from lol.html"}, @filename="/Users/rsc/Workdesk/hyde/test/fixtures/custom/site/lol.html.erb", @renderer=#<Hyde::Renderers::Erb:0x0000010126a578 @page=#<Hyde::Page:0x0000010126a930 ...>, @filename="/Users/rsc/Workdesk/hyde/test/fixtures/custom/site/lol.html.erb", @markup="Hey there!\n<%= self.inspect %>\n<%= yay %>\n", @engine=#<ERB:0x0000010125ebc0 @safe_level=nil, @src="#coding:US-ASCII\n_erbout = ''; _erbout.concat \"Hey there!\\n\"\n; _erbout.concat(( self.inspect ).to_s); _erbout.concat \"\\n\"\n; _erbout.concat(( yay ).to_s); _erbout.concat \"\\n\"\n; _erbout.force_encoding(__ENCODING__)", @enc=#<Encoding:US-ASCII>, @filename=nil>>, @_locals={}, @layout=#<Hyde::Layout:0x000001012624a0 @project=#<Hyde::Project:0x00000100b35058 @config=#<Hyde::OStruct layouts_path="layouts", extensions_path="extensions", site_path="site", output_path="www", ignore=["hyde", "_*"]>, @root="/Users/rsc/Workdesk/hyde/test/fixtures/custom", @config_file="/Users/rsc/Workdesk/hyde/test/fixtures/custom/_config.yml", @ignore_list=["/Users/rsc/Workdesk/hyde/test/fixtures/custom/layouts/**/*", "/Users/rsc/Workdesk/hyde/test/fixtures/custom/extensions/**/*", "/Users/rsc/Workdesk/hyde/test/fixtures/custom/www/**/*", "/Users/rsc/Workdesk/hyde/test/fixtures/custom/_config.yml"], @ignored_files=["/Users/rsc/Workdesk/hyde/test/fixtures/custom/layouts/default.haml", "/Users/rsc/Workdesk/hyde/test/fixtures/custom/layouts/erbtest.erb", "/Users/rsc/Workdesk/hyde/test/fixtures/custom/_config.yml"], @file_list=["about/index.html", "assets/common.css", "assets/style.css", "foo.html", "index.html", "layout_test.html", "lol.html", "markdown.html", "yes.html"]>, @name="erbtest", @meta={}, @filename="/Users/rsc/Workdesk/hyde/test/fixtures/custom/layouts/erbtest.erb", @renderer=#<Hyde::Renderers::Erb:0x000001012623f8 @page=#<Hyde::Layout:0x000001012624a0 ...>, @filename="/Users/rsc/Workdesk/hyde/test/fixtures/custom/layouts/erbtest.erb", @markup="Hello\n<%= yield %>\n">>>
+444
+

data/test/fixtures/custom/www_control/markdown.html

@@ -0,0 +1,10 @@
+<title>Site</title>
+<!-- (default layout) -->
+<h2>Template</h2>
+<div>
+  <h1 id='markdown_test'>Markdown test</h1>
+  
+  <ul>
+  <li>This file is generated from Markdown. * &#8230;</li>
+  </ul>
+</div>

data/test/fixtures/default/_config.yml

@@ -2,7 +2,7 @@
 layouts_path: _layouts
 extensions_path: _extensions
 site_path: .
-output_path: _www
+output_path: www
 ignore:
   - hyde
   - _*

data/test/fixtures/default/_layouts/default.haml

@@ -2,4 +2,4 @@
 != "<!-- (default layout) -->"
 %h2 Template
 %div
-  =content
+  =yield

data/test/test_all_fixtures.rb

@@ -0,0 +1,47 @@
+require "helper"
+require 'fileutils'
+
+class TestAllFixtures < Test::Unit::TestCase
+  @@root = File.join(Dir.pwd, 'test', 'fixtures')
+
+  def setup
+    @original_pwd = Dir.pwd
+  end
+
+  def teardown
+    # Remove all the generated www's
+    Dir["#{@@root}/**/www"].each do |match|
+      FileUtils.rm_rf match
+    end
+    Dir.chdir @original_pwd
+  end
+
+  def self.all_sites
+    @@sites ||= Dir["#{@@root}/*"] \
+      .reject { |f| not Dir.exists? f } \
+      .map    { |f| File.basename(f) }
+  end
+
+  all_sites.each do |site|
+    describe "Test `#{site}`" do
+      should "Build it properly and have identical files to the control" do
+        @project = Hyde::Project.new File.join(@@root, site)
+        @project.build
+
+        unknown_root = @project.root :site
+        control_root = @project.root 'www_control'
+
+        if not Dir.exists? control_root
+          flunk "No www_control"
+        else
+          @project.files.reject { |f| not Dir.exists? f }.each do |path|
+            unknown = File.open(File.join(unknown_root, path)).read
+            control = File.open(File.join(control_root, path)).read
+
+            assert_equal control, unknown
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - 1
-  - pre3
-  version: 0.0.1.pre3
+  - pre4
+  version: 0.0.1.pre4
 platform: ruby
 authors: 
 - Rico Sta. Cruz
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 +08:00
+date: 2010-04-30 00:00:00 +08:00
 default_executable: hyde
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,10 +78,11 @@ files:
 - Rakefile
 - VERSION
 - bin/hyde
+- data/new_site/.gitignore
 - data/new_site/README.md
 - data/new_site/_config.yml
 - data/new_site/layouts/default.haml
-- data/new_site/site/index.html
+- data/new_site/site/index.html.haml
 - lib/hyde.rb
 - lib/hyde/init.rb
 - lib/hyde/layout.rb
@@ -90,33 +91,45 @@ files:
 - lib/hyde/project.rb
 - lib/hyde/renderer.rb
 - lib/hyde/renderers.rb
+- lib/hyde/scope.rb
+- lib/hyde/template_helpers.rb
 - lib/hyde/utils.rb
 - test/fixtures/custom/_config.yml
 - test/fixtures/custom/layouts/default.haml
+- test/fixtures/custom/layouts/erbtest.erb
 - test/fixtures/custom/site/about/index.html
+- test/fixtures/custom/site/assets/common.css.less
+- test/fixtures/custom/site/assets/style.css.less
 - test/fixtures/custom/site/foo.html.haml
 - test/fixtures/custom/site/index.html.haml
 - test/fixtures/custom/site/layout_test.html.haml
+- test/fixtures/custom/site/lol.html.erb
+- test/fixtures/custom/site/markdown.html.md
 - test/fixtures/custom/site/yes.html
-- test/fixtures/custom/www/about/index.html
-- test/fixtures/custom/www/foo.html
-- test/fixtures/custom/www/index.html
-- test/fixtures/custom/www/layout_test.html
-- test/fixtures/custom/www/yes.html
+- test/fixtures/custom/www_control/about/index.html
+- test/fixtures/custom/www_control/assets/common.css
+- test/fixtures/custom/www_control/assets/style.css
+- test/fixtures/custom/www_control/foo.html
+- test/fixtures/custom/www_control/index.html
+- test/fixtures/custom/www_control/layout_test.html
+- test/fixtures/custom/www_control/lol.html
+- test/fixtures/custom/www_control/markdown.html
+- test/fixtures/custom/www_control/yes.html
 - test/fixtures/default/_config.yml
 - test/fixtures/default/_layouts/default.haml
-- test/fixtures/default/_www/Users/rsc/Workdesk/hyde/hyde/test/fixtures/default/about/index.html
-- test/fixtures/default/_www/about/index.html
-- test/fixtures/default/_www/foo.html
-- test/fixtures/default/_www/index.html
-- test/fixtures/default/_www/layout_test.html
-- test/fixtures/default/_www/yes.html
 - test/fixtures/default/about/index.html
 - test/fixtures/default/foo.html.haml
 - test/fixtures/default/index.html.haml
 - test/fixtures/default/layout_test.html.haml
+- test/fixtures/default/www_control/Users/rsc/Workdesk/hyde/hyde/test/fixtures/default/about/index.html
+- test/fixtures/default/www_control/about/index.html
+- test/fixtures/default/www_control/foo.html
+- test/fixtures/default/www_control/index.html
+- test/fixtures/default/www_control/layout_test.html
+- test/fixtures/default/www_control/yes.html
 - test/fixtures/default/yes.html
 - test/helper.rb
+- test/test_all_fixtures.rb
 - test/test_build.rb
 - test/test_hyde.rb
 - test/test_utils.rb
@@ -154,6 +167,7 @@ specification_version: 3
 summary: Website preprocessor
 test_files: 
 - test/helper.rb
+- test/test_all_fixtures.rb
 - test/test_build.rb
 - test/test_hyde.rb
 - test/test_utils.rb

data/data/new_site/site/index.html

@@ -1,5 +0,0 @@
-layout: default
-title: Your new Hyde site
---
-<h1>It works!</h1>
-<p>This is your new site. Feel free to take a look around!</p>