RubyGems - sproutcore - Versions diffs - 1.6.0.rc.2-x86-mingw32 → 1.6.0.1-x86-mingw32 - Mend

sproutcore 1.6.0.rc.2-x86-mingw32 → 1.6.0.1-x86-mingw32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (209) hide show

data/lib/frameworks/sproutcore/frameworks/yuireset/resources/base.css ADDED Viewed

@@ -0,0 +1,80 @@
+/*
+Copyright (c) 2010, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.com/yui/license.html
+version: 3.3.0
+build: 3167
+*/
+/* base.css, part of YUI's CSS Foundation */
+h1 {
+	/*18px via YUI Fonts CSS foundation*/
+	font-size:138.5%;
+}
+h2 {
+	/*16px via YUI Fonts CSS foundation*/
+	font-size:123.1%;
+}
+h3 {
+	/*14px via YUI Fonts CSS foundation*/
+	font-size:108%;
+}
+h1,h2,h3 {
+	/* top & bottom margin based on font size */
+	margin:1em 0;
+}
+h1,h2,h3,h4,h5,h6,strong {
+	/*bringing boldness back to headers and the strong element*/
+	font-weight:bold;
+}
+abbr,acronym {
+	/*indicating to users that more info is available */
+	border-bottom:1px dotted #000;
+	cursor:help;
+}
+em {
+	/*bringing italics back to the em element*/
+	font-style:italic;
+}
+blockquote,ul,ol,dl {
+	/*giving blockquotes and lists room to breath*/
+	margin:1em;
+}
+ol,ul,dl {
+	/*bringing lists on to the page with breathing room */
+	margin-left:2em;
+}
+ol li {
+	/*giving OL's LIs generated numbers*/
+	list-style: decimal outside;
+}
+ul li {
+	/*giving UL's LIs generated disc markers*/
+	list-style: disc outside;
+}
+dl dd {
+	/*providing spacing for definition terms*/
+	margin-left:1em;
+}
+th,td {
+	/*borders and padding to make the table readable*/
+	border:1px solid #000;
+	padding:.5em;
+}
+th {
+	/*distinguishing table headers from data cells*/
+	font-weight:bold;
+	text-align:center;
+}
+caption {
+	/*coordinated margin to match cell's padding*/
+	margin-bottom:.5em;
+	/*centered so it doesn't blend in to other content*/
+	text-align:center;
+}
+p,fieldset,table,pre {
+	/*so things don't run into each other*/
+	margin-bottom:1em;
+}
+/* setting a consistent width, 160px;
+   control of type=file still not possible */
+input[type=text],input[type=password],textarea{width:12.25em;*width:11.9em;}

data/lib/frameworks/sproutcore/frameworks/yuireset/resources/core.css CHANGED Viewed

@@ -18,7 +18,3 @@ body {
  	line-height: 1.4;
 }
-/* 3D-accelerate panes in MobileSafari */
-.mobile-safari .sc-pane {
-  -webkit-transform: translate3d(0,0,0);
-}

data/lib/frameworks/sproutcore/lib/index.rhtml CHANGED Viewed

@@ -11,12 +11,13 @@
 <!DOCTYPE html>
 <html<% unless @content_for_html5_manifest.blank? %> manifest="app.manifest"<% end %>>
   <head>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge<%= config.chrome_frame ? ',chrome=1' : '' %>" />
     <script>
     var SC_benchmarkPreloadEvents = { headStart: new Date().getTime() };
     </script>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=EDGE<%= config.chrome_frame ? ',chrome=1' : '' %>" />
     <meta http-equiv="Content-Script-Type" content="text/javascript" />
     <meta name="apple-mobile-web-app-capable" content="yes" />
     <meta name="apple-mobile-web-app-status-bar-style" content="<%= config.status_bar_style || 'default' %>" />

data/lib/frameworks/sproutcore/themes/ace/resources/collection/normal/list.css CHANGED Viewed

@@ -1,12 +1,12 @@
-$theme.sc-collection-view {
+$theme.collection {
   background: white;
-  border-right: 1px #A8B0BA solid;
   &.alternating .sc-collection-item.even {
     background: #eef3f6;
   }
-  .sc-view.sc-collection-item.sel {
+  &.alternating .sc-collection-item.even.sel,
+  .sc-collection-item.sel {
     color: white;
     background: #608AB9;
   }

data/lib/frameworks/sproutcore/themes/ace/resources/collection/normal/list_item.css CHANGED Viewed

@@ -1,13 +1,13 @@
 /* Overriding some of the styles on checkbox */
 $theme.sc-list-item-view {
-  .sc-checkbox-view {
+  $theme.checkbox {
     background-color: transparent;
     border: 0 none;
     margin-top: -9px;
   }
- .disclosure {
+ $theme.disclosure {
     position: absolute;
     left: -6px;
     top: 50%;

data/lib/frameworks/sproutcore/themes/ace/resources/form/form.css ADDED Viewed

@@ -0,0 +1,9 @@
+/* This default stylesheet for forms maximizes fluidity. */
+$theme.sc-form-label {
+  white-space:pre; text-align: right;
+}
+$theme.form-row {
+  overflow: visible;
+}

data/lib/frameworks/sproutcore/themes/ace/resources/menu/menu.css CHANGED Viewed

@@ -37,7 +37,9 @@ $theme.menu {
     /* CHECKBOXES */
     .checkbox {
-      top: 3px;
+      position: absolute;
+      left: 5px;
+      top: 4px;
       width: 12px; height: 12px;
       @include slice(checkmark.png);
     }

data/lib/frameworks/sproutcore/themes/ace/resources/picker/popover/picker.js CHANGED Viewed

@@ -7,7 +7,7 @@
 sc_require("resources/picker/popover/popover");
 SC.AceTheme.Popover.pickerRenderDelegate = SC.RenderDelegate.create({
-  name: 'picker',
+  className: 'picker',
   render: function(dataSource, context) {
     var preferType = dataSource.get('preferType');

data/lib/frameworks/sproutcore/themes/ace/resources/picker/popover/workspace.js CHANGED Viewed

@@ -6,7 +6,7 @@
 // ==========================================================================
 SC.AceTheme.Popover.workspaceRenderDelegate = SC.RenderDelegate.create({
-  name: 'workspace',
+  className: 'workspace',
   render: function(dataSource, context) {
     context.setClass({
       'top-toolbar': dataSource.get('hasTopToolbar'),

data/lib/frameworks/sproutcore/themes/legacy_theme/render_delegates/button.js CHANGED Viewed

@@ -9,7 +9,7 @@ sc_require("theme");
   Renders and updates the HTML representation of a button.
 */
 SC.LegacyTheme.buttonRenderDelegate = SC.RenderDelegate.create({
-  name: 'button',
+  className: 'button',
   /**
     Called when we need to create the HTML that represents the button.

data/lib/frameworks/sproutcore/themes/legacy_theme/render_delegates/panel.js CHANGED Viewed

@@ -6,7 +6,7 @@
 // ==========================================================================
 sc_require("theme");
 SC.LegacyTheme.panelRenderDelegate = SC.RenderDelegate.create({
-  name: 'panel',
+  className: 'panel',
   render: function(dataSource, context) {
     context.push(

data/lib/frameworks/sproutcore/themes/legacy_theme/render_delegates/progress.js CHANGED Viewed

@@ -41,6 +41,8 @@ SC.LegacyTheme.PROGRESS_OFFSET_RANGE = 24;
 */
 SC.LegacyTheme.progressRenderDelegate = SC.RenderDelegate.create({
+  className: 'progress',
   render: function(dataSource, context) {
     this.addSizeClassName(dataSource, context);

data/lib/frameworks/sproutcore/themes/legacy_theme/render_delegates/slider.js CHANGED Viewed

@@ -18,7 +18,7 @@ sc_require("theme");
 SC.LegacyTheme.sliderRenderDelegate = SC.RenderDelegate.create({
-  name: 'slider',
+  className: 'slider',
   render: function(dataSource, context) {
     this.addSizeClassName(dataSource, context);

data/lib/frameworks/sproutcore/themes/legacy_theme/render_delegates/well.js CHANGED Viewed

@@ -7,7 +7,7 @@
 sc_require("theme");
 // the 'well'-styled container
 SC.BaseTheme.wellRenderDelegate = SC.Object.create({
-  name: 'well',
+  className: 'well',
   render: function(dataSource, context) {
     context.push("<div class='top-left-edge'></div>",

data/lib/sproutcore/builders/base.rb CHANGED Viewed

@@ -64,9 +64,13 @@ module SC
         writeline(dst_path,joinlines(lines))
       end
+      def sc_static_match
+        /(sc_static|static_url|sc_target)\(\s*['"]([^"']*?)['"]\s*\)/
+      end
       # Handles occurances of sc_static() or static_url()
       def replace_static_url(line)
-        line.gsub!(/(sc_static|static_url|sc_target)\(\s*['"]([^"']*?)['"]\s*\)/) do | rsrc |
+        line.gsub!(sc_static_match) do | rsrc |
           entry_name = $2
           entry_name = "#{$2}:index.html" if $1 == 'sc_target'

data/lib/sproutcore/builders/handlebars.rb CHANGED Viewed

@@ -22,8 +22,19 @@ module SC
     def build(dst_path)
       template_name = entry.rootname[/^.*\/([^\/]*)$/, 1]
-      writelines dst_path, "SC.TEMPLATES[#{template_name.inspect}] = SC.Handlebars.compile(#{readlines(entry[:source_path]).to_json});"
+      template_code = readlines(entry[:source_path])
+      replace_static_url(template_code)
+      writelines dst_path, "SC.TEMPLATES[#{template_name.inspect}] = SC.Handlebars.compile(#{template_code.to_json});"
     end
+    def sc_static_match
+      /\{\{(sc_static|static_url|sc_target)\(\s*['"]([^"']*?)['"]\s*\)\}\}/
+    end
+    def static_url(url='')
+      url
+    end
   end
 end

data/lib/sproutcore/models/target.rb CHANGED Viewed

@@ -643,15 +643,7 @@ module SC
         javascript_entries.each do |resource_name, entries|
           resource_name = resource_name.ext('js')
-          if resource_name == 'javascript.js'
-            pf = ['source/lproj/strings.js', 'source/core.js', 'source/utils.js']
-            if manifest.target.target_type == :app
-              target_name = manifest.target.target_name.to_s.split('/')[-1]
-              pf.insert(2, "source/#{target_name}.js")
-            end
-          else
-            pf = []
-          end
+          pf = (resource_name == 'javascript.js') ? ['source/lproj/strings.js', 'source/core.js', 'source/utils.js'] : []
           SC::Helpers::EntrySorter.sort(entries, pf).each do |entry|
             if minify_js && entry[:minified]

data/lib/sproutcore/rack/proxy.rb CHANGED Viewed

@@ -5,17 +5,60 @@
 #            and contributors
 # ===========================================================================
+# We only require net/https to ensure that HTTPS is supported for
+# proxy[:secure] requests
 begin
   require 'net/https'
   SC::HTTPS_ENABLED = true
 rescue LoadError => e
-  require 'net/http'
   SC::HTTPS_ENABLED = false
 end
+require 'eventmachine'
+require 'em-http'
+require 'thin'
 module SC
   module Rack
+    class DeferrableBody
+      include EM::Deferrable
+      def initialize(options = {})
+        @options = options
+      end
+      def call(body)
+        body.each do |chunk|
+          @body_callback.call(prepare_chunk(chunk))
+        end
+      end
+      def prepare_chunk(chunk)
+        if chunked?
+          size = chunk.respond_to?(:bytesize) ? chunk.bytesize : chunk.length
+          "#{size.to_s(16)}\r\n#{chunk}\r\n"
+        else
+          # Thin doesn't like null bodies
+          chunk || ''
+        end
+      end
+      def each(&blk)
+        @body_callback = blk
+      end
+    private
+      def chunked?
+        @options[:chunked]
+      end
+    end
     # Rack application proxies requests as needed for the given project.
     class Proxy
@@ -25,141 +68,244 @@ module SC
       end
       def call(env)
-        url = env['PATH_INFO']
+        path = env['PATH_INFO']
         @proxies.each do |proxy, value|
-          if url.match(/^#{Regexp.escape(proxy.to_s)}/)
-            return handle_proxy(value, proxy.to_s, env)
+          # If the url matches a proxied url, handle it
+          if path.match(/^#{Regexp.escape(proxy.to_s)}/)
+            handle_proxy(value, proxy.to_s, env)
+            # Don't block waiting for a response
+            throw :async
           end
         end
         return [404, {}, "not found"]
       end
+      def chunked?(headers)
+        headers['Transfer-Encoding'] == "chunked"
+      end
       def handle_proxy(proxy, proxy_url, env)
         if proxy[:secure] && !SC::HTTPS_ENABLED
           SC.logger << "~ WARNING: HTTPS is not supported on your system, using HTTP instead.\n"
           SC.logger << "    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']
+        headers = request_headers(env, proxy)         # ex. {"Host"=>"localhost:4020", "Connection"=>"...
+        path = env['PATH_INFO']                       # ex. /contacts
+        params = env['QUERY_STRING']                  # ex. since=yesterday&unread=true
-        # 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
+        # Switch to https if proxy[:secure] configured
+        protocol = proxy[:secure] ? 'https' : 'http'
-        # Rack documentation says CONTENT_TYPE and CONTENT_LENGTH aren't prefixed by HTTP_
-        headers['Content-Type'] = env['CONTENT_TYPE'] if env['CONTENT_TYPE']
+        # Adjust the path if proxy[:url] configured
+        if proxy[:url]
+          path = path.sub(/^#{Regexp.escape proxy_url}/, proxy[:url])
+        end
-        length = env['CONTENT_LENGTH']
-        headers['Content-Length'] = length if length
+        # The endpoint URL
+        url = protocol + '://' + proxy[:to]
+        url += path unless path.empty?
+        url += '?' + params unless params.empty?
-        http_host, http_port = proxy[:to].split(':')
-        http_port = proxy[:secure] ? '443' : '80' if http_port.nil?
+        if env['CONTENT_LENGTH'] || env['HTTP_TRANSFER_ENCODING']
+          req_body = env['rack.input']
+          req_body.rewind # May not be necessary but can't hurt
-        if proxy[:url]
-          url = url.sub(/^#{Regexp.escape proxy_url}/, proxy[:url])
+          req_body = req_body.read
         end
-        http_path = [url]
-        http_path << params if params && params.size>0
-        http_path = http_path.join('?')
+        # Options for the request
+        request_options = {}
+        request_options[:head] = headers
+        request_options[:body] = req_body if !!req_body
+        request_options[:timeout] = proxy[:timeout] if proxy[:timeout]
+        request_options[:redirects] = 10 if proxy[:redirect] != false
-        response = nil
-        no_body_method = %w(get copy head move options trace)
+        EventMachine.run {
+          body = nil
+          conn = EM::HttpRequest.new(url)
+          chunked = false
+          headers = {}
+          method = env['REQUEST_METHOD'].upcase
+          status = 0
-        done = false
-        tries = 0
-        until done
-          # added 4/23/09 per Charles Jolley, corrects problem
-          # when making requests to virtual hosts
-          headers['Host'] = "#{http_host}:#{http_port}"
+          case method
+            when 'GET'
+              http = conn.get request_options
+            when 'POST'
+              http = conn.post request_options
+            when 'PUT'
+              http = conn.put request_options
+            when 'DELETE'
+              http = conn.delete request_options
+            else
+              http = conn.head request_options
+            end
-          http = ::Net::HTTP.new(http_host, http_port)
+          # Received error
+          http.errback {
+            status = http.response_header.status
+            path = env['PATH_INFO']
+            url = http.last_effective_url
+            SC.logger << "~ PROXY FAILED:  #{method} #{path} -> #{status} #{url}\n"
-          if proxy[:secure]
-            http.use_ssl = true
-            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-          end
+            # If a body has been sent use it, otherwise respond with generic message
+            if !body
+              body = "Unable to proxy to #{url}.  Received status: #{status}"
+              size = body.respond_to?(:bytesize) ? body.bytesize : body.length
+              headers = { 'Content-Length' => size.to_s }
+              body = [body]
+            end
-          http.start do |web|
-            if no_body_method.include?(http_method)
-              response = web.send(http_method, http_path, headers)
+            env['async.callback'].call [502, headers, body]
+          }
+          # Received response
+          http.callback {
+            # Too many redirects
+            if redirect? status
+              body = "Unable to proxy to #{url}.  Too many redirects."
+              size = body.respond_to?(:bytesize) ? body.bytesize : body.length
+              headers = { 'Content-Length' => size.to_s }
+              env['async.callback'].call [502, headers, [body]]
             else
-              http_body = env['rack.input']
-              http_body.rewind # May not be necessary but can't hurt
+              # Terminate the deferred body (which may have been chunked)
+              if body
+                body.call ['']
+                body.succeed
+              end
-              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
+              # Log the initial path and the final url
+              path = env['PATH_INFO']
+              url = http.last_effective_url
+              SC.logger << "~ PROXY: #{method} #{path} -> #{status} #{url}\n"
+           end
+          }
+          # Received headers
+          http.headers { |hash|
+            status = http.response_header.status
+            headers = response_headers(hash)
+            # Don't respond on redirection, but fail out on bad redirects
+            if redirect? status
+              if status == 304
+                env["async.callback"].call [status, headers, ['']]
+                SC.logger << "~ PROXY: #{method} #{path} -> #{status} #{url}\n"
+              elsif !headers['Location']
+                body = "Unable to proxy to #{url}. Received redirect with no Location."
+                size = body.respond_to?(:bytesize) ? body.bytesize : body.length
+                headers = { 'Content-Length' => size.to_s }
-          status = response.code # http status code
-          protocol = proxy[:secure] ? 'https' : 'http'
-          SC.logger << "~ 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'
-            # 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'
+                http.close
               end
+            else
+              # Stream the body right across in the format it was sent
+              chunked = chunked?(headers)
+              body = DeferrableBody.new({ :chunked => chunked })
+              # Start responding to the client immediately
+              env["async.callback"].call [status, headers, body]
             end
+          }
-            SC.logger << "   #{key}: #{value}\n"
-            response_headers[key] = value
+          # Received chunk of data
+          http.stream { |chunk|
+            # Ignore body of redirects
+            if !redirect? status
+              body.call [chunk]
+            end
+          }
+        }
+      end
+      def redirect?(status)
+        status >= 300 && status < 400
+      end
+      # collect headers...
+      def request_headers(env, proxy)
+        result = {}
+        env.each do |key, value|
+          next unless key =~ /^HTTP_/
+          key = headerize(key)
+          if !key.eql? "Version"
+            result[key] = value
           end
+        end
+        # Rack documentation says CONTENT_TYPE and CONTENT_LENGTH aren't prefixed by HTTP_
+        result['Content-Type'] = env['CONTENT_TYPE'] if env['CONTENT_TYPE']
+        length = env['CONTENT_LENGTH']
+        result['Content-Length'] = length if length
+        # added 4/23/09 per Charles Jolley, corrects problem
+        # when making requests to virtual hosts
+        result['Host'] = proxy[:to]
-          if [301, 302, 303, 307].include?(status.to_i) && proxy[:redirect] != false
-            SC.logger << '~ REDIRECTING: '+response_headers['location']+"\n"
+        result
+      end
+      # construct and display specific response headers
+      def response_headers(hash)
+        result = {}
+        hash.each do |key, value|
+          key = headerize(key)
-            uri = URI.parse(response_headers['location']);
-            if uri.host != http_host || uri.port != http_port
-              response_body = response.body || ''
-              return [status, ::Rack::Utils::HeaderHash.new(response_headers), [response_body]]
+          # Because Set-Cookie header can appear more the once in the response body,
+          # but Rack only accepts a hash of headers, we store it in a line break separated string
+          # for Ruby 1.9 and as an Array for Ruby 1.8
+          # See http://groups.google.com/group/rack-devel/browse_thread/thread/e8759b91a82c5a10/a8dbd4574fe97d69?#a8dbd4574fe97d69
+          if key.downcase == 'set-cookie'
+            cookies = []
+            case value
+              when Array then value.each { |c| cookies << strip_domain(c) }
+              when Hash  then value.each { |_, c| cookies << strip_domain(c) }
+              else            cookies << strip_domain(value)
             end
-            http_path = uri.path
-            http_path += '?'+uri.query if uri.query
+            # Remove nil values
+            result['Set-Cookie'] = [result['Set-Cookie'], cookies].compact
-            tries += 1
-            if tries > 10
-              raise "Too many redirects!"
+            if Thin.ruby_18?
+              result['Set-Cookie'].flatten!
+            else
+              result['Set-Cookie'] = result['Set-Cookie'].join("\n")
             end
-          else
-            done = true
           end
+          SC.logger << "   #{key}: #{value}\n"
+          result[key] = value
         end
-        # Thin doesn't like null bodies
-        response_body = response.body || ''
+        ::Rack::Utils::HeaderHash.new(result)
+      end
+      # remove HTTP_, dasherize and titleize
+      def headerize(str)
+        parts = str.gsub(/^HTTP_/, '').split('_')
+        parts.map! { |p| p.capitalize }.join('-')
+      end
-        return [status, ::Rack::Utils::HeaderHash.new(response_headers), [response_body]]
+      # Strip out the domain of passed in cookie.  This technically may
+      # break certain scenarios where services try to set cross-domain
+      # cookies, but those services should not be doing that anyway...
+      def strip_domain(cookie)
+        cookie.to_s.gsub!(/domain=[^\;]+\;? ?/,'')
       end
     end
   end