default to no layout; makes dealing with binary files easier
This commit is contained in:
parent
f4d8dcb64d
commit
c1e31feeec
|
@ -21,7 +21,6 @@ module AutoBlog
|
||||||
|
|
||||||
self.process(name)
|
self.process(name)
|
||||||
self.read_yaml(File.join(base, dir), name)
|
self.read_yaml(File.join(base, dir), name)
|
||||||
self.set_defaults
|
|
||||||
self.transform
|
self.transform
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -33,13 +32,6 @@ module AutoBlog
|
||||||
self.ext = File.extname(name)
|
self.ext = File.extname(name)
|
||||||
end
|
end
|
||||||
|
|
||||||
# Set the data defaults.
|
|
||||||
#
|
|
||||||
# Returns nothing
|
|
||||||
def set_defaults
|
|
||||||
self.data["layout"] ||= "default"
|
|
||||||
end
|
|
||||||
|
|
||||||
# Add any necessary layouts to this post
|
# Add any necessary layouts to this post
|
||||||
# +layouts+ is a Hash of {"name" => "layout"}
|
# +layouts+ is a Hash of {"name" => "layout"}
|
||||||
# +site_payload+ is the site payload hash
|
# +site_payload+ is the site payload hash
|
||||||
|
|
|
@ -28,7 +28,6 @@ module AutoBlog
|
||||||
|
|
||||||
self.process(name)
|
self.process(name)
|
||||||
self.read_yaml(base, name)
|
self.read_yaml(base, name)
|
||||||
self.set_defaults
|
|
||||||
self.transform
|
self.transform
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -74,13 +73,6 @@ module AutoBlog
|
||||||
self.dir + self.slug
|
self.dir + self.slug
|
||||||
end
|
end
|
||||||
|
|
||||||
# Set the data defaults.
|
|
||||||
#
|
|
||||||
# Returns nothing
|
|
||||||
def set_defaults
|
|
||||||
self.data["layout"] ||= "default"
|
|
||||||
end
|
|
||||||
|
|
||||||
# Calculate related posts.
|
# Calculate related posts.
|
||||||
#
|
#
|
||||||
# Returns [<Post>]
|
# Returns [<Post>]
|
||||||
|
|
|
@ -89,13 +89,15 @@ module AutoBlog
|
||||||
if File.directory?(File.join(base, f))
|
if File.directory?(File.join(base, f))
|
||||||
transform_pages(File.join(dir, f))
|
transform_pages(File.join(dir, f))
|
||||||
else
|
else
|
||||||
if %w{.png .jpg .gif}.include?(File.extname(f))
|
first3 = File.open(File.join(self.source, dir, f)) { |fd| fd.read(3) }
|
||||||
FileUtils.mkdir_p(File.join(self.dest, dir))
|
|
||||||
FileUtils.cp(File.join(self.source, dir, f), File.join(self.dest, dir, f))
|
if first3 == "---"
|
||||||
else
|
|
||||||
page = Page.new(self.source, dir, f)
|
page = Page.new(self.source, dir, f)
|
||||||
page.add_layout(self.layouts, site_payload)
|
page.add_layout(self.layouts, site_payload)
|
||||||
page.write(self.dest)
|
page.write(self.dest)
|
||||||
|
else
|
||||||
|
FileUtils.mkdir_p(File.join(self.dest, dir))
|
||||||
|
FileUtils.cp(File.join(self.source, dir, f), File.join(self.dest, dir, f))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -30,7 +30,7 @@ class TestPost < Test::Unit::TestCase
|
||||||
p = Post.allocate
|
p = Post.allocate
|
||||||
p.read_yaml(File.join(File.dirname(__FILE__), *%w[source posts]), "2008-10-18-foo-bar.textile")
|
p.read_yaml(File.join(File.dirname(__FILE__), *%w[source posts]), "2008-10-18-foo-bar.textile")
|
||||||
|
|
||||||
assert_equal({"title" => "Foo Bar"}, p.data)
|
assert_equal({"title" => "Foo Bar", "layout" => "default"}, p.data)
|
||||||
assert_equal "\nh1. {{ page.title }}\n\nBest *post* ever", p.content
|
assert_equal "\nh1. {{ page.title }}\n\nBest *post* ever", p.content
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue