sproutcore 0.9.1 → 0.9.2

data/bin/sc-build

@@ -42,6 +42,7 @@ include_dependencies = false
 verbose = false # show debug level
 languages = nil
 clean = false
+docs = false
 
 opts = OptionParser.new do |opts|
   opts.version = SproutCore::VERSION::STRING
@@ -79,6 +80,10 @@ opts = OptionParser.new do |opts|
   opts.on("-c", "--[no-]clean", "If set, then the build tool will delete a bundle's output before it builds it, so you get a clean build") do |opt_clean|
     clean = !!opt_clean
   end
+
+  opts.on('-d', '--[no-]docs', "Include documentation") do |opt_docs|
+    docs = !!opt_docs
+  end
   
 end
 opts.parse!
@@ -92,7 +97,7 @@ SC.logger.level = (verbose) ? Logger::DEBUG : Logger::INFO
 SC.logger.progname = $0
 
 # Load Library
-library = SC.library_for(library_root, :public_root => build_root, :url_prefix => '', :build_mode => build_mode)
+library = SC.library_for(library_root, :public_root => build_root, :build_mode => build_mode)
 
 ############################################################
 ## FIND BUNDLES TO BUILD
@@ -139,6 +144,12 @@ bundles.each do |bundle|
   end
   
   bundle.build(*languages)
+  
+  if docs
+    SC.logger.debug('~ Building docs')
+    SC::JSDoc.generate(:bundle => bundle) 
+  end
+  
 end
 
 SC.logger.debug("")

data/bin/sc-gen

@@ -3,7 +3,7 @@
 # GENERATE SPROUTCORE COMPONENTS
 # Generates components for you in a sproutcore app.
 # Usages
-# sc-gen generator [path] [class]
+# sc-gen generator [client_name|framework_name] [class]
 #
 
 APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))

data/bin/sproutcore

@@ -13,6 +13,20 @@ if %w(-v --version).include? ARGV.first
   exit(0)
 end
 
+if ARGV.first == 'freeze:edge'
+  puts "Freezing SproutCore edge..."
+  FileUtils.mkdir_p('frameworks')
+  ['sproutcore'].each do |framework|
+    if File.exists?(File.join('frameworks', framework, '.svn'))
+      puts `svn up #{File.join('frameworks',framework)}`
+    else
+      puts `svn co http://sproutcore.googlecode.com/svn/trunk/frameworks/#{framework} #{File.join('frameworks', framework)}`
+    end
+  end
+    
+  exit(0)
+end
+    
 require 'rubigen/scripts/generate'
 source = RubiGen::PathSource.new(:application, 
   File.join(File.dirname(__FILE__), "../app_generators"))

data/clients/sc_docs/controllers/docs.js

@@ -7,7 +7,7 @@ require('core');
 Docs.docsController = SC.Object.create({
   
   // This is used in the client warning dialog.
-  windowLocation: window.location.href,
+  windowLocation: window.location.href.toString(),
   
   // This is the current client name.
   clientName: '',
@@ -16,15 +16,25 @@ Docs.docsController = SC.Object.create({
   
   isRebuilding: false,
   
+  canRebuild: NO,
+  
   nowShowingContainer: function() {
-    return (this.get('isRebuilding')) ? 'rebuilding' : 'runner';
-  }.property('isRebuilding'),
+    return (this.get('isRebuilding')) ? 'rebuilding' : (this.get('selectedDoc')) ? 'runner' : 'empty' ;
+  }.property('isRebuilding', 'selectedDoc'),
   
   // This is displayed as the main UI label.
   displayClientName: function() {
-    return "%@ Docs".fmt((this.get('clientName') || '').humanize().capitalize()) ;
+    var clientName = (this.get('clientName') || '').humanize().capitalize() ;
+    if (clientName.toLowerCase() == 'sproutcore') clientName = 'SproutCore';
+    return "%@ Reference".fmt(clientName) ;
   }.property('clientName'),
   
+  nowShowingLabel: function() {
+    var sel = this.get('selection') ;  
+    var rec = (sel && sel.get('length') > 0) ? sel.objectAt(0) : null ;
+    return (rec) ? rec.get('title') : '' ;
+  }.property('selection'),
+  
   arrangedObjects: [],
   selection: [],
   
@@ -65,11 +75,32 @@ Docs.docsController = SC.Object.create({
     // working away immediately.
     if (recs.length == 0) {
       SC.page.get('noDocsPanel').set('isVisible',true) ;
-      setTimeout(this.reloadDocs.bind(this),2000) ; 
+      this.invokeLater(this.reloadDocs,2000) ; 
     } else {
       SC.page.get('noDocsPanel').set('isVisible',false) ;
     }
     
+    this.set('allRecords', recs) ;
+  },
+
+  rebuildArrangedDocs: function() {
+    
+    var search = this.get('search') ;
+    var recs = this.get('allRecords') ;
+
+    // filter out search
+    if (search && search.length > 0) {
+      search = search.toLowerCase() ;
+      var filtered =[];
+      var idx = recs.get('length') ;
+      while(--idx >= 0) {
+        var rec = recs.objectAt(idx) ;
+        var symbols = (rec.get('symbols') || '') ;
+        if (symbols.indexOf(search) >= 0) filtered.push(rec) ;
+      }
+      recs = filtered ;
+    }
+    
     // sort the records by name and set as the new arrangedObjects.
     recs = recs.sort(function(a,b) {
       
@@ -89,9 +120,8 @@ Docs.docsController = SC.Object.create({
     
     // if the current selection is not in the list, clear the selection.
     var doc = this.get('selectedDoc') ;
-    if (doc && !(recs.include(test))) this.set('selection', []) ;
-    
-  },
+    if (doc && !(recs.include(doc))) this.set('selection', []) ;
+  }.observes('allRecords', 'search'),
   
   _reloadFailure: function(status, transport) {
     console.log('TEST RELOAD FAILED!') ;

data/clients/sc_docs/english.lproj/body.css

@@ -1,159 +1,112 @@
+/* @override 
+	http://localhost:4020/static/sc_docs/en/_cache/body-1208633994.css
+	http://localhost:4020/static/sc_docs/en/_cache/body-1208635640.css
+*/
 
-/* @group Workspace */
+/* @group Core */
 
-#workspace {
-	background-color: #8db69a;
+body {
 	position: absolute ;
-	top: 0;
 	left: 0;
-	right:  0;
-	bottom: 0; 
+	right: 0;
+	top: 0;
+	bottom: 0;
+	padding: 0;
+	margin: 0;
+	overflow: hidden ;
 }
 
-#workspace .container {
-	position: absolute ;
-	top:  49px;
-	left: 171px;
-	right: 0px;
-	bottom: 0px;
-	background-color: white ;
-	overflow: auto;
+.workspace .sidebar {
+	position: absolute;
+	left:  0;
+	top:  0;
+	width: 200px;
+	bottom: 0;
 }
 
-#workspace .container iframe {
-	border: none ;
-	width: 100%;
-	height: 100%;
-	outline: hidden ;	
+.sc-theme .workspace.horizontal .sc-split-divider-view {
+  position: absolute;
+  left: 200px;
+  top: 0;
+  bottom: 0;
 }
 
-/* @end */
-
-/* @group Toolbar */
+.workspace .document_view {
+	position: absolute;	
+	left: 205px;
+	right: 0;
+	top: 0;
+	bottom: 0;
+	border: none ;
+	background-color: #aaa ;
+}
 
-#workspace .toolbar {
-	position: absolute ;
-	top:  0;
-	left:  0px;
-	right: 0px;
-	height: 48px;
-	border-bottom: 1px solid #62806d;
-	background: static_url('images/gradients') repeat-x center top;
+.left.app-label {
+ 	padding-top: 5px;
 }
- 
-#workspace .toolbar .buttons {
-	text-align: right ;
-	position: absolute ;
-	top:  13px ;
-	right: 10px ;
+
+.sc-theme .app-label .sc-label-view {
+	text-shadow: white 0px 1px 0px;
+	font-weight: bold ;
+	font-size: 15px;
 }
 
-#workspace .toolbar h1 {
-  border: none ;
-  padding: 0;
-  margin : 0;
-	position: absolute ;
-	left: 8px;
-	top:  4px;
-	font-size: 28px;
-	font-weight: normal ;
+.app-label img {
+	width: 27px;
+	height: 27px;
+	vertical-align: middle;
+	position: relative ;
+	top: -3px;
+	margin-right: 2px;
 }
 
 /* @end */
 
 /* @group Sidebar */
 
-#workspace .sidebar {
+.sidebar .source_list {
 	position: absolute ;
-	top: 49px;
-	left: 0px;
-	width: 170px;
-	bottom: 0px;
-	background-color: #e0efed;
-	border-right: 1px #62806d solid;
-	overflow: auto ;
-}
-
-.sidebar {
-	list-style-type: none ;
-	padding: 0;
-	margin: 0;
-}
-
-.sidebar h1 {
-	border:  none ;
-	text-align: left ;
-	font-size: 11px;
-	margin:  0;
-	padding:  0;
-	margin-top: 8px;
-	padding-top: 2px;
-	padding-left: 4px;
-	padding-bottom: 2px;
-	margin-left: 2px;
-	margin-right: 2px ;
-	margin-bottom: 2px;
-	text-transform: uppercase ;
-	color: #454b4a;
-	border-bottom: 1px solid #b5c6c4;
-}
-
-.sidebar div:first-child h1 {
-	display: none ;
-}
-
-.sidebar div:first-child a {
-	font-weight: bold ;
+	top: 0;
+	left:  0;
+	right: 0;
+	bottom: 0;
+	border: none ;
 }
 
-.sidebar a {
-	display: block ;
-	text-decoration: none ;
-	color: black ;
-	border: 1px solid #e0efed;
-	padding-bottom: 4px;
-	padding-top: 7px ;
-	padding-left: 8px ;
-	border-left-style: none;
-	border-right-style: none;
-	-moz-user-select: none;
-	-khtml-user-select: none;
-	user-select: none;
-}
+/* @end */
 
-.sidebar a.sel {
-	border: 1px solid #1e504a;
-	color: white ;
-	font-weight: bold;
-	padding-top: 6px;
-	background: static_url('images/gradients') repeat-x center -144px;
-	border-top-color: #188b7d;
-	border-right-style: none;
-	border-left-style: none;
-}
+/* @group Content */
 
-.sidebar a.sel:active {
-	border: 1px solid #1e504a;
-	color: white ;
-	font-weight: bold;
-	padding-top: 6px;
-	background: static_url('images/gradients') repeat-x center -144px;
-	border-top-color: #188b7d;
-	border-right-style: none;
-	border-left-style: none;
+.document_view iframe {
+	position: absolute ;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	border: none ;
+	padding: 0;
+	margin: 0;
+	background: white;
 }
 
-.sidebar a:active {
-	background-color: #cedfdf;
-	border: 1px solid #cedfdf;
-	border-right-style: none;
-	border-left-style: none;
+.document_view .rebuilding_tab .dialog {
+	position: absolute ;
+	background: #f0f0f0;
+	padding: 20px;
+	border: 8px #888 solid ;
+	width: 400px;
+	top: 100px;
+	left: 50%;
+	margin: 0;
+	margin-left: -240px;
+	text-align: center ;
 }
 
-.sidebar hr {
-	border:  none ;
-	border-top: #ccc solid 1px;
-	margin: 4px 8px;
+.document_view .rebuilding_tab .dialog h1 {
+	font-size: 20px ;
+	margin: 0;
+	padding: 0;
 }
 
 /* @end */
+

data/clients/sc_docs/english.lproj/body.rhtml

@@ -1,33 +1,53 @@
 <% content_for('body') do %>
 
-<% view :workspace do %>
-
-<% # PRIMARY TOOLBAR -%>
-<div class="toolbar">
-  <%= label_view :outlet => true, :tag => 'h1', :bind => {
-    :content => 'Docs.docsController.displayClientName'
-  } %>
-  <div class="buttons">
-  <%= button_view :outlet => true, :label => "Rebuild Docs", :image => static_url('icons/small/reset'), :action => 'Docs.docsController.rebuildDocs' %>
+<% view :header, :class => 'sc-header sc-square-theme' do %>
+  <div class="left app-label">
+    <img src="<%= static_url('images/sproutcore-logo.png') %>" /><%= label_view :outlet => true, :tag => :span, 
+    :bind => { :value => 'Docs.docsController.displayClientName' } %>
   </div>
-</div>
-
-<%= collection_view :outlet => :sidebar, :class => :sidebar, :bind => {
-  :content => 'Docs.docsController.arrangedObjects',
-  :selection => 'Docs.docsController.selection',
-}, :example_view => 'Docs.DocLabelView', :properties => {
-  :group_by => '"group"' } %>
-
-<% tab_view :outlet => 'container', :class => "container", :bind => { :now_showing => 'Docs.docsController.nowShowingContainer' } do %>
+  <div class="center">
+  </div>
+  <div class="right">
+    <%= text_field_view :outlet => true, :hint => 'Search Symbols', 
+      :bind => { :value => 'Docs.docsController.search' } %>
+  </div>
+<% end %>
 
-<%= view :outlet => :runner_tab, :tag => :iframe, :view => 'Docs.DocFrameView', :bind => { 
-  :doc => 'Docs.docsController.selectedDoc' } %>
 
-<% view :outlet => :rebuilding_tab do %>
-<h1><img src="<%= static_url('spinner') %>" /> Rebuilding Documentation...</h1>
+<% split_view :workspace, :class => 'sc-app-workspace header footer', :direction => :horizontal do %>  
+  <% view :sidebar, :outlet => true do %>
+    <% scroll_view :source_list, :outlet => true do %>
+      <%= source_list_view :outlet => true, 
+        :content_value_key => :title,
+        :group_visible_key => true,
+        :content_icon_key => :icon,
+        :group => :group,
+        
+        :bind => {
+          :content => 'Docs.docsController.arrangedObjects',
+          :selection => 'Docs.docsController.selection'
+        } %>
+        
+    <% end %>
+  <% end %>
+  
+  <%= split_divider_view :outlet => true, :width => 5 %>
+  
+  <%= tab_view :document_view, :outlet => true, 
+    :bind => { :now_showing => 'Docs.docsController.nowShowingContainer' }, 
+    :lazy_tabs => :true %>
+    
 <% end %>
 
-<% end %>
+<% view :footer, :class => 'sc-footer sc-square-theme' do %>
+  <div class="left">
+    <%= button_view :outlet => true, :title => "Rebuild Docs", :action => 'Docs.docsController.rebuildDocs', :bind => { :enabled => 'Docs.docsController.canRebuild' } %>
+  </div>
+  <div class="center"><%= label_view :outlet => true, 
+    :bind => { :value => 'Docs.docsController.nowShowingLabel' } %></div>
+  <div class="right">
+    
+  </div>
 <% end %>
 
 <script>