RubyGems - hydeweb - Versions diffs - 0.0.4 → 0.0.5 - Mend

hydeweb 0.0.4 → 0.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (35) hide show

data/CHANGELOG +13 -0
data/README.md +5 -0
data/VERSION +1 -1
data/bin/hyde +5 -0
data/data/new_site/hyde.conf +5 -0
data/data/pages/404.html +3 -0
data/hydeweb.gemspec +14 -3
data/lib/hyde.rb +9 -4
data/lib/hyde/clicommands.rb +1 -1
data/lib/hyde/helpers.rb +33 -6
data/lib/hyde/layout.rb +0 -4
data/lib/hyde/meta.rb +21 -0
data/lib/hyde/ostruct.rb +1 -6
data/lib/hyde/page.rb +16 -32
data/lib/hyde/page_factory.rb +6 -3
data/lib/hyde/partial.rb +2 -2
data/lib/hyde/project.rb +41 -39
data/lib/hyde/renderer.rb +16 -11
data/lib/hyde/renderers.rb +9 -1
data/lib/hyde/{init.rb → sinatra/init.rb} +8 -4
data/lib/hyde/utils.rb +8 -3
data/test/fixtures/custom/layouts/default.haml +1 -1
data/test/fixtures/two/_config.yml +8 -0
data/test/fixtures/two/layouts/default.haml +4 -0
data/test/fixtures/two/layouts/shared/test.haml +4 -0
data/test/fixtures/two/site/default.html.haml +2 -0
data/test/fixtures/two/site/index.html.haml +9 -0
data/test/fixtures/two/site/var.html.haml +5 -0
data/test/fixtures/two/www_control/default.html +2 -0
data/test/fixtures/two/www_control/index.html +10 -0
data/test/fixtures/two/www_control/var.html +2 -0
data/test/helper.rb +9 -0
data/test/test_hyde.rb +9 -9
data/test/test_page.rb +1 -1
metadata +15 -4

data/CHANGELOG CHANGED Viewed

@@ -1 +1,14 @@
+v0.0.5 - 2010-xx-xx
+-------------------
+ - Implemented `content_for` and `yield_content` helpers
+ - Added `partials_path` config variable
+ - Changed helper method `partial`s syntax (from `partial X, :locals => { ... }` to `partial X, ...`)
+ - Line numbers for errors are shown now
+ - Added rudimentary 404 page
+ - Added `hyde_requirement` config variable -- Hyde will now not proceed if the project needs a later version of Hyde
+ - Extensions are now auto-guessed (for example, 'foo.less' will be accessible as 'foo.css')
+v0.0.4 - 2010-05-25
+-------------------
+ - First public release

data/README.md CHANGED Viewed

@@ -19,10 +19,15 @@ To do
  - ignores
  - error pages
+ - page types
  - _meta.yml
 Done:
+ - default extensions
+ - version checking
+ - content_for
+ - partials_path
  - last_modified
  - partials support
  - hyde build

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 0.0.4
1	+ 0.0.5

data/bin/hyde CHANGED Viewed

@@ -9,6 +9,11 @@ require 'hyde'
 # This will load the extensions
 begin
   $project = Hyde::Project.new
+rescue Hyde::IncompatibleError => e
+  $stderr << e.message << "\n"
+  exit
 rescue Hyde::NoRootError; end
 if ARGV.size == 0

data/data/new_site/hyde.conf CHANGED Viewed

@@ -1,6 +1,8 @@
 # This is a Hyde site.
 # Install the `hydeweb` Ruby gem and type `hyde` for help.
+hyde_requirement: 0.0.5
 # Path options
 # -------------
@@ -13,6 +15,9 @@ layouts_path: layouts
 # The folder where the optional extensions are kept.
 extensions_path: extensions
+# The folder for partials.
+partials_path: layouts
 # The folder where the HTML files are to be built when typing `hyde build`.
 output_path: public

data/data/pages/404.html ADDED Viewed

@@ -0,0 +1,3 @@
+    <body style='text-align: center'>
+    <h1>Not found.</h1>
+    <a href='/-'>List of pages</a>

data/hydeweb.gemspec CHANGED Viewed

@@ -5,11 +5,11 @@
 Gem::Specification.new do |s|
   s.name = %q{hydeweb}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rico Sta. Cruz", "Sinefunc, Inc."]
-  s.date = %q{2010-05-25}
+  s.date = %q{2010-05-30}
   s.default_executable = %q{hyde}
   s.description = %q{Website preprocessor}
   s.email = %q{rico@sinefunc.com}
@@ -33,13 +33,14 @@ Gem::Specification.new do |s|
      "data/new_site/hyde.conf",
      "data/new_site/layouts/default.haml",
      "data/new_site/site/index.html.haml",
+     "data/pages/404.html",
      "hydeweb.gemspec",
      "lib/hyde.rb",
      "lib/hyde/clicommand.rb",
      "lib/hyde/clicommands.rb",
      "lib/hyde/helpers.rb",
-     "lib/hyde/init.rb",
      "lib/hyde/layout.rb",
+     "lib/hyde/meta.rb",
      "lib/hyde/ostruct.rb",
      "lib/hyde/page.rb",
      "lib/hyde/page_factory.rb",
@@ -47,6 +48,7 @@ Gem::Specification.new do |s|
      "lib/hyde/project.rb",
      "lib/hyde/renderer.rb",
      "lib/hyde/renderers.rb",
+     "lib/hyde/sinatra/init.rb",
      "lib/hyde/utils.rb",
      "manual/Extending/ExtendingHyde.md",
      "manual/Hyde.md",
@@ -93,6 +95,15 @@ Gem::Specification.new do |s|
      "test/fixtures/default/www_control/index.html",
      "test/fixtures/default/www_control/layout_test.html",
      "test/fixtures/default/www_control/yes.html",
+     "test/fixtures/two/_config.yml",
+     "test/fixtures/two/layouts/default.haml",
+     "test/fixtures/two/layouts/shared/test.haml",
+     "test/fixtures/two/site/default.html.haml",
+     "test/fixtures/two/site/index.html.haml",
+     "test/fixtures/two/site/var.html.haml",
+     "test/fixtures/two/www_control/default.html",
+     "test/fixtures/two/www_control/index.html",
+     "test/fixtures/two/www_control/var.html",
      "test/helper.rb",
      "test/test_all_fixtures.rb",
      "test/test_build.rb",

data/lib/hyde.rb CHANGED Viewed

@@ -10,16 +10,17 @@ module Hyde
   autoload :Renderer,    "#{prefix}/hyde/renderer"
   autoload :Renderers,   "#{prefix}/hyde/renderers"
   autoload :Utils,       "#{prefix}/hyde/utils"
-  autoload :Scope,       "#{prefix}/hyde/scope"
+  autoload :Meta,        "#{prefix}/hyde/meta"
   autoload :CLICommand,  "#{prefix}/hyde/clicommand"
   autoload :CLICommands, "#{prefix}/hyde/clicommands"
   autoload :Helpers,     "#{prefix}/hyde/helpers"
   autoload :Partial,     "#{prefix}/hyde/partial"
   Error = Class.new(::StandardError)
-  NoGemError  = Class.new(Error)
-  NotFound    = Class.new(Error)
-  NoRootError = Class.new(Error)
+  NoGemError        = Class.new(Error)
+  NotFound          = Class.new(Error)
+  NoRootError       = Class.new(Error)
+  IncompatibleError = Class.new(Error)
   class RenderError < Error
     attr_accessor :message
@@ -43,4 +44,8 @@ module Hyde
   def version
     @version ||= File.open(File.join(File.dirname(__FILE__), '..', 'VERSION')) { |f| f.read.strip }
   end
+  def compatible_with?(given_version)
+    Gem::Version.new(version) >= Gem::Version.new(given_version)
+  end
 end

data/lib/hyde/clicommands.rb CHANGED Viewed

@@ -72,7 +72,7 @@ module Hyde
       desc "Starts the local webserver"
       def self.run(*a)
         project
-        system "ruby \"%s\"" % [File.join(lib_path, 'hyde', 'init.rb')]
+        system "ruby \"%s\"" % [File.join(lib_path, 'hyde', 'sinatra', 'init.rb')]
       end
       def self.help

data/lib/hyde/helpers.rb CHANGED Viewed

@@ -1,15 +1,42 @@
 module Hyde
   module Helpers
-    module Default
-      def render_partial(partial_path, args = {})
-        locals = args[:locals] || {}
-        p = Partial.create partial_path.to_s, project
+    def partial(partial_path, locals = {})
+      begin
+        p = project[partial_path.to_s, :Partial]
+        p.referrer = self.referrer
         p.render locals
+      rescue ::Hyde::NotFound
+        "<!-- Can't find #{partial_path.to_s} -->"
       end
+    end
+    def content_for(key, &block)
+      content_blocks[key.to_sym] = block
+    end
+    def has_content?(key)
+      content_blocks.keys.include? key.to_sym
+    end
+    def yield_content(key, *args)
+      block = content_blocks[key.to_sym]
+      return ''  if block.nil?
-      def partial(*a)
-        render_partial *a
+      if respond_to?(:block_is_haml?) && block_is_haml?(block)
+        capture_haml *args, &block
+      elsif block.is_a? Proc
+        block.call *args
+      elsif block_given?
+        yield
+      else
+        ''
       end
     end
+  protected
+    def content_blocks
+      @@content_blocks ||= Hash.new
+      @@content_blocks[referrer.to_sym] ||= Hash.new { |h, k| h[k] = [] }
+    end
   end
 end

data/lib/hyde/layout.rb CHANGED Viewed

@@ -1,9 +1,5 @@
 module Hyde
   class Layout < Page
-    def self.create(path, project, page_class = Layout)
-      super path, project, page_class
-    end
     def self.get_filename(path, project)
       project.root(:layouts, path)
     end

data/lib/hyde/meta.rb ADDED Viewed

@@ -0,0 +1,21 @@
+module Hyde
+  class Meta < OStruct
+    attr_reader :page
+    def initialize(page)
+      @page = page
+      super nil
+    end
+    def |(data)
+      # TODO: Consider OStruct here?
+      @table.merge data  #if data.is_a? Hash
+    end
+    def layout=(value)
+      super value
+      @page.layout = @page.project[value, :Layout]
+      @page.layout.referrer = page.referrer
+    end
+  end
+end

data/lib/hyde/ostruct.rb CHANGED Viewed

@@ -3,16 +3,11 @@ require 'ostruct'
 module Hyde
   class OStruct < OpenStruct
     def merge!(hash)
-      hash.each_pair { |k, v| self.set!(k, v) }
+      hash.each_pair { |key, value| self.send "#{key.to_s}=".to_sym, value }
     end
     def include?(key)
       @table.keys.include? key
     end
-    protected
-    def set!(key, value)
-      self.send "#{key.to_s}=".to_sym, value
-    end
   end
 end

data/lib/hyde/page.rb CHANGED Viewed

@@ -2,20 +2,17 @@ module Hyde
   class Page
     include Hyde::Utils
-    attr :filename
     attr :renderer
-    attr :meta
-    attr :page
-    attr :layout
-    attr :project
     # The filename of the source file.
+    #
     # @example
     #   puts page.name
     #   puts page.filename
     #
     #   # about/index.html
     #   # about/index.html.haml
+    #
     attr_accessor :filename
     # Metadata hash
@@ -28,55 +25,42 @@ module Hyde
     # A reference to the parent {Project} instance
     attr_reader :project
+    attr_accessor :layout
+    attr_writer :referrer
     # Factory
     #
-    def self.create(path, project, def_page_class = Page)
+    def self.[](path, project, def_page_class = Page)
       PageFactory.create path, project, def_page_class
     end
+    def referrer
+      @referrer.nil? ? name : @referrer
+    end
     # Returns the rendered output.
     def render(data = {}, &block)
+      data = @meta | data
       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 = @layout.render(data) { output }  unless @layout.nil?
       output
     end
-    def method_missing(meth, *args, &blk)
-      meta[meth.to_s] || meta[meth.to_sym] || super
-    end
-    def get_binding
+    def get_binding #(&blk)
       binding
     end
-    # Sets the meta data as read from the file.
-    #
-    # Params:
-    #   meta   - The metadata Hash.
-    #
-    # Called by Renderer::Base.
-    #
-    def set_meta(meta)
-      # TODO: OStruct and stuff
-      # Merge
-      @meta ||= Hash.new
-      @meta.merge! meta
-      # Set the Layout
-      @layout = Layout.create(@meta['layout'], @project)  if @meta['layout']
-    end
     protected
     # Constructor.
     # The `page` argument is a page name
-    # Don't use me: use {Project#create}
+    # Don't use me: use {Project#[]}
     #
     def initialize(path, project, renderer, filename)
       @project    = project
       @name     ||= path
-      @meta     ||= {}
+      @meta     ||= Meta.new self
       @filename   = filename
       @renderer   = renderer.new(self, filename)
     end

data/lib/hyde/page_factory.rb CHANGED Viewed

@@ -1,12 +1,15 @@
 module Hyde
   class PageFactory
     def self.create(path, project, def_page_class = Page)
+      ext = File.extname(path)
       begin
         do_create path, project, def_page_class
       rescue NotFound
-        do_create "#{path}/index.html".squeeze('/'), project, def_page_class
-      rescue NotFound => e
-        raise e
+        begin
+          do_create "#{path.chomp(ext)}", project, def_page_class
+        rescue NotFound
+          do_create "#{path}/index.html".squeeze('/'), project, def_page_class
+        end
       end
     end

data/lib/hyde/partial.rb CHANGED Viewed

@@ -1,7 +1,7 @@
 module Hyde
   class Partial < Layout
-    def self.create(path, project, page_class = Partial)
-      super path, project, page_class
+    def self.get_filename(path, project)
+      project.root(:partials, path)
     end
   end
 end

data/lib/hyde/project.rb CHANGED Viewed

@@ -3,6 +3,14 @@ module Hyde
   class Project
     include Hyde::Utils
+    # The filename of the configuration file, relative to the project root. (String)
+    #
+    attr :config_file
+    # The configuration k/v storage (OStruct)
+    #
+    attr_accessor :config
     # The root path (String).
     #
     # @example
@@ -12,51 +20,37 @@ module Hyde
     #
     def root(*args)
       where = ''
-      where = send("#{args.shift.to_s}_path")  if args[0].class == Symbol
+      where = @config.send("#{args.shift.to_s}_path")  if args[0].class == Symbol
       path = args
       File.expand_path(File.join [@root, where, path].reject(&:empty?))
     end
-    # The filename of the configuration file, relative to the project root. (String)
-    #
-    attr :config_file
-    # The configuration k/v storage (OStruct)
-    #
-    attr_accessor :config
     # Can raise a NoRootError
     #
     def initialize(root = Dir.pwd)
       @config = OStruct.new defaults
       @root, @config_file = find_root_from root
-      @config.merge! YAML::load_file(@config_file)  if File.exists? @config_file
-      load_extensions
-    end
+      @config.merge! YAML::load_file(@config_file)
-    def method_missing(meth, *args, &blk)
-      super  unless @config.include?(meth)
-      @config.send meth
-    end
+      # Check for version
+      raise IncompatibleError, "This project requires at least Hyde v#{@config.hyde_requirement}." \
+        unless @config.hyde_requirement.nil? or \
+          ::Hyde.compatible_with?(@config.hyde_requirement)
-    # Returns a page in a certain URL path.
-    # @return {Page} or a subclass of it
-    #
-    def get_page(path)
-     Page.create path, self
+      load_extensions
     end
-    # Returns a layout
-    # (Try Layout.create path, @project instead)
+    # Returns an object in the project.
+    # Can be a page, layout, template...
     #
-    def get_layout(path)
-      Layout.create path, self
-    end
-    # Can throw a NotFound.
+    # @example
+    #   @project['index.html']
+    #   @project['default', :Layout]
+    #   @project['widgets/sidebar', :Partial]
     #
-    def render(path)
-      Page.create(path, self).render
+    def [](name, default_class=Page)
+      default_class = ::Hyde.const_get(default_class)  if default_class.is_a? Symbol
+      Hyde::Page[name, self, default_class]
     end
     # Writes the output files.
@@ -64,21 +58,25 @@ module Hyde
     #   ostream    - (Stream) Where to send the messages
     #
     def build(ostream = nil)
-      raise Errno::EEXISTS  if File.exists? root(:output) and not File.directory? root(:output)
-      Dir.mkdir(root :output)  unless File.directory?(root :output)
+      if File.exists? root(:output)
+        raise Errno::EEXISTS  unless File.directory? root(:output)
+      else
+        Dir.mkdir root(:output)
+      end
       begin
         files.each do |path|
-          ostream << " * #{output_path}/#{path}\n"  if ostream
+          ostream << " * #{@config.output_path}/#{path}\n"  if ostream
           begin
-            rendered = render(path)
-            mfile = force_file_open(root(:output, path))
-            mfile << rendered
-            mfile.close
+            rendered = self[path].render
+            force_file_open(root(:output, path)) { |file| file << rendered }
           rescue RenderError => e
             ostream << " *** Error: #{e.to_s}".gsub("\n", "\n *** ") << "\n"
           end
         end
       rescue NoGemError => e
         ostream << " *** Error: #{e.message}\n"
       end
@@ -96,7 +94,9 @@ module Hyde
         if ignored_files.include?(path) or File.directory?(match)
           # pass
         elsif not get_renderer(ext).nil? # Has a renderer associated
-          a << file.chomp(".#{ext}")
+          fname = file.chomp(".#{ext}")
+          fname += get_renderer(ext).default_ext  unless File.basename(fname).include?('.')
+          a << fname
         else
           a << file
         end
@@ -112,8 +112,9 @@ module Hyde
         root(:layouts, '**/*'),
         root(:extensions, '**/*'),
         root(:output, '**/*'),
+        root(:partials, '**/*'),
         @config_file
-      ]
+      ].uniq
     end
     # Returns a list of ignored files based on the {ignore_list}.
@@ -175,6 +176,7 @@ module Hyde
     def defaults
       { 'layouts_path'    => 'layouts',
         'extensions_path' => 'extensions',
+        'partials_path'   => 'layouts',
         'site_path'       => 'site',
         'output_path'     => 'public',
         'gems'            => []

data/lib/hyde/renderer.rb CHANGED Viewed

@@ -17,7 +17,7 @@ module Hyde
       end
       def render(data, &block)
-        scope = build_scope(page, data)
+        scope = build_scope(page, data, &block)
         evaluate scope, data, &block
       end
@@ -26,7 +26,11 @@ module Hyde
         @markup
       end
-      protected
+      def self.default_ext
+        ''
+      end
+    protected
       def require_lib(lib, gem=lib)
         begin
           require lib
@@ -37,21 +41,18 @@ module Hyde
         end
       end
-      def build_scope(page, data)
+      def build_scope(page, data, &block)
         # Page is the scope
-        scope = page.get_binding
+        scope = page.get_binding &block
         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")
+        data_object = data.inject({}) { |a, i| a[i[0].to_s] = i[1]; a }
+        scope_object.send(:instance_variable_set, '@_locals', data_object)
+        f_set_locals = data_object.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, &block
-          end
           get_helpers.each { |helper_class| extend helper_class }
         end
@@ -66,6 +67,10 @@ module Hyde
     # Any filetype that is split with the -- separator
     class Parsable < Base
+      def self.default_ext
+        '.html'
+      end
       def initialize(page, filename)
         super page, filename
@@ -76,7 +81,7 @@ module Hyde
           @markup = parts[0]
         else
           @markup = parts[1]
-          page.set_meta YAML::load("--- " + parts[0])
+          page.meta.merge! YAML::load("--- " + parts[0])
         end
       end

data/lib/hyde/renderers.rb CHANGED Viewed

@@ -16,11 +16,15 @@ module Hyde
       def evaluate(scope, data={}, &block)
         require_lib 'erb'
         @engine = ::ERB.new markup
-        eval("self", scope).eval_block @engine.src, &block
+        eval @engine.src, scope
       end
     end
     class Less < Renderer::Base
+      def self.default_ext
+        '.css'
+      end
       def evaluate(scope, data={}, &block)
         require_lib 'less'
         begin
@@ -50,6 +54,10 @@ module Hyde
     end
     class Textile < Renderer::Parsable
+      def self.default_ext
+        '.css'
+      end
       def evaluate(s, d={}, &block)
         require_lib 'redcloth', 'RedCloth'
         RedCloth.new(markup).to_html

data/lib/hyde/{init.rb → sinatra/init.rb} RENAMED Viewed

@@ -6,7 +6,7 @@ rescue LoadError
   exit
 end
-$:.unshift File.dirname(__FILE__) + "/.."
+$:.unshift File.dirname(__FILE__) + "/../.."
 require 'hyde'
 $project = Hyde::Project.new
@@ -34,7 +34,7 @@ class Main < Sinatra::Base
       type = File.extname(path)[1..-1]
       content_type type.to_sym  if type.is_a? String
-      page = Hyde::Page.create path, @@project
+      page = @@project[path]
       # Send the last modified time
       last_modified File.mtime(page.filename)
@@ -43,15 +43,19 @@ class Main < Sinatra::Base
       page.render
     rescue Hyde::RenderError => e
-      puts " * `#{path}` error"
+      puts " * `#{path}` line #{e.line} error"
       puts " *** #{e.message}".gsub("\n","\n *** ")
       e.message
     rescue Hyde::NotFound
       raise Sinatra::NotFound
     end
   end
+  not_found do
+    html_path = File.join(File.dirname(__FILE__), %w[.. .. .. data pages 404.html])
+    File.open(html_path) { |f| f.read } + (" "*4096)
+  end
 end
 Main.show_start

data/lib/hyde/utils.rb CHANGED Viewed

@@ -10,15 +10,20 @@ module Hyde
       end
     end
-    def force_file_open(filepath)
+    def force_file_open(filepath, &blk)
       require 'fileutils'
       FileUtils.mkdir_p File.dirname(filepath)
-      File.new filepath, 'w'
+      if block_given?
+        File.open filepath, 'w', &blk
+      else
+        File.new filepath, 'w'
+      end
     end
     # Returns all helper classes under the Hyde::Helpers module.
     def get_helpers
-      Hyde::Helpers.constants.inject([]) do |a, constant|
+      Hyde::Helpers.constants.inject([Hyde::Helpers]) do |a, constant|
         mod = Hyde::Helpers.const_get(constant)
         a << mod  if mod.is_a? Module
         a

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

@@ -4,5 +4,5 @@ title: Site
 != "<!-- (default layout) -->"
 %h2 Template
 %div
-  =render_partial 'shared/sidebar'
+  =partial 'shared/sidebar'
   =yield

data/test/fixtures/two/_config.yml ADDED Viewed

@@ -0,0 +1,8 @@
+---
+layouts_path: layouts
+extensions_path: extensions
+site_path: site
+output_path: www
+ignore:
+  - hyde
+  - _*

data/test/fixtures/two/layouts/default.haml ADDED Viewed

@@ -0,0 +1,4 @@
+title: Default
+--
+%title= title
+= yield

data/test/fixtures/two/layouts/shared/test.haml ADDED Viewed

@@ -0,0 +1,4 @@
+custom: "partial"
+--
+.partial
+  = custom

data/test/fixtures/two/site/default.html.haml ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ layout: default
2	+ --

data/test/fixtures/two/site/index.html.haml ADDED Viewed

@@ -0,0 +1,9 @@
+layout: default
+title: Index
+--
+Hello
+%h3 Partial
+= partial 'shared/test'
+= partial 'shared/test', :custom => 'yip'
+/ End

data/test/fixtures/two/site/var.html.haml ADDED Viewed

@@ -0,0 +1,5 @@
+var1: one
+var2: two
+--
+= var1
+= var2

data/test/fixtures/two/www_control/default.html ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ <title>Default</title>
2	+

data/test/fixtures/two/www_control/index.html ADDED Viewed

@@ -0,0 +1,10 @@
+<title>Index</title>
+Hello
+<h3>Partial</h3>
+<div class='partial'>
+  partial
+</div>
+<div class='partial'>
+  yip
+</div>
+<!-- End -->

data/test/fixtures/two/www_control/var.html ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ one
2	+ two

data/test/helper.rb CHANGED Viewed

@@ -20,3 +20,12 @@ class Test::Unit::TestCase
     File.join File.dirname(__FILE__), 'fixtures', site
   end
 end
+module Hyde
+  class Project
+    # Can throw a NotFound. Get rid of this!
+    def render(path)
+      self[path].render
+    end
+  end
+end

data/test/test_hyde.rb CHANGED Viewed

@@ -36,26 +36,26 @@ class TestHyde < Test::Unit::TestCase
   end
   should "use layouts" do
-    output = @project.render 'layout_test.html'
+    output = @project['layout_test.html'].render
     assert_match /This is the meta title/, output
     assert_match /<!-- \(default layout\) -->/, output
   end
   should "account for index.html" do
-    home_output = @project.render('index.html')
-    assert_equal home_output, @project.render('/')
-    assert_equal home_output, @project.render('/index.html')
+    home_output = @project['index.html'].render
+    assert_equal home_output, @project['/'].render
+    assert_equal home_output, @project['/index.html'].render
-    about_output = @project.render('/about/index.html')
-    assert_equal about_output, @project.render('/about')
-    assert_equal about_output, @project.render('/about/')
+    about_output = @project['/about/index.html'].render
+    assert_equal about_output, @project['/about'].render
+    assert_equal about_output, @project['/about/'].render
   end
   should "get types right" do
-    page = @project.get_page('index.html')
+    page = @project['index.html']
     assert page.is_a? Hyde::Page
-    layout = Hyde::Layout.create 'default', @project
+    layout = @project['default', Hyde::Layout]
     assert layout.is_a? Hyde::Layout
     assert layout.is_a? Hyde::Page
   end

data/test/test_page.rb CHANGED Viewed

@@ -3,7 +3,7 @@ require 'helper'
 class TestPage < Test::Unit::TestCase
   def setup(site = 'default')
     @project = get_project site
-    @page = @project.get_page 'index.html'
+    @page = Hyde::Page['index.html', @project]
   end
   should "raise a method missing error" do

metadata CHANGED Viewed

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments:
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors:
 - Rico Sta. Cruz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-05-25 00:00:00 +08:00
+date: 2010-05-30 00:00:00 +08:00
 default_executable: hyde
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -84,13 +84,14 @@ files:
 - data/new_site/hyde.conf
 - data/new_site/layouts/default.haml
 - data/new_site/site/index.html.haml
+- data/pages/404.html
 - hydeweb.gemspec
 - lib/hyde.rb
 - lib/hyde/clicommand.rb
 - lib/hyde/clicommands.rb
 - lib/hyde/helpers.rb
-- lib/hyde/init.rb
 - lib/hyde/layout.rb
+- lib/hyde/meta.rb
 - lib/hyde/ostruct.rb
 - lib/hyde/page.rb
 - lib/hyde/page_factory.rb
@@ -98,6 +99,7 @@ files:
 - lib/hyde/project.rb
 - lib/hyde/renderer.rb
 - lib/hyde/renderers.rb
+- lib/hyde/sinatra/init.rb
 - lib/hyde/utils.rb
 - manual/Extending/ExtendingHyde.md
 - manual/Hyde.md
@@ -144,6 +146,15 @@ files:
 - test/fixtures/default/www_control/index.html
 - test/fixtures/default/www_control/layout_test.html
 - test/fixtures/default/www_control/yes.html
+- test/fixtures/two/_config.yml
+- test/fixtures/two/layouts/default.haml
+- test/fixtures/two/layouts/shared/test.haml
+- test/fixtures/two/site/default.html.haml
+- test/fixtures/two/site/index.html.haml
+- test/fixtures/two/site/var.html.haml
+- test/fixtures/two/www_control/default.html
+- test/fixtures/two/www_control/index.html
+- test/fixtures/two/www_control/var.html
 - test/helper.rb
 - test/test_all_fixtures.rb
 - test/test_build.rb