middleman 0.10.5 → 0.10.6

data/VERSION

@@ -1 +1 @@
-0.10.5
+0.10.6

data/lib/middleman/helpers.rb

@@ -7,17 +7,33 @@ module Middleman
   end
   
   module Helpers
-    def page_classes(*additional)
-      path = request.path_info
+    def haml_partial(name, options = {})
+      haml name.to_sym, options.merge(:layout => false)
+    end
+    
+    def auto_stylesheet_link_tag
+      path = request.path_info.dup
+      path << self.class.index_file if path.match(%r{/$})
+      path = path.gsub(%r{^/}, '')
+      path = path.gsub(File.extname(path), '')
+      path = path.gsub('/', '-')
+
+      css_file = File.join(File.basename(self.class.public), self.class.css_dir, "#{path}.css")
+      sass_file = File.join(File.basename(self.class.views), self.class.css_dir, "#{path}.css.sass")
+      if File.exists?(css_file) || File.exists?(sass_file)
+        stylesheet_link_tag "#{path}.css"
+      end
+    end
+    
+    def page_classes
+      path = request.path_info.dup
       path << options.index_file if path.match(%r{/$})
-      path.gsub!(%r{^/}, '')
+      path = path.gsub(%r{^/}, '')
   
       classes = []
       parts = path.split('.')[0].split('/')
       parts.each_with_index { |path, i| classes << parts.first(i+1).join('_') }
-
-      classes << "index" if classes.empty?
-      classes += additional unless additional.empty?
+      
       classes.join(' ')
     end
     

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

@@ -4,6 +4,6 @@
     = stylesheet_link_tag "site.css"
     = yield_content :head
     
-  %body
+  %body{ :class => page_classes }
     #frame
       = yield

data/middleman.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{middleman}
-  s.version = "0.10.5"
+  s.version = "0.10.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Reynolds"]
-  s.date = %q{2009-11-02}
+  s.date = %q{2009-11-03}
   s.email = %q{tdreyno@gmail.com}
   s.executables = ["mm-init", "mm-build", "mm-server"]
   s.extra_rdoc_files = [
@@ -73,6 +73,7 @@ Gem::Specification.new do |s|
      "spec/fixtures/sample/views/stylesheets/relative_assets.css.sass",
      "spec/fixtures/sample/views/stylesheets/site.css.sass",
      "spec/generator_spec.rb",
+     "spec/minify_javascript_spec.rb",
      "spec/relative_assets_spec.rb",
      "spec/spec_helper.rb"
   ]
@@ -88,6 +89,7 @@ Gem::Specification.new do |s|
      "spec/cache_buster_spec.rb",
      "spec/fixtures/sample/init.rb",
      "spec/generator_spec.rb",
+     "spec/minify_javascript_spec.rb",
      "spec/relative_assets_spec.rb",
      "spec/spec_helper.rb"
   ]

data/spec/builder_spec.rb

@@ -49,10 +49,6 @@ describe "Builder" do
   it "should not build partial files" do
     File.exists?("#{@root_dir}/build/_partial.html").should be_false
   end
-  
-  it "should minify inline javascript" do
-    File.readlines("#{@root_dir}/build/inline-js.html").length.should == 9
-  end
 
   it "should combine javascript" do
     File.read("#{@root_dir}/build/javascripts/empty-with-include.js").should include("combo")

data/spec/fixtures/sample/init.rb

@@ -1 +1,4 @@
-# enable :maruku
+# enable :maruku
+get "/inline-js.html" do
+  haml :"inline-js.html", :layout => false
+end

data/spec/minify_javascript_spec.rb

@@ -0,0 +1,21 @@
+require 'rack/test'
+require File.join(File.dirname(__FILE__), "spec_helper")
+
+base = ::Middleman::Base
+base.set :root, File.join(File.dirname(__FILE__), "fixtures", "sample")
+
+describe "Minify Javascript Feature" do
+  it "should not minify inline js if off" do
+    base.disable :minify_javascript
+    browser = Rack::Test::Session.new(Rack::MockSession.new(base.new))
+    browser.get("/inline-js.html")
+    browser.last_response.body.chomp.split($/).length.should == 10
+  end
+  
+  it "should minify inline js if on" do
+    base.enable :minify_javascript
+    browser = Rack::Test::Session.new(Rack::MockSession.new(base.new))
+    browser.get("/inline-js.html")
+    browser.last_response.body.chomp.split($/).length.should == 1
+  end
+end

data/spec/relative_assets_spec.rb

@@ -11,9 +11,7 @@ describe "Relative Assets Feature" do
     browser.get("/stylesheets/relative_assets.css")
     browser.last_response.body.should_not include("../")
   end
-end
-
-describe "Relative Assets Feature" do
+  
   it "should contain ../ if on" do
     base.enable :relative_assets
     browser = Rack::Test::Session.new(Rack::MockSession.new(base.new))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  version: 0.10.5
+  version: 0.10.6
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-02 00:00:00 -08:00
+date: 2009-11-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -200,6 +200,7 @@ files:
 - spec/fixtures/sample/views/stylesheets/relative_assets.css.sass
 - spec/fixtures/sample/views/stylesheets/site.css.sass
 - spec/generator_spec.rb
+- spec/minify_javascript_spec.rb
 - spec/relative_assets_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -236,5 +237,6 @@ test_files:
 - spec/cache_buster_spec.rb
 - spec/fixtures/sample/init.rb
 - spec/generator_spec.rb
+- spec/minify_javascript_spec.rb
 - spec/relative_assets_spec.rb
 - spec/spec_helper.rb