middleman 0.10.6 → 0.10.7

data/VERSION

@@ -1 +1 @@
-0.10.6
+0.10.7

data/lib/middleman/helpers.rb

@@ -16,10 +16,10 @@ module Middleman
       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")
+      css_file = File.join(self.class.public, self.class.css_dir, "#{path}.css")
+      sass_file = File.join(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

data/middleman.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{middleman}
-  s.version = "0.10.6"
+  s.version = "0.10.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Reynolds"]
@@ -89,6 +89,7 @@ Gem::Specification.new do |s|
      "spec/cache_buster_spec.rb",
      "spec/fixtures/sample/init.rb",
      "spec/generator_spec.rb",
+     "spec/helpers_spec.rb",
      "spec/minify_javascript_spec.rb",
      "spec/relative_assets_spec.rb",
      "spec/spec_helper.rb"

data/spec/fixtures/sample/init.rb

@@ -1,4 +1,29 @@
 # enable :maruku
 get "/inline-js.html" do
   haml :"inline-js.html", :layout => false
+end
+
+
+get "/page-class.html" do
+  haml :"page-classes.html", :layout => false
+end
+
+get "/sub1/page-class.html" do
+  haml :"page-classes.html", :layout => false
+end
+
+get "/sub1/sub2/page-class.html" do
+  haml :"page-classes.html", :layout => false
+end
+
+get "/auto-css.html" do
+  haml :"auto-css.html", :layout => false
+end
+
+get "/sub1/auto-css.html" do
+  haml :"auto-css.html", :layout => false
+end
+
+get "/sub1/sub2/auto-css.html" do
+  haml :"auto-css.html", :layout => false
 end

data/spec/helpers_spec.rb

@@ -0,0 +1,45 @@
+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 "page_classes helper" do
+  it "should generate root paths correctly" do
+    browser = Rack::Test::Session.new(Rack::MockSession.new(base.new))
+    browser.get("/page-class.html")
+    browser.last_response.body.chomp.should == "page-class"
+  end
+  
+  it "should generate 1-deep paths correctly" do
+    browser = Rack::Test::Session.new(Rack::MockSession.new(base.new))
+    browser.get("/sub1/page-class.html")
+    browser.last_response.body.chomp.should == "sub1 sub1_page-class"
+  end
+
+  it "should generate 2-deep paths correctly" do
+    browser = Rack::Test::Session.new(Rack::MockSession.new(base.new))
+    browser.get("/sub1/sub2/page-class.html")
+    browser.last_response.body.chomp.should == "sub1 sub1_sub2 sub1_sub2_page-class"
+  end
+end
+
+describe "auto_stylesheet_link_tag helper" do
+  it "should generate root paths correctly" do
+    browser = Rack::Test::Session.new(Rack::MockSession.new(base.new))
+    browser.get("/auto-css.html")
+    browser.last_response.body.chomp.should include("stylesheets/auto-css.css")
+  end
+  
+  it "should generate 1-deep paths correctly" do
+    browser = Rack::Test::Session.new(Rack::MockSession.new(base.new))
+    browser.get("/sub1/auto-css.html")
+    browser.last_response.body.chomp.should include("stylesheets/sub1/auto-css.css")
+  end
+
+  it "should generate 2-deep paths correctly" do
+    browser = Rack::Test::Session.new(Rack::MockSession.new(base.new))
+    browser.get("/sub1/sub2/auto-css.html")
+    browser.last_response.body.chomp.should include("stylesheets/sub1/sub2/auto-css.css")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  version: 0.10.6
+  version: 0.10.7
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -237,6 +237,7 @@ test_files:
 - spec/cache_buster_spec.rb
 - spec/fixtures/sample/init.rb
 - spec/generator_spec.rb
+- spec/helpers_spec.rb
 - spec/minify_javascript_spec.rb
 - spec/relative_assets_spec.rb
 - spec/spec_helper.rb