middleman 0.10.2 → 0.10.3

data/Rakefile

@@ -25,10 +25,6 @@ begin
     gem.add_development_dependency("sdoc")
   end
   
-  Jeweler::RubyforgeTasks.new do |rubyforge|
-    rubyforge.doc_task = "rdoc"
-  end
-  
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"

data/VERSION

@@ -1 +1 @@
-0.10.2
+0.10.3

data/lib/middleman/base.rb

@@ -70,6 +70,8 @@ module Middleman
       path << options.index_file if path.match(%r{/$})
       path.gsub!(%r{^/}, '')
 
+      # layout(:"layout.html") # Insert the .html into the layout name like the rest of the templates
+
       # If the enabled renderers succeed, return the content, mime-type and an HTTP 200
       if content = render_path(path)
         content_type media_type(File.extname(path)), :charset => 'utf-8'

data/lib/middleman/template/views/index.html.haml

@@ -1,4 +1,4 @@
 - content_for :head do
-  %title Custom head title
+  %title The Middleman!
 
 %h1 The Middleman is watching.

data/lib/middleman/template/views/layout.haml

@@ -1,7 +1,9 @@
 %html
   %head
-    %title The Middleman!
+    // Comment in layout
+    = stylesheet_link_tag "site.css"
     = yield_content :head
     
   %body
-    = yield
+    #frame
+      = yield

data/lib/middleman/template/views/stylesheets/site.css.sass

@@ -1 +1,11 @@
-@import compass/reset.sass
+@import compass.sass
+@import blueprint/modules/grid.sass
+@import blueprint/modules/typography.sass
+
++global-reset
++blueprint-typography
+
+#frame
+  padding: 50px
+  text-align: center
+  +container

data/middleman.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{middleman}
-  s.version = "0.10.2"
+  s.version = "0.10.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Reynolds"]

data/spec/generator_spec.rb

@@ -18,6 +18,13 @@ describe "Generator" do
     FileUtils.rm_rf(@root_dir)
   end
   
+  it "should use layout file" do
+    build_cmd = project_file("bin", "mm-build")
+    `cd #{@root_dir} && #{build_cmd}`
+    File.exists?("#{@root_dir}/build/index.html").should be_true
+    File.read("#{@root_dir}/build/index.html").should include("Comment in layout")
+  end
+  
   it "should copy template files" do
     template_dir = project_file("lib", "template", "**/*")
     Dir[template_dir].each do |f|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors: 
 - Thomas Reynolds