sproutcore 1.4.5 → 1.5.0.pre.3

data/CHANGELOG

@@ -1,3 +1,37 @@
+*SproutCore 1.5.0.pre.3 (February 3, 2011)*
+
+* More fixes to Ruby 1.8/1.9 compat
+
+
+*SproutCore 1.5.0.pre.2 (February 2, 2011)*
+
+* Minor code cleanup
+* Fixed Ruby 1.8 issues
+
+
+*SproutCore 1.5.0.pre.1 (February 1, 2011)*
+
+* Integrated Chance
+* UTF-8 encoding fixes
+* Improved minification and packing
+* Add HTML5 application cache manifest configuration options and also disable in debug by default
+* Deferred loading
+* Fixes for css media query minifications
+* Added .manifest and .htm into the default acceptable files
+* Add --yui_minification flag to switch between closure compiler and yui compressor for minification
+* Set PreferredLanguage earlier
+* Changes to be able to build multiple languages
+
+
+*SproutCore 1.4.5 (January 25, 2011)*
+
+*Got Specs running again*
+*Updated Copyrights*
+*Added RSpec task back into Rakefile*
+*Fixed issue with :combine_javascripts => false crashing*
+*Corrected references to the old sproutit repo*
+
+
 *SproutCore 1.4.4 (November 12, 2010)*
 
 * Support for custom mime-types
@@ -27,3 +61,4 @@
 *SproutCore 1.4.1 (September 21, 2010)*
 
 * Fixed string escaping issue in call to YUI Compressor [PDW]
+

data/VERSION.yml

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

data/lib/Buildfile

@@ -31,7 +31,7 @@ mode :all do
       :pages      => :app, # used for static pages with your site
       :frameworks => :framework,
       :themes     => :theme,
-      :bundles    => :framework
+      :modules    => :module
     },
 
     # Allows the target to have other targets nested inside of it.  Override
@@ -79,6 +79,7 @@ mode :all do
     # In design mode, load the designer
     :design_required => ['sproutcore/designer'],
 
+    # packs all JavaScript and CSS into one file for reduced HTTP requests
     :use_packed => true,
 
 		# If set to true, the specified framework, if loaded via the SC.loadBundle
@@ -96,8 +97,13 @@ mode :all do
     :hide_body_overflow => true,
 
     # A hash of additional MIME types, i.e. { '.m4a' => 'audio/mp4a-latm' }
-    :mime_types => {}
-
+    :mime_types => {},
+    
+    # Whether to generate an app.manifest file for HTML5 application caching
+    :html5_manifest => false,
+    # Which networks/URLs to allow if HTML5 application caching is turned on
+    :html5_manifest_networks => []
+    
 end
 
 
@@ -137,7 +143,10 @@ mode :debug do
 
     # Do not pack javascripts in development mode, we want each file to
     # load independently.
-    :use_packed => false
+    :use_packed => false,
+    
+    # Turn off HTML5 application caching by default in debug mode
+    :html5_manifest => false
 end
 
 

data/lib/buildtasks/build.rake

@@ -17,13 +17,12 @@ namespace :build do
 
   desc "builds a single css files"
   build_task :css do |task, env|
-    if env[:dst_path] =~ %r{en/current/menu_item_view.css}
-      SC.profile("PROFILE_CSS") do
-        SC::Builder::Stylesheet.build env[:entry], env[:dst_path]
-      end
-    else
-      SC::Builder::Stylesheet.build env[:entry], env[:dst_path]
-    end
+    SC::Builder::Stylesheet.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"
@@ -61,6 +60,16 @@ namespace :build do
     SC::Builder::Combine.build env[:entry], env[:dst_path]
   end
   
+  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]
+  end
+  
+  desc "wraps the entry into a string for prefetched modules"
+  build_task :string_wrap do |task, env|
+    SC::Builder::StringWrapper.build env[:entry], env[:dst_path]
+  end
+
   namespace :minify do
     
     desc "Minifies a CSS file by invoking CSSmin"
@@ -77,7 +86,6 @@ namespace :build do
     build_task :inline_javascript do |task, env|
       SC::Builder::Minify.build env[:entry], env[:dst_path], :inline_javascript
     end
-    
   end
   
   desc "builds a unit test"
@@ -89,15 +97,10 @@ namespace :build do
   build_task :test_index do |task, env|
     SC::Builder::TestIndex.build env[:entry], env[:dst_path]
   end
-  
-  desc "builds the bundle_loaded.js file for a framework"
-  build_task :bundle_loaded do |task, env|
-    SC::Builder::BundleLoaded.build env[:entry], env[:dst_path]
-  end
-  
-  desc "builds the bundle_info.js file for a required framework"
-  build_task :bundle_info do |task, env|
-    SC::Builder::BundleInfo.build env[:entry], env[:dst_path]
+
+  desc "builds the module_info.js file for a required framework"
+  build_task :module_info do |task, env|
+    SC::Builder::ModuleInfo.build env[:entry], env[:dst_path]
   end
   
 end

data/lib/buildtasks/manifest.rake

@@ -5,6 +5,7 @@
 
 # Tasks invoked while building Manifest objects.  You can override these
 # tasks in your buildfiles.
+
 namespace :manifest do
 
   desc "Invoked just before a manifest object is built to setup standard properties"
@@ -44,18 +45,69 @@ namespace :manifest do
   desc "Actually builds a manifest.  This will catalog all entries and then filter them"
   task :build => %w(catalog hide_buildfiles localize prepare_build_tasks:all)
 
-  desc "first step in building a manifest, this adds a simple copy file entry for every file in the source"
+  desc "Builds a manifest, this adds a copy file entry for every whitelisted file in the source"
   task :catalog do |t, env|
     target   = env[:target]
     manifest = env[:manifest]
 
     source_root = target[:source_root]
 
-    SC.profile("PROFILE_CATALOG") do
-      Dir["#{source_root}/**/*"].each do |path|
-        next unless File.file?(path)
-        next if target.target_directory?(path)
+    whitelist = nil
+
+    # Find and parse the BuildWhitelist json file
+    # Right now, the build whitelist is read for every target, can we optimize this?
+    Dir.glob("#{Dir.pwd}/Whitelist").each do |path|
+      next unless File.file?(path)
+
+      contents = File.read(path)
+      parser = JSON.parser.new(contents)
+      whitelist = parser.parse
+    end
+
+    if whitelist
+      acceptableFilesForTarget = whitelist["#{target[:target_name]}"]
+
+      # Always accept these files
+      defaultAcceptableFiles = [
+        '.manifest',
+        '.htm',
+        '.html',
+        '.rhtml',
+        '.png',
+        '.jpg',
+        '.gif'
+      ]
+
+      if acceptableFilesForTarget.kind_of?(Array)
+        acceptableFilesForTarget += defaultAcceptableFiles
+
+      # I make an assumption that if the type of acceptableFilesForTarget is String,
+      # then the user wants to match that across any file, so make it an array to accomodate
+      elsif acceptableFilesForTarget.kind_of?(String)
+        acceptableFilesForTarget = [acceptableFilesForTarget] + defaultAcceptableFiles
+
+      else
+        #WhiteList isn't defined, don't include anything
+        acceptableFilesForTarget = defaultAcceptableFiles
+      end
+    else
+      acceptableFilesForTarget = [".*"]
+    end
+
+    Dir.glob("#{source_root}/**/*").each do |path|
+      next unless File.file?(path)
+      next if target.target_directory?(path)
+
+      valid = false
+
+      acceptableFilesForTarget.each do |acceptableFile|
+        if path =~ Regexp.new(acceptableFile) then
+          valid = true
+          break
+        end
+      end
 
+      if valid
         # cut source root out to make filename.  make sure path separators are /
         filename = path.sub /^#{Regexp.escape source_root}\//, ''
         filename = filename.split(::File::SEPARATOR).join('/')
@@ -65,7 +117,7 @@ namespace :manifest do
   end
 
   desc "hides structural files that do not belong in build include Buildfiles and debug or fixtures if turned off"
-  task :hide_buildfiles => :catalog do |task, env|
+  task :hide_buildfiles => [:catalog] do |task, env|
     manifest = env[:manifest]
 
     # these directories are to be excluded unless CONFIG.load_"dirname" = true
@@ -127,7 +179,7 @@ namespace :manifest do
           end
 
         # if this is a preferred_language, hide unless we've seen one
-        elsif entry[:language] == preferred_language
+        elsif entry[:language].to_s == preferred_language.to_s
           if seen[entry[:filename]]
             entry.hide!
           else
@@ -150,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 javascript bundle_info bundle_loaded sass scss less combine minify html strings tests packed) 
+    task :all => %w(css javascript module_info sass scss 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)
@@ -237,52 +289,53 @@ namespace :manifest do
     desc "scans for css files, creates a transform and annotates them"
     task :css => :setup do |task, env|
       manifest = env[:manifest]
+      config = env[:target].config
 
-      # select all original entries with with ext of css
-      entries = manifest.entries.select do |e|
-        e.original? && e[:ext] == 'css'
-      end
+      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
 
-      # 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!
+        # 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
       end
     end
 
-    desc "adds a bundle_info.js entry for each dynamic_required target"
-    task :bundle_info => %w(setup) do |task, env|
+    desc "adds a module_info.js entry for all deferred and prefetched modules"
+    task :module_info => %w(setup) do |task, env|
       target   = env[:target]
       manifest = env[:manifest]
       config   = CONFIG
 
-      # Populate bundle_info for all dynamic_required frameworks.
-      # Add :debug_dynamic_required and :test_dynamic_required depending on
+      # Populate module_info for all deferred_modules frameworks.
+      # Add :debug_deferred_modules and :test_deferred_modules depending on
       # the build mode.
       debug = config[:load_debug]
       test = config[:load_tests]
 
-      targets = target.dynamic_required_targets({ :debug => debug, :test => test, :theme => true })
+      # 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
-        source_entries = []
-        targets.each do |t|
-          t.manifest_for(manifest.variation).build!.entries.each do |e|
-            source_entries << e
-          end
-        end
-        manifest.add_entry 'bundle_info.js',
+        manifest.add_entry 'module_info.js',
           :dynamic        => true, # required to get correct timestamp for cacheable_url
-          :build_task     => 'build:bundle_info',
+          :build_task     => 'build:module_info',
           :resource       => 'javascript',
           :entry_type     => :javascript,
           :composite      => true,
-          :source_entries => source_entries,
           :target         => target,
           :targets        => targets,
           :variation      => manifest.variation,
@@ -291,57 +344,53 @@ namespace :manifest do
           :theme          => true
       end
     end
-    task :bundle_info => :tests # IMPORTANT! to avoid JS including unit tests.
 
-    desc "adds a bundle_loaded.js entry if the target is a framework"
-    task :bundle_loaded => %w(setup) do |task, env|
-      target   = env[:target]
-      manifest = env[:manifest]
-
-      if target[:target_type] == :framework
-        manifest.add_entry 'bundle_loaded.js',
-          :build_task  => 'build:bundle_loaded',
-          :resource    => 'javascript',
-          :entry_type  => :javascript,
-          :composite   => true, # does not have a source
-          :source_entries => [],
-          :target      => target
-      end
-
-    end
-    task :bundle_loaded => :tests # IMPORTANT! to avoid JS including unit tests.
+    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 bundle_info bundle_loaded sass scss less) do |task, env|
+    task :combine => %w(setup css javascript module_info sass scss less) do |task, env|
+      config = env[:target].config
       manifest = env[:manifest]
       config   = CONFIG
 
+      chance_types = [
+        '.css',
+        '.jpg',
+        '.png',
+        '.gif'
+      ]
+
       # sort entries...
-      css_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?
+        next if entry[:resource].nil? and not is_chance_file
 
         # look for CSS or JS type entries
-        case entry[:entry_type]
-        when :css
-          (css_entries[entry[:resource]] ||= []) << entry
-        when :javascript
+        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
           (javascript_entries[entry[:resource]] ||= []) << entry
         end
       end
 
       # build combined CSS entry
-      css_entries.each do |resource_name, entries|
-        manifest.add_composite resource_name.ext('css'),
-          :build_task      => 'build:combine',
-          :source_entries  => entries,
-          :hide_entries    => config[:combine_stylesheets],
-          :ordered_entries => SC::Helpers::EntrySorter.sort(entries),
-          :entry_type      => :css,
-          :combined        => true
-      end
+      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|
@@ -359,13 +408,30 @@ namespace :manifest do
 
     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|
+      manifest = env[:manifest]
+      target   = env[:target]
+
+      next unless target[:target_type] == :module
+
+      entry = manifest.entry_for "javascript.js"
+
+      next if not entry
+      transform = manifest.add_composite 'javascript-strings.js',
+        :build_task     => 'build:string_wrap',
+        :entry_type     => :javascript,
+        :hide_entries   => false,
+        :source_entries => [entry],
+        :packed         => entry.packed? # carry forward
+    end
+
     desc "adds a packed entry including javascript.js from required targets"
     task :packed => %w(setup combine) do |task, env|
+      # don't add packed entries for apps.
       target   = env[:target]
       manifest = env[:manifest]
 
-      # don't add packed entries for apps.
-      if target[:target_type] != :app
         # Handle JavaScript version.  get all required targets and find their
         # javascript.js.  Build packed js from that.
         targets = target.expand_required_targets + [target]
@@ -389,8 +455,8 @@ namespace :manifest do
           :targets           => targets,
           :packed            => true
 
-      end
     end
+
     task :minify => :packed # IMPORTANT: don't want minified version
 
     desc "adds a packed entry including stylesheet.css from required targets"
@@ -399,10 +465,10 @@ namespace :manifest do
       manifest = env[:manifest]
 
       # don't add packed entries for apps.
-      if target[:target_type] != :app
+
         # Handle CSS version.  get all required targets and find their
         # stylesheet.css.  Build packed css from that.
-        targets = target.expand_required_targets + [target]
+        targets = target.expand_required_targets(:theme=>true) + [target]
         entries = targets.map do |target|
           m = target.manifest_for(manifest.variation).build!
 
@@ -423,7 +489,6 @@ namespace :manifest do
           :targets           => targets,
           :packed            => true
 
-      end
     end
     task :minify => :packed # IMPORTANT: don't want minified version
 
@@ -550,7 +615,7 @@ namespace :manifest do
     end
 
     desc "creates transform entries for all css and Js entries to minify them if needed"
-    task :minify => %w(setup javascript bundle_info bundle_loaded css combine sass scss less) do |task, env|
+    task :minify => %w(setup javascript module_info css combine sass scss less) do |task, env|
       manifest = env[:manifest]
       config   = CONFIG
 
@@ -586,7 +651,7 @@ namespace :manifest do
     end
 
     desc "adds a loc strings entry that generates a yaml file server-side functions can use"
-    task :strings => %w(setup javascript bundle_info bundle_loaded) do |task, env|
+    task :strings => %w(setup javascript module_info) do |task, env|
       manifest = env[:manifest]
 
       # find the lproj/strings.js file...