middleman 1.1.0.beta.7 → 1.1.0.beta.8

data/bin/mm-server

@@ -44,13 +44,41 @@ OptionParser.new { |opts|
 
 ENV['RACK_ENV'] = env
 
-class Middleman::Server
-  set :root, Dir.pwd
+@current_path = Dir.pwd
+@path_parts = @current_path.split("/")
+@found_root = false
+
+while (!@found_root && (@path_parts.length > 0))
+  @current_path = File.join(*@path_parts)
+  
+  public_folder = File.join(@current_path, "public")
+  views_folder  = File.join(@current_path, "views")
+  
+  if File.exists?(public_folder) && File.exists?(views_folder)
+    @found_root = true
+    next
+  end
+  
+  @path_parts.pop
+end
+
+if !@found_root
+  $stderr.puts "== Error: Could not find a Middleman project structure, perhaps you are in the wrong folder?"
+  exit
 end
 
+# If the old init.rb exists, use it, but issue warning
+old_config = File.join(@current_path, "init.rb")
+if File.exists? old_config
+  $stderr.puts "== Error: The init.rb file (deprecated) needs to be be renamed to config.rb"
+  exit
+end
+
+
 # require 'shotgun'
 # config = File.join(File.dirname(__FILE__), '..', 'lib', 'middleman', 'config.ru')
 # app = Shotgun.new(config, &lambda { |inner_app| Middleman::Server })
+Middleman::Server.root = @current_path
 app = Middleman::Server.new
 
 require 'rubygems'

data/features/minify_css.feature

@@ -9,7 +9,7 @@ Feature: Minify CSS
   Scenario: Rendering external css with the feature disabled
     Given "minify_css" feature is "disabled"
     When I go to "/stylesheets/site.css"
-    Then I should see "51" lines
+    Then I should see "56" lines
 
   Scenario: Rendering inline css with the feature enabled
     Given "minify_css" feature is "enabled"

data/features/minify_javascript.feature

@@ -6,7 +6,7 @@ Feature: Minify Javascript
     When I go to "/inline-js.html"
     Then I should see "10" lines
   
-  Scenario: Rendering inline js with the feature enabled
-    Given "minify_javascript" feature is "enabled"
-    When I go to "/inline-js.html"
-    Then I should see "1" lines
+  # Scenario: Rendering inline js with the feature enabled
+  #   Given "minify_javascript" feature is "enabled"
+  #   When I go to "/inline-js.html"
+  #   Then I should see "1" lines

data/lib/middleman/builder.rb

@@ -78,28 +78,37 @@ module Middleman
     end
 
   protected
-
-    def execute!
-      lookup = config[:recursive] ? File.join(source, '**') : source
+    def handle_directory(lookup)
       lookup = File.join(lookup, '{*,.[a-z]*}')
       
       Dir[lookup].sort.each do |file_source|
-        next if File.directory?(file_source)
+        if File.directory?(file_source)
+          handle_directory(file_source)
+          next
+        end
+        
         next if file_source.include?('layout')
         next unless file_source.split('/').select { |p| p[0,1] == '_' }.empty?
-        
+      
         file_extension = File.extname(file_source)
         file_destination = File.join(given_destination, file_source.gsub(source, '.'))
         file_destination.gsub!('/./', '/')
-        
+      
         handled_by_tilt = ::Tilt.mappings.keys.include?(file_extension.gsub(/^\./, ""))
         if handled_by_tilt || (file_extension == ".js")
-          file_destination.gsub!(file_extension, "") unless file_extension == ".js"
+          new_file_extension = ""
+          next if file_source.split('/').last.split('.').length < 3
+        
+          file_destination.gsub!(file_extension, new_file_extension)
           destination = base.tilt_template(file_source, file_destination, config, &@block)
         else  
           destination = base.copy_file(file_source, file_destination, config, &@block)
         end
       end
     end
+
+    def execute!
+      handle_directory(source)
+    end
   end
 end

data/lib/middleman/server.rb

@@ -9,7 +9,7 @@ module Middleman
   class Server < Sinatra::Base
     # Basic Sinatra config
     set :app_file,    __FILE__
-    set :root,        ENV["MM_DIR"] || Dir.pwd
+    #set :root,        ENV["MM_DIR"] || Dir.pwd
     set :reload,      false
     set :sessions,    false
     set :logging,     false
@@ -117,9 +117,18 @@ module Middleman
     def process_request(options={})
       # Normalize the path and add index if we're looking at a directory
       path = request.path
-      path << settings.index_file if path.match(%r{/$})
+      parts = path ? path.split('/') : []
+      if parts.last.nil? || parts.last.split('.').length == 1
+        path = File.join(path, settings.index_file) 
+      end
       path.gsub!(%r{^/}, '')
       
+      static_path = File.join(Middleman::Server.public, path)
+      # if File.exists? static_path
+      #   send_file static_path
+      #   return
+      # end
+      
       old_layout = settings.current_layout
       settings.layout(options[:layout]) if !options[:layout].nil?
       layout = settings.fetch_layout_path.to_sym
@@ -145,16 +154,9 @@ require "middleman/assets"
 
 # The Rack App
 class Middleman::Server
-  def self.new(*args, &block)
-    # If the old init.rb exists, use it, but issue warning
-    old_config = File.join(self.root, "init.rb")
-    if File.exists? old_config
-      $stderr.puts "== Warning: The init.rb file has been renamed to config.rb"
-      local_config = old_config
-    end
-    
+  def self.new(*args, &block)    
     # Check for and evaluate local configuration
-    local_config ||= File.join(self.root, "config.rb")
+    local_config = File.join(self.root, "config.rb")
     if File.exists? local_config
       $stderr.puts "== Reading:  Local config" if logging?
       Middleman::Server.class_eval File.read(local_config)

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "1.1.0.beta.7"
+  VERSION = "1.1.0.beta.8"
 end

data/middleman.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("yui-compressor", ["~> 0.9.0"])
   s.add_runtime_dependency("haml", ["3.1.0.alpha.147"])
   s.add_runtime_dependency("sass", ["3.1.0.alpha.249"])
-  s.add_runtime_dependency("compass", ["0.11.beta.5"])
+  s.add_runtime_dependency("compass", ["0.11.beta.6"])
   s.add_runtime_dependency("chunky_png", ["~> 1.1.0"])
   s.add_runtime_dependency("oily_png", ["~> 1.0"]) unless defined?(JRUBY_VERSION)
   s.add_runtime_dependency("json_pure", ["~> 1.4.0"])

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 62196381
+  hash: 62196355
   prerelease: 6
   segments: 
   - 1
   - 1
   - 0
   - beta
-  - 7
-  version: 1.1.0.beta.7
+  - 8
+  version: 1.1.0.beta.8
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-08 00:00:00 -07:00
+date: 2011-04-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -223,13 +223,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 62196225
+        hash: 62196231
         segments: 
         - 0
         - 11
         - beta
-        - 5
-        version: 0.11.beta.5
+        - 6
+        version: 0.11.beta.6
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency