sproutcore 1.6.0.1-java → 1.7.1.beta-java

data/lib/buildtasks/manifest.rake

@@ -6,6 +6,8 @@
 # Tasks invoked while building Manifest objects.  You can override these
 # tasks in your buildfiles.
 
+require File.dirname(__FILE__) + '/helpers/file_rule_list'
+
 namespace :manifest do
 
   desc "Invoked just before a manifest object is built to setup standard properties"
@@ -52,47 +54,21 @@ namespace :manifest do
 
     source_root = target[:source_root]
 
-    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
+    file_rule_list = SproutCore::FileRuleList.new
+    
+    Dir.glob("#{Dir.pwd}/#{SC.env[:whitelist_name]}").each do |path|
+      file_rule_list.read_json(path, :allow) if File.file? path
     end
-
-    if whitelist
-      acceptableFilesForTarget = whitelist["#{target[:target_name]}"]
-
-      # Always accept these files
-      defaultAcceptableFiles = [
-        '.manifest',
-        '.htm',
-        '.html',
-        '.rhtml',
-        '.png',
-        '.jpg',
-        '.jpeg',
-        '.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
+    
+    Dir.glob("#{Dir.pwd}/#{SC.env[:blacklist_name]}").each do |path|
+      if File.file? path
+        file_rule_list.allow_by_default = true
+        file_rule_list.read_json(path, :deny)
       end
-    else
-      acceptableFilesForTarget = [".*"]
+    end
+    
+    Dir.glob("#{Dir.pwd}/#{SC.env[:accept_name]}").each do |path|
+      file_rule_list.read(path) if File.file? path
     end
 
     number_rejected_entries = 0
@@ -100,18 +76,8 @@ namespace :manifest do
     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 /
+      
+      if file_rule_list.include?(target[:target_name], path)
         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
@@ -214,7 +180,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 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 split)
 
     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)
@@ -275,6 +241,7 @@ namespace :manifest do
     desc "scans for javascript files, annotates them and prepares combined entries for each output target"
     task :javascript => :setup do |task, env|
       manifest = env[:manifest]
+      target = env[:target]
       config   = CONFIG
 
       # select all original entries with with ext of css
@@ -293,6 +260,7 @@ namespace :manifest do
           :build_task => 'build:javascript',
           :resource   => 'javascript',
           :entry_type => :javascript
+        
         entry.discover_build_directives!
       end
     end
@@ -426,9 +394,10 @@ namespace :manifest do
     task :chance => %w(setup images javascript module_info css sass less) do |task, env|
       config = CONFIG
       manifest = env[:manifest]
+      target = manifest.target
 
       sprited = CONFIG[:use_sprites]
-      minify = CONFIG[:minify_css]
+      minify = !SC.env[:dont_minify] && (CONFIG[:minify_css].nil? ? CONFIG[:minify] : CONFIG[:minify_css])
 
       # the image files will be shared between all css_entries-- that is,
       # all instances of Chance created
@@ -458,10 +427,6 @@ namespace :manifest do
       all_chance_entries = []
       timestamps = []
 
-      # 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
@@ -472,23 +437,57 @@ namespace :manifest do
         # 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] })
-
+        #
+        # To help, we cache the Chance Instance based on a key we generate. The Chance Factory does
+        # this for us. It will automatically handle when things change, for the most part (though
+        # the builder still has to tell Chance to double-check things, etc.)
+        opts = { 
+          # the value of $theme
+          :theme => CONFIG[:css_theme],
+          
+          # whether it should minify
+          :minify => minify,
+          
+          # whether it should optimize sprites. This is opt-in, and comes from the buildfile.
+          :optimize_sprites => CONFIG[:optimize_sprites],
+          
+          # Whether it should pad slices for debugging when writing them to the sprite. This is opt-out
+          # in development, but is off during production.
+          :pad_sprites_for_debugging => CONFIG[:pad_sprites_for_debugging],
+          
+          # a unique identifier for the instance. we can share across localizations; this is
+          # merely used to prevent conflicts within the SAME CSS file: Chance makes sure
+          # all rules for generated images include this key. We'll use the target name.
+          :instance_id => target[:target_name]
+        }
+        chance_key = manifest[:staging_root] + "/" + resource_name
+        
+        chance = Chance::ChanceFactory.instance_for_key(chance_key, opts)
+        chance_files = {}
+        
         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]
+          # unfortunately, we have to stage the source entries NOW. But only if they require
+          # building to be used. This applies primarily to sass and less entries.
+          if entry[:build_required]
+            src_path = entry.stage![:staging_path]
+          else
+            src_path = entry[:source_path]
+          end
+          
           next unless File.exist?(src_path)
 
           Chance.add_file src_path
           # Also remove source/ from the filename for sc_require and @import
-          chance.map_file(entry.filename.sub(/^source\//, ''), src_path)
+          chance_files[entry.filename.sub(/^source\//, '')] = src_path
 
           has_2x_entries = true if src_path.include?("@2x")
         end
+        
+        Chance::ChanceFactory.update_instance(chance_key, opts, chance_files)
 
         timestamps << timestamp
         chance_instances << chance
@@ -501,11 +500,11 @@ 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] }
 
-        add_chance_file = lambda {|entry_name, chance_file|
+        add_chance_file = lambda {|entry_name, chance_file, entry_type|
           manifest.add_entry entry_name,
             :variation       => manifest.variation,
             :build_task      => 'build:chance_file',
-            :entry_type      => :css,
+            :entry_type      => entry_type,
             :combined        => true,
 
             :source_entries  => entries,
@@ -524,9 +523,7 @@ namespace :manifest do
 
             # So that modules, etc. can figure out what resource it belongs to
             :resource => resource_name,
-
-            # Chance does minification on its own
-            :minify => minify,
+            :minified => minify,
 
             # So that it can easily be recognized as an @2x entry.
             :x2 => entry_name.include?("@2x")
@@ -535,52 +532,25 @@ namespace :manifest do
 
         chance_file = "chance" + (sprited ? "-sprited" : "") + ".css"
 
-        add_chance_file.call(resource_name + ".css", chance_file)
+        add_chance_file.call(resource_name + ".css", chance_file, :css)
 
         # 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)
+          add_chance_file.call(resource_name + "@2x.css", chance_2x_file, :css)
         end
 
         if sprited
           chance.sprite_names.each {|name|
-            add_chance_file.call(resource_name + "-" + name, name);
+            add_chance_file.call(resource_name + "-" + name, name, :image);
           }
 
           chance.sprite_names({:x2 => true}).each {|name|
-            add_chance_file.call(resource_name + "-" + name, name);
+            add_chance_file.call(resource_name + "-" + name, name, :image);
           }
         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
-
-      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
@@ -607,7 +577,7 @@ namespace :manifest do
         resource_name = resource_name.ext('js')
 
         if resource_name == 'javascript.js'
-          pf = ['source/lproj/strings.js', 'source/core.js', 'source/utils.js']
+          pf = ['source/lproj/layout.js', 'source/lproj/strings.js', 'source/core.js', 'source/utils.js']
           if manifest.target.target_type == :app
             target_name = manifest.target.target_name.to_s.split('/')[-1]
             pf.insert(2, "source/#{target_name}.js")
@@ -642,6 +612,10 @@ namespace :manifest do
         :entry_type     => :javascript,
         :hide_entries   => false,
         :source_entries => [entry],
+        
+        # carry forward minification so we can do a last-minute security check
+        # and not reject this file.
+        :minified       => entry.minified?,
         :packed         => entry.packed? # carry forward
     end
 
@@ -687,18 +661,30 @@ namespace :manifest do
 
       # packed entries only for apps now.
       if target[:target_type] == :app
-
-        %w(stylesheet stylesheet@2x).each {|resource|
+        
+        combine_entries = [{
+          :resource => 'stylesheet',
+          :fallback => nil
+        }, {
+          :resource => 'stylesheet@2x',
+          :fallback => 'stylesheet'
+        }]
+
+        combine_entries.each {|combine_entry|
+          resource = combine_entry[:resource]
+          fallback = combine_entry[:fallback]
 
           # 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!
-
-            # need to find the version that is not minified
             entry = m.entry_for(resource + ".css")
-            entry = entry.source_entry while entry && entry.minified?
+            
+            if entry.nil? and not fallback.nil?
+              entry = m.entry_for(fallback + ".css")
+            end
+            
             entry
           end
 
@@ -719,8 +705,30 @@ namespace :manifest do
       end
 
     end
+    
+    desc "splits packed CSS files into chunks based on selector count because internet explorer is shitty"
+    task :split => %w(packed) do |task, env|
+      # The split_css transform, which we add to stylesheet-packed, splits CSS based on number
+      # of selectors (because IE has a maximum of ~4096 per file). It actually ends up adding
+      # more manifest entries, which is UBER HACKY!!! But, what can you do when you don't
+      # know what files you'll have to create until you've already started building?
+      target = env[:target]
+      manifest = env[:manifest]
+      
+      if target[:target_type] == :app
+        # We don't need to do @2x: it is safari only.
+        resource = "stylesheet-packed.css"
+        entry = manifest.entry_for(resource)
+        
+        # There may not be a stylesheet-packed.
+        if not entry.nil?        
+          entry = manifest.add_transform entry,
+            :build_task => 'build:split_css'
+        end
+      end
+    end
 
-    task :minify => :packed # IMPORTANT: don't want minified version
+    task :minify => :split # IMPORTANT: don't want minified version
 
     #Create builder tasks for sass and less in a DRY way
     [:sass, :less].each do |csscompiler|
@@ -737,6 +745,7 @@ namespace :manifest do
             :url => [manifest[:url_root], 'source', entry[:filename]].join("/"),
             :build_task => 'build:'+csscompiler.to_s,
             :entry_type => :css,
+            :build_required => true, # tells the :chance step that it needs to stage it before it can use it
             :ext        => 'css',
             :resource   => 'stylesheet',
             :required   => []
@@ -843,37 +852,39 @@ namespace :manifest do
     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 less) do |task, env|
+    task :minify => %w(setup javascript module_info css combine sass less html) do |task, env|
       manifest = env[:manifest]
       config   = CONFIG
 
-      minify_css = config[:minify_css]
-      minify_css = config[:minify] if minify_css.nil?
-
       minify_javascript = config[:minify_javascript]
       minify_javascript = config[:minify] if minify_javascript.nil?
+      
+      minify_html = config[:minify_html]
+      minify_html = config[:minify] if minify_html.nil?
+      
+      if SC.env[:dont_minify]
+        minify_javascript = false
+        minify_html = false
+      end
 
       manifest.entries.dup.each do |entry|
         case entry[:entry_type]
-        when :css
-          # 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
-
+          # NOTE: CSS IS MINIFIED BY CHANCE. So we ignore it here.
+          
+        when :html
+          if minify_html
+            manifest.add_transform entry,
+                :build_task => 'build:minify:html',
+                :entry_type => :html,
+                :minified => true
+          end
         when :javascript
           if minify_javascript
             manifest.add_transform entry,
               :build_task => 'build:minify:javascript',
               :entry_type => :javascript,
               :minified   => true,
+              :combined   => entry.combined?,  # carry forward
               :packed     => entry.packed? # carry forward
           end
         end

data/lib/frameworks/sproutcore/CHANGELOG.md

@@ -1,5 +1,72 @@
-CHANGE LOG FOR 1.6
-==================
+CHANGE LOG FOR 1.6+
+===================
+
+1.7.1.beta
+----------
+
+### MINOR FEATURES
+
+* Added Safari Lion browser detection.
+* Speed improvements in renderContext, switching from joining arrays of strings to simple string concatenation.
+* Faster code escaping using regular expressions instead of DOM.
+* New flag to stop picker repositioning when the window is resized.
+* SegmentedView update to enable/disable overflow.
+* Small performance improvement for splitView.
+* New string measurement functions to optimize for string wrapping.
+* Added support for autoCorrect and autoCapitalize in TextFields.
+* Added back object types previously removed by the refactored SC.Object
+* Refactored observer paths code for a more robust handling.
+* Rewrite SC.LOG_RUNLOOP_INVOCATIONS — now renamed to SC.LOG_DEFERRED_CALLS — to work with the new runloop implementation.
+* Added this SC.RunLoop.kill to terminate cleanly a run loop in case of an error.
+* Added the ability to dynamically add substates to a statechart via a state's addSubstate method.
+* Updated the statechart tracing logic.
+* Updated SC.State. getSubstate now accepts a callback; added getState method; gotoState and gotoHistoryState now use getState
+* Updated state's gotoState and gotoHistoryState to allow for a more expressive state arg that now allows for the use of 'parentState'
+* Updated SC.State's getSubstate method to allow for path expressions. Also refacted the findFirstRelativeCurrentState method.
+* New SC globals to provide information like build mode, build number and locale.
+
+### BUG FIXES
+
+* Bug fix, when the apps don’t have a first responder at loading time the app throws an error.
+* Tweaked scrolling acceleration and speed to match native scroller.
+* Removed Internet Explorer legacy code.
+* Passing the native event when a focus or blur event is called. This makes it consistent with all the other event handlers.
+* Workarounds for mobileSafari touch handling in textfields and links.
+* IE was getting two blur/focus events. 
+* Small bug fix for timers when there is no currentRunLoop.
+* Unit test updates for renderContext.
+* Reverted change to receive focus if it the view becomes key responder.
+* Disabling layout style calculations for opacity in IE, as this will always break transparent pngs.
+* Changed code to get a reliable anchor for pickers and menus.
+* Reposition pickers based on the size of the app and not the window viewport.
+* Added tooltips back to button.
+* Fix for popup_buttons as they were not rendering as expected.
+* Removing acceleration layer on sliders as this was creating GPU glitches on views appended after the slider.
+* Removing legacy handler of buttons to improve speed.
+* Bug fix to update list scrollers when adding new items to the list.
+* Changed timeout value for a faster experience in menu scrolling.
+* Removed deltaAdjust in scrollView and left only the calculations done in SC.Event. 
+* Updated values in select button to fix rendering regressions.
+* Refactored childViews creation in formView.
+* Updated new selectView to correctly support width resizing.
+* Better string measurements for autoResize mixin. Also included the support to auto fit text (reduce font size if neccessary.
+* FlowedLayout fixes when the view changes visibility and code clean up.
+* Added back hints to labels.
+* Removed unneccesary font-weight label css attribute.
+* Removed zIndex in text-fields.
+* Removed preload images task for “Chance” slicing system .
+* Several modular loading bug fixes, including support for css.
+* Bug fix for string measurement. It was double escaping.
+* Observers failing in IE as strings don’t work as arrays.
+* Don't schedule multiple run loops when we only need one in SC.Binding.
+* Add in support for specifying an optional prefix that will be applied to all messages.
+* Updated observable unit tests
+* Updated SC.Logger unit tests
+* Updated SC.State's getSubstate method to allow for path expressions.
+* Updated Statechart unit tests
+* Updated state charts unit tests
+* Updated css to match abbot css fixes for $skip parameter in chance.
+* Added css style namespace to sc-focus, this was generating problems when focusing the elements the first time in the app.
 
 1.6.0
 -----