hydeweb 0.1.7 → 0.1.8

data/HISTORY.md

@@ -1,3 +1,13 @@
+v0.1.8
+------
+
+ - Fix: 404 pages in 'hyde start' no longer throws an exception log to the viewer.
+ - Implemented the `content_for` and `yield_content` helpers.
+ - Fix partial locals not working.
+ - Allow having the same layouts/partials path as the site.
+ - Implement `Hyde.project` which returns the latest project. (deprecates $project)
+ - Support tilt_build_options in the config.
+
 v0.1.7
 ------
 

data/TODO.md

@@ -0,0 +1,3 @@
+- Post build hooks?
+- tilt_build_options
+- deprecate $project, implement Hyde.project

data/data/new_site/hyde.conf

@@ -25,4 +25,11 @@ tilt_options:
     :escape_html: true
   scss:
     :load_paths: [ 'css' ]
+    :style: :compact
+    :line_numbers: true
 
+# Optional settings for doing a build
+tilt_build_options:
+  scss:
+    :style: :compressed
+    :line_numbers: false

data/lib/hyde/config.rb

@@ -20,22 +20,25 @@ class Config < OpenStruct
 
   # Returns tilt options for a given file.
   # @example tilt_options('index.haml')  # { :escape_html => ... }
-  def tilt_options_for(file)
-    tilt_options file.split('.').last.downcase
+  def tilt_options_for(file, options)
+    ext = file.split('.').last.downcase
+    opts = tilt_options(ext)
+    opts = opts.merge(tilt_options(ext, :tilt_build_options))  if options[:build]
+    opts
   end
 
   # Returns tilt options for a given engine.
   # @example tilt_options('haml')  # { :escape_html => ... }
-  def tilt_options(what)
-    @tilt_options ||= begin
-      o = @table[:tilt_options] || Hash.new
-      o['haml'] ||= { :escape_html => true }
-      o['scss'] ||= { :load_path => ['css'] }
-      o['sass'] ||= { :load_path => ['css'] }
-      o
+  def tilt_options(what, key=:tilt_options)
+    @table[key] ||= begin
+      h = Hash.new { |h, k| h[k] = Hash.new }
+      h['haml'] = { :escape_html => true }
+      h['scss'] = { :load_path => ['css'] }
+      h['sass'] = { :load_path => ['css'] }
+      h
     end
 
-    @tilt_options[what.to_s]
+    @table[key][what.to_s]
   end
 end
 end

data/lib/hyde/helpers.rb

@@ -2,7 +2,7 @@ class Hyde
 module Helpers
   def partial(path, locals={})
     partial = Partial[path.to_s, page]  or return ''
-    partial.to_html :page => self
+    partial.to_html locals.merge(:page => self)
   end
 
   def rel(path)
@@ -10,5 +10,27 @@ module Helpers
     dotdot = depth > 1 ? ('../' * (page.depth-1)) : './'
     (dotdot[0...-1] + path)
   end
+
+  def content_for(key, &blk)
+    content_blocks[key.to_sym] = blk
+  end
+
+  def content_blocks
+    $content_blocks ||= Hash.new
+    $content_blocks[page.path] ||= Hash.new
+  end
+
+  def has_content?(key)
+    content_blocks.member? key.to_sym
+  end
+
+  def yield_content(key, *args)
+    content = content_blocks[key.to_sym]
+    if respond_to?(:block_is_haml?) && block_is_haml?(content)
+      capture_haml(*args, &content)
+    elsif content
+      content.call(*args)
+    end
+  end
 end
 end

data/lib/hyde/page.rb

@@ -3,7 +3,7 @@ class Page
   attr_reader :project
   attr_reader :file
 
-  def self.[](id, project=$project)
+  def self.[](id, project=Hyde.project)
     site_path = root_path(project)
     return nil  if site_path.nil?
 
@@ -33,7 +33,7 @@ class Page
     page
   end
 
-  def initialize(file, project=$project)
+  def initialize(file, project=Hyde.project)
     @file = File.expand_path(file)  if file.is_a?(String)
     @project = project
     raise Error  if project.nil?
@@ -125,19 +125,14 @@ class Page
     prefix == File.expand_path(@file)[0...prefix.size]
   end
 
-  def content(locals={}, &blk)
+  def content(locals={}, tilt_options={}, &blk)
     return markup  unless tilt?
-    # Build scope
-    scope = self.dup
-    scope.extend Helpers
-    scope.meta.merge! locals
-
-    tilt.render(scope, &blk)
+    tilt(tilt_options).render(dup.extend(Helpers), locals, &blk)
   end
 
-  def to_html(locals={}, &blk)
-    html = content(locals, &blk)
-    html = layout.to_html(locals) { html }  if layout?
+  def to_html(locals={}, tilt_options={}, &blk)
+    html = content(locals, tilt_options, &blk)
+    html = layout.to_html(locals, tilt_options) { html }  if layout?
     html
   end
 
@@ -165,7 +160,7 @@ class Page
     FileUtils.mkdir_p File.dirname(out)
 
     if tilt?
-      File.open(out, 'w') { |f| f.write to_html }
+      File.open(out, 'w') { |f| f.write to_html({}, :build => true) }
     else
       FileUtils.cp file, out
     end
@@ -186,13 +181,13 @@ class Page
   end
 
   # Returns the tilt layout.
-  def tilt
+  def tilt(tilt_options={})
     if tilt?
       parts
       # HAML options and such (like :escape_html)
-      options = project.config.tilt_options_for(@file)
+      options = project.config.tilt_options_for(@file, tilt_options)
       offset = @offset || 1
-      @tilt ||= Tilt.new(@file, offset, options) { markup }
+      Tilt.new(@file, offset, options) { markup }
     end
   end
 

data/lib/hyde/project.rb

@@ -2,7 +2,7 @@ class Hyde
 class Project
   def initialize(root=Dir.pwd)
     @root = root
-    $project = self
+    Hyde.project = self
 
     validate_version
     load_extensions
@@ -64,7 +64,7 @@ class Project
     specs  = [*config.ignore].map { |s| root(s) }
     specs << config_file
     [:layouts, :extensions, :partials, :output].each do |aspect|
-      specs << path(aspect, '**/*') if path(aspect)
+      specs << path(aspect, '**/*') if path(aspect) && path(aspect) != path(:site)
     end
     specs.compact.map { |s| Dir[s] }.flatten.uniq
   end

data/lib/hyde/server.rb

@@ -11,7 +11,7 @@ class Hyde
     def not_found
       show_status nil
       res.status = 404
-      res.write "404"
+      res.write "<h1>File Not Found</h1><p>The path <code>#{env['PATH_INFO']}</code> was not found." + " "*1024
     end
 
     def options
@@ -26,7 +26,7 @@ class Hyde
       status = page ? "\033[0;32m[ OK ]" : "\033[0;31m[404 ]"
       verb = get ? 'GET ' : (post ? 'POST' : '')
       puts "%s\033[0;m %s %s" % [ status, verb, env['PATH_INFO'] ]
-      puts "       src: #{page.filepath} (#{page.tilt_engine_name})"  if page.tilt?
+      puts "       src: #{page.filepath} (#{page.tilt_engine_name})"  if page && page.tilt?
     end
   end
 

data/lib/hyde.rb

@@ -15,7 +15,7 @@ require 'shake'
 Tilt.mappings['html'] = Tilt.mappings['erb']
 
 class Hyde
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
   PREFIX  = File.expand_path('../', __FILE__)
 
   Error        = Class.new(StandardError)
@@ -35,7 +35,12 @@ class Hyde
   autoload :Partial, "#{PREFIX}/hyde/partial"
   autoload :Helpers, "#{PREFIX}/hyde/helpers"
 
-  def self.version
-    VERSION
+  class << self
+    # The latest project.
+    attr_accessor :project
+
+    def version
+      VERSION
+    end
   end
 end

data/test/fixture/build_options/hyde.conf

@@ -0,0 +1,16 @@
+hyde_requirement: 0.1
+site_path: site
+extensions_path: extensions
+output_path: public
+ignore:
+- **/*~
+- **/compass/**/*
+- **/_*.scss
+
+tilt_options:
+  scss:
+    :line_numbers: true
+
+tilt_build_options:
+  scss:
+    :line_numbers: false

data/test/fixture/build_options/site/style.scss

@@ -0,0 +1 @@
+div { a { color: red; } }

data/test/fixture/ignores/control/about.html

@@ -0,0 +1 @@
+<h1>ello</h1>

data/test/fixture/ignores/hyde.conf

@@ -0,0 +1,10 @@
+hyde_requirement: 0.1
+site_path: site
+extensions_path: extensions
+output_path: public
+partials_path: site
+ignore:
+- **/*~
+- **/h*
+- **/compass/**/*
+- **/_*.scss

data/test/fixture/ignores/site/about.haml

@@ -0,0 +1 @@
+%h1 ello

data/test/fixture/ignores/site/hi.haml

@@ -0,0 +1 @@
+xxx

data/test/unit/build_options_test.rb

@@ -0,0 +1,18 @@
+
+require File.expand_path('../../helper', __FILE__)
+
+class BuildOptionsTest < TestCase
+  setup do
+    @path = fixture('build_options')
+    @project = Project.new(@path)
+    Dir.chdir @path
+  end
+
+  test "yada" do
+    raw   = Page['/style.css'].to_html
+    built = Page['/style.css'].to_html({}, :build => true)
+
+    assert !built.include?("line 1")
+    assert raw.include?("line 1")
+  end
+end

data/test/unit/fixture_test.rb

@@ -65,6 +65,10 @@ class HydeTest < TestCase
     assert_fixture_works fixture('sort')
   end
 
+  test "fixture ignores" do
+    assert_fixture_works fixture('ignores')
+  end
+
   test "fixture metadata" do
     assert_fixture_works fixture('metadata')
   end
@@ -72,6 +76,10 @@ class HydeTest < TestCase
   test "fixture nested_layout" do
     assert_fixture_works fixture('nested_layout')
   end
+  
+  test "fixture build_options" do
+    assert_fixture_works fixture('build_options')
+  end
 
   test "fixture fail_type" do
     assert_fixture_fails(fixture('fail_type')) { |e|

metadata

@@ -2,7 +2,7 @@
 name: hydeweb
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Rico Sta. Cruz
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 +08:00
+date: 2011-02-25 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,9 +19,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.1.2
+        version: "0.1"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -93,6 +93,8 @@ files:
 - lib/hyde/server.rb
 - lib/hyde/set.rb
 - lib/hyde.rb
+- test/fixture/build_options/hyde.conf
+- test/fixture/build_options/site/style.scss
 - test/fixture/extensions/control/index.html
 - test/fixture/extensions/extensions/a/a.rb
 - test/fixture/extensions/hyde.conf
@@ -105,6 +107,10 @@ files:
 - test/fixture/html/control/index.html
 - test/fixture/html/hyde.conf
 - test/fixture/html/site/index.html
+- test/fixture/ignores/control/about.html
+- test/fixture/ignores/hyde.conf
+- test/fixture/ignores/site/about.haml
+- test/fixture/ignores/site/hi.haml
 - test/fixture/metadata/control/index.html
 - test/fixture/metadata/hyde.conf
 - test/fixture/metadata/site/index.haml
@@ -153,6 +159,7 @@ files:
 - test/fixture/subclass/layouts/post.haml
 - test/fixture/subclass/site/index.haml
 - test/helper.rb
+- test/unit/build_options_test.rb
 - test/unit/extensions_test.rb
 - test/unit/fixture_test.rb
 - test/unit/hyde_test.rb
@@ -165,6 +172,7 @@ files:
 - data/new_site/README.md
 - HISTORY.md
 - README.md
+- TODO.md
 - Rakefile
 - AUTHORS
 has_rdoc: true