middleman 1.2.4 → 1.2.5

data/lib/middleman/builder.rb

@@ -16,7 +16,7 @@ module Middleman
 
       create_file destination, nil, config do
         # The default render just requests the page over Rack and writes the response
-        request_path = destination.gsub(Middleman::Server.build_dir, "")
+        request_path = destination.sub(/^#{Middleman::Server.build_dir}/, "")
         @@rack_test.get(request_path)
         @@rack_test.last_response.body
       end
@@ -87,7 +87,7 @@ module Middleman
 
   protected
     def handle_directory(lookup)
-      lookup = File.join(lookup, '{*,.[a-z]*}')
+      lookup = File.join(lookup, '*')
       
       Dir[lookup].sort.each do |file_source|
         if File.directory?(file_source)

data/lib/middleman/features.rb

@@ -71,6 +71,9 @@ module Middleman::Features
   # to dynamic requests.
   autoload :Data,                "middleman/features/data"
 
+  # Proxy web services requests in dev mode only
+  # autoload :Proxy,               "middleman/features/proxy"
+  
   # Automatically resize images for mobile devises
   # autoload :TinySrc,             "middleman/features/tiny_src"
 

data/lib/middleman/features/proxy.rb

@@ -0,0 +1,194 @@
+# ===========================================================================
+# 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

data/lib/middleman/renderers/sass.rb

@@ -38,6 +38,8 @@ end
 
 class Tilt::SassPlusCSSFilenameTemplate < Tilt::SassTemplate
   def sass_options
+    return super if basename.nil?
+    
     location_of_sass_file = Middleman::Server.environment == :build ? 
                               File.join(Middleman::Server.root, Middleman::Server.build_dir) : 
                               Middleman::Server.public

data/lib/middleman/server.rb

@@ -43,6 +43,9 @@ module Middleman
     # Activate Yaml Data package
     register Middleman::Features::Data
     
+    # Activate Webservices Proxy package
+    # register Middleman::Features::Proxy
+    
     # Activate Lorem helpers
     register Middleman::Features::Lorem
     

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "1.2.4"
+  VERSION = "1.2.5"
 end

data/middleman.gemspec

@@ -28,13 +28,11 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("padrino-core", ["~> 0.9.23"])
   s.add_runtime_dependency("padrino-helpers", ["~> 0.9.23"])
   s.add_runtime_dependency("rack-test", ["~> 0.5.0"])
-  s.add_runtime_dependency("therubyracer", ["~> 0.8.0"]) unless defined?(JRUBY_VERSION)
-  s.add_runtime_dependency("therubyrhino", ["~> 1.72.0"]) if defined?(JRUBY_VERSION)
   s.add_runtime_dependency("uglifier", ["~> 0.5.0"])
   s.add_runtime_dependency("haml", ["~> 3.1.0"])
   s.add_runtime_dependency("sass", ["~> 3.1.0"])
   s.add_runtime_dependency("compass", ["~> 0.11.1"])
-  s.add_runtime_dependency("coffee-script", ["~> 2.1.0"])
+  s.add_runtime_dependency("coffee-script", ["~> 2.2.0"])
   s.add_runtime_dependency("httparty", ["~> 0.7.0"])
   # s.add_runtime_dependency("fssm", ["~> 0.2.0"])
   s.add_development_dependency("cucumber", ["~> 0.10.0"])

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 4
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -15,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 -07:00
-default_executable: 
+date: 2011-05-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -26,10 +20,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
         version: "1.0"
   type: :runtime
   version_requirements: *id001
@@ -41,11 +31,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
         version: 1.2.0
   type: :runtime
   version_requirements: *id002
@@ -57,11 +42,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 8
-        - 0
         version: 0.8.0
   type: :runtime
   version_requirements: *id003
@@ -73,11 +53,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 39
-        segments: 
-        - 0
-        - 14
-        - 0
         version: 0.14.0
   type: :runtime
   version_requirements: *id004
@@ -89,11 +64,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
         version: 1.3.0
   type: :runtime
   version_requirements: *id005
@@ -105,11 +75,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
         version: 1.2.0
   type: :runtime
   version_requirements: *id006
@@ -121,11 +86,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 9
-        - 23
         version: 0.9.23
   type: :runtime
   version_requirements: *id007
@@ -137,11 +97,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 9
-        - 23
         version: 0.9.23
   type: :runtime
   version_requirements: *id008
@@ -153,170 +108,108 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
         version: 0.5.0
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: therubyracer
+  name: uglifier
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 8
-        - 0
-        version: 0.8.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: uglifier
+  name: haml
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
-        version: 0.5.0
+        version: 3.1.0
   type: :runtime
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: haml
+  name: sass
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 1
-        - 0
         version: 3.1.0
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: sass
+  name: compass
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 1
-        - 0
-        version: 3.1.0
+        version: 0.11.1
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: compass
+  name: coffee-script
   prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 11
-        - 1
-        version: 0.11.1
+        version: 2.2.0
   type: :runtime
   version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: coffee-script
-  prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
-        version: 2.1.0
-  type: :runtime
-  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: httparty
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 7
-        - 0
         version: 0.7.0
   type: :runtime
-  version_requirements: *id016
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 10
-        - 0
         version: 0.10.0
   type: :development
-  version_requirements: *id017
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
-  version_requirements: *id018
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: rocco
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
-  version_requirements: *id019
+  version_requirements: *id018
 description: 
 email: 
 - tdreyno@gmail.com
@@ -406,6 +299,7 @@ files:
 - lib/middleman/features/minify_css.rb
 - lib/middleman/features/minify_javascript.rb
 - lib/middleman/features/minify_javascript/rack.rb
+- lib/middleman/features/proxy.rb
 - lib/middleman/features/relative_assets.rb
 - lib/middleman/features/tiny_src.rb
 - lib/middleman/features/ugly_haml.rb
@@ -449,7 +343,6 @@ files:
 - lib/middleman/templates/xhtml/views/stylesheets/site.css.sass
 - lib/middleman/version.rb
 - middleman.gemspec
-has_rdoc: true
 homepage: http://wiki.github.com/tdreyno/middleman
 licenses: []
 
@@ -463,23 +356,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: middleman
-rubygems_version: 1.5.0
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: A static site generator based on Sinatra. Providing Haml, Sass, Compass, Less, Coffee Script and including minification, compression and cache busting.