sproutcore 1.5.0.pre.5 → 1.5.0.rc.1

data/CHANGELOG

@@ -1,3 +1,23 @@
+*SproutCore 1.5.0.rc.1 (April 1, 2011)*
+
+* Made it possible to share index.html across multiple languages vs. duplicating it for each.
+* Fixed spriting support related regressions
+* sc-build speed improvements
+* Added support for @debug statements which allow you to mark blocks of code only for debugging purposes.
+* Introduce some new safe-guards for the parallelization of minification
+* Refactored how Chance is invoked by the buildtools
+* Made Chance minify the CSS
+* Added verbose logging about the whitelisting feature
+* Fixed bugs with the modular loading feature of sproutcore that caused the modules not to refresh during development
+* Refactored the spriting support of Chance
+* Added a first-draft of a Chance unit test runner, similar to the existing rake test runner, but based on file output not method output
+* Added support for rmagick, allowing us to preprocess jpegs and gifs in addition to pngs
+* Fixed the -r --include-required build flags when used in conjunction with the --build-targets flag in the buildtools which caused missing building and minifying of targets
+* Prevented the buildtools from generating CSS files unnecessarily
+* Updated unit tests
+* Bug fixes throughout
+
+
 *SproutCore 1.5.0.pre.5 (March 16, 2011)*
 
 * Fixes Ruby 1.8 support

data/VERSION.yml

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

data/lib/buildtasks/manifest.rake

@@ -95,6 +95,8 @@ namespace :manifest do
       acceptableFilesForTarget = [".*"]
     end
 
+    number_rejected_entries = 0
+
     Dir.glob("#{source_root}/**/*").each do |path|
       next unless File.file?(path)
       next if target.target_directory?(path)
@@ -113,8 +115,14 @@ namespace :manifest do
         filename = path.sub /^#{Regexp.escape source_root}\//, ''
         filename = filename.split(::File::SEPARATOR).join('/')
         manifest.add_entry filename, :original => true # entry:prepare will fill in the rest
+      else
+        number_rejected_entries += 1
       end
     end
+
+      if number_rejected_entries > 0
+        SC.logger.warn "The Whitelist file rejected #{number_rejected_entries} file(s) from #{target[:target_name]}"
+      end
   end
 
   desc "hides structural files that do not belong in build include Buildfiles and debug or fixtures if turned off"
@@ -259,7 +267,7 @@ namespace :manifest do
       end
     end
     task :javascript => :tests # IMPORTANT! to avoid JS including unit tests.
-    # task :html       => :tests # IMPORTANT! to avoid HTML including tests
+    # task :html       => :tests # IMPORTANT! to avoid HTML including tests 
 
     desc "scans for javascript files, annotates them and prepares combined entries for each output target"
     task :javascript => :setup do |task, env|
@@ -374,8 +382,23 @@ namespace :manifest do
 
       unless targets.size == 0
 
+        source_paths = []
+
         targets.each do |target|
-          target.manifest_for(manifest.variation).build!
+          m = target.manifest_for(manifest.variation)
+          m.build!
+
+          m.entries.each do |entry|
+            # The entry may have been built directly; we need to make sure it was
+            # staged because we check staging_path
+            entry.stage!
+            case entry[:entry_type]
+            when :css
+              source_paths << entry[:staging_path]
+            when :javascript
+              source_paths << entry[:staging_path]
+            end
+          end
         end
 
         manifest.add_entry 'module_info.js',
@@ -389,7 +412,8 @@ namespace :manifest do
           :variation      => manifest.variation,
           :debug          => debug,
           :test           => test,
-          :theme          => true
+          :theme          => true,
+          :source_paths   => source_paths
       end
     end
 
@@ -400,6 +424,9 @@ namespace :manifest do
       config = CONFIG
       manifest = env[:manifest]
 
+      sprited = CONFIG[:use_sprites]
+      minify = CONFIG[:minify_css]
+
       # the image files will be shared between all css_entries-- that is,
       # all instances of Chance created
       global_chance_entries = []
@@ -424,7 +451,9 @@ namespace :manifest do
 
       end
 
-      chance_entries = []
+      chance_instances = []
+      all_chance_entries = []
+      timestamps = []
 
       # We need a collection of source paths for our mhtml and JS files to
       # check mtimes against.
@@ -435,19 +464,30 @@ namespace :manifest do
         # 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
+        # We create the Chance Instance now, even though we don't run the whole thing.
+        # This could incur a performance penalty to build manifests, but it is the only 
+        # way to know what sprties, etc. need to be put into the manifest.
+        #
+        # Still, Chance has to get created sometime.
+        chance = Chance::Instance.new({ :theme => CONFIG[:css_theme], :minify => CONFIG[:minify_css] })
+
+        timestamp = 0
+        has_2x_entries = false
+        entries.each do |entry|
+          timestamp = [entry.timestamp, timestamp].max
+
+          # unfortunately, we have to stage the source entries NOW.
+          src_path = entry.stage![:staging_path]
+          next unless File.exist?(src_path)
+
+          Chance.add_file src_path
+          chance.map_file(entry.filename, src_path)
+
+          has_2x_entries = true if src_path.include?("@2x")
+        end
 
-        chance_entries << entry
+        timestamps << timestamp
+        chance_instances << chance
 
 
         # ADD A 2X version
@@ -457,45 +497,87 @@ namespace :manifest do
         # 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",
+        add_chance_file = lambda {|entry_name, chance_file|
+          manifest.add_entry entry_name,
+            :variation       => manifest.variation,
+            :build_task      => 'build:chance_file',
+            :entry_type      => :css,
+            :combined        => true,
+
+            :source_entries  => entries,
+            :ordered_entries => SC::Helpers::EntrySorter.sort(entries),
+
+            :chance_file     => chance_file,
+            :chance_instance => chance,
+
+            # 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       => timestamp,
+
+            :source_paths => entry_source_paths,
+            :resource_name => resource_name,
+
+            # So that modules, etc. can figure out what resource it belongs to
+            :resource => resource_name,
+
+            # Chance does minification on its own
+            :minify => minify,
+
+            # So that it can easily be recognized as an @2x entry.
+            :x2 => entry_name.include?("@2x")
+        }
+
+
+        chance_file = "chance" + (sprited ? "-sprited" : "") + ".css"
+
+        add_chance_file.call(resource_name + ".css", chance_file)
+
+        # We only want to add the 2x version if there is a need for it.
+        # NOTE: the HTML builder will need to pick the normal version if it
+        # cannot find the @2x version.
+        if has_2x_entries
+          chance_2x_file = "chance" + (sprited ? "-sprited" : "") + "@2x.css"
+          add_chance_file.call(resource_name + "@2x.css", chance_2x_file)
+        end
 
-          # 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,
+        if sprited
+          chance.sprite_names.each {|name|
+            add_chance_file.call(resource_name + "-" + name, name);
+          }
 
-          :source_paths => entry_source_paths
+          chance.sprite_names({:x2 => true}).each {|name|
+            add_chance_file.call(resource_name + "-" + name, name);
+          }
+        end
 
         # 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
+        all_chance_entries += entries
       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
+      if chance_instances.length > 0
+        manifest.add_entry "__sc_chance.js",
+          :build_task       => 'build:chance_file',
+          :chance_instances   => chance_instances,
+          :entry_type       => :javascript,
+          :resource         => "javascript",
+          :chance_file      => "chance.js",
+          :timestamp        => timestamps.max,
+          :source_paths     => source_paths,
+          :source_entries   => all_chance_entries
+
+        manifest.add_entry "__sc_chance_mhtml.txt",
+          :build_task       => 'build:chance_file',
+          :chance_instances   => chance_instances,
+          :entry_type       => :mhtml,
+          :chance_file      => "chance-mhtml.txt",
+          :timestamp        => timestamps.max,
+          :source_paths     => source_paths,
+          :source_entries   => all_chance_entries
+      end
 
     end
 
@@ -516,7 +598,6 @@ namespace :manifest do
         end
       end
 
-
       # build combined JS entry
       javascript_entries.each do |resource_name, entries|
         resource_name = resource_name.ext('js')
@@ -552,13 +633,14 @@ namespace :manifest do
 
     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]
 
+      # Only include a packed entry _if_ it is an app.
+      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]
+        targets = target.expand_required_targets({ :theme => true }) + [target]
         entries = targets.map do |target|
           m = target.manifest_for(manifest.variation).build!
 
@@ -579,6 +661,7 @@ namespace :manifest do
           :targets           => targets,
           :packed            => true
 
+      end
     end
 
     task :minify => :packed # IMPORTANT: don't want minified version
@@ -588,32 +671,38 @@ namespace :manifest do
       target   = env[:target]
       manifest = env[:manifest]
 
-      %w(stylesheet stylesheet@2x).each {|resource|
+      # packed entries only for apps now.
+      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]
-        entries = targets.map do |target|
-          m = target.manifest_for(manifest.variation).build!
+        %w(stylesheet stylesheet@2x).each {|resource|
 
-          # need to find the version that is not minified
-          entry = m.entry_for(resource + ".css")
-          entry = entry.source_entry while entry && entry.minified?
-          entry
-        end
+          # 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]
+          entries = targets.map do |target|
+            m = target.manifest_for(manifest.variation).build!
 
-        entries.compact!
-        manifest.add_composite resource + '-packed.css',
-          :build_task        => 'build:combine',
-          :source_entries    => entries,
-          :hide_entries      => false,
-          :entry_type        => :css,
-          :combined          => true,
-          :ordered_entries   => entries, # ordered by load order
-          :targets           => targets,
-          :packed            => true
+            # need to find the version that is not minified
+            entry = m.entry_for(resource + ".css")
+            entry = entry.source_entry while entry && entry.minified?
+            entry
+          end
+
+          entries.compact!
 
-      }
+          next if entries.length == 0
+          manifest.add_composite resource + '-packed.css',
+            :build_task        => 'build:combine',
+            :source_entries    => entries,
+            :hide_entries      => false,
+            :entry_type        => :css,
+            :combined          => true,
+            :ordered_entries   => entries, # ordered by load order
+            :targets           => targets,
+            :packed            => true
+
+        }
+      end
 
     end
 
@@ -753,13 +842,17 @@ namespace :manifest do
       manifest.entries.dup.each do |entry|
         case entry[:entry_type]
         when :css
-          if minify_css
-            manifest.add_transform entry,
-              :build_task => 'build:minify:css',
-              :entry_type => :css,
-              :minified   => true,
-              :packed     => entry.packed? # carry forward
-          end
+          # NOTE: CSS MINIFICATION USING YUI MINIFIER IS CURRENTLY NOT WORKING.
+          # But, since Chance is minifying it, we can disable this code path
+          # for the moment. We'll need to add it back and fix YUI if we end up
+          # supporting disabling Chance.
+          # if minify_css
+          #   manifest.add_transform entry,
+          #     :build_task => 'build:minify:css',
+          #     :entry_type => :css,
+          #     :minified   => true,
+          #     :packed     => entry.packed? # carry forward
+          # end
 
         when :javascript
           if minify_javascript

data/lib/frameworks/sproutcore/Buildfile

@@ -34,9 +34,9 @@ config :datetime,        :required => [:runtime]
 config :core_foundation, :required => [:runtime, :handlebars]
 config :foundation,      :required => [:core_foundation, :datetime]
 config :datastore,       :required => [:runtime, :datetime]
-config :statechart,      :required => [:core_foundation]
 config :desktop,         :required => [:foundation]
 config :media,           :required => [:desktop]
+config :statechart,      :required => [:core_foundation], :test_required => [:core_foundation, :desktop]
 
 # APP-LEVEL FRAMEWORKS
 %w(mobile designer).each do |app_framework|
@@ -56,7 +56,7 @@ config :forms, :required => :desktop
 
 # SPECIAL FRAMEWORKS AND THEMES
 # These do not require any of the built-in SproutCore frameworks
-%w(testing debug standard_theme empty_theme).each do |target_name|
+%w(testing debug legacy_theme empty_theme).each do |target_name|
   config target_name, 
     :required => [], :test_required => [], :debug_required => []
 end
@@ -73,7 +73,7 @@ config :iphone_theme,
   :test_required  => ['sproutcore/testing'],
   :debug_required => ['sproutcore/debug']
 
-config :standard_theme, 
+config :legacy_theme, 
   :required => :empty_theme, 
   :theme_name => 'sc-theme',
   :test_required  => ['sproutcore/testing'],
@@ -87,7 +87,10 @@ config :ace,
   :css_theme => 'ace'
 
 # CONFIGURE APPS
-config :core_tools, :required => [:desktop, :datastore, :animation, :forms]
+config :core_tools, :required => [
+  :desktop, :datastore, :animation, :forms,
+  "sproutcore/ace", "sproutcore/experimental/split_view"
+]
 
 # mode :debug do
 #   config :core_tools, :combine_javascript => false
@@ -104,8 +107,6 @@ config :core_tools, :required => [:desktop, :datastore, :animation, :forms]
 
 end
 
-config :test_controls, :css_theme => 'ace.test-controls'
-
 config :greenhouse, 
   :required => [:sproutcore, :'sproutcore/designer', :statechart],
   :theme => :ace,

data/lib/frameworks/sproutcore/CHANGELOG.md

@@ -2,6 +2,62 @@
 CHANGE LOG FOR 1.5
 ==================
 
+1.5.0.rc.1
+-----------
+* Removed #bindCollection helper. Instead, use {{#collection
+  PathTo.Collection contentBinding="MyApp.controller.content"}}
+* {{view}} helper looks up views relative to the view, and then the
+  global scope
+* Built-in helpers and mustaches now automatically update. It is no
+  longer necessary to use {{bind}} or {{boundIf}}
+* Adds enumerable observers, which allow you to subscribe to mutations
+  of an enumerable
+* Fixed error reporting when a Handlebars template is unable to find a
+  property
+* Dependent keys that contain paths now invalidate immediately instead
+  of at the end of the run loop, which significantly improves
+  performances, especially when combined with @each
+* SC.offset offers more reliability than the deprecated SC.viewOffset
+* Added SC.getPath(), which is like SC.get() but takes a path instead of
+  just a property
+* Improved compatibility of using SC.CoreViews (such as SC.TemplateView)
+  inside standard SC.Views
+* Tear down SC.TemplateCollectionView child views when no longer needed,
+  which fixes a memory leak issue
+* Integrated new functionality from the Ki framework into the SC.StateChart framework so that they now have feature-parity
+* The SC.PickerPane was updated to add removeTarget and removeTarget properties
+* Fixed documentation in datastore and view layer
+* Refactored and fixed bugs in the way SproutCore handles AutoResizing.
+* Updated the test_controls application to reflect AutoResize changes
+* Fixed bugs with the selection behavior in lists
+* Fixed bugs with the logic that determines when sproutcore applications are ready to begin execution
+* Improved performance of layout updates
+* Fixed bugs in keyboard behavior of menus
+* Made more views utilize render delegates
+* Updated unit tests for menus to reflect new keyboard behavior
+* Add proper autoresize behavior to buttons
+* Fixed frame calculation bugs in lists
+* Removed redundant bounds checking in scroll
+* Fixed bugs with the localization of titles in segmented views
+* Fixes for formView
+* Added ability to scale apps so that we can visualize them on the iPhone
+* If using StaticLayout in the image, don't use Canvas
+* Fixed firstResponder support in text_field
+* Fixed responder behavior in editable
+* Refactoring for flowed_layout
+* Rewrote the existing inline editing code to make it more generic and integrated it with SC.LabelView, SC.InlineTextFieldView and SC.ListItemView
+* Added a new SC.SplitView class to the experimental framework which is a re-write of the existing SC.SplitView class but with cleaner code and multi-pane support.
+* Introduced a new AlertPane API and backwards compatibility for the existing API. The new API allows us to create an AlertPane by defining a hash of parameters instead of single methods which take 15+ parameters.
+* Added the ability to programmatically trigger SC.Ready instead of automatically by jQuery which allows the app developer to decide when his app is ready to run
+* Moved render delegates from Ace to base_theme, and render delegates from base to legacy_theme
+* Renamed standard_theme to legacy_theme
+* Cleaned up old, broken css code in desktop and foundation frameworks
+* Updated ImageView documentation
+* Small bug fixes throughout
+* Added unit tests for new functionality
+* Fix failing unit tests
+
+
 1.5.0.pre.5
 -----------
 * Support for high resolution screens.