middleman 2.0.0.rc98 → 2.0.0.rc99

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+script: "bundle exec rake test"

data/README.md

@@ -2,6 +2,8 @@
 
 The Middleman is ever-vigilant against tag-soup, unreadable CSS and repetition. He stands-watch over your Haml, Sass, and CoffeeScript producing only the cleanest and most efficient markup.
 
+[![Build Status](http://travis-ci.org/tdreyno/middleman.png)](http://travis-ci.org/tdreyno/middleman)
+
 ## Getting Started
 
 Everything you need to know is on the official site: 

data/features/builder.feature

@@ -18,6 +18,6 @@ Feature: Builder
     And cleanup built app at "test-app"
     
   Scenario: Force relative assets
-    Given a built test app with flags "--relative"
-    Then "stylesheets/relative_assets.css" should exist at "test-app" and include "../"
-    And cleanup built app at "test-app"
+    Given a built app at "relative-app" with flags "--relative"
+    Then "stylesheets/relative_assets.css" should exist at "relative-app" and include "../"
+    And cleanup built app at "relative-app"

data/features/step_definitions/builder_steps.rb

@@ -13,9 +13,10 @@ Then /^cleanup built app at "([^"]*)"$/ do |path|
   FileUtils.rm_rf(target)
 end
 
-Given /^a built test app with flags "([^"]*)"$/ do |flags|
-  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", "test-app")
-  build_cmd = File.expand_path(File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "bin", "middleman build"))
+Given /^a built app at "([^"]*)" with flags "([^"]*)"$/ do |path, flags|
+  root = File.dirname(File.dirname(File.dirname(__FILE__)))
+  target = File.join(root, "fixtures", path)
+  build_cmd = File.expand_path(File.join(root, "bin", "middleman build"))
   `cd #{target} && #{build_cmd} #{flags}`
 end
 

data/fixtures/relative-app/source/stylesheets/relative_assets.css.sass

@@ -0,0 +1,3 @@
+@import "compass"
+h1
+  background: image-url("blank.gif")

data/lib/middleman/builder.rb

@@ -102,7 +102,7 @@ module Middleman
     end
 
   protected
-    def handle_directory(lookup)
+    def handle_directory(lookup, &block)
       lookup = File.join(lookup, '*')
       
       results = Dir[lookup].sort do |a, b|
@@ -121,14 +121,14 @@ module Middleman
         end
       end
       
+      results = results.select(&block) if block_given?
+      
       results.each do |file_source|
         if File.directory?(file_source)
           handle_directory(file_source)
           next
         end
         
-        next if file_source.include?('layout') && !file_source.include?('.css')
-        
         # Skip partials prefixed with an underscore
         next unless file_source.gsub(SHARED_SERVER.root, '').split('/').select { |p| p[0,1] == '_' }.empty?
         
@@ -146,7 +146,16 @@ module Middleman
     end
 
     def execute!
-      handle_directory(source)
+      handle_directory(source) do |path|
+        file_name = path.gsub(SHARED_SERVER.views + "/", "")
+        if file_name == "layouts"
+          false
+        elsif file_name.include?("layout.") && file_name.split(".").length == 2
+          false
+        else
+          true
+        end
+      end
     end
   end
 end

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.0.rc98"
+  VERSION = "2.0.0.rc99"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 15424145
+  hash: 15424147
   prerelease: 6
   segments: 
   - 2
   - 0
   - 0
   - rc
-  - 98
-  version: 2.0.0.rc98
+  - 99
+  version: 2.0.0.rc99
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-05 00:00:00 Z
+date: 2011-08-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -412,6 +412,7 @@ extra_rdoc_files: []
 files: 
 - .gemtest
 - .gitignore
+- .travis.yml
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -456,6 +457,9 @@ files:
 - fixtures/indexable-app/source/leave_me_alone.html
 - fixtures/indexable-app/source/needs_index.html
 - fixtures/indexable-app/source/regular/index.html
+- fixtures/relative-app/config.rb
+- fixtures/relative-app/source/images/blank.gif
+- fixtures/relative-app/source/stylesheets/relative_assets.css.sass
 - fixtures/test-app/config.rb
 - fixtures/test-app/data/test.yml
 - fixtures/test-app/source/_partial.haml
@@ -669,6 +673,9 @@ test_files:
 - fixtures/indexable-app/source/leave_me_alone.html
 - fixtures/indexable-app/source/needs_index.html
 - fixtures/indexable-app/source/regular/index.html
+- fixtures/relative-app/config.rb
+- fixtures/relative-app/source/images/blank.gif
+- fixtures/relative-app/source/stylesheets/relative_assets.css.sass
 - fixtures/test-app/config.rb
 - fixtures/test-app/data/test.yml
 - fixtures/test-app/source/_partial.haml