sproutcore 0.9.11 → 0.9.12

data/lib/sproutcore/merb/bundle_controller.rb

@@ -3,28 +3,33 @@ require 'net/http'
 require 'uri'
 
 module SproutCore
+  
+  NO_BODY_METHOD = [:delete, :get, :copy, :head, :move, :options, :trace]
+  
   module Merb
-   
-    # A subclass of this controller handles all incoming requests for the location it is
-    # mounted at.  For index.html requests, it will rebuild the html file everytime it is
-    # requested if you are in development mode.  For all other requests, it will build the
-    # resource one time and then return the file if it already exists.
+
+    # A subclass of this controller handles all incoming requests for the 
+    # location it is mounted at.  For index.html requests, it will rebuild the 
+    # html file everytime it is requested if you are in development mode.  For 
+    # all other requests, it will build the resource one time and then return 
+    # the file if it already exists.
     class BundleController < ::Merb::Controller
-      
+
       def self.library_for_class(klass)
         (@registered_libraries ||= {})[klass]
       end
-      
+
       def self.register_library_for_class(library, klass)
         (@registered_libraries ||= {})[klass] = library
       end
-        
-      # Entry point for all requests routed through the SproutCore controller.  Example
-      # the request path to determine which bundle should handle the request.
+
+      # Entry point for all requests routed through the SproutCore controller.  
+      # Example the request path to determine which bundle should handle the 
+      # request.
       def main
 
-        # Before we do anything, set the build_mode for the bundles.  This 
-        # shouldn't change during execution, but if we set this during the 
+        # Before we do anything, set the build_mode for the bundles.  This
+        # shouldn't change during execution, but if we set this during the
         # router call, the Merb.environment is sometimes not ready yet.
         #
         if ::Merb.environment.to_sym == :production
@@ -32,23 +37,23 @@ module SproutCore
         else
           ::SproutCore.logger.level = Logger::DEBUG
         end
-        
+
         # Make sure we can service this with a bundle
         # If no bundle is found, try to proxy...
         if current_bundle.nil?
           # if proxy url, return proxy...
-          url = request.path
-          proxy_url, proxy_opts = library.proxy_url_for(url) 
-          if proxy_url 
+          url = request.uri
+          proxy_url, proxy_opts = library.proxy_url_for(url)
+          if proxy_url
             return handle_proxy(url, proxy_url, proxy_opts)
           else
-            raise(NotFound, "No SproutCore Bundle registered at this location.") 
+            raise(NotFound, "No SproutCore Bundle registered at this location.")
           end
         end
 
         # Check for a few special urls that need to be rewritten
         url = request.path
-        if request.method == :get 
+        if request.method == :get
           url = rewrite_bundle_if(url, /^#{current_bundle.index_root}\/-tests/, :sc_test_runner)
           url = rewrite_bundle_if(url, /^#{current_bundle.index_root}\/-docs/, :sc_docs)
         end
@@ -72,31 +77,31 @@ module SproutCore
         else
           ret = handle_resource(url)
         end
-        
+
         # Done!
         return ret
       end
-      
+
       # Invoked whenever you request a regular resource
       def handle_resource(url)
-        
-        # Get the entry for the resource.  
+
+        # Get the entry for the resource.
         entry = current_bundle.entry_for_url(url, :hidden => :include)
         raise(NotFound, "No matching entry in #{current_bundle.bundle_name} for #{url}") if entry.nil?
-        
+
         build_path = entry.build_path
 
-        # Found an entry, build the resource.  If the resource has already 
-        # been built, this will not do much.  If this the resource is an 
+        # Found an entry, build the resource.  If the resource has already
+        # been built, this will not do much.  If this the resource is an
         # index.html file, force the build.
         is_index = /\/index\.html$/ =~ url
 
-        # If we need to serve the source directly, then just set the 
+        # If we need to serve the source directly, then just set the
         # build path to the source_path.
         if entry.use_source_directly?
           build_path = entry.source_path
-          
-        # Otherwise, run the build command on the entry to make sure the 
+
+        # Otherwise, run the build command on the entry to make sure the
         # file is up to date.
         else
           current_bundle.build_entry(entry, :force => is_index, :hidden => :include)
@@ -110,33 +115,33 @@ module SproutCore
         # And return the file.  Set the content type using a mime-map borroed from Rack.
         headers['Content-Type'] = entry.content_type
         headers['Content-Length'] = File.size(build_path).to_s
-        ret = File.open(build_path)
-        
-        
-        # In development mode only, immediately delete built composite 
+        ret = File.open(build_path, 'rb')
+
+
+        # In development mode only, immediately delete built composite
         # resources.  We want each request to come directly to us.
         if (current_bundle.build_mode == :development) && (!entry.cacheable?)
-          
+
           # Deleting composite resources will not work in windows because it
           # does not like to have files you just open deleted. (Its OK on
           # windows)
           FileUtils.rm(build_path) if (RUBY_PLATFORM !~ /mswin32/)
         end
-        
+
         return ret
       end
 
       # Proxy the request and return the result...
-      def handle_proxy(url, proxy_url, opts ={}) 
-        
+      def handle_proxy(url, proxy_url, opts ={})
+
         # collect the method
         http_method = request.method
 
         # capture the origin host for cookies.  strip away any port.
         origin_host = request.host.gsub(/:[0-9]+$/,'')
-        
+
         # collect the headers...
-        headers = {} 
+        headers = {}
         request.env.each do |key, value|
           next unless key =~ /^HTTP_/
           key = key.gsub(/^HTTP_/,'').titleize.gsub(' ','-')
@@ -151,12 +156,22 @@ module SproutCore
 
         # now make the request...
         response = nil
+        
+        # Handle those that require a body.
+        
         ::Net::HTTP.start(http_host, http_port) do |http|
-          response = http.send(http_method, http_path, headers)
+          if NO_BODY_METHOD.include?(http_method.to_sym)
+            response = http.send(http_method, http_path, headers)
+          else
+            http_body = request.raw_post
+            response = http.send(http_method, http_path, http_body, headers)
+          end
         end
 
         # Now set the status, headers, and body.
         @status = response.code
+
+        SC.logger.debug " ~ PROXY: #{@status} #{request.uri} -> http://#{http_host}:#{http_port}#{http_path}"
         
         # Transfer response headers into reponse
         ignore = ['transfer-encoding', 'keep-alive', 'connection']
@@ -169,21 +184,29 @@ module SproutCore
           if key.downcase == 'set-cookie'
             value.gsub!(/domain=[^\;]+\;? ?/,'')
           end
-            
+
+          # Location headers should rewrite the hostname if it is included.
+          if key.downcase == 'location'
+            value.gsub!(/^http:\/\/#{http_host}(:[0-9]+)?\//, "http://#{request.host}/")
+          end
+          
           # Prep key and set header.
           key = key.split('-').map { |x| x.downcase.capitalize }.join('-')
+          SC.logger.debug "   #{key}: #{value}"
           @headers[key] = value
         end
-        
+
+        SC.logger.debug ''
+
         # Transfer response body
         return response.body
       end
-      
+
       # Returns JSON containing all of the tests
       def handle_test(url)
         test_entries = current_bundle.entries_for(:test, :hidden => :include)
         content_type = :json
-        ret = test_entries.map do |entry| 
+        ret = test_entries.map do |entry|
           { :name => entry.filename.gsub(/^tests\//,''), :url => "#{entry.url}?#{entry.timestamp}" }
         end
         return ret.to_json
@@ -194,22 +217,22 @@ module SproutCore
         JSDoc.generate :bundle => current_bundle
         return "OK"
       end
-      
+
       ######################################################################
       ## Support Methods
       ##
-      
+
       # Returns the library for this class
       def library
         ::SproutCore::Merb::BundleController.library_for_class(self.class)
       end
-      
-      
+
+
       # Returns the bundle for this request
       def current_bundle
         return @current_bundle unless @current_bundle.nil?
 
-        # Tear down the URL, looking for the first bundle 
+        # Tear down the URL, looking for the first bundle
         bundle_map = library.bundles_grouped_by_url
         url = request.path.split('/')
         ret = nil
@@ -217,15 +240,15 @@ module SproutCore
           ret = bundle_map[url.join('/')]
           url.pop
         end
-        
+
         # Try root path if nothing found
         ret = bundle_map['/'] if ret.nil?
-        
+
         # Return
         return (@current_bundle = ret)
       end
 
-      # This method is used to redirect certain urls to an alternate bundle.  If the 
+      # This method is used to redirect certain urls to an alternate bundle.  If the
       # match phrase matches the url, then both the url we use to fetch resources and the
       # current_bundle will be swapped out.
       #
@@ -246,8 +269,8 @@ module SproutCore
         end
         return url
       end
-      
+
     end
-    
+
   end
-end
+end

data/lib/sproutcore/merb/router.rb

@@ -3,37 +3,44 @@ require 'sproutcore/merb/bundle_controller'
 module SproutCore
   module Merb
     module RouterMethods
-      
-      # Connect a BundleController to the specified location.  All requests matching
-      # this path root will by default be handled by this new controller.
+
+      # Connect a BundleController to the specified location.  All requests 
+      # matching this path root will by default be handled by this new 
+      # controller.
       #
       # ==== Params
-      # path<String>:: The root path or other matcher to use for the matcher.  This
-      #  will be passed through to the router, so you can use anything you like.
+      # path<String>:: The root path or other matcher to use for the matcher.  
+      #  This will be passed through to the router, so you can use anything 
+      #  you like.
       #
       # === Options
-      # library:: Optional path to the library that should be hosted 
+      # library:: Optional path to the library that should be hosted
       # You can also include any other options that are known to Merb::Bundle
       #
       def connect_clients(match_path, opts ={}, &block)
-        
-        # Create library 
+
+        # Create library
         library_root = opts.delete(:library) || opts.delete(:library_root) || ::Merb.root
         library = Library.library_for(library_root, opts)
-        
+        if library.nil?
+          raise "ERROR: No sc-config found at #{library_root}.  Make sure you start sc-server in a directory with an sc-config file."
+        else
+          SC.logger.debug "Loading SproutCore bundles in #{library.root_path}"
+        end
+
         # Define new subclass of bundle controller
         cnt = 0
         while Object.const_defined?(class_name = "SproutCoreBundleController#{cnt}".to_sym)
           cnt += 1
         end
         klass = eval("class ::#{class_name} < SproutCore::Merb::BundleController; end; #{class_name}")
-        
+
         # Register library for class in BundleController
         ::SproutCore::Merb::BundleController.register_library_for_class(library, klass)
-        
+
         # Finally, register match
         return self.match(%r[^#{match_path}\/?.*]).to(:controller => "sprout_core_bundle_controller_#{cnt}", :action => 'main')
-        
+
       end
     end
   end

data/lib/sproutcore/merb.rb

@@ -7,7 +7,7 @@
 #
 # The first parameter you pass is the URL you want SproutCore apps to be served from.  Anything
 # URL beginning with this root will be automatically directed to the SproutCore build tools.
-# 
+#
 # The second parameter is an optional root path to the Library that you want hosted at that
 # location.  If you do not pass this parameter then Merb.root will be used (which is what you
 # usually want anyway.)

data/lib/sproutcore/version.rb

@@ -2,7 +2,7 @@ module SproutCore #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 9
-    TINY  = 11
+    TINY  = 12
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end