sproutcore 0.9.0 → 0.9.1

data/frameworks/sproutcore/views/collection/text_cell.js

@@ -0,0 +1,128 @@
+// ==========================================================================
+// SC.TextCellView
+// ==========================================================================
+
+require('views/collection/collection_item') ;
+
+/** @class
+
+  A Text Cell can display some textual or HTML content based on a content 
+  object.  Unlike a label view, a text cell relies on an owner view (usually
+  a collection view) to handle all of its event management and many of its 
+  drawing properties and functions.
+
+  @extends SC.View
+  @author    AuthorName  
+  @version 0.1
+*/
+SC.TextCellView = SC.View.extend(SC.CollectionItem,
+/** @scope SC.TextCellView.prototype */ {
+
+  emptyElement: '<div class="text-cell collection-item"></div>',
+  
+  /** 
+    The content object this text item view will display. 
+  */
+  content: null,
+
+  /** 
+    The owner view of this cell.  The TextCell relies on this
+    view to provide many of its behavioral defaults and for 
+    event handling.
+  */
+  owner: null,
+  
+  /**
+    If true, value will be escaped to avoid scripting attacks.
+    
+    This is a default value that can be overridden by the
+    settings on the owner view.
+  */
+  escapeHtml: true,
+
+  /**
+    If true, then the value will be localized.
+    
+    This is a default default that can be overidden by the
+    settings in the owner view.
+  */
+  localize: false,
+  
+  /**
+    Set this to a validator or to a function and the value
+    will be passed through it before being set.
+    
+    This is a default default that can be overidden by the
+    settings in the owner view.
+  */
+  formatter: null,
+  
+  displayProperty: null,
+  
+  // invoked whenever the content object changes.
+  _contentObserver: function() {
+    var content = this.get('content') ;
+    if (this._content == content) return ;
+    var f = this._boundValueDidChange() ;
+
+    // stop observing the old display property, if there is one.
+    if (this._content && this._displayProperty) {
+      this._content.removeObserver(this._displayProperty, f) ;
+    }
+    
+    // start observing the new display property, if there is one
+    this._displayProperty = this._getDefault('displayProperty') ;
+    this._content = content ;
+    if (this._content && this._displayProperty) {
+      this._content.addObserver(this._displayProperty, f) ;
+    }
+    
+    // notify value did change
+    this._valueDidChange() ;
+  }.observes('content'),
+  
+  /** 
+    @private
+    
+    Invoked whenever the monitored value on the content object 
+    changes.
+    
+    The value processed is either the displayProperty, if set, or 
+    it is the content object itself.
+  */
+  _valueDidChange: function() {
+    var content = this.get('content') ;
+    var value = (content && this._displayProperty) ? content.get(this._displayProperty) : content;
+    var owner = this.get('owner') ;
+    
+    // prepare the value...
+    
+    // 1. apply the formatter
+    var formatter = this._getDefault('formatter') ;
+    if (formatter) {
+      var formattedValue = ($type(formatter) == T_FUNCTION) ? formatter(value, this) : formatter.fieldValueForObject(value, this) ;
+      if (formattedValue != null) value = formattedValue ;
+    }
+    
+    // 2. If the returned value is not a string, convert it.
+    if (($type(value) != T_NULL) && value.toString) value = value.toString() ;
+    
+    // 3. Localize
+    if (value && this._getDefault('localize')) value = value.loc() ;
+    
+    // 4. Escape HTML
+    if (value && this._getDefault('escapeHtml')) value = value.escapeHTML() ;
+    
+    this.set('asHTML', value || '') ;
+  },
+  
+  _boundValueDidChange: function() { 
+    return this._boundValueDidChange = this._boundValueDidChange  || this._valueDidChange.bind(this); 
+  },
+  
+  // Retrieves the default value from the owner or locally.
+  _getDefault: function(keyName) {
+    var ret = (this.owner) ? this.owner.get(keyName) : null ;
+    return (ret != null) ? ret : this.get(keyName) ;
+  }  
+}) ;

data/frameworks/sproutcore/views/image.js

@@ -8,7 +8,7 @@ require('views/view') ;
 lc_cnt = 0 ;
 
 SC.ImageView = SC.View.extend({
-  emptyElement: '<img />',
+  emptyElement: '<img src="%@" />'.fmt(static_url('blank')),
   
   status: 'unknown',
   

data/frameworks/sproutcore/views/label.js

@@ -19,10 +19,14 @@ SC.LabelView = SC.View.extend({
   isEditing: false,
 
 
-  // set to true to have any markup in the content escaped.
+  /**
+    set to true to have any markup in the content escaped.
+  */
   escapeHTML: true,
 
-  // set to true to have the value you set automatically localized.
+  /**
+    set to true to have the value you set automatically localized.
+  */
   localize: false,
   
   

data/frameworks/sproutcore/views/scroll.js

@@ -0,0 +1,34 @@
+// ==========================================================================
+// Sproutcore.ScrollView
+// ==========================================================================
+
+require('views/container') ;
+
+/** @class
+
+  The scroll view is used throughout SproutCore anytime you need to display
+  content that can be scrolled.  Although you can make any div scrollable in
+  HTML using CSS, SC.ScrollView provides a number of additional advantages
+  including support for incremental rendering, auto-scrolling during a
+  drag operations and support for custom scroll bars.
+
+  Scroll views are generally included automatically if you use the built-in
+  view helpers in SproutCore.  Depending on the views you are writing, you may
+  want to use scroll views yourself as well.  The following sections describe
+  how you can use the scroll view to support incremental rendering and auto-
+  scrolling dragging.
+  
+  h3. Using Scroll Views for Incremental Rendering
+  
+  Coming Soon...
+
+  @extends SC.View
+  @author  Charles Jolley  
+  @version 1.0
+*/
+SC.ScrollView = SC.View.extend(
+/** @scope SC.ScrollView.prototype */ {
+
+  emptyElement: '<div class="sc-scroll-view"></div>'
+    
+}) ;

data/frameworks/sproutcore/views/view.js

@@ -466,10 +466,8 @@ SC.View = SC.Responder.extend(SC.PathModule,
   // if you cached the frame, you can use this to clear that cache so that it
   // will now track with the frame in the document.
   flushFrameCache: function() {
-    if (this._frameCached) {
-      this._frame = null ;
-      this._frameCached = false;
-    }
+    this._frame = null ;
+    this._frameCached = false;
   },
   
   // This property returns a DOM ELEMENT that is the offset parent for
@@ -1344,6 +1342,14 @@ SC.View.mixin({
     return this.viewFor.apply(this,args) ;  
   },
   
+  // extend works just like a normal extend except that we need to delete the cached empty
+  // element.
+  extend: function(configs) {
+    var ret = SC.Object.extend.apply(this, arguments) ;  
+    ret.prototype._cachedEmptyElement = null ;
+    return ret ;
+  },
+  
   // define your view as an outlet.
   outletFor: function(path) {
     var view = this ;
@@ -1387,3 +1393,5 @@ SC._ViewCreator = document.createElement('div') ;
 
 // This div can be used to hold elements you don't want on the page right now.
 SC.NodeCache = document.createElement('div') ;
+
+console.log('SC.View = %@'.fmt(SC.View)) ;

data/generators/client/client_generator.rb

@@ -34,20 +34,12 @@ EOS
     end
 
     def add_options!(opts)
-      # opts.separator ''
-      # opts.separator 'Options:'
-      # For each option below, place the default
-      # at the top of the file next to "default_options"
-      # opts.on("-a", "--author=\"Your Name\"", String,
-      #         "Some comment about this option",
-      #         "Default: none") { |options[:author]| }
-      # opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
+      opts.on('-l', "--library=LIBRARY_ROOT", String, "Specify an alternate library root other than current working directory", "Default: working directory") { |options[:library_root] | }
     end
     
     def extract_options
       # for each option, extract it into a local variable (and create an "attr_reader :author" at the top)
-      # Templates can access these value via the attr_reader-generated methods, but not the
-      # raw instance variable value.
-      # @author = options[:author]
+      @destination_root = File.expand_path(options[:library_root]) unless options[:library_root].nil?
     end
+    
 end

data/generators/client/templates/english.lproj/body.css

@@ -0,0 +1,75 @@
+/* Default CSS for welcome page.  Delete this styling and replace it with your own. */
+
+.sc-welcome {
+	position: absolute ;
+	top: 0px;
+	left: 0px;
+	right: 0px;
+	bottom: 0px;
+	background-color: white ;
+}
+
+.sc-welcome img.logo {
+	position: absolute ;
+	bottom: 80px;
+	left: 50%;
+	margin-left: -20px;	
+}
+
+/* @group Message */
+
+
+
+.sc-welcome .message {
+	max-width: 800px;
+	margin-left: auto ;
+	margin-right: auto;
+	margin-top: 100px;
+	position: relative;
+}
+
+.sc-welcome h1 {
+	border: none ;
+	padding: 0;
+	margin: 0;
+	letter-spacing: -3px;
+	font: normal 6.4em "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
+}
+
+.sc-welcome h3 {
+	margin: 8px 12px;
+	padding: 0;
+	font: 1.5em "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
+	color: #808080;
+}
+
+/* @end */
+
+/* @group Sticky Note */
+
+.sc-welcome .sticky-note {
+	position: absolute ;
+	right: 0;
+	top: -70px;
+	width: 320px;
+	height: 300px;
+	padding: 60px;
+	padding-right: 20px;
+	background: url(/static/sproutcore/_src/english.lproj/images/sticky-note.png) no-repeat center center;
+	font: 1.3em "Comic Sans MS", "Comic Sans", Arial, Helvetica, Geneva, sans-serif;
+	color: #5f4700;
+}
+
+.sc-welcome .sticky-note p {
+	font-weight: bold ;
+}
+
+.sc-welcome .sticky-note ul {
+	padding: 0 10px ;
+}
+
+.sc-welcome .sticky-note li {
+	margin: 8px 0 ;
+}
+
+/* @end */

data/generators/client/templates/english.lproj/body.rhtml

@@ -1,3 +1,18 @@
 <% content_for('body') do %>
-<h1>Welcome to SproutCore</h1>
-<% end %>
+<div class="sc-welcome">
+  <img class="logo" src="<%= static_url('images/sproutcore-logo') %>" />
+  <div class="message">
+    <h1>Welcome!</h1>
+    <h3>You are now running SproutCore.</h3>
+    <div class="sticky-note">
+      <p>Things to do:</p>
+      <ul>
+        <li>Add a model:<br/>sc-gen model contacts/my_model</li>
+        <li>Add a controller:<br/>sc-gen controller contacts/my_controller</li>
+        <li>Edit english.lproj/body.rhtml</li>
+        <li>Build for deployment:<br />sc-build</li>
+      </ul>
+    </div>
+  </div>
+</div>
+<% end %>

data/generators/model/templates/fixture.js

@@ -7,5 +7,37 @@ require('core') ;
 <%= client_namespace %>.FIXTURES = <%= client_namespace %>.FIXTURES.concat([
 
   // TODO: Add your data fixtures here.
+  // All fixture records must have a unique guid and a type matching the
+  // name of your contact.  See the example below.
+  
+  // { guid: 1, 
+  //   type: 'Contact', 
+  //   firstName: "Michael", 
+  //   lastName: "Scott" 
+  // },
+  // 
+  // { guid: 2, 
+  //   type: 'Contact', 
+  //   firstName: "Dwight", 
+  //   lastName: "Schrute" 
+  // },
+  // 
+  // { guid: 3, 
+  //   type: 'Contact', 
+  //   firstName: "Jim", 
+  //   lastName: "Halpert" 
+  // },
+  // 
+  // { guid: 4, 
+  //   type: 'Contact', 
+  //   firstName: "Pam", 
+  //   lastName: "Beesly" 
+  // },
+  // 
+  // { guid: 5, 
+  //   type: 'Contact', 
+  //   firstName: "Ryan", 
+  //   lastName: "Howard" 
+  // }  
 
 ]);

data/lib/sproutcore/build_tools/html_builder.rb

@@ -18,14 +18,30 @@ module SproutCore
       include SproutCore::Helpers::StaticHelper
       include SproutCore::ViewHelpers
       
-      attr_reader :entry, :bundle, :filenames, :filename, :language, :library
+      attr_reader :entry, :bundle, :entries, :filename, :language, :library
       
-      def initialize(entry, bundle)
+      def initialize(entry, bundle, deep=true)
         @entry = nil
         @language = entry.language
-        @filenames = entry.composite.nil? ? [entry.filename] : entry.composite 
         @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.
+        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)
+            ret.map do |e|
+              e.composite? ? e.composite.map { |c| cur_bundle.entry_for(c, :hidden => :include) } : [e]
+            end
+          end
+          @entries = @entries.flatten.compact.uniq
+        else
+          @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.
+        @entries.reject! { |entry| entry.composite? }
       end
 
       # Actually builds the HTML file from the entry (actually from any composite entries)
@@ -35,7 +51,7 @@ module SproutCore
         
         # Render each filename.  By default, the output goes to the resources string
         @content_for_resources = ''
-        filenames.each { |fn| _render_one(fn) }
+        entries.each { |fn| _render_one(fn) }
         
         # Finally, render the layout.  This should produce the final output to return
         input = File.read(@layout_path)
@@ -43,9 +59,9 @@ module SproutCore
       end
 
       # render a single entry
-      def _render_one(filename)
-        @filename = filename
-        @entry = bundle.entry_for(filename, :hidden => :include, :language => language)
+      def _render_one(entry)
+        @entry = entry
+        @filename = @entry.filename
 
         # avoid double render of layout path
          return if @entry.source_path == @layout_path
@@ -68,11 +84,13 @@ module SproutCore
       
     end
     
-    def self.build_html(entry, bundle)
-      context = HtmlContext.new(entry,bundle)
+    # 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
 
-      puts "saving: #{entry.filename} to #{entry.build_path}: size: #{output.size}"
       FileUtils.mkdir_p(File.dirname(entry.build_path))
       f = File.open(entry.build_path, 'w')
       f.write(output)
@@ -82,7 +100,7 @@ module SproutCore
     
     # Building a test is just like building a single page except that we do not include
     # all the other html templates in the project
-    def self.build_test(entry, bundle); build_html(entry, bundle); end
+    def self.build_test(entry, bundle); build_html(entry, bundle, false); end
     
   end
 end