sproutcore 0.9.1 → 0.9.2

data/jsdoc/templates/sproutcore/default.css

@@ -1,47 +1,72 @@
+/* @override http://localhost:4020/static/sproutcore/-docs/data/default.css */
 
+/* @group Core */
 
-/* @group Root Form */
+body.sc-doc {
+	background-color: white  ;
+	padding: 20px;
+}
 
-input.show-hint {
-	color: #888;
+.sc-doc {
+	font: 64.5% Helvetica, Arial, Verdana, sans-serif;
+	line-height: 1em ;
 }
 
-.radio.vertical,
-.radio.vertical .button.radio {
-	display: block ;	
+/* Set standard size on some things. */
+.sc-doc p, 
+.sc-doc dd, 
+.sc-doc dt, 
+.sc-doc li, 
+.sc-doc table {
+	line-height: 1.3em;
+	font-size: 1.3em ;
 }
 
-.radio.horizontal,
-.radio.horizontal .button.radio {
-	display: inline ;
+.sc-doc h1 {
+	font-size: 3em;
+	margin: 0 0 1em 0;
+	text-transform: capitalize;
 }
 
-.radio.vertical {
-  text-align: left ;
+.sc-doc h2 {
+	padding: 0;
+	padding-bottom: 4px;
+	border-bottom: 1px #555 solid;
+	text-transform: capitalize;
+	margin: 1.5em 0 0;
+	font-size: 2.2em;
 }
 
-/* @end */
+.sc-doc h3 {
+	font-size: 2em;
+	padding: 0;
+	margin: 3em 0 0 0;	
+}
 
-/* @group sc-theme */
+.sc-doc h4 {
+	font-weight: normal ;
+	font-size: 1.4em;
+	margin: 0.5em 0 0 0;
+	padding: 0;
+}
 
-body.sc-theme {
-	font: 12px "Helvetica Neue", Helvetica, Verdana, sans-serif;
-	background-color: #f0f0f0 ;
-	padding: 10px;
+.sc-doc h5 {
+	font-size: 1.3em;
+	padding: 0;
+	margin: 1.3em 0 0.5em 0;
 }
 
-.sc-theme h1 {
-	margin: 0 10%;
-	padding: 0 ;
-	margin-bottom: 10px;
-	border-bottom: 1px #888 dotted ;
+.sc-doc p { margin: 0.5em 0; }
+ 
+.sc-doc a {
+	text-decoration: none ;
 }
 
-.sc-theme label {
+.sc-doc label {
 	font-weight: bold ;
 }
 
-.sc-theme .ghost {
+.sc-doc .sc-theme .ghost {
 	-moz-user-select: none;
 	-khtml-user-select: none;
 	user-select: none;
@@ -49,189 +74,114 @@ body.sc-theme {
 	-moz-opacity: .45 ;
 }
 
-/* @end */
-
-/* @group sc-theme Form */
-
-.sc-theme .invalid {
-	border: 2px red solid ;
+.sc-doc dt {
+	font-style: italic;
 }
 
-.sc-theme ul.errors {
-	color:  red ;
-	list-style-type: none ;
-	font-size: 11px;
-}
-
-.sc-theme form ul.errors {
-	margin:  0;
-	padding: 0; 
-	color: red ;
-}
-
-.sc-theme input {
-	font-size: 12px; 
+.sc-doc dd {
+ margin: 0 0 1em 1em;
 }
 
 /* @end */
 
-/* @group jsdoc */
+/* @group Summary Table */
 
-body.sc-theme {
-	font-family: Helvetica, "Helvetica Neue", Verdana, sans-serif;
-	font-size: 12px;
-	background-color: white ;
+.sc-doc table.summary {
+	min-width: 450px;
+	border: 1px #999 solid;
+	border-bottom: none ;
+	border-spacing: 0;
+	margin-bottom: 2em;
 }
 
-table.nav {
-	font-size: .8em;
-	width: 100%;
-	border-bottom: 1px solid #ccc;
+.sc-doc table.summary td {
+	border-bottom: 1px #999 solid;
+	border-collapse: collapse;
+	padding: 0.5em;
+	text-align: left ;
 }
 
-table.nav .right {
-	text-align: right;
+.sc-doc table.summary .even td {
+	background-color: #eef;
 }
 
-.summary h2,
-.detail h2 {
-	border-top: 1px none #ccc;
-	border-bottom: 1px solid #666;
-	margin: 1.0em 0 0;
-	font-size: 1.8em;
-}
-
-.method {
+.sc-doc table.summary td.label {
 	font-weight: bold ;
+	width: 100px;
+	text-align: right ;
+	padding-right: 4px;
 }
 
-.type {
-	font-style: italic ;
-	color: #666;
-}
-
-
-/* @end */
-
-/* @group Intro */
-
-.intro h1 {
-	border: none ;
-	padding: 0;
-	margin:  0;
-	font-size: 2.5em;
-	padding-top: 1em;
-	line-height: 1;
-}
-
-.intro p.source {
-	margin: 0;
-	font-size: .9em;
-	color: #aaa;
-	font-weight: bold;
-	padding: 0 0 0 1px;
-}
-
-.intro p.source a {
-	color: #555;
-}
-
-.intro .description {
-	border-bottom: 1px none #ccc;
-	border-top: 1px none #ccc;
-	padding-top: 0;
-	margin-top: 20px;
-	margin-bottom: 30px;
+.sc-doc table.summary td.value {
+	min-width: 300px;
+	width: 300px;
 }
 
 /* @end */
 
-/* @group Summary */
+/* @group Field & Method Summary */
 
-.summary table {
-	width: 100%;
-	background-color: #fafafa ;
-	margin-top: 4px;
-	border-spacing: 0 ;
-	border-collapse: collapse ;
-}
-
-.summary table td {
-	border-top: 1px #ccc solid ;
-	border-bottom: 1px #ccc solid ;
-	padding: 4px;
+.sc-doc .summary li {
+	list-style-type: none ;
+	position: relative;
 }
 
-.summary table td .description {
-	font-size: .9em;
-	font-weight: bold ;
+.sc-doc .summary li code {
+	font-size: 1.1em;
 }
 
-.summary ul.inherited {
-	list-style-type: none ;
-	margin: 0;
-	padding:  0;
+.sc-doc .summary li .description {
+	display: none ;
 }
 
-.summary ul.inherited h3 {
-	border-bottom: 1px dotted #ccc;
+.sc-doc .summary li:hover .description {
+	display: block ;
+	font-size: 0.86em;
+	position: absolute ;
+	left: 80px;
+	bottom: 2em;
+	padding: 0.3em 1em ;
+	background-color: #fff898;
+	border: 1px solid #bbae2f;
+	-webkit-box-shadow: rgba(0,0,0,0.3) 0px 2px 5px;
+	color: #4b4000;
+	z-index: 100;
 }
 
 /* @end */
 
 /* @group Detail */
 
-.constructor-detail  {
-	display: none;
-}
-
-.detail .single-method,
-.detail .property {
-	margin-top: 30px;
-}
-
-.detail h3 {
-	margin: 4px 0;
-	padding: 4px;
-	border-top: 1px #ccc solid ;
-	border-bottom: 1px #ccc solid ;
-	background-color: #fafafa ;
+.sc-doc .detail p.signature {
+	padding: 0;
+	margin: 1em 0;
+	font-family: Courier, mono;
 }
 
-.signature {
-	margin: 8px 0;
-	display: block ;
+.sc-doc .detail p.signature .type {
+	font-style: italic;
 }
 
-.parameters .name {
+.sc-doc .detail p.signature .name {
 	font-weight: bold ;
 }
 
-h4 {
-	margin-bottom: 0;	
-}
-
-.single-method .parameters ul {
-	margin-top: 0;
-	padding-left: 20px
-}
-
 /* @end */
 
-.jsdoc_ctime {
+.sc-doc .jsdoc_ctime {
 	border-top: 1px #ccc solid ;
 	padding: 4px 0;
 	margin-top: 20px;
 	margin-bottom: 0px;
-	font-size: .8em;
+	font-size: 1.0em;
 	text-align: center ;
 	color: #888 ;
 }
 
 /* @group Description */
 
-.description blockquote,
-.description p.code {
+.sc-doc .description blockquote,
+.sc-doc .description p.code {
 	padding:  10px ;
 	margin: 10px 20px;
 	background-color: #f5f5f5 ;

data/jsdoc/templates/sproutcore/index.tmpl

@@ -7,15 +7,50 @@ function keys(o) {
 
 function groupName(path) {
   var parts = path.split('/') ;
-  return parts[parts.length - 2] ;
+  
+  var rootIndex = parts.indexOf('frameworks') ;
+  if (rootIndex < 0) rootIndex = parts.indexOf('clients') ;
+  
+  if (rootIndex < 0) {
+    return parts[parts.length - 2] ;
+    
+  } else {
+    return parts.slice(rootIndex+2, parts.length-1).join('/') ;
+  }
+};
+
+function getSymbols(className, thisClass) {
+  var ret = [className.toLowerCase()] ;
+  
+  var f = function(data) {
+    if (data && data.length) {
+      var idx = data.length ;
+      while(--idx >= 0) { 
+        var name = data[idx].name ;
+        if (name) ret.push(name.toLowerCase()) ;
+      }
+    }
+  };
+  
+  f(thisClass.properties) ;
+  f(thisClass.methods) ;
+  
+  return ret.join(' ') ;
 };
 
 !}
-{
-  records: [
-  	<for each="classname" in="keys(data).sort()">
-  	{ "type": "Doc", "guid": "{+classname+}", title: "{+classname+}", url: "{+data[classname][0].docs+}", group: "{+groupName(data[classname][0].file.path)+}" },
-  	</for>
-    { "type": "Doc", "guid": "_GLOBALS", title: "GLOBALS", url: "globals.html" }
-  ]
+{ records: [<for each="classname" in="keys(data).sort()">
+  { "type": "Doc", 
+    "guid": "{+classname+}", 
+    "title": "{+classname+}", 
+    "url": "{+data[classname][0].docs+}", 
+    "group": "{+groupName(data[classname][0].file.path)+}", 
+    "symbols": "{+getSymbols(classname, data[classname][0])+}",
+    "path": "{+data[classname][0].file.path+}"
+  },</for>
+  { "type": "Doc", 
+    "guid": "_GLOBALS", 
+    "title": "GLOBALS", 
+    "url": "globals.html" 
+  }]
 }

data/jsdoc/templates/sproutcore/publish.js

@@ -92,6 +92,11 @@ function superTextile(s) {
         line = line.replace(/^\s*h([1|2|3|4|5|6])\.(.+)/, '<h$1>$2</h$1>');
         changed = 1; 
         
+      // convert - to bulletted list.  liu tag will be fixed later.
+      } else if (line.search(/^\s*-\s+/) != -1) { 
+        line = line.replace(/^\s*-\s+/,'\t<liu>') + '</liu>'; changed = 1;
+        changed = 1;
+
       // convert * to bulletted list.  liu tag will be fixed later.
       } else if (line.search(/^\s*\*\s+/) != -1) { 
         line = line.replace(/^\s*\*\s+/,'\t<liu>') + '</liu>'; changed = 1;
@@ -209,10 +214,10 @@ function publish(fileGroup, context) {
       }
     }
     
-    if (!allFiles[fileGroup.files[i].path]) {
-      var hiliter = new JsHilite(IO.readFile(fileGroup.files[i].path), JsDoc.opt.e);
-      IO.saveFile(context.d, file_srcname, hiliter.hilite());
-    }
+    // if (!allFiles[fileGroup.files[i].path]) {
+    //   var hiliter = new JsHilite(IO.readFile(fileGroup.files[i].path), JsDoc.opt.e);
+    //   IO.saveFile(context.d, file_srcname, hiliter.hilite());
+    // }
     fileGroup.files[i].source = file_srcname;
     allFiles[fileGroup.files[i].path] = true;
   }

data/lib/sproutcore/build_tools/html_builder.rb

@@ -2,13 +2,16 @@ require 'erubis'
 require 'sproutcore/helpers'
 require 'sproutcore/view_helpers'
 
+puts "LOADED HTML_BUILDER"
+
 module SproutCore
   
   module BuildTools
 
-    # Whenever you build an HTML file for a SproutCore client, an instance of this class
-    # is created to actually process and build the HTML using Erubus.  If you want to add
-    # more methods to use in your HTML files, just include them in HtmlContext.
+    # Whenever you build an HTML file for a SproutCore client, an instance of 
+    # this class is created to actually process and build the HTML using 
+    # Erubus.  If you want to add more methods to use in your HTML files, just 
+    # include them in HtmlContext.
     #
     class HtmlContext 
 
@@ -26,8 +29,9 @@ module SproutCore
         @bundle = bundle
         @library = bundle.library
 
-        # Find all of the entries that need to be included.  If deep is true, the include
-        # required bundles.  Example composite entries to include their members.
+        # Find all of the entries that need to be included.  If deep is true, 
+        # the include required bundles.  Example composite entries to include 
+        # their members.
         if deep
           @entries = bundle.all_required_bundles.map do |cur_bundle| 
             ret = (cur_bundle == bundle) ? [entry] : cur_bundle.entries_for(:html, :language => language, :hidden => :include)
@@ -40,11 +44,21 @@ module SproutCore
           @entries = entry.composite? ? entry.composite.map { |c| x.entry_for(c) } : [entry]
         end
         
-        # Clean out any composites we might have collected.  They have already been expanded.
+        # Clean out any composites we might have collected.  They have already 
+        # been expanded.
         @entries.reject! { |entry| entry.composite? }
+        
+        # Load any helpers before we continue
+        puts "*************REQUIRE"
+        bundle.all_required_bundles.each do |cur_bundle|
+          puts "requiring: #{cur_bundle.bundle_name}"
+          require_helpers(nil, cur_bundle)
+        end
+          
       end
 
-      # Actually builds the HTML file from the entry (actually from any composite entries)
+      # Actually builds the HTML file from the entry (actually from any 
+      # composite entries)
       def build
 
         @layout_path = bundle.layout_path
@@ -75,18 +89,20 @@ module SproutCore
       end
       
       
-      # Returns the current bundle name.  Often useful for generating titles, etc.
+      # Returns the current bundle name.  Often useful for generating titles, 
+      # etc.
       def bundle_name; bundle.bundle_name; end
 
-      #### For Rails Compatibility.  render() does not do anything useful since the
-      # new build system is nice about putting things into the right place for output.
+      #### For Rails Compatibility.  render() does not do anything useful 
+      # since the new build system is nice about putting things into the right 
+      # place for output.
       def render; ''; end
       
     end
     
-    # Builds an html file for the specified entry.  If deep is true, then this will also
-    # find all of the html entries for any required bundles and include them in the built
-    # html file.
+    # Builds an html file for the specified entry.  If deep is true, then this 
+    # will also find all of the html entries for any required bundles and 
+    # include them in the built html file.
     def self.build_html(entry, bundle, deep=true)
       context = HtmlContext.new(entry, bundle, deep)
       output = context.build