sproutcore 0.9.10 → 0.9.11

data/lib/sproutcore/jsdoc.rb

@@ -33,9 +33,11 @@ module SproutCore
       runjs_path = File.join(jsdoc_root, 'app', 'run.js')
       template_path = File.join(jsdoc_root, 'templates', 'sproutcore')
 
-      puts "GENERATING: java -Djsdoc.dir=#{jsdoc_root} -jar #{jar_path} #{runjs_path} -t=#{template_path} -d=#{build_path} #{files * ' '} -v"
+      puts %(GENERATING: java -Djsdoc.dir="#{jsdoc_root}" -jar "#{jar_path}" "#{runjs_path}" -t="#{template_path}" -d="#{build_path}" "#{ files * '" "' }" -v)
       
-      SC.logger.debug `java -Djsdoc.dir=#{jsdoc_root} -jar #{jar_path} #{runjs_path} -t=#{template_path} -d=#{build_path} #{files * ' '} -v`
+      # wrap files in quotes...
+      
+      SC.logger.debug `java -Djsdoc.dir="#{jsdoc_root}" -jar "#{jar_path}" "#{runjs_path}" -t="#{template_path}" -d="#{build_path}" "#{ files * '" "' }" -v`
     
     end
   end

data/lib/sproutcore/library.rb

@@ -64,6 +64,9 @@ module SproutCore
     # The parent library, used for load order dependency
     attr_accessor :next_library
     
+    # Any proxy info stored for development
+    attr_accessor :proxies
+    
     # The client directories found in this library.  This usually maps directly to a 
     # client name but it may not if you have set up some other options.
     def client_directories
@@ -161,7 +164,6 @@ module SproutCore
     # way to get all of your code onto disk in a deployable state
     def build(*languages)
       (client_bundles + framework_bundles).each do |bundle|
-        puts "building: #{bundle.bundle_name}"
         bundle.build(*languages)
       end
     end
@@ -170,57 +172,75 @@ module SproutCore
     # This will go up the chain of parent libraries, retrieving and merging 
     # any known environment settings.  The returned options are suitable for 
     # passing to the ClientBuilder for registration.
+    #
+    # The process here is:
+    # 
+    # 1. merge together the :all configs.
+    # 2. Find the deepest config for the bundle specifically and merge that.
+    #
     def environment_for(bundle_name)
 
-      is_local_client = client_directories.include?(bundle_name.to_s)
-      is_local_framework = framework_directories.include?(bundle_name.to_s)
-      ret = nil
+      # Get the bundle location info.  This will return nil if the bundle
+      # is not found anywhere.  In that case, return nil to indicate bundle
+      # does not exist.
+      bundle_location = bundle_location_for(bundle_name)
+      return nil if bundle_location.nil?
+
+      # A bundle was found, so collect the base environment and any bundle-
+      # specific configs provided by the developer.
+      base_env = base_environment
+      config_env = bundle_environment_for(bundle_name)
+
+      # Now we have the relevant pieces. Join them together.  Start with the
+      # base environment and fill in some useful defaults...
+      ret = base_env.dup.merge(config_env).merge(bundle_location)
+      ret[:required] = [:sproutcore] if ret[:required].nil?
       
-      # CASE 1: If named client or framework is local, then use our local settings
-      if (is_local_client || is_local_framework)
+      # Add local library so we get proper deployment paths, etc.
+      ret[:library] = self
+      
+      # Done!  return...
+      return ret 
+    end
+
+    # Returns a re-written proxy URL for the passed URL or nil if no proxy
+    # is registered.  The URL should NOT include a hostname.
+    # 
+    # === Returns
+    # the converted proxy_url and the proxy options or nil if no match
+    #
+    def proxy_url_for(url) 
+      
+      # look for a matching proxy.
+      matched = nil
+      matched_url = nil
+      
+      @proxies.each do |proxy_url, opts|
+        matched_url = proxy_url
+        matched = opts if url =~ /^#{proxy_url}/
+        break if matched
+      end
+      
+      # If matched, rewrite the URL
+      if matched
         
-        # start with local environment
-        ret = (environment[:all] || {}).dup
+        # rewrite the matched_url if needed...
+        if matched[:url]
+          url = url.gsub(/^#{matched_url}/, matched[:url])
+        end
         
-        # Now fill in some default values based on what we know
-        # This should be enough to make the bundle load
-        ret[:bundle_name] = bundle_name.to_sym
-        ret[:bundle_type] = is_local_framework ? :framework : :client
-        ret[:requires] = [:prototype, :sproutcore] if ret[:requires].nil?
+        # prepend the hostname and protocol 
+        url = [(matched[:protocol] || 'http'), '://', matched[:to], url].join('')
         
-        # Fill in the source_root since we know where this came from
-        ret[:source_root] = File.join(root_path, ret[:bundle_type].to_s.pluralize, bundle_name.to_s)
-          
-      # CASE 2: Otherwise, if we have a next library, see if the next library has something
+      # otherwise nil
       else 
-        ret = next_library.nil? ? nil : next_library.environment_for(bundle_name)
-      end
-
-      # Final fixup
-      unless ret.nil?
-        # Always url_prefix & index_prefix are always used.
-        all = environment[:all] || {}
-        [:url_prefix, :all_prefix, :preferred_language].each do |key|
-          ret[key] = all[key] if all.include?(key)
-        end
-      
-        # Either way, if we have local settings for this specific client, they 
-        # override whatever we cooked up just now.
-        local_settings = environment[bundle_name.to_sym] 
-        ret = ret.merge(local_settings) unless local_settings.nil?
-
-        # Always replace the library with self so that we get the correct root location for
-        # public paths, etc. 
-        ret[:library] = self
+        url = nil
       end
       
+      return [url, matched]
       
-      # CASE 3: Next library doesn't know about this client.  Neither do we.  Even if the
-      # user has provided some environmental options, there is no source content, so just 
-      # return nil
-      return ret 
     end
-
+      
     protected
     
     # Load the library at the specified path.  Loads the sc-config.rb if it 
@@ -235,6 +255,7 @@ module SproutCore
       @root_path = rp
       @next_library = next_lib
       @load_opts = opts
+      @proxies = {}
       load_environment!(opts)
     end
     
@@ -269,9 +290,57 @@ module SproutCore
       env.merge!(opts) unless opts.nil?
       yield(env) if block_given?
     end
+    
+    # Adds a proxy to the local library.  This does NOT inherit from parent
+    # libraries.
+    #
+    # ==== Params
+    # url: the root URL to match
+    # opts: options.
+    #
+    # ==== Options
+    # :to: the new hostname
+    # :url: an optional rewriting of the URL path as well.
+    #
+    def proxy(url, opts={})
+      @proxies[url] = opts
+    end
+    
+    # ==== Returns 
+    # the first :all environment config...
+    def base_environment
+      environment[:all] || (next_library.nil? ? {} : next_library.base_environment)
+    end
+    
+    # ==== Returns
+    # the first config found for the specified bundle
+    def bundle_environment_for(bundle_name)
+      bundle_name = bundle_name.to_sym
+      return environment[bundle_name] || (next_library.nil? ? {} : next_library.bundle_environment_for(bundle_name))
+    end
+    
+    # ==== Returns
+    # path info for the bundle.  Used by bundle object.
+    def bundle_location_for(bundle_name)
+      bundle_name = bundle_name.to_sym
+      is_local_client = client_directories.include?(bundle_name.to_s)
+      is_local_framework = framework_directories.include?(bundle_name.to_s)
       
+      ret = nil
+      if is_local_client || is_local_framework
+        bundle_type = is_local_framework ? :framework : :client
+        ret = {
+          :bundle_name => bundle_name,
+          :bundle_type => bundle_type,
+          :source_root => File.join(root_path, bundle_type.to_s.pluralize, bundle_name.to_s)
+        }
+      else
+        ret = next_library.nil? ? nil : next_library.bundle_location_for(bundle_name)
+      end
+      
+      return ret
+    end
+    
   end
   
 end
-
-  

data/lib/sproutcore/merb/bundle_controller.rb

@@ -1,4 +1,6 @@
 require 'sproutcore/jsdoc'
+require 'net/http'
+require 'uri'
 
 module SproutCore
   module Merb
@@ -32,7 +34,17 @@ module SproutCore
         end
         
         # Make sure we can service this with a bundle
-        raise(NotFound, "No SproutCore Bundle registered at this location.") if current_bundle.nil?
+        # 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 
+            return handle_proxy(url, proxy_url, proxy_opts)
+          else
+            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
@@ -71,7 +83,6 @@ module SproutCore
         # 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
 
@@ -79,8 +90,17 @@ module SproutCore
         # been built, this will not do much.  If this the resource is an 
         # index.html file, force the build.
         is_index = /\/index\.html$/ =~ url
-        
-        current_bundle.build_entry(entry, :force => is_index, :hidden => :include)
+
+        # 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 
+        # file is up to date.
+        else
+          current_bundle.build_entry(entry, :force => is_index, :hidden => :include)
+        end
 
         # Move to final build path if necessary
         if (build_path != entry.build_path) && File.exists?(entry.build_path)
@@ -106,6 +126,59 @@ module SproutCore
         return ret
       end
 
+      # Proxy the request and return the result...
+      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 = {} 
+        request.env.each do |key, value|
+          next unless key =~ /^HTTP_/
+          key = key.gsub(/^HTTP_/,'').titleize.gsub(' ','-')
+          headers[key] = value
+        end
+
+        uri = URI.parse(proxy_url)
+        http_host = uri.host
+        http_port = uri.port
+        http_path = [uri.path, uri.query].compact.join('?')
+        http_path = '/' if http_path.nil? || http_path.size <= 0
+
+        # now make the request...
+        response = nil
+        ::Net::HTTP.start(http_host, http_port) do |http|
+          response = http.send(http_method, http_path, headers)
+        end
+
+        # Now set the status, headers, and body.
+        @status = response.code
+        
+        # Transfer response headers into reponse
+        ignore = ['transfer-encoding', 'keep-alive', 'connection']
+        response.each do | key, value |
+          next if ignore.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...
+          if key.downcase == 'set-cookie'
+            value.gsub!(/domain=[^\;]+\;? ?/,'')
+          end
+            
+          # Prep key and set header.
+          key = key.split('-').map { |x| x.downcase.capitalize }.join('-')
+          @headers[key] = value
+        end
+        
+        # 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)

data/lib/sproutcore/version.rb

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

data/sc_generators/client/templates/core.js

@@ -11,9 +11,6 @@
   // When you are in development mode, this array will be populated with 
   // any fixtures you create for testing and loaded automatically in your
   // main method.  When in production, this will be an empty array.
-  FIXTURES: [],
-
-  // Any keys in this array will be instantiated automatically from main.
-  controllers: []
+  FIXTURES: []
   
 }) ;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sproutcore
 version: !ruby/object:Gem::Version 
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors: 
 - Charles Jolley
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-17 00:00:00 -07:00
+date: 2008-06-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -133,7 +133,7 @@ files:
 - frameworks/sproutcore/controllers/collection.js
 - frameworks/sproutcore/controllers/controller.js
 - frameworks/sproutcore/controllers/object.js
-- frameworks/sproutcore/Core.js
+- frameworks/sproutcore/core.js
 - frameworks/sproutcore/drag/drag.js
 - frameworks/sproutcore/drag/drag_data_source.js
 - frameworks/sproutcore/drag/drag_source.js
@@ -141,6 +141,7 @@ files:
 - frameworks/sproutcore/english.lproj/blank.gif
 - frameworks/sproutcore/english.lproj/buttons.css
 - frameworks/sproutcore/english.lproj/core.css
+- frameworks/sproutcore/english.lproj/detect-browser
 - frameworks/sproutcore/english.lproj/icons.css
 - frameworks/sproutcore/english.lproj/images/indicator.gif
 - frameworks/sproutcore/english.lproj/images/sc-theme-sprite.png