middleman 2.0.0.rc93 → 2.0.0.rc95

data/README.md

@@ -1,6 +1,6 @@
 # middleman
 
-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 efficient markup.
+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.
 
 ## Getting Started
 

data/bin/mm-build

@@ -1,2 +1,9 @@
-#!/bin/bash
-/usr/bin/env middleman build $@
+#!/usr/bin/env ruby
+require "rubygems"
+
+libdir = File.join(File.dirname(File.dirname(__FILE__)), "lib")
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
+
+require 'middleman'
+args = ARGV.dup.unshift("build")
+Middleman::CLI.start(args)

data/bin/mm-init

@@ -1,2 +1,9 @@
-#!/bin/bash
-/usr/bin/env middleman init $@
+#!/usr/bin/env ruby
+require "rubygems"
+
+libdir = File.join(File.dirname(File.dirname(__FILE__)), "lib")
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
+
+require 'middleman'
+args = ARGV.dup.unshift("init")
+Middleman::CLI.start(args)

data/bin/mm-server

@@ -1,2 +1,9 @@
-#!/bin/bash
-/usr/bin/env middleman server $@
+#!/usr/bin/env ruby
+require "rubygems"
+
+libdir = File.join(File.dirname(File.dirname(__FILE__)), "lib")
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
+
+require 'middleman'
+args = ARGV.dup.unshift("server")
+Middleman::CLI.start(args)

data/features/directory_index.feature

@@ -6,6 +6,8 @@ Feature: Directory Index
     Then "needs_index/index.html" should exist at "indexable-app" and include "Indexable"
     Then "a_folder/needs_index/index.html" should exist at "indexable-app" and include "Indexable"
     Then "leave_me_alone.html" should exist at "indexable-app" and include "Stay away"
+    Then "regular/index.html" should exist at "indexable-app" and include "Regular"
+    Then "regular/index/index.html" should not exist at "indexable-app"
     Then "needs_index.html" should not exist at "indexable-app"
     Then "a_folder/needs_index.html" should not exist at "indexable-app"
     Then "leave_me_alone/index.html" should not exist at "indexable-app"

data/features/sprockets_gems.feature

@@ -0,0 +1,7 @@
+@wip
+Feature: Sprockets Gems
+
+  Scenario: Sprockets can pull jQuery from gem
+    Given the Server is running at "test-app"
+    When I go to "/javascripts/jquery_base.js"
+    # Then I should see "sprockets_sub_function"

data/fixtures/indexable-app/source/regular/index.html

@@ -0,0 +1 @@
+Regular

data/fixtures/test-app/source/javascripts/jquery_base.js

@@ -0,0 +1,5 @@
+//= require "jquery-ui"
+
+function then_do_stuff() {
+  
+}

data/lib/middleman.rb

@@ -140,9 +140,6 @@ module Middleman
 
     # Treat project as a blog
     autoload :Blog,                "middleman/features/blog"
-
-    # Proxy web services requests in dev mode only
-    autoload :Proxy,               "middleman/features/proxy"
     
     # guard-livereload
     autoload :LiveReload,          "middleman/features/live_reload"

data/lib/middleman/cli.rb

@@ -34,7 +34,7 @@ module Middleman
     method_option "livereload", :default => false, :type => :boolean, :desc => "Whether to enable Livereload or not"
     method_option "livereload-port", :default => "35729", :desc => "The port Livereload will listen on"
     def server
-      config_check
+      config_check && v1_check
       if options["livereload"]
         livereload_options = {:port => options["livereload-port"]}
       end
@@ -48,7 +48,7 @@ module Middleman
     desc "build", "Builds the static site for deployment"
     method_option "relative", :type => :boolean, :aliases => "-r", :default => false, :desc => 'Override the config.rb file and force relative urls'
     def build
-      config_check
+      config_check && v1_check
       thor_group = Middleman::Builder.new([], options).invoke_all
     end
 
@@ -68,7 +68,9 @@ module Middleman
         $stderr.puts "== Error: Could not find a Middleman project config, perhaps you are in the wrong folder?"
         exit 1
       end
-
+    end
+    
+    def v1_check
       if File.exists?("views") || File.exists?("public")
         $stderr.puts "== Error: The views and public folders are have been combined. Create a new 'source' folder, add the contents of views and public to it and then remove the empty views and public folders."
         exit 1

data/lib/middleman/core_extensions/sprockets.rb

@@ -1,8 +1,8 @@
 require "sprockets"
-
+  
 module Middleman::CoreExtensions::Sprockets
   class << self
-    def registered(app)
+    def registered(app)      
       app.set :js_compressor, false
       
       app.map "/#{app.js_dir}" do
@@ -15,7 +15,7 @@ module Middleman::CoreExtensions::Sprockets
     alias :included :registered
   end
 
-  class MiddlemanEnvironment < Sprockets::Environment
+  class MiddlemanEnvironment < ::Sprockets::Environment
     def initialize(app)
       full_path = app.views
       full_path = File.join(app.root, app.views) unless app.views.include?(app.root)
@@ -35,6 +35,13 @@ module Middleman::CoreExtensions::Sprockets
 
       # configure search paths
       append_path app.js_dir
+      
+      # jQuery for Sprockets
+      # begin
+      #   require "jquery-rails"
+      #   jquery-rails / vendor / assets / javascripts
+      # rescue LoadError
+      # end
     end
   end
   

data/lib/middleman/features/directory_indexes.rb

@@ -12,6 +12,8 @@ module Middleman::Features::DirectoryIndexes
         
         if app.settings.ignored_directory_indexes.include?(request_path)
           false
+        elsif request_path =~ /#{new_index_path}$/
+          false
         else
           [
             destination.gsub(/#{index_ext.gsub(".", "\\.")}$/, new_index_path),
@@ -21,16 +23,20 @@ module Middleman::Features::DirectoryIndexes
       end
       
       app.before do
-        indexed_path = request.path_info.gsub(/\/$/, "") + File.extname(app.settings.index_file)
+        indexed_path = request.path_info.gsub(/\/$/, "") + "/" + app.settings.index_file        
+        indexed_exists = resolve_template(indexed_path, :raise_exceptions => false)
+
+        extensioned_path = request.path_info.gsub(/\/$/, "") + File.extname(app.settings.index_file)
+        is_ingored = settings.ignored_directory_indexes.include?(extensioned_path)
         
-        if !settings.ignored_directory_indexes.include?(indexed_path)
+        if !indexed_exists && !is_ingored
           parts = request.path_info.split("/")
           last_part = parts.last
           last_part_ext = File.extname(last_part)
         
           if last_part_ext.blank?
             # This is a folder, redirect to index
-            request.path_info = indexed_path
+            request.path_info = extensioned_path
           end
         end
       end

data/lib/middleman/templates/default/source/stylesheets/site.css.scss

@@ -1,5 +1,4 @@
 @import "compass";
-@import "susy";
 
 $link-color:         #0388a6;
 $link-hover-color:   #009ce0;
@@ -18,7 +17,6 @@ $gutter-width: 1em;
 $side-gutter-width: $gutter-width;
 
 @include global-reset;
-@include establish-baseline;
 
 body {
   font-family: $font-family;
@@ -31,6 +29,4 @@ a {
 
 #main {
   padding: 50px;
-  @include container;
-  @include susy-grid-background;
 }

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.0.rc93"
+  VERSION = "2.0.0.rc95"
 end

data/middleman.gemspec

@@ -11,8 +11,6 @@ Gem::Specification.new do |s|
   s.homepage    = "http://middlemanapp.com"
   s.summary     = "A static site generator based on Sinatra. Providing Haml, Sass, Compass, CoffeeScript and including minification, compression and cache busting."
 
-  s.rubyforge_project = "middleman"
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {fixtures,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
@@ -24,21 +22,22 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("tilt", ["~> 1.3.1"])
   s.add_runtime_dependency("rdiscount", ["~> 1.6.8"])
   s.add_runtime_dependency("sinatra", ["~> 1.2.6"])
-  s.add_runtime_dependency("padrino-core", ["~> 0.10.0"])
-  s.add_runtime_dependency("padrino-helpers", ["~> 0.10.0"])
+  s.add_runtime_dependency("padrino-core", ["~> 0.10.1"])
+  s.add_runtime_dependency("padrino-helpers", ["~> 0.10.1"])
   s.add_runtime_dependency("rack-test", ["~> 0.6.1"])
   s.add_runtime_dependency("uglifier", ["~> 1.0.0"])
   s.add_runtime_dependency("slim", ["~> 0.9.0"])
   s.add_runtime_dependency("haml", ["~> 3.1.0"])
-  s.add_runtime_dependency("sass", ["~> 3.1.5"])
+  s.add_runtime_dependency("sass", ["~> 3.1.6"])
   s.add_runtime_dependency("coffee-script", ["~> 2.2.0"])
   s.add_runtime_dependency("compass", ["~> 0.11.3"])
   s.add_runtime_dependency("sprockets", ["2.0.0.beta.12"])
   s.add_runtime_dependency("httparty", ["~> 0.7.0"])
   s.add_runtime_dependency("guard", ["~> 0.5.1"])
-  s.add_runtime_dependency("guard-livereload", ["~> 0.2.0"])
+  s.add_runtime_dependency("guard-livereload", ["~> 0.2.1"])
   s.add_development_dependency("coffee-filter", ["~> 0.1.1"])
-  s.add_development_dependency("cucumber", ["~> 0.10.0"])
+  # s.add_development_dependency("jquery-rails", ["~> 1.0.12"])
+  s.add_development_dependency("cucumber", ["~> 1.0.2"])
   s.add_development_dependency("rake", ["0.8.7"])
   s.add_development_dependency("rspec", ["~> 2.6.0"])
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 15424239
+  hash: 15424235
   prerelease: 6
   segments: 
   - 2
   - 0
   - 0
   - rc
-  - 93
-  version: 2.0.0.rc93
+  - 95
+  version: 2.0.0.rc95
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-01 00:00:00 Z
+date: 2011-08-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -123,12 +123,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 55
+        hash: 53
         segments: 
         - 0
         - 10
-        - 0
-        version: 0.10.0
+        - 1
+        version: 0.10.1
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -139,12 +139,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 55
+        hash: 53
         segments: 
         - 0
         - 10
-        - 0
-        version: 0.10.0
+        - 1
+        version: 0.10.1
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -219,12 +219,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 15
         segments: 
         - 3
         - 1
-        - 5
-        version: 3.1.5
+        - 6
+        version: 3.1.6
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
@@ -317,12 +317,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 0
         - 2
-        - 0
-        version: 0.2.0
+        - 1
+        version: 0.2.1
   type: :runtime
   version_requirements: *id019
 - !ruby/object:Gem::Dependency 
@@ -349,12 +349,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 55
+        hash: 19
         segments: 
+        - 1
         - 0
-        - 10
-        - 0
-        version: 0.10.0
+        - 2
+        version: 1.0.2
   type: :development
   version_requirements: *id021
 - !ruby/object:Gem::Dependency 
@@ -435,6 +435,7 @@ files:
 - features/sinatra.feature
 - features/slim.feature
 - features/sprockets.feature
+- features/sprockets_gems.feature
 - features/step_definitions/asset_host_steps.rb
 - features/step_definitions/builder_steps.rb
 - features/step_definitions/generator_steps.rb
@@ -446,6 +447,7 @@ files:
 - fixtures/indexable-app/source/a_folder/needs_index.html
 - fixtures/indexable-app/source/leave_me_alone.html
 - fixtures/indexable-app/source/needs_index.html
+- fixtures/indexable-app/source/regular/index.html
 - fixtures/test-app/config.rb
 - fixtures/test-app/data/test.yml
 - fixtures/test-app/source/_partial.haml
@@ -480,6 +482,7 @@ files:
 - fixtures/test-app/source/javascripts/broken-coffee.js.coffee
 - fixtures/test-app/source/javascripts/coffee_test.js.coffee
 - fixtures/test-app/source/javascripts/jquery.plugin.with.dots.js
+- fixtures/test-app/source/javascripts/jquery_base.js
 - fixtures/test-app/source/javascripts/sprockets_base.js
 - fixtures/test-app/source/javascripts/sprockets_sub.js
 - fixtures/test-app/source/layout.haml
@@ -534,7 +537,6 @@ files:
 - lib/middleman/features/lorem.rb
 - lib/middleman/features/minify_css.rb
 - lib/middleman/features/minify_javascript.rb
-- lib/middleman/features/proxy.rb
 - lib/middleman/features/relative_assets.rb
 - lib/middleman/features/tiny_src.rb
 - lib/middleman/guard.rb
@@ -617,7 +619,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 
-rubyforge_project: middleman
+rubyforge_project: 
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
@@ -645,6 +647,7 @@ test_files:
 - features/sinatra.feature
 - features/slim.feature
 - features/sprockets.feature
+- features/sprockets_gems.feature
 - features/step_definitions/asset_host_steps.rb
 - features/step_definitions/builder_steps.rb
 - features/step_definitions/generator_steps.rb
@@ -656,6 +659,7 @@ test_files:
 - fixtures/indexable-app/source/a_folder/needs_index.html
 - fixtures/indexable-app/source/leave_me_alone.html
 - fixtures/indexable-app/source/needs_index.html
+- fixtures/indexable-app/source/regular/index.html
 - fixtures/test-app/config.rb
 - fixtures/test-app/data/test.yml
 - fixtures/test-app/source/_partial.haml
@@ -690,6 +694,7 @@ test_files:
 - fixtures/test-app/source/javascripts/broken-coffee.js.coffee
 - fixtures/test-app/source/javascripts/coffee_test.js.coffee
 - fixtures/test-app/source/javascripts/jquery.plugin.with.dots.js
+- fixtures/test-app/source/javascripts/jquery_base.js
 - fixtures/test-app/source/javascripts/sprockets_base.js
 - fixtures/test-app/source/javascripts/sprockets_sub.js
 - fixtures/test-app/source/layout.haml

data/lib/middleman/features/proxy.rb

@@ -1,194 +0,0 @@
-# ===========================================================================
-# Original Project:   Abbot - SproutCore Build Tools
-# Copyright: ©2009 Apple Inc.
-#            portions copyright @2006-2011 Strobe Inc.
-#            and contributors
-# ===========================================================================
-
-begin
-  require 'net/https'
-  Middleman::HTTPS_ENABLED = true
-rescue LoadError => e
-  require 'net/http'
-  Middleman::HTTPS_ENABLED = false
-end
-
-module Middleman::Features::Proxy
-  class << self
-    def registered(app)
-      app.extend ClassMethods
-      app.use Middleman::Features::Proxy::Rack
-    end
-    alias :included :registered
-  end
-  
-  class Collection
-    def initialize(app)
-      @app = app
-    end
-    
-    def self.proxies
-      @@proxies ||= {}
-    end
-    
-    def self.add(path, options={})
-      @@proxies ||= {}
-      @@proxies[path] = options[:to]
-    end
-  end
-  
-  module ClassMethods
-    # Proxies requests to the path 
-    #
-    #     proxy '/twitter', "http://twitter/web/service"
-    def proxy(path, options={})
-      Middleman::Features::Proxy::Collection.add(path, options)
-    end
-  end
-  
-  # Rack application proxies requests as needed for the given project.
-  module Rack
-
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      url = env['PATH_INFO']
-      
-      @proxies = Middleman::Features::Proxy::Collection.proxies
-      @proxies.each do |proxy, value|
-        if url.match(/^#{Regexp.escape(proxy.to_s)}/)
-          return handle_proxy(value, proxy.to_s, env)
-        end
-      end
-
-      return [404, {}, "not found"]
-    end
-
-    def handle_proxy(proxy, proxy_url, env)
-      if proxy[:secure] && !Middleman::HTTPS_ENABLED
-        $stderr.puts "~ WARNING: HTTPS is not supported on your system, using HTTP instead.\n"
-        $stderr.puts"    If you are using Ubuntu, you can run `apt-get install libopenssl-ruby`\n"
-        proxy[:secure] = false
-      end
-
-      origin_host = env['SERVER_NAME'] # capture the origin host for cookies
-      http_method = env['REQUEST_METHOD'].to_s.downcase
-      url = env['PATH_INFO']
-      params = env['QUERY_STRING']
-
-      # collect headers...
-      headers = {}
-      env.each do |key, value|
-        next unless key =~ /^HTTP_/
-        key = key.gsub(/^HTTP_/,'').downcase.sub(/^\w/){|l| l.upcase}.gsub(/_(\w)/){|l| "-#{$1.upcase}"} # remove HTTP_, dasherize and titleize
-        if !key.eql? "Version"
-          headers[key] = value
-        end
-      end
-
-      # Rack documentation says CONTENT_TYPE and CONTENT_LENGTH aren't prefixed by HTTP_
-      headers['Content-Type'] = env['CONTENT_TYPE'] if env['CONTENT_TYPE']
-
-      length = env['CONTENT_LENGTH']
-      headers['Content-Length'] = length if length
-
-      http_host, http_port = proxy[:to].split(':')
-      http_port = proxy[:secure] ? '443' : '80' if http_port.nil?
-
-      # added 4/23/09 per Charles Jolley, corrects problem
-      # when making requests to virtual hosts
-      headers['Host'] = "#{http_host}:#{http_port}"
-
-      if proxy[:url]
-        url = url.sub(/^#{Regexp.escape proxy_url}/, proxy[:url])
-      end
-
-      http_path = [url]
-      http_path << params if params && params.size>0
-      http_path = http_path.join('?')
-
-      response = nil
-      no_body_method = %w(get copy head move options trace)
-
-      done = false
-      tries = 0
-      until done
-        http = ::Net::HTTP.new(http_host, http_port)
-
-        if proxy[:secure]
-          http.use_ssl = true
-          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        end
-
-        http.start do |web|
-          if no_body_method.include?(http_method)
-            response = web.send(http_method, http_path, headers)
-          else
-            http_body = env['rack.input']
-            http_body.rewind # May not be necessary but can't hurt
-
-            req = Net::HTTPGenericRequest.new(http_method.upcase,
-                                                true, true, http_path, headers)
-            req.body_stream = http_body if length.to_i > 0
-            response = web.request(req)
-          end
-        end
-
-        status = response.code # http status code
-        protocol = proxy[:secure] ? 'https' : 'http'
-
-        $stderr.puts "~ PROXY: #{http_method.upcase} #{status} #{url} -> #{protocol}://#{http_host}:#{http_port}#{http_path}\n"
-
-        # display and construct specific response headers
-        response_headers = {}
-        ignore_headers = ['transfer-encoding', 'keep-alive', 'connection']
-        response.each do |key, value|
-          next if ignore_headers.include?(key.downcase)
-          # If this is a cookie, strip out the domain.  This technically may
-          # break certain scenarios where services try to set cross-domain
-          # cookies, but those services should not be doing that anyway...
-          value.gsub!(/domain=[^\;]+\;? ?/,'') if key.downcase == 'set-cookie'
-          # Location headers should rewrite the hostname if it is included.
-          value.gsub!(/^http:\/\/#{http_host}(:[0-9]+)?\//, "http://#{http_host}/") if key.downcase == 'location'
-          # content-length is returning char count not bytesize
-          if key.downcase == 'content-length'
-            if response.body.respond_to?(:bytesize)
-              value = response.body.bytesize.to_s
-            elsif response.body.respond_to?(:size)
-              value = response.body.size.to_s
-            else
-              value = '0'
-            end
-          end
-
-          $stderr.puts << "   #{key}: #{value}\n"
-          response_headers[key] = value
-        end
-
-        if [301, 302, 303, 307].include?(status.to_i) && proxy[:redirect] != false
-          $stderr.puts '~ REDIRECTING: '+response_headers['location']+"\n"
-
-          uri = URI.parse(response_headers['location']);
-          http_host = uri.host
-          http_port = uri.port
-          http_path = uri.path
-          http_path += '?'+uri.query if uri.query
-
-          tries += 1
-          if tries > 10
-            raise "Too many redirects!"
-          end
-        else
-          done = true
-        end
-      end
-
-      # Thin doesn't like null bodies
-      response_body = response.body || ''
-
-      return [status, ::Rack::Utils::HeaderHash.new(response_headers), [response_body]]
-    end
-  end
-end