sproutcore 1.5.0.pre.4 → 1.5.0.pre.4.1

data/CHANGELOG

@@ -1,3 +1,9 @@
+*SproutCore 1.5.0.pre.4.1 (March 1, 2011)*
+
+* Fix bug in SC.TemplateCollectionView that was causing Todos demo not to work
+in Firefox.
+* Added default CSS for HTML-based projects.
+
 *SproutCore 1.5.0.pre.4 (February 28, 2011)*
 
 * We are beginning to move API that we don't believe will be ready before 1.5

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 5
-:patch: 0.pre.4
+:patch: 0.pre.4.1

data/lib/Buildfile

@@ -71,7 +71,7 @@ mode :all do
 
     # name a framework to use as the theme.  will be included in required
     # frameworks automatically if found.
-    :theme  => 'sproutcore/standard_theme',
+    :theme  => 'sproutcore/ace',
 
     # use default bootstrap framework
     :bootstrap_inline => 'sproutcore/bootstrap:javascript',

data/lib/buildtasks/build.rake

@@ -20,16 +20,19 @@ namespace :build do
     SC::Builder::Stylesheet.build env[:entry], env[:dst_path]
   end
 
+  desc "builds an image file"
+  build_task :image do |task, env|
+    # by default, just copy images
+    require 'fileutils'
+    FileUtils.mkdir_p(File.dirname(env[:dst_path]))
+    FileUtils.cp_r(env[:src_path], env[:dst_path])
+  end
+
   desc "converts a Handlebars file to JavaScript"
   build_task :handlebars do |task, env|
     SC::Builder::Handlebars.build env[:entry], env[:dst_path]
   end
 
-  desc "stub task for images"
-  build_task :image do |task, env|
-
-  end
-
   desc "builds a single sass file"
   build_task :sass do |task, env|
     SC::Builder::Sass.build env[:entry], env[:dst_path]
@@ -67,7 +70,12 @@ namespace :build do
   
   desc "adds all the css and image files in the target to chance and lets it run on a per-target basis"
   build_task :chance do |task, env|
-    SC::Builder::Combine.buildWithChance env[:entry], env[:dst_path]
+    SC::Builder::Chance.build env[:entry], env[:dst_path]
+  end
+
+  desc "extracts a file from the Chance entries"
+  build_task :chance_file do |task, env|
+    SC::Builder::ChanceFile.build env[:entry], env[:dst_path]
   end
   
   desc "wraps the entry into a string for prefetched modules"

data/lib/buildtasks/manifest.rake

@@ -202,7 +202,7 @@ namespace :manifest do
   namespace :prepare_build_tasks do
 
     desc "main entrypoint for preparing all build tasks.  This should invoke all needed tasks"
-    task :all => %w(css handlebars javascript module_info sass scss less combine string_wrap minify string_wrap html strings tests packed)
+    task :all => %w(css handlebars javascript module_info sass less combine string_wrap minify string_wrap html strings tests packed)
 
     desc "executes prerequisites needed before one of the subtasks can be invoked.  All subtasks that have this as a prereq"
     task :setup => %w(manifest:catalog manifest:hide_buildfiles manifest:localize)
@@ -283,7 +283,6 @@ namespace :manifest do
           :entry_type => :javascript
         entry.discover_build_directives!
       end
-
     end
 
     desc "scans for css files, creates a transform and annotates them"
@@ -291,26 +290,53 @@ namespace :manifest do
       manifest = env[:manifest]
       config = env[:target].config
 
-      if config[:no_chance]
-        # select all original entries with with ext of css
-        entries = manifest.entries.select do |e|
-          e.original? && e[:ext] == 'css'
-        end
+      # select all original entries with with ext of css
+      entries = manifest.entries.select do |e|
+        e.original? && ['css', 'scss'].include?(e[:ext])
+      end
 
-        # add transform & tag with build directives.
-        entries.each do |entry|
-          entry = manifest.add_transform entry,
-            :filename   => ['source', entry[:filename]].join('/'),
-            :build_path => File.join(manifest[:build_root], 'source', entry[:filename]),
-            :url => [manifest[:url_root], 'source', entry[:filename]].join("/"),
-            :build_task => 'build:css',
-            :resource   => 'stylesheet',
-            :entry_type => :css
-          entry.discover_build_directives!
-        end
+      # add transform & tag with build directives.
+      entries.each do |entry|
+        filename = entry[:filename]
+
+        # We want it to appear as CSS
+        filename.gsub! /\.scss$/, '.css'
+
+        entry = manifest.add_transform entry,
+          :filename   => ['source', filename].join('/'),
+          :build_path => File.join(manifest[:build_root], 'source', entry[:filename]),
+          :url => [manifest[:url_root], 'source', entry[:filename]].join("/"),
+          :build_task => 'build:css',
+          :resource   => 'stylesheet',
+          :entry_type => :css,
+          :ext => 'css',
+          :from_scss => (entry[:ext] == 'scss')   # for testing
+        entry.discover_build_directives!
       end
     end
 
+    desc "scans for image files, creates a transform and annotates them"
+    task :images => :setup do |task, env|
+      manifest = env[:manifest]
+      config = env[:target].config
+
+      # select all original entries with with ext of png
+      entries = manifest.entries.select do |e|
+        e.original? && e[:ext] == 'png'
+      end
+
+      # add transform & tag with build directives.
+      entries.each do |entry|
+        entry = manifest.add_transform entry,
+          :filename   => ['source', entry[:filename]].join('/'),
+          :build_path => File.join(manifest[:build_root], 'source', entry[:filename]),
+          :url => [manifest[:url_root], 'source', entry[:filename]].join("/"),
+          :build_task => 'build:image',
+          :entry_type => :image
+      end
+
+    end
+
     desc "scans for Handlebars templates and converts them to JavaScript"
     task :handlebars => %w(setup) do |task, env|
       manifest = env[:manifest]
@@ -337,18 +363,20 @@ namespace :manifest do
       config   = CONFIG
 
       # Populate module_info for all deferred_modules frameworks.
-      # Add :debug_deferred_modules and :test_deferred_modules depending on
+      # Add :debug_required and :test_required depending on
       # the build mode.
       debug = config[:load_debug]
       test = config[:load_tests]
 
       # find all of the modules required by this target
       targets = target.modules({ :debug => debug, :test => test, :theme => true })
-      targets.each do |target|
-        target.manifest_for(manifest.variation).build!
-      end
 
       unless targets.size == 0
+
+        targets.each do |target|
+          target.manifest_for(manifest.variation).build!
+        end
+
         manifest.add_entry 'module_info.js',
           :dynamic        => true, # required to get correct timestamp for cacheable_url
           :build_task     => 'build:module_info',
@@ -366,50 +394,127 @@ namespace :manifest do
 
     task :module_info => :tests # IMPORTANT! to avoid JS including unit tests.
 
-    desc "generates combined entries for javascript and css"
-    task :combine => %w(setup css javascript module_info sass scss less) do |task, env|
+    desc "generates combined entries for CSS"
+    task :chance => %w(setup images javascript module_info css sass less) do |task, env|
+      config = CONFIG
+      manifest = env[:manifest]
+
+      # the image files will be shared between all css_entries-- that is,
+      # all instances of Chance created
+      global_chance_entries = []
+
+      # For each "resource" a separate css entry will be created.
+      css_entries = {}
+
+      manifest.entries.each do |entry|
+        # Chance needs to know about image files so it can embed as data URIs in the
+        # CSS. For this reason, if Chance is enabled, we need to send entries for image
+        # files to the 'build:chance' buildtask.
+        is_chance_file = File.extname(entry[:filename]) === '.png'
+
+        next if entry[:resource].nil? and not is_chance_file
+
+        if is_chance_file
+          global_chance_entries << entry
+        elsif entry[:entry_type] == :css
+          (css_entries[entry[:resource]] ||= []) << entry
+          entry.hide! if config[:combine_stylesheets]
+        end
+
+      end
+
+      chance_entries = []
+
+      # We need a collection of source paths for our mhtml and JS files to
+      # check mtimes against.
+      source_paths = []
+
+      # build combined CSS entry
+      css_entries.each do |resource_name, entries|
+        # Send image files to the build task if Chance is being used
+        entries.concat global_chance_entries
+
+        # Add a composite entry for the combined CSS.
+        # Note that we manually hid the CSS entries above, but, if Chance
+        # is enabled, we need to keep the images visible so they are still
+        # copied into the final product.
+        entry = manifest.add_composite resource_name.ext('css'),
+          :build_task      => 'build:chance',
+          :source_entries  => entries,
+          :hide_entries    => false, # We hid entries manually above
+          :ordered_entries => SC::Helpers::EntrySorter.sort(entries),
+          :entry_type      => :css,
+          :combined        => true
+
+        chance_entries << entry
+
+
+        # ADD A 2X version
+        # Because the @2x file is not a _real_ composite entry, and as such has
+        # no true source entries (because we don't want to stage them as that
+        # adversely impacts performance), we need to give a set of source paths
+        # for the entry to compare mtimes with to know if it needs to update.
+        entry_source_paths = entries.map {|e| e[:source_path] }
+
+        # Rather than run Chance an extra time for 2x, we create a composite entry
+        # referencing the chance entry as a source
+        manifest.add_entry resource_name + "@2x.css",
+          :variation       => manifest.variation,
+          :build_task      => 'build:chance_file',
+          :chance_entry    => entry,
+          :entry_type      => :css,
+          :combined        => true,
+          :chance_file     => "chance@2x.css",
+
+          # For cache-busting, we must support timestamped urls, but the entry
+          # will be unable to calculate the timestamp for this on its own. So, we
+          # must supply the calculated timestamp.
+          :timestamp       => entry.timestamp,
+
+          :source_paths => entry_source_paths
+
+        # We also have a set of all source paths for the chance task. We need
+        # to keep it up-to-date so that the MHTML and JS tasks can compare mtimes
+        # with the entries.
+        source_paths += entry_source_paths
+      end
+
+      manifest.add_entry "__sc_chance.js",
+        :build_task       => 'build:chance_file',
+        :chance_entries   => chance_entries,
+        :entry_type       => :javascript,
+        :resource         => "javascript",
+        :chance_file      => "chance.js",
+        :timestamp        => chance_entries.map {|e| e.timestamp }.max,
+        :source_paths     => source_paths
+
+      manifest.add_entry "__sc_chance_mhtml.txt",
+        :build_task       => 'build:chance_file',
+        :chance_entries   => chance_entries,
+        :entry_type       => :mhtml,
+        :chance_file      => "chance-mhtml.txt",
+        :timestamp        => chance_entries.map {|e| e.timestamp }.max,
+        :source_paths     => source_paths
+
+    end
+
+    desc "generates combined entries for javascript"
+    task :combine => %w(setup chance javascript module_info) do |task, env|
       config = env[:target].config
       manifest = env[:manifest]
       config   = CONFIG
 
-      chance_types = [
-        '.css',
-        '.jpg',
-        '.png',
-        '.gif'
-      ]
-
-      # sort entries...
-      css_entries = []
       javascript_entries = {}
+
       manifest.entries.each do |entry|
-        is_chance_file = false
-        if not config[:no_chance] and chance_types.include?(File.extname(entry[:filename]))
-          is_chance_file = true
-        end
-        
         # we can only combine entries with a resource property.
-        next if entry[:resource].nil? and not is_chance_file
+        next if entry[:resource].nil?
 
-        # look for CSS or JS type entries
-        if entry[:entry_type] == :css or (is_chance_file and File.extname(entry[:filename]) == '.css')
-          css_entries << entry
-          entry.hide! if config[:combine_stylesheets] 
-        elsif is_chance_file
-          css_entries << entry
-        elsif entry[:entry_type] == :javascript
+        if entry[:entry_type] == :javascript
           (javascript_entries[entry[:resource]] ||= []) << entry
         end
       end
 
-      # build combined CSS entry
-      manifest.add_composite 'stylesheet.css',
-        :build_task      => config[:no_chance] ? 'build:combine' : 'build:chance',
-        :source_entries  => css_entries,
-        :hide_entries    => false, # we hide entries manually above
-        :ordered_entries => SC::Helpers::EntrySorter.sort(css_entries),
-        :entry_type      => :css,
-        :combined        => true
 
       # build combined JS entry
       javascript_entries.each do |resource_name, entries|
@@ -424,11 +529,10 @@ namespace :manifest do
           :entry_type      => :javascript,
           :combined        => true
       end
-
     end
 
     desc "Wraps the javascript.js file into a string if the target is a prefetched module"
-    task :string_wrap => %w(setup css javascript module_info sass scss less combine minify) do |task, env|
+    task :string_wrap => %w(setup css javascript module_info sass less combine minify) do |task, env|
       manifest = env[:manifest]
       target   = env[:target]
 
@@ -483,36 +587,39 @@ namespace :manifest do
       target   = env[:target]
       manifest = env[:manifest]
 
-      # don't add packed entries for apps.
+      %w(stylesheet stylesheet@2x).each {|resource|
 
         # Handle CSS version.  get all required targets and find their
         # stylesheet.css.  Build packed css from that.
-        targets = target.expand_required_targets(:theme=>true) + [target]
+        targets = target.expand_required_targets + [target]
         entries = targets.map do |target|
           m = target.manifest_for(manifest.variation).build!
 
           # need to find the version that is not minified
-          entry = m.entry_for('stylesheet.css')
+          entry = m.entry_for(resource + ".css")
           entry = entry.source_entry while entry && entry.minified?
           entry
         end
 
         entries.compact!
-        manifest.add_composite 'stylesheet-packed.css',
+        manifest.add_composite resource + '-packed.css',
           :build_task        => 'build:combine',
           :source_entries    => entries,
           :hide_entries      => false,
           :entry_type        => :css,
           :combined          => true,
-          :ordered_entries   => entries, # orderd by load order
+          :ordered_entries   => entries, # ordered by load order
           :targets           => targets,
           :packed            => true
 
+      }
+
     end
+
     task :minify => :packed # IMPORTANT: don't want minified version
 
-    #Create builder tasks for sass, scss (sass v3) and less in a DRY way
-    [:sass, :scss, :less].each do |csscompiler|
+    #Create builder tasks for sass and less in a DRY way
+    [:sass, :less].each do |csscompiler|
       desc sprintf("create a builder task for all %s files to create css files", csscompiler.to_s)
       task csscompiler => :setup do |task, env|
         manifest = env[:manifest]
@@ -575,7 +682,6 @@ namespace :manifest do
           end
           (entries_by_resource[entry[:resource]] ||= []) << entry
         end
-
       end
 
       # even if no resource was found for the index.html, add one anyway if
@@ -629,12 +735,11 @@ namespace :manifest do
             is_hidden = true if (rep_cnt>=2) && !is_pref_lang
           end
         end
-
       end
     end
 
     desc "creates transform entries for all css and Js entries to minify them if needed"
-    task :minify => %w(setup javascript module_info css combine sass scss less) do |task, env|
+    task :minify => %w(setup javascript module_info css combine sass less) do |task, env|
       manifest = env[:manifest]
       config   = CONFIG
 
@@ -664,9 +769,7 @@ namespace :manifest do
               :packed     => entry.packed? # carry forward
           end
         end
-
       end
-
     end
 
     desc "adds a loc strings entry that generates a yaml file server-side functions can use"
@@ -691,9 +794,5 @@ namespace :manifest do
     desc "..."
     task :image => :setup do
     end
-
-
   end
-
-
 end

data/lib/frameworks/sproutcore/Buildfile

@@ -81,13 +81,11 @@ config :standard_theme,
 
 config :ace, 
   :required => :empty_theme, 
-  :theme_name => 'sc-theme',
+  :theme_name => nil,
   :test_required  => ['sproutcore/testing'],
   :debug_required => ['sproutcore/debug'],
   :css_theme => 'ace'
 
-# CONFIGURE APPS
-
 # CONFIGURE APPS
 config :core_tools, :required => [:desktop, :datastore, :animation, :forms]
 
@@ -100,11 +98,11 @@ config :core_tools, :required => [:desktop, :datastore, :animation, :forms]
     :required => [:desktop, :datastore, :core_tools],
     :theme => :ace,
     :html5_history => true
-    
+
   # mode :debug do
   #   config app_target, :combine_javascript => false
   # end
-  
+
 end
 
 config :test_controls, :css_theme => 'ace.test-controls'