hydeweb 0.1.5 → 0.1.6

data/HISTORY.md

@@ -1,6 +1,7 @@
-v0.1.5
+v0.1.6
 ------
 
+ - Fix an edge case where files containing '---' somewhere is treated wrong.
  - Ruby 1.8 compatibility.
 
 v0.1.4

data/lib/hyde/page.rb

@@ -8,7 +8,7 @@ class Page
     return nil  if site_path.nil?
 
     site = lambda { |*x| File.join site_path, *(x.compact) }
-    try  = lambda { |id| p = new(id, project); p if p.exists? }
+    try  = lambda { |_id| p = new(_id, project); p if p.exists? }
 
     # Account for:
     #   ~/mysite/site/about/us.html.haml
@@ -26,9 +26,10 @@ class Page
     # Subclass
     if page && page.tilt? && page.meta[:type]
       klass = Page.get_type(page.meta[:type])
-      raise Error, "#{page.filepath}: Class for type '#{page.meta.type}' not found"  unless klass
+      raise Error, "#{page.filepath}: Class for type '#{page.meta[:type]}' not found"  unless klass
       page = klass.new(id, project)
     end
+
     page
   end
 
@@ -108,13 +109,14 @@ class Page
   # Returns a page subtype.
   # @example Page.get_type('post') => Hyde::Page::Post
   def self.get_type(type)
-    klass = type[0].upcase + type[1..-1].downcase
+    type  = type.to_s
+    klass = type[0..0].upcase + type[1..-1].downcase
     klass = klass.to_sym
     self.const_get(klass)  if self.const_defined?(klass)
   end
 
   def exists?
-    @file and File.file?(@file) and valid?
+    @file and File.file?(@file||'') and valid?
   end
 
   # Make sure that it's in the right folder.
@@ -242,7 +244,7 @@ class Page
   end
 
   def breadcrumbs
-    Set.new (parent? ? (parent.breadcrumbs + [self]) : [self])
+    Set.new(parent? ? (parent.breadcrumbs + [self]) : [self])
   end
   
   def index?
@@ -286,7 +288,7 @@ protected
     @parts ||= begin
       t = File.open(@file).read
       t = t.force_encoding('UTF-8')  if t.respond_to?(:force_encoding)
-      m = t.match(/^(.*)--+\n(.*)$/m)
+      m = t.match(/^(.*?)\n--+\n(.*)$/m)
 
       if m.nil?
         [{}, t]

data/lib/hyde.rb

@@ -1,5 +1,7 @@
 $:.push *Dir[File.expand_path('../../vendor/*/lib', __FILE__)]
 
+require 'rubygems'  if !Object.respond_to?(:gem)
+
 gem 'shake', '>= 0.1.2'
 gem 'tilt', '>= 1.2.2'
 
@@ -13,7 +15,7 @@ require 'shake'
 Tilt.mappings['html'] = Tilt.mappings['erb']
 
 class Hyde
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
   PREFIX  = File.expand_path('../', __FILE__)
 
   Error        = Class.new(StandardError)

data/test/fixture/metadata/control/index.html

@@ -0,0 +1,4 @@
+<h1>Hyde is it</h1>
+<pre class='prettyprint lang-html'>title: Hello world!
+---
+<div class='highlight'>  &lt;h1&gt;Hi&lt;/hi&gt;</div></pre>

data/test/fixture/metadata/hyde.conf

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

data/test/fixture/metadata/site/index.haml

@@ -0,0 +1,8 @@
+title: Hyde is it
+---
+%h1= meta.title
+%pre.prettyprint.lang-html
+  :escaped
+    title: Hello world!
+    ---
+  .highlight="  <h1>Hi</hi>"

data/test/helper.rb

@@ -1,5 +1,7 @@
 $:.push File.expand_path('../../lib', __FILE__)
 
+require 'rubygems'  if !Object.respond_to?(:gem)
+
 gem "contest", "~> 0.1"
 
 require 'hyde'
@@ -25,3 +27,10 @@ class TestCase < Test::Unit::TestCase
     FileUtils.rm_rf project.path(:output)
   end
 end
+
+class Hyde::Set
+  # Because 1.8.6 doesn't support map(&:path)
+  def paths
+    map { |page| page.path }
+  end
+end

data/test/unit/fixture_test.rb

@@ -65,6 +65,10 @@ class HydeTest < TestCase
     assert_fixture_works fixture('sort')
   end
 
+  test "fixture metadata" do
+    assert_fixture_works fixture('metadata')
+  end
+
   test "fixture nested_layout" do
     assert_fixture_works fixture('nested_layout')
   end

data/test/unit/page_test.rb

@@ -14,10 +14,10 @@ class PageTest < TestCase
   end
 
   test "breadcrumbs" do
-    assert_equal %w(/index.html /about/index.css), Page['/about/index.css'].breadcrumbs.map(&:path)
-    assert_equal %w(/index.html /about/index.css /about/us.html), Page['/about/us.html'].breadcrumbs.map(&:path)
-    assert_equal %w(/index.html /css/style.css), Page['/css/style.css'].breadcrumbs.map(&:path)
-    assert_equal %w(/index.html), Page['/'].breadcrumbs.map(&:path)
+    assert_equal %w(/index.html /about/index.css), Page['/about/index.css'].breadcrumbs.paths
+    assert_equal %w(/index.html /about/index.css /about/us.html), Page['/about/us.html'].breadcrumbs.paths
+    assert_equal %w(/index.html /css/style.css), Page['/css/style.css'].breadcrumbs.paths
+    assert_equal %w(/index.html), Page['/'].breadcrumbs.paths
   end
 
   test "parent" do
@@ -31,7 +31,7 @@ class PageTest < TestCase
     assert page.siblings.empty?
 
     page = Page['/hello.html']
-    assert_equal %w(/cheers.html /hello.html /hi.html), page.siblings.map(&:path)
+    assert_equal %w(/cheers.html /hello.html /hi.html), page.siblings.paths
   end
 
   test "mimes" do

data/test/unit/set_test.rb

@@ -21,6 +21,6 @@ class SetTest < TestCase
 
   test "children" do
     set = Page['/'].children.find(:hello => 'world')
-    assert set.map(&:path) == ['/hello.html']
+    assert set.paths == ['/hello.html']
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: hydeweb
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Rico Sta. Cruz
@@ -105,6 +105,9 @@ files:
 - test/fixture/html/control/index.html
 - test/fixture/html/hyde.conf
 - test/fixture/html/site/index.html
+- test/fixture/metadata/control/index.html
+- test/fixture/metadata/hyde.conf
+- test/fixture/metadata/site/index.haml
 - test/fixture/nested_layout/control/index.html
 - test/fixture/nested_layout/hyde.conf
 - test/fixture/nested_layout/layouts/default.haml