sproutcore 1.4.0.rc.2 → 1.4.0.rc.3

data/VERSION.yml

@@ -1,7 +1,7 @@
 --- 
 :major: 1
 :minor: 4
-:patch: 0.rc.2
+:patch: 0.rc.3
 :digest: e038ba5746bb757cd0ff2391828c5f03496fbb64
 :dist: 
-  frameworks/sproutcore: 637dc82942f2fd5c1e9cd57ce7582fca821a3bfa
+  frameworks/sproutcore: 7174adeb47aa0930c95ddae79e2c9cf042fded45

data/lib/sproutcore/models/target.rb

@@ -704,7 +704,7 @@ module SC
       FileUtils.mkdir_p(build_root)
 
       # Prepare jsdoc opts
-      jsdoc_root    = SC::PATH / 'vendor' / 'jsdoc'
+      jsdoc_root    = SC::LIBPATH / 'vendor' / 'jsdoc'
       jar_path      = jsdoc_root / 'jsrun.jar'
       runjs_path    = jsdoc_root / 'app' / 'run.js'
 

data/lib/sproutcore/rack/proxy.rb

@@ -70,46 +70,55 @@ module SC
         done = false
         tries = 0
         until done
-        ::Net::HTTP.start(http_host, http_port) do |http|
-          if proxy[:secure]
-            http.use_ssl = true
-            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-          end
-
-          if no_body_method.include?(http_method)
-            response = http.send(http_method, http_path, headers)
-          else
-            http_body = env['rack.input']
-            some_request = Net::HTTPGenericRequest.new http_method.upcase,
-                            true, true, http_path, headers
-
-            some_request.body_stream = http_body
-            response = http.request(some_request)
-          end
-        end
+          ::Net::HTTP.start(http_host, http_port) do |http|
+            if proxy[:secure]
+              http.use_ssl = true
+              http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+            end
 
-        status = response.code # http status code
+            if no_body_method.include?(http_method)
+              response = http.send(http_method, http_path, headers)
+            else
+              http_body = env['rack.input']
+              http_body.rewind
 
-        SC.logger << "~ PROXY: #{http_method.upcase} #{status} #{url} -> http://#{http_host}:#{http_port}#{http_path}\n"
+              some_request = Net::HTTPGenericRequest.new http_method.upcase,
+                              true, true, http_path, headers
 
-        # 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
-          value = response.body.bytesize.to_s if key.downcase == 'content-length'
+              some_request.body_stream = http_body
+              response = http.request(some_request)
+            end
+          end
 
+          status = response.code # http status code
+
+          SC.logger << "~ PROXY: #{http_method.upcase} #{status} #{url} -> http://#{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
 
-          SC.logger << "   #{key}: #{value}\n"
-          response_headers[key] = value
-        end
+            SC.logger << "   #{key}: #{value}\n"
+            response_headers[key] = value
+          end
 
           if [301, 307].include?(status.to_i)
             SC.logger << '~ REDIRECTING: '+response_headers['location']
@@ -130,7 +139,10 @@ module SC
           end
         end
 
-        return [status, ::Rack::Utils::HeaderHash.new(response_headers), [response.body]]
+        # Thin doesn't like null bodies
+        response_body = response.body || ''
+
+        return [status, ::Rack::Utils::HeaderHash.new(response_headers), [response_body]]
       end
     end
   end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 4
   - 0
   - rc
-  - 2
-  version: 1.4.0.rc.2
+  - 3
+  version: 1.4.0.rc.3
 platform: ruby
 authors: 
 - Sprout Systems, Inc.  Apple Inc. and contributors
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-09 00:00:00 -07:00
+date: 2010-09-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -292,31 +292,31 @@ files:
 - design/Technical Notes.graffle/QuickLook/Thumbnail.tiff
 - design/Technical Notes.graffle/data.plist
 - design/Technical Notes.graffle/image8.png
-- doc_templates/jsdoc/allclasses.tmpl
-- doc_templates/jsdoc/allfiles.tmpl
-- doc_templates/jsdoc/class.tmpl
-- doc_templates/jsdoc/index.tmpl
-- doc_templates/jsdoc/publish.js
-- doc_templates/jsdoc/static/default.css
-- doc_templates/jsdoc/static/header.html
-- doc_templates/jsdoc/static/index.html
-- doc_templates/jsdoc/symbol.tmpl
-- doc_templates/sproutcore/allclasses.tmpl
-- doc_templates/sproutcore/allfiles.tmpl
-- doc_templates/sproutcore/class.tmpl
-- doc_templates/sproutcore/classes-json.tmpl
-- doc_templates/sproutcore/index.tmpl
-- doc_templates/sproutcore/publish.js
-- doc_templates/sproutcore/static/default.css
-- doc_templates/sproutcore/static/header.html
-- doc_templates/sproutcore/static/index.html
-- doc_templates/sproutcore/symbol.tmpl
 - lib/Buildfile
 - lib/buildtasks/build.rake
 - lib/buildtasks/entry.rake
 - lib/buildtasks/manifest.rake
 - lib/buildtasks/render.rake
 - lib/buildtasks/target.rake
+- lib/doc_templates/jsdoc/allclasses.tmpl
+- lib/doc_templates/jsdoc/allfiles.tmpl
+- lib/doc_templates/jsdoc/class.tmpl
+- lib/doc_templates/jsdoc/index.tmpl
+- lib/doc_templates/jsdoc/publish.js
+- lib/doc_templates/jsdoc/static/default.css
+- lib/doc_templates/jsdoc/static/header.html
+- lib/doc_templates/jsdoc/static/index.html
+- lib/doc_templates/jsdoc/symbol.tmpl
+- lib/doc_templates/sproutcore/allclasses.tmpl
+- lib/doc_templates/sproutcore/allfiles.tmpl
+- lib/doc_templates/sproutcore/class.tmpl
+- lib/doc_templates/sproutcore/classes-json.tmpl
+- lib/doc_templates/sproutcore/index.tmpl
+- lib/doc_templates/sproutcore/publish.js
+- lib/doc_templates/sproutcore/static/default.css
+- lib/doc_templates/sproutcore/static/header.html
+- lib/doc_templates/sproutcore/static/index.html
+- lib/doc_templates/sproutcore/symbol.tmpl
 - lib/gen/Buildfile
 - lib/gen/app/Buildfile
 - lib/gen/app/README