middleman 0.11.1 → 0.11.2

data/VERSION

@@ -1 +1 @@
-0.11.1
+0.11.2

data/lib/middleman/features/cache_buster.rb

@@ -1,6 +1,4 @@
-class Middleman::Base
-  include Middleman::Sass
-  
+class Middleman::Base  
   after_feature_init do 
     ::Compass.configuration do |config|
       config.asset_cache_buster do |path, real_path|
@@ -31,8 +29,12 @@ class << Middleman::Base
       rescue
       end
       
-      real_path = File.join(self.public, prefix, path)
-      http_path << "?" + File.mtime(real_path).strftime("%s") if File.readable?(real_path)
+      real_path_static  = File.join(self.public, prefix, path)
+      real_path_dynamic = File.join(self.views, prefix, path)
+      real_path_dynamic << ".sass" if File.extname(real_path_dynamic) == ".css"
+
+      http_path << "?" + File.mtime(real_path_static).strftime("%s") if File.readable?(real_path_static)
+      http_path << "?" + File.mtime(real_path_dynamic).strftime("%s") if File.readable?(real_path_dynamic)
       http_path
     end
   end

data/middleman.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{middleman}
-  s.version = "0.11.1"
+  s.version = "0.11.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Reynolds"]
@@ -57,7 +57,8 @@ Gem::Specification.new do |s|
      "middleman.gemspec",
      "spec/auto_image_sizes.rb",
      "spec/builder_spec.rb",
-     "spec/cache_buster_spec.rb",
+     "spec/cache_buster_off_spec.rb",
+     "spec/cache_buster_on_spec.rb",
      "spec/fixtures/sample/init.rb",
      "spec/fixtures/sample/public/images/blank.gif",
      "spec/fixtures/sample/public/javascripts/to-be-included.js",
@@ -69,6 +70,7 @@ Gem::Specification.new do |s|
      "spec/fixtures/sample/views/_partial.haml",
      "spec/fixtures/sample/views/auto-css.html.haml",
      "spec/fixtures/sample/views/auto-image-sizes.html.haml",
+     "spec/fixtures/sample/views/cache-buster.html.haml",
      "spec/fixtures/sample/views/custom-layout.html.haml",
      "spec/fixtures/sample/views/custom.haml",
      "spec/fixtures/sample/views/index.html.haml",
@@ -98,7 +100,8 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/auto_image_sizes.rb",
      "spec/builder_spec.rb",
-     "spec/cache_buster_spec.rb",
+     "spec/cache_buster_off_spec.rb",
+     "spec/cache_buster_on_spec.rb",
      "spec/fixtures/sample/init.rb",
      "spec/generator_spec.rb",
      "spec/helpers_spec.rb",

data/spec/cache_buster_off_spec.rb

@@ -0,0 +1,21 @@
+require File.join(File.dirname(__FILE__), "spec_helper")
+
+describe "Cache Buster Feature in CSS" do
+  before :each do
+    @base = ::Middleman::Base
+    @base.set :root, File.join(File.dirname(__FILE__), "fixtures", "sample")
+    @base.disable :cache_buster
+  end
+  
+  it "should not append query string in CSS if off" do
+    browser = Rack::Test::Session.new(Rack::MockSession.new(@base.new))
+    browser.get("/stylesheets/relative_assets.css")
+    browser.last_response.body.should_not include("?")
+  end
+  
+  it "should not append query string in HTML if off" do
+    browser = Rack::Test::Session.new(Rack::MockSession.new(@base.new))
+    browser.get("/cache-buster.html")
+    browser.last_response.body.count("?").should == 0
+  end
+end

data/spec/cache_buster_on_spec.rb

@@ -0,0 +1,21 @@
+require File.join(File.dirname(__FILE__), "spec_helper")
+
+describe "Cache Buster Feature in CSS" do
+  before :each do
+    @base = ::Middleman::Base
+    @base.set :root, File.join(File.dirname(__FILE__), "fixtures", "sample")
+    @base.enable :cache_buster
+  end
+  
+  it "should append query string in CSS if on" do
+    browser = Rack::Test::Session.new(Rack::MockSession.new(@base.new))
+    browser.get("/stylesheets/relative_assets.css")
+    browser.last_response.body.should include("?")
+  end
+
+  it "should append query string in HTML if on" do
+    browser = Rack::Test::Session.new(Rack::MockSession.new(@base.new))
+    browser.get("/cache-buster.html")
+    browser.last_response.body.count("?").should == 2
+  end
+end

data/spec/fixtures/sample/views/cache-buster.html.haml

@@ -0,0 +1,2 @@
+= stylesheet_link_tag "site.css"
+= javascript_include_tag "empty-with-include.js"

data/spec/fixtures/sample/views/layout.haml

@@ -1,6 +1,5 @@
 %html
   %head
-    %link{ :href => "/stylesheets/site.css", :rel => "stylesheet", :type => "text/css" }
     %title My Sample Site
   %body
     = yield

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -204,7 +204,8 @@ files:
 - middleman.gemspec
 - spec/auto_image_sizes.rb
 - spec/builder_spec.rb
-- spec/cache_buster_spec.rb
+- spec/cache_buster_off_spec.rb
+- spec/cache_buster_on_spec.rb
 - spec/fixtures/sample/init.rb
 - spec/fixtures/sample/public/images/blank.gif
 - spec/fixtures/sample/public/javascripts/to-be-included.js
@@ -216,6 +217,7 @@ files:
 - spec/fixtures/sample/views/_partial.haml
 - spec/fixtures/sample/views/auto-css.html.haml
 - spec/fixtures/sample/views/auto-image-sizes.html.haml
+- spec/fixtures/sample/views/cache-buster.html.haml
 - spec/fixtures/sample/views/custom-layout.html.haml
 - spec/fixtures/sample/views/custom.haml
 - spec/fixtures/sample/views/index.html.haml
@@ -266,7 +268,8 @@ summary: A static site generator utilizing Haml, Sass and providing YUI compress
 test_files: 
 - spec/auto_image_sizes.rb
 - spec/builder_spec.rb
-- spec/cache_buster_spec.rb
+- spec/cache_buster_off_spec.rb
+- spec/cache_buster_on_spec.rb
 - spec/fixtures/sample/init.rb
 - spec/generator_spec.rb
 - spec/helpers_spec.rb

data/spec/cache_buster_spec.rb

@@ -1,20 +0,0 @@
-require File.join(File.dirname(__FILE__), "spec_helper")
-
-base = ::Middleman::Base
-base.set :root, File.join(File.dirname(__FILE__), "fixtures", "sample")
-
-describe "Cache Buster Feature" do
-  it "should not append query string if off" do
-    base.disable :cache_buster
-    browser = Rack::Test::Session.new(Rack::MockSession.new(base.new))
-    browser.get("/stylesheets/relative_assets.css")
-    browser.last_response.body.should_not include("?")
-  end
-  
-  it "should append query string if on" do
-    base.enable :cache_buster
-    browser = Rack::Test::Session.new(Rack::MockSession.new(base.new))
-    browser.get("/stylesheets/relative_assets.css")
-    browser.last_response.body.should include("?")
-  end
-end