middleman 2.0.0.beta4 → 2.0.0.beta5

data/Rakefile

@@ -4,7 +4,19 @@ Bundler::GemHelper.install_tasks
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
-  t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
+  t.cucumber_opts = "--drb --color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
+end
+
+namespace :spork do
+ desc "start spork in background"
+ task :start do
+   sh %{spork &}
+ end
+
+ desc "stop spork"
+ task :stop do
+   Process.kill(:TERM, `ps -ef | grep spork | grep -v grep | awk '{ print $2 }'`.to_i)
+ end
 end
 
 #$LOAD_PATH.unshift 'lib'
@@ -12,7 +24,7 @@ end
 require 'rake/testtask'
 require 'rake/clean'
 
-task :test => :cucumber
+task :test => ["spork:start", "cucumber", "spork:stop"]
 
 # rocco depends on rdiscount, which makes me sad.
 unless defined?(JRUBY_VERSION)

data/features/step_definitions/builder_steps.rb

@@ -14,7 +14,7 @@ end
 
 Given /^cleanup built test app$/ do
   target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", "test-app", "build")
-  FileUtils.rm_rf(target)
+  # FileUtils.rm_rf(target)
 end
 
 Then /^"([^"]*)" should exist and include "([^"]*)"$/ do |target_file, expected|

data/features/support/env.rb

@@ -0,0 +1,53 @@
+require 'rubygems'
+require 'spork'
+
+root_path = File.dirname(File.dirname(File.dirname(__FILE__)))
+
+Spork.prefork do
+  # Loading more in this block will cause your tests to run faster. However,
+  # if you change any configuration or code from libraries loaded here, you'll
+  # need to restart spork for it take effect.
+  
+  ENV["MM_DIR"] = File.join(root_path, "fixtures", "test-app")
+end
+
+Spork.each_run do
+  # This code will be run each time you run your specs.
+  require File.join(root_path, 'lib', 'middleman')
+  require "rack/test"
+
+  # absolute views path
+  # otherwise resolve_template (padrino-core) can't find templates
+  Before do
+    Middleman::Server.views = File.join(Middleman::Server.root, "source")
+  end
+end
+
+# --- Instructions ---
+# Sort the contents of this file into a Spork.prefork and a Spork.each_run
+# block.
+#
+# The Spork.prefork block is run only once when the spork server is started.
+# You typically want to place most of your (slow) initializer code in here, in
+# particular, require'ing any 3rd-party gems that you don't normally modify
+# during development.
+#
+# The Spork.each_run block is run each time you run your specs.  In case you
+# need to load files that tend to change during development, require them here.
+# With Rails, your application modules are loaded automatically, so sometimes
+# this block can remain empty.
+#
+# Note: You can modify files loaded *from* the Spork.each_run block without
+# restarting the spork server.  However, this file itself will not be reloaded,
+# so if you change any of the code inside the each_run block, you still need to
+# restart the server.  In general, if you have non-trivial code in this file,
+# it's advisable to move it into a separate file so you can easily edit it
+# without restarting spork.  (For example, with RSpec, you could move
+# non-trivial code into a file spec/support/my_helper.rb, making sure that the
+# spec/support/* files are require'd from inside the each_run block.)
+#
+# Any code that is left outside the two blocks will be run during preforking
+# *and* during each_run -- that's probably not what you want.
+#
+# These instructions should self-destruct in 10 seconds.  If they don't, feel
+# free to delete them.

data/lib/middleman/builder.rb

@@ -84,7 +84,25 @@ module Middleman
     def handle_directory(lookup)
       lookup = File.join(lookup, '*')
       
-      Dir[lookup].sort.each do |file_source|
+      results = Dir[lookup].sort do |a, b|
+        simple_a = a.gsub(Middleman::Server.root + "/", '')
+                    .gsub(Middleman::Server.views + "/", '') 
+        simple_b = b.gsub(Middleman::Server.root + "/", '')
+                    .gsub(Middleman::Server.views + "/", '')
+        
+        a_dir = simple_a.split("/").first
+        b_dir = simple_b.split("/").first
+        
+        if a_dir == Middleman::Server.images_dir
+          -1
+        elsif b_dir == Middleman::Server.images_dir
+          1
+        else
+          0
+        end
+      end
+      
+      results.each do |file_source|
         if File.directory?(file_source)
           handle_directory(file_source)
           next

data/lib/middleman/features.rb

@@ -78,7 +78,7 @@ module Middleman::Features
   autoload :Blog,                "middleman/features/blog"
   
   # Proxy web services requests in dev mode only
-  # autoload :Proxy,               "middleman/features/proxy"
+  autoload :Proxy,               "middleman/features/proxy"
   
   # Automatically resize images for mobile devises
   # autoload :TinySrc,             "middleman/features/tiny_src"

data/lib/middleman/renderers/sass.rb

@@ -9,25 +9,27 @@ module Middleman
       class << self
         def registered(app)
           app.after_feature_init do
+            views_root = File.basename(self.views)
             ::Compass.configuration do |config|
               config.cache_path            = File.join(self.root, ".sass-cache") # For sassc files
               config.project_path          = self.root
-              config.sass_dir              = File.join(File.basename(self.views), self.css_dir)
+              config.sass_dir              = File.join(views_root, self.css_dir)
               config.output_style          = :nested
-              config.fonts_dir             = File.join(File.basename(self.views), self.fonts_dir)
-              config.css_dir               = File.join(File.basename(self.views), self.css_dir)
-              config.images_dir            = File.join(File.basename(self.views), self.images_dir)      
+              config.fonts_dir             = File.join(views_root, self.fonts_dir)
+              config.css_dir               = File.join(views_root, self.css_dir)
+              config.images_dir            = File.join(views_root, self.images_dir)      
               config.http_images_path      = self.http_images_path rescue File.join(self.http_prefix || "/", self.images_dir)
               config.http_stylesheets_path = self.http_css_path rescue File.join(self.http_prefix || "/", self.css_dir)
-              config.asset_cache_buster { false }
+              config.asset_cache_buster :none
 
               config.add_import_path(config.sass_dir)
             end
 
             configure :build do
+              build_root = File.basename(self.build_dir)
               ::Compass.configuration do |config|
-                config.css_dir       = File.join(File.basename(self.build_dir), self.css_dir)
-                config.images_dir    = File.join(File.basename(self.build_dir), self.images_dir)
+                config.css_dir    = File.join(build_root, self.css_dir)
+                config.images_dir = File.join(build_root, self.images_dir)
               end
             end
           end

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.0.beta4"
+  VERSION = "2.0.0.beta5"
 end

data/middleman.gemspec

@@ -31,10 +31,11 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("haml", ["~> 3.1.0"])
   s.add_runtime_dependency("coffee-filter", ["~> 0.1.0"])
   s.add_runtime_dependency("sass", ["~> 3.1.0"])
-  s.add_runtime_dependency("compass", ["0.11.2"])
+  s.add_runtime_dependency("compass", ["~> 0.11.3"])
   s.add_runtime_dependency("compass-susy-plugin", ["~> 0.9.0"])
   s.add_runtime_dependency("coffee-script", ["~> 2.2.0"])
   s.add_runtime_dependency("httparty", ["~> 0.7.0"])
+  s.add_development_dependency("spork", ["~> 0.9.0.rc8"])
   s.add_development_dependency("cucumber", ["~> 0.10.0"])
   s.add_development_dependency("rake", ["0.8.7"])
   s.add_development_dependency("rspec", [">= 0"])

metadata

@@ -2,7 +2,7 @@
 name: middleman
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.beta4
+  version: 2.0.0.beta5
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -162,9 +162,9 @@ dependencies:
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.11.2
+        version: 0.11.3
   type: :runtime
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
@@ -201,49 +201,60 @@ dependencies:
   type: :runtime
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: spork
   prerelease: false
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.10.0
+        version: 0.9.0.rc8
   type: :development
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: cucumber
   prerelease: false
   requirement: &id019 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.10.0
+  type: :development
+  version_requirements: *id019
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         version: 0.8.7
   type: :development
-  version_requirements: *id019
+  version_requirements: *id020
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id020
+  version_requirements: *id021
 - !ruby/object:Gem::Dependency 
   name: rocco
   prerelease: false
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id021
+  version_requirements: *id022
 description: 
 email: 
 - tdreyno@gmail.com
@@ -282,10 +293,10 @@ files:
 - features/slim.feature
 - features/step_definitions/asset_host_steps.rb
 - features/step_definitions/builder_steps.rb
-- features/step_definitions/env.rb
 - features/step_definitions/generator_steps.rb
 - features/step_definitions/middleman_steps.rb
 - features/step_definitions/page_layout_steps.rb
+- features/support/env.rb
 - features/tiny_src.feature
 - features/w_asset_host.feature
 - features/x_automatic_image_sizes.feature
@@ -436,10 +447,10 @@ test_files:
 - features/slim.feature
 - features/step_definitions/asset_host_steps.rb
 - features/step_definitions/builder_steps.rb
-- features/step_definitions/env.rb
 - features/step_definitions/generator_steps.rb
 - features/step_definitions/middleman_steps.rb
 - features/step_definitions/page_layout_steps.rb
+- features/support/env.rb
 - features/tiny_src.feature
 - features/w_asset_host.feature
 - features/x_automatic_image_sizes.feature

data/features/step_definitions/env.rb

@@ -1,9 +0,0 @@
-ENV["MM_DIR"] = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", "test-app")
-require File.join(File.dirname(File.dirname(File.dirname(__FILE__))), 'lib', 'middleman')
-require "rack/test"
-
-# absolute views path
-# otherwise resolve_template (padrino-core) can't find templates
-Before do
-  Middleman::Server.views = File.join(Middleman::Server.root, "source")
-end