gumdrop 0.3.10 → 0.4.0

data/ChangeLog.md

@@ -1,3 +1,6 @@
+# v0.4
+- Added support for special dev proxy at /-proxy/ENDPOINT_URL -- Useful for working with external (non-CORS) apis/websites. Enabled by default. To disable, set Gumdrop.config.proxy_enabled= false
+
 # v0.3.10
 - Added 'ignore' dsl command -- keeps the node in the memory, but doesn't render/copy it on build.
 

data/lib/gumdrop.rb

@@ -9,8 +9,9 @@ DEFAULT_OPTIONS= {
   relative_paths: true,
   auto_run: false,
   force_reload: false,
-  root: ".",
+  proxy_enabled: true,
   log_level: :info,
+  root: ".",
   output_dir: "./output",
   lib_dir: "./lib",
   source_dir: "./source",

data/lib/gumdrop/proxy_handler.rb

@@ -0,0 +1,153 @@
+#
+# Based on code from MiddleMan Proxy: 
+#  https://github.com/middleman/middleman-proxy/blob/master/lib/middleman-proxy.rb
+#
+# Which in turn looks to be based on Apple Code:
+#  # ===========================================================================
+#  # Original Project:   Abbot - SproutCore Build Tools
+#  # Copyright: ©2009 Apple Inc.
+#  #            portions copyright @2006-2011 Strobe Inc.
+#  #            and contributors
+#  # ===========================================================================
+
+begin
+  require 'net/https'
+  HTTPS_ENABLED = true
+rescue LoadError => e
+  require 'net/http'
+  HTTPS_ENABLED = false
+end
+
+#require "net/http"
+require "uri"
+
+module Gumdrop
+  
+  def self.handle_proxy(proxy, proxy_url, env)
+    if proxy[:secure] && !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 = proxy[:path_info] #proxy_url #env['PATH_INFO']
+    params = env['QUERY_STRING']
+    
+    puts "PROXY: -> #{url}"
+
+    # 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 << "   #{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 || ''
+    #::Rack::Utils::HeaderHash.new(response_headers)
+    return [status.to_i, response_headers, response_body.to_s]
+  end
+  
+end

data/lib/gumdrop/server.rb

@@ -3,7 +3,6 @@
 require 'sinatra/base'
 require 'logger'
 
-
 module Gumdrop
 
   class Server < Sinatra::Base
@@ -18,6 +17,48 @@ module Gumdrop
     # end
     
     Gumdrop.run dry_run:true, log:server_log
+    
+    if Gumdrop.config.proxy_enabled
+      require 'gumdrop/proxy_handler'
+      Gumdrop.report 'Enabled proxy at /-proxy/*', :info
+      get '/-proxy/*' do
+        proxy_to= params[:splat][0]
+        proxy_parts= proxy_to.split('/')
+        host= proxy_parts.shift
+        path_info= "/#{proxy_parts.join('/')}"
+        #puts "HOST: #{host}  PATH_INFO: #{path_info}"
+        opts={ :to=>host, :path_info=>path_info  }
+        Gumdrop.handle_proxy opts, proxy_to, env
+      end
+      post '/-proxy/*' do
+        proxy_to= params[:splat][0]
+        proxy_parts= proxy_to.split('/')
+        host= proxy_parts.shift
+        path_info= "/#{proxy_parts.join('/')}"
+        #puts "HOST: #{host}  PATH_INFO: #{path_info}"
+        opts={ :to=>host, :path_info=>path_info  }
+        Gumdrop.handle_proxy opts, proxy_to, env
+      end
+      delete '/-proxy/*' do
+        proxy_to= params[:splat][0]
+        proxy_parts= proxy_to.split('/')
+        host= proxy_parts.shift
+        path_info= "/#{proxy_parts.join('/')}"
+        #puts "HOST: #{host}  PATH_INFO: #{path_info}"
+        opts={ :to=>host, :path_info=>path_info  }
+        Gumdrop.handle_proxy opts, proxy_to, env
+      end
+      put '/-proxy/*' do
+        proxy_to= params[:splat][0]
+        proxy_parts= proxy_to.split('/')
+        host= proxy_parts.shift
+        path_info= "/#{proxy_parts.join('/')}"
+        #puts "HOST: #{host}  PATH_INFO: #{path_info}"
+        opts={ :to=>host, :path_info=>path_info  }
+        Gumdrop.handle_proxy opts, proxy_to, env
+      end
+      
+    end
 
     get '/*' do
       file_path= get_content_path params[:splat].join('/')
@@ -50,9 +91,26 @@ module Gumdrop
           send_file File.join( source_base_path, file_path)
         end
       else
-        Gumdrop.log.error "[#{$$}]  *Missing: #{file_path}"
-        puts "NOT FOUND: #{file_path}"
-        "#{file_path} Not Found"
+        # uri_path= params[:splat].join('/')
+        # puts "LOOKING FOR: #{uri_path}"
+        # if uri_path =~ /^\-proxy\/(.*)$/
+        #   uri= URI.parse "http://#{$1}"
+        #   
+        #   puts "PROXY TO: #{uri}"
+        #   
+        #   http = Net::HTTP.new(uri.host, uri.port)
+        #   response = http.request(Net::HTTP::Get.new(uri.request_uri))
+        #   
+        #   #[response.code, response.body]
+        #    #halt response.code, {}, response.body.to_s
+        #    puts "Responded with: #{response.body.to_s}"
+        #    #response
+        #    [response.code.to_i, {}, response.body.to_s]
+        # else
+          Gumdrop.log.error "[#{$$}]  *Missing: #{file_path}"
+          puts "NOT FOUND: #{file_path}"
+          "#{file_path} Not Found"
+        # end
       end
     end
     
@@ -71,7 +129,7 @@ module Gumdrop
     end
     
     if Gumdrop.config.auto_run
-      Gumdrop.run dry_run:true 
+      #Gumdrop.run dry_run:true 
       run!
     end    
 

data/lib/gumdrop/version.rb

@@ -1,5 +1,5 @@
 module Gumdrop
   
-  VERSION = "0.3.10" unless defined?(::Gumdrop::VERSION)
+  VERSION = "0.4.0" unless defined?(::Gumdrop::VERSION)
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gumdrop
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-07-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70184358598880 !ruby/object:Gem::Requirement
+  requirement: &70152000645980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70184358598880
+  version_requirements: *70152000645980
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70184358598420 !ruby/object:Gem::Requirement
+  requirement: &70152000645100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70184358598420
+  version_requirements: *70152000645100
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70184358597980 !ruby/object:Gem::Requirement
+  requirement: &70152000644420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70184358597980
+  version_requirements: *70152000644420
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70184358597540 !ruby/object:Gem::Requirement
+  requirement: &70152000632300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70184358597540
+  version_requirements: *70152000632300
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70184358597060 !ruby/object:Gem::Requirement
+  requirement: &70152000631540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70184358597060
+  version_requirements: *70152000631540
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70184358596360 !ruby/object:Gem::Requirement
+  requirement: &70152000631100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70184358596360
+  version_requirements: *70152000631100
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70184358595580 !ruby/object:Gem::Requirement
+  requirement: &70152000630680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70184358595580
+  version_requirements: *70152000630680
 - !ruby/object:Gem::Dependency
   name: bundle
-  requirement: &70184358594740 !ruby/object:Gem::Requirement
+  requirement: &70152000630200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70184358594740
+  version_requirements: *70152000630200
 description: A simple cms/prototyping tool.
 email: matt@elucidata.net
 executables:
@@ -148,6 +148,7 @@ files:
 - lib/gumdrop/hash_object.rb
 - lib/gumdrop/logging.rb
 - lib/gumdrop/pager.rb
+- lib/gumdrop/proxy_handler.rb
 - lib/gumdrop/server.rb
 - lib/gumdrop/stitch_compilers.rb
 - lib/gumdrop/stitch_ex.rb