hydeweb 0.0.8.pre1 → 0.0.8.pre2

data/CHANGELOG

@@ -5,6 +5,9 @@ v0.0.8
  - Implement Project#all.
  - Implement Page#all and Page#all(type).
  - Fix binary files losing extensions on 'hyde build'.
+ - Allow "layout: false" to ensure that a page doesn't have a layout.
+ - Fix bug where "index.html.haml" and "index.rss.haml" clash.
+ - Implement Page#content.
 
 v0.0.7
 ------

data/VERSION

@@ -1 +1 @@
-0.0.8.pre1
+0.0.8.pre2

data/hydeweb.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hydeweb}
-  s.version = "0.0.8.pre1"
+  s.version = "0.0.8.pre2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rico Sta. Cruz", "Sinefunc, Inc."]

data/lib/hyde/meta.rb

@@ -14,8 +14,10 @@ module Hyde
 
     def layout=(value)
       super value
-      @page.layout = @page.project[value, :Layout]
-      @page.layout.referrer = (page.referrer || page)
+      if value.is_a?(String)
+        @page.layout = @page.project[value, :Layout]
+        @page.layout.referrer = (page.referrer || page)
+      end
     end
   end
 end

data/lib/hyde/page.rb

@@ -37,20 +37,23 @@ module Hyde
 
     # Returns the rendered output.
     def render(data = {}, &block)
-      data = @meta | data
-      data[:page] ||= self
-      output = @renderer.render(data, &block)
-      output = layout.render(data) { output }  unless layout.nil?
+      output = content(data, &block)
+      output = layout.render(get_data(data)) { output }  unless layout.nil?
       output
     end
 
+    # Returns the HTML content.
+    def content(data = {}, &block)
+      @renderer.render(get_data(data), &block)
+    end
+
     def layout=(val)
       @layout = val
     end
 
     def layout
       begin
-        @layout ||= project[DEFAULT_LAYOUT, :Layout]  if !@renderer.nil? and @renderer.layoutable?
+        @layout ||= project[DEFAULT_LAYOUT, :Layout]  if !@renderer.nil? and @renderer.layoutable? and meta.layout != false
         @layout
       rescue NotFound
         nil
@@ -73,7 +76,7 @@ module Hyde
         if renderer.is_a?(Renderer::Passthru)
           '/' + @name
         else
-          url = File.split(@name)
+          url = [ File.dirname(@name), File.basename(@filename) ]
           url[1] = File.basename(url[1], '.*')
           url[1] = (url[1] + @renderer.default_ext)  unless url[1].include?('.')
           '/' + url.join('/')
@@ -193,5 +196,14 @@ module Hyde
     def self.get_filename(path, project)
       project.root(:site, path)
     end
+
+  private
+
+    # Data for rendering
+    def get_data(data)
+      data = @meta | data
+      data[:page] ||= self
+      data
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: hydeweb
 version: !ruby/object:Gem::Version 
-  hash: -1876988224
+  hash: -1876988223
   prerelease: true
   segments: 
   - 0
   - 0
   - 8
-  - pre1
-  version: 0.0.8.pre1
+  - pre2
+  version: 0.0.8.pre2
 platform: ruby
 authors: 
 - Rico Sta. Cruz