sproutcore 1.0.1003 → 1.0.1008

data/frameworks/sproutcore/themes/standard_theme/english.lproj/split_view.css

@@ -12,7 +12,7 @@
 }
 
 .sc-theme .sc-split-view.vertical > .sc-split-divider-view {
-	background: static_url('images/sc-theme-sprite.png') repeat-x 0px -1397px;
+	background: static_url('images/sc-theme-repeat-x.png') repeat-x 0px -1397px;
 /*  border-top: 1px #888 solid;
   border-bottom: 1px #888 solid;
 */	z-index: 5;

data/frameworks/sproutcore/themes/standard_theme/english.lproj/text_field.css

@@ -2,19 +2,4 @@
 
 /* SC.TextFieldView - sc-theme */
 
-.sc-text-field-view input {
-	border: none;
-	outline: none;
-	}
-
-.sc-text-field-view textarea {
-	border: none;
-	outline: none;
-}
-
-.sc-theme .sc-text-field-view .sc-hint {
-	color: #aaa ;
-	font-size: 12px;
-}
-
 

data/gen/data-source/Buildfile

@@ -0,0 +1,18 @@
+# ==========================================================================
+# Generator: DataSource
+# Copyright: ©2006-2009 Sprout Systems, Inc. and contributors
+#            portions copyright ©2009 Apple Inc.
+# ==========================================================================
+
+namespace :generator do
+
+  # - Verify required properties are present
+  # - Accept second argument as base class
+  # - If file name ends in "_data_source", strip it off
+  task :prepare do
+    GENERATOR.requires! :target_project, :target, :namespace, :class_name
+    GENERATOR.base_class_name ||= GENERATOR.arguments[2]
+    GENERATOR.filename = GENERATOR.filename.sub(/_data_source$/,'')
+  end
+  
+end

data/gen/data-source/README

@@ -0,0 +1 @@
+Your data source is ready to use!  Fill in the missing methods in the new file.

data/gen/data-source/USAGE

@@ -0,0 +1,15 @@
+data-source - Create a new DataSource class in your SproutCore app.
+
+USAGE:
+
+  sc-gen data-source AppName.DataSourceName [--filename=FILENAME] [--target=TARGET_NAME]
+
+DISCUSSION:
+
+This generator will create a new SproutCore DataSource template file in your 
+app.  You should pass as the first parameter your AppName.DataSourceName combination you want to create.  For example:
+
+sc-gen data-source Todos.TasksDataSource
+
+defines a new class called Todos.TasksDataSource in the file apps/todos/data_sources/task.js.
+

data/gen/data-source/templates/data_sources/@filename@.js

@@ -0,0 +1,64 @@
+// ==========================================================================
+// Project:   <%= namespace_class_name %>
+// Copyright: ©<%= Time.now.year %> My Company, Inc.
+// ==========================================================================
+/*globals <%= namespace %> */
+
+/** @class
+
+  (Document Your Data Source Here)
+
+  @extends <%= base_class_name || 'SC.DataSource' %>
+*/
+<%= namespace_class_name %> = <%= base_class_name || 'SC.DataSource' %>.create(
+/** @scope <%= namespace_class_name %>.prototype */ {
+
+  // ..........................................................
+  // QUERY SUPPORT
+  // 
+
+  fetch: function(store, query) {
+
+    // TODO: Add handlers to fetch data for specific queries.  
+    // call store.dataSourceDidFetchQuery(query) when done.
+
+    return NO ; // return YES if you handled the query
+  },
+
+  // ..........................................................
+  // RECORD SUPPORT
+  // 
+  
+  retrieveRecord: function(store, storeKey) {
+    
+    // TODO: Add handlers to retrieve an individual record's contents
+    // call store.dataSourceDidComplete(storeKey) when done.
+    
+    return NO ; // return YES if you handled the storeKey
+  },
+  
+  createRecord: function(store, storeKey) {
+    
+    // TODO: Add handlers to submit new records to the data source.
+    // call store.dataSourceDidComplete(storeKey) when done.
+    
+    return NO ; // return YES if you handled the storeKey
+  },
+  
+  updateRecord: function(store, storeKey) {
+    
+    // TODO: Add handlers to submit modified record to the data source
+    // call store.dataSourceDidComplete(storeKey) when done.
+
+    return NO ; // return YES if you handled the storeKey
+  },
+  
+  destroyRecord: function(store, storeKey) {
+    
+    // TODO: Add handlers to destroy records on the data source.
+    // call store.dataSourceDidDestroy(storeKey) when done
+    
+    return NO ; // return YES if you handled the storeKey
+  }
+  
+}) ;

data/lib/sproutcore/builders/combine.rb

@@ -21,6 +21,21 @@ module SC
       lines = []
       entries = entry.ordered_entries || entry.source_entries
       
+      target_name = entry.target.target_name.to_s.sub(/^\//,'')
+      if entry.top_level_lazy_instantiation && entry.combined
+        lines << ";
+if ((typeof SC !== 'undefined') && SC && !SC.LAZY_INSTANTIATION) {
+  SC.LAZY_INSTANTIATION = {};
+}
+if(!SC.LAZY_INSTANTIATION['#{target_name}']) {
+  SC.LAZY_INSTANTIATION['#{target_name}'] = [];
+}
+SC.LAZY_INSTANTIATION['#{target_name}'].push(
+  (
+    function() {
+"        
+      end  
+
       entries.each do |entry|
         src_path = entry.stage!.staging_path
         next unless File.exist?(src_path)
@@ -29,6 +44,14 @@ module SC
         lines += readlines(src_path)
         lines << "\n"
       end
+
+      if entry.top_level_lazy_instantiation && entry.combined
+        lines << "
+    }
+  )
+);
+"
+    end
       writelines dst_path, lines
     end
     

data/lib/sproutcore/builders/javascript.rb

@@ -17,13 +17,38 @@ module SC
   class Builder::JavaScript < Builder::Base
     
     def build(dst_path)
-      lines = readlines(entry.source_path).map { |l| rewrite_inline_code(l) }
+      lines = []
+      target_name = entry.target.target_name.to_s.sub(/^\//,'')
+      
+      if entry.lazy_instantiation && entry.notify_onload
+        lines << ";
+if ((typeof SC !== 'undefined') && SC && !SC.LAZY_INSTANTIATION) {
+  SC.LAZY_INSTANTIATION = {};
+}
+if(!SC.LAZY_INSTANTIATION['#{target_name}']) {
+  SC.LAZY_INSTANTIATION['#{target_name}'] = [];
+}
+SC.LAZY_INSTANTIATION['#{target_name}'].push(
+  (
+    function() {
+"
+      end
+
+      lines << readlines(entry.source_path).map { |l| rewrite_inline_code(l) }
 
       # Try to load dependencies if we're not combining javascript.
       if entry.notify_onload
-        lines << "; if ((typeof SC !== 'undefined') && SC && SC.scriptDidLoad) SC.scriptDidLoad('#{entry.target.target_name.to_s.sub(/^\//,'')}');"
+        lines << "; if ((typeof SC !== 'undefined') && SC && SC.scriptDidLoad) SC.scriptDidLoad('#{target_name}');"
       end
 
+      if entry.lazy_instantiation && entry.notify_onload
+        lines << "
+    }
+  )
+);
+"
+      end
+      
       writelines dst_path, lines
     end
 

data/lib/sproutcore/buildfile/task.rb

@@ -69,7 +69,7 @@ module SC
       app = application if app.nil?
       sibling = self.class.new(name, app)
       self.instance_variables.each do |key|
-        next if IGNORE.include?(key)
+        next if IGNORE.include?(key.to_s) # instance_variables is an array of symbols in Ruby 1.9
         sibling.instance_variable_set(key, self.instance_variable_get(key))
       end
       sibling.taint if tainted?

data/lib/sproutcore/helpers/entry_sorter.rb

@@ -52,10 +52,10 @@ module SC
           b = (b.filename || '').to_s.downcase
 
           # lproj/foo_page.js and main.js are loaded last
-          a_kind = (a =~ /lproj\/.+_page\.js$/) ? 1 : -1
+          a_kind = (a =~ /(lproj|resources)\/.+_page\.js$/) ? 1 : -1
           a_kind = 2 if a =~ /main.js$/
 
-          b_kind = (b =~ /lproj\/.+_page\.js$/) ? 1 : -1
+          b_kind = (b =~ /(lproj|resources)\/.+_page\.js$/) ? 1 : -1
           b_kind = 2 if b =~ /main.js$/
           
           if a_kind != b_kind

data/lib/sproutcore/helpers/static_helper.rb

@@ -115,6 +115,85 @@ module SC
         urls.join("\n")
       end
 
+      # Detects and includes any bootstrap code
+      #
+      def bootstrap 
+        
+        ret = []
+        
+        # Reference any external bootstrap scripts
+        if (resources_names = target.config.bootstrap)
+          Array(resources_names).each do |resource_name|
+            ret << %(<script src="#{sc_static(resource_name)}" type="text/javascript" ></script>)
+          end
+        end
+        
+        # Reference any inlined bootstrap scripts
+        if (resources_names = target.config.bootstrap_inline)
+          Array(resources_names).each do |resource_name|
+            ret << inline_javascript(resource_name)
+          end
+        end
+        
+        return ret * "\n"
+      end
+      
+      # Attempts to include the named javascript entry inline to the file
+      #
+      # === Options
+      #  language:: the language to use.  defaults to current
+      #
+      def inline_javascript(resource_name, opts ={}) 
+
+        resource_name = resource_name.to_s
+        
+        # determine which manifest to search.  if a language is explicitly
+        # specified, lookup manifest for that language.  otherwise use 
+        # current manifest.
+        m = self.manifest 
+        if opts[:language]
+          m = target.manifest_for(:language => opts[:language]).build! 
+        end
+        
+        entry = m.find_entry(resource_name, :entry_type => :javascript)
+        if entry.nil?
+          entry = m.find_entry(resource_name, :hidden => true, :entry_type => :javascript)
+        end
+          
+        return '' if entry.nil?
+        
+        ret = File.readlines(entry.build!.build_path)*''
+        return %(<script type="text/javascript">\n#{ret}\n</script>)
+      end
+
+      # Attempts to include the named javascript entry inline to the file
+      #
+      # === Options
+      #  language:: the language to use.  defaults to current
+      #
+      def inline_stylesheet(resource_name, opts ={}) 
+
+        resource_name = resource_name.to_s
+        
+        # determine which manifest to search.  if a language is explicitly
+        # specified, lookup manifest for that language.  otherwise use 
+        # current manifest.
+        m = self.manifest 
+        if opts[:language]
+          m = target.manifest_for(:language => opts[:language]).build! 
+        end
+        
+        entry = m.find_entry(resource_name, :entry_type => :stylesheet)
+        if entry.nil?
+          entry = m.find_entry(resource_name, :hidden => true, :entry_type => :stylesheet)
+        end
+          
+        return '' if entry.nil?
+        
+        ret = File.readlines(entry.build!.build_path)
+        return %(<style>\n#{ret*"\n"}\n</style>)
+      end
+        
       # Attempts to render the named entry as a partial
       #
       # === Options

data/lib/sproutcore/models/manifest.rb

@@ -350,7 +350,7 @@ module SC
     def unique_staging_path(path)
       paths = entries(:hidden => true).map { |e| e.staging_path }
       while paths.include?(path)
-        path = path.sub(/(__\$[0-9]+)?(\.\w+)?$/,"__$#{next_staging_uuid}\\2")
+        path = path.sub(/(__\$[0-9]+)?(\.\w+)?$/,"__#{next_staging_uuid}\\2")
       end
       return path
     end
@@ -360,7 +360,7 @@ module SC
     def unique_cache_path(path)
       paths = entries(:hidden => true).map { |e| e.cache_path }
       while paths.include?(path)
-        path = path.sub(/(__\$[0-9]+)?(\.\w+)?$/,"__$#{next_staging_uuid}\\2")
+        path = path.sub(/(__\$[0-9]+)?(\.\w+)?$/,"__#{next_staging_uuid}\\2")
       end
       return path
     end

data/lib/sproutcore/models/target.rb

@@ -315,7 +315,7 @@ module SC
 
       # Otherwise, actually compute a build number. 
       if build_number.nil?
-        require 'digest/md5'
+        require 'digest/sha1'
 
         # Computes the build number based on the contents of the
         # files.  It is not as fast as using an mtime, but it will remain

data/lib/sproutcore/tools/build.rb

@@ -12,7 +12,7 @@ module SC
     
     desc "build [TARGET..]", "Builds one or more targets"
     method_options(
-      MANIFEST_OPTIONS.merge(:entries => :optional, :clean => false))
+      MANIFEST_OPTIONS.merge(:entries => :string, :clean => false))
       
     def build(*targets)
 

data/lib/sproutcore/tools/docs.rb

@@ -12,10 +12,10 @@ module SC
   class Tools
 
     desc "sc-docs [TARGET..]", "Generates JSDoc's for specified targets."
-    method_options(:entries  => :optional,
+    method_options(:entries  => :string,
                    :clean    => true,
-                   :language => :optional,
-                   :template => :optional,
+                   :language => :string,
+                   :template => :string,
                    ['--include-required', '-r'] => false)
     def docs(*targets)
 

data/lib/sproutcore/tools/gen.rb

@@ -28,30 +28,32 @@ module SC
   # 
   class Tools
     
-    def show_help(generator_name=nil, generator=nil)
-      if generator_name
-        if generator.nil?
-          warn("There is no #{generator_name} generator") 
+    no_tasks do
+      def show_help(generator_name=nil, generator=nil)
+        if generator_name
+          if generator.nil?
+            warn("There is no #{generator_name} generator") 
+          else
+            generator.log_usage
+          end
         else
-          generator.log_usage
+          SC.logger << "Available generators:\n"
+          SC::Generator.installed_generators_for(project).each do |name|
+            SC.logger << "  #{name}\n"
+          end
+          SC.logger << "Type sc-gen GENERATOR --help for specific usage\n\n"
         end
-      else
-        SC.logger << "Available generators:\n"
-        SC::Generator.installed_generators_for(project).each do |name|
-          SC.logger << "  #{name}\n"
-        end
-        SC.logger << "Type sc-gen GENERATOR --help for specific usage\n\n"
+        return 0
       end
-      return 0
     end
     
     desc "sc-gen generator Namespace[.ClassName] [--target=TARGET_NAME] [--filename=FILE_NAME]", 
       "Generates SproutCore components"
     
     method_options(
-      MANIFEST_OPTIONS.merge(:help       => :optional,
-                             :filename   => :optional,
-                             :target     => :optional,
+      MANIFEST_OPTIONS.merge(:help       => :string,
+                             :filename   => :string,
+                             :target     => :string,
                              '--dry-run' => false,
                              :force      => false))
       

data/lib/sproutcore/tools/manifest.rb

@@ -9,21 +9,21 @@ module SC
   class Tools
     
     # Standard manifest options.  Used by build tool as well.
-    MANIFEST_OPTIONS = { :languages     => :optional,
+    MANIFEST_OPTIONS = { :languages     => :string,
                          :symlink       => false,
-                         :buildroot     => :optional,
-                         :stageroot     => :optional,
-                         :format        => :optional,
-                         :output        => :output,
+                         :buildroot     => :string,
+                         :stageroot     => :string,
+                         :format        => :string,
+                         :output        => :string,
                          :all           => false,
-                         ['--build-numbers', '-B'] => :optional,
+                         ['--build-numbers', '-B'] => :string,
                          ['--include-required', '-r'] => false }
                      
     desc "manifest [TARGET..]", "Generates a manifest for the specified targets"
     method_options(MANIFEST_OPTIONS.merge(
-      :format        => :optional,
-      :only          => :optional,
-      :except        => :optional,
+      :format        => :string,
+      :only          => :string,
+      :except        => :string,
       :hidden        => false ))
     def manifest(*targets)
 

data/lib/sproutcore/tools/server.rb

@@ -11,9 +11,9 @@ module SC
     
     desc "server", "Starts the development server"
     method_options  :daemonize  => false,
-                    :pid        => :optional,
-                    :port       => :optional,
-                    :host       => :optional,
+                    :pid        => :string,
+                    :port       => :string,
+                    :host       => :string,
                     :irb        => false,
                     :filesystem => false
     def server