sproutcore 1.6.0.1 → 1.7.1.beta

data/CHANGELOG

@@ -1,3 +1,24 @@
+*SproutCore 1.7.1.beta (August 30, 2011)*
+
+MINOR FEATURES
+
+* When the file hits the 4096 CSS selectors limit in IE , the tools will split the files.
+* Sprites are now optimized to use space in the most optimal way, to reduce
+memory foot print generated by a lot of extra transparent space.
+* Layout.js will be always first when building the js files , just as strings.js (Layout.js includes loc metrics)
+* Added security feature for dev environment. By default sc-server can only be used from your local machine unless you set a flag.
+
+BUG FIXES
+
+* Sprites is again the default for abbot after several perf problems with base64 urls across different browsers.
+* Minification is optimized again to minify the index.html.
+* Fixes for whitelist, when the name filenames include the 'html' string.
+* Several bug fixes for speed and reliability of whitelisting.
+* Fixed retina display styling.
+* Fixed --help command line option.
+* Updated abbot gem dependencies.
+
+
 *SproutCore 1.6.0 (June 09, 2011)*
 
 * Code cleanup +  Stream the headers and body directly across the proxy as they arrive, which will work with streaming APIs like Twitter

data/Gemfile

@@ -1,3 +1,8 @@
 source "http://rubygems.org"
 
 gemspec
+
+group :development do
+  gem 'rake'
+  gem 'packager' if Bundler::VERSION[0,3] == '1.1'
+end

data/Rakefile

@@ -66,11 +66,6 @@ end
 
 ### RELEASE TASKS ###
 
-rvm_data = `rvm list` rescue nil
-rvm_versions = rvm_data ? rvm_data.split("\n")[3..-1].map{|l| l[3..-1].split(" ")[0] } : []
-rvm_mri = rvm_versions.select{|v| v =~ /^ruby-/ }[-1]
-rvm_jruby = rvm_versions.select{|v| v =~ /^jruby-/ }[-1]
-
 version = SproutCore::VERSION
 
 namespace :release do
@@ -85,6 +80,7 @@ namespace :release do
       chdir File.expand_path('../lib/frameworks/sproutcore', __FILE__)
     end
 
+    desc "Update framework"
     task :update do
       branch = `git describe --contains --all HEAD`
       puts "Checking out framework branch: #{branch}"
@@ -95,6 +91,7 @@ namespace :release do
       end
     end
 
+    desc "Update framework changelog with latest changes"
     task :changelog => :chdir do
       last_tag = `git describe --tags --abbrev=0`.strip
       puts "Getting Changes since #{last_tag}"
@@ -117,6 +114,7 @@ namespace :release do
       end
     end
 
+    desc "Update framework version references"
     task :update_references => :chdir do
       puts "Updating version references to #{version}"
 
@@ -127,6 +125,7 @@ namespace :release do
       pretend? ? puts(cmd) : system(cmd)
     end
 
+    desc "Commit framework version bump"
     task :commit => :chdir do
       puts "Commiting Version Bump"
       unless pretend?
@@ -136,11 +135,13 @@ namespace :release do
       end
     end
 
+    desc "Tag new framework version"
     task :tag => :chdir do
       puts "Tagging REL-#{version}"
       system "git tag REL-#{version}" unless pretend?
     end
 
+    desc "Push framework to git"
     task :push => :chdir do
       puts "Pushing Repo"
       unless pretend?
@@ -155,7 +156,10 @@ namespace :release do
       end
     end
 
+    desc "Prepare for new framework release"
     task :prepare => [:update, :changelog, :update_references]
+
+    desc "Commit framework updates and push"
     task :deploy => [:commit, :tag, :push]
 
   end
@@ -166,11 +170,13 @@ namespace :release do
       chdir File.dirname(__FILE__)
     end
 
+    desc "Update repo"
     task :update do
       puts "Checking updating repo"
       system "git pull" unless pretend?
     end
 
+    desc "Update Changelog"
     task :changelog => :chdir do
       last_tag = `git describe --tags --abbrev=0`.strip
       puts "Getting Changes since #{last_tag}"
@@ -193,6 +199,7 @@ namespace :release do
       end
     end
 
+    desc "Commit version bump"
     task :commit => :chdir do
       puts "Commiting Version Bump"
       unless pretend?
@@ -202,11 +209,13 @@ namespace :release do
       end
     end
 
+    desc "Tag new version"
     task :tag => :chdir do
       puts "Tagging REL-#{version}"
       system "git tag REL-#{version}" unless pretend?
     end
 
+    desc "Push new commit to git"
     task :push => :chdir do
       puts "Pushing Repo"
       unless pretend?
@@ -221,24 +230,23 @@ namespace :release do
       end
     end
 
+    desc "Prepare for a new release"
     task :prepare => [:update, :changelog]
+
+    desc "Commit the new release"
     task :deploy => [:commit, :tag, :push]
 
   end
 
   namespace :gems do
 
+    desc "Build a new sproutcore gem"
     task :build do
-      versions = [rvm_mri, rvm_jruby].compact
-      unless versions.empty?
-        puts "Building for #{versions.join(", ")}"
-        system "rvm #{versions.join(',')} exec gem build sproutcore.gemspec" unless pretend?
-      else
-        puts "Building for current version"
-        system "gem build sproutcore.gemspec" unless pretend?
-      end
+      puts "Building for current version"
+      system "gem build sproutcore.gemspec" unless pretend?
     end
 
+    desc "Push new sproutcore gems"
     task :push do
       Dir["sproutcore-#{version}*.gem"].each do |g|
         puts "Pushing #{g}"
@@ -255,11 +263,16 @@ namespace :release do
     end
 
     task :prepare => []
+
+    desc "Build and push new sproutcore gems"
     task :deploy => [:build, :push]
 
   end
 
+  desc "Prepare for a new gem release"
   task :prepare => ["framework:prepare", "abbot:prepare", "gems:prepare"]
+
+  desc "Push new release to github and rubygems.org"
   task :deploy => ["framework:deploy", "abbot:deploy", "gems:deploy"]
 
 end

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
-:minor: 6
-:patch: 0.1
+:minor: 7
+:patch: 1.beta

data/lib/Buildfile

@@ -57,13 +57,26 @@ mode :all do
     # Generate a combined javascript and stylesheet
     :combine_javascript => true,
     :combine_stylesheets => true,
+    
+    # We do NOT want to pad sprites for debugging in production. This both increases filesize
+    # and makes the background of the sprite an embarrassing pink.
+    :pad_sprites_for_debugging => false,
+    
+    # Optimizing sprites is good, but some apps that (appeared) to work before may break with
+    # this turned on. :pad_sprites_for_debugging makes the errors very visible, and that IS
+    # turned on in dev by default, so hopefully we should be able to make this default eventually.
+    #
+    # For reference, optimized sprites lay out sprites horizontally in addition to vertically.
+    :optimize_sprites => false,
+    
+    # enable the hack that splits CSS into files with only ~4000 selectors for IE
+    :split_css_for_ie => true,
 
     # by default all targets autobuild
     :autobuild => true,
 
     # by default minify javacript and stylesheets
     :minify => true,
-    :minify_css => true,
 
     # use the default layout defined in SproutCore
     :layout => 'sproutcore:lib/index.rhtml',
@@ -82,6 +95,11 @@ mode :all do
     # packs all JavaScript and CSS into one file for reduced HTTP requests
     :use_packed => true,
 
+    # generates output using sprites rather than data urls. This is default
+    # for all modes: it is faster to generate and browsers handle sprites better
+    # than data urls.
+    :use_sprites => true,
+
 		# If set to true, the specified framework, if loaded via the SC.loadBundle
 		# API, will be set up to be lazily instantiated when loaded.
 		:lazy_instantiation => false,
@@ -103,10 +121,26 @@ mode :all do
     :html5_manifest => false,
     # Which networks/URLs to allow if HTML5 application caching is turned on
     :html5_manifest_networks => [],
-    
-    # whether to include touch icons in the index.html and other touch related
+
+    # Default favicon.  You can set your own or set it to nil to not use one.
+    # If one is set, the path will be evaluated via sc_static() in the
+    # index.rhtml file.
+    :favicon => 'favicon.ico',
+
+    # Whether to include touch icons in the index.html and other touch related
     # properties
-    :touch_enabled => true
+    :touch_enabled => true,
+
+    # If touch graphics are enabled (see above), then these are the paths which
+    # will be used for the various graphics.  The paths will be evaluated via
+    # sc_static() in the index.rhtml file.
+    #
+    # Note:  If you specify both a precomposed icon and a "regular" icon, the
+    #        precomposed version will be used.
+    :icon                    => 'sproutcore-logo.png',
+    :precomposed_icon        => nil,
+    :startup_image_portrait  => 'sproutcore-startup-portrait.png',
+    :startup_image_landscape => 'sproutcore-startup-landscape.png'
     
 end
 
@@ -126,6 +160,11 @@ mode :debug do
 
     :minify_javascript => false,
 		:minify_css => false,
+		:minify_html => false,
+		
+		# In debug mode, we want to pad sprites for debugging so it is clear
+		# when the developer messes up their CSS.
+		:pad_sprites_for_debugging => true,
 
     :build_prefix => 'tmp/debug/build',
     :staging_prefix => 'tmp/debug/staging',

data/lib/buildtasks/build.rake

@@ -33,6 +33,11 @@ namespace :build do
     SC::Builder::Handlebars.build env[:entry], env[:dst_path]
   end
 
+  desc "splits CSS files by rule count so IE doesn't crap out"
+  build_task :split_css do |task, env|
+    SC::Builder::SplitCSS.build env[:entry], env[:dst_path]
+  end
+
   desc "builds a single sass file"
   build_task :sass do |task, env|
     SC::Builder::Sass.build env[:entry], env[:dst_path]
@@ -95,6 +100,11 @@ namespace :build do
       SC::Builder::Minify.build env[:entry], env[:dst_path], :javascript
     end
     
+    desc "minifies a HTML file by invoking the HTML compressor"
+    build_task :html do |task, env|
+      SC::Builder::Minify.build env[:entry], env[:dst_path], :html
+    end
+    
     desc "minifies a Javascript file immediately by invoking the YUI compressor"
     build_task :inline_javascript do |task, env|
       SC::Builder::Minify.build env[:entry], env[:dst_path], :inline_javascript

data/lib/buildtasks/helpers/file_rule.rb

@@ -0,0 +1,22 @@
+module SproutCore
+  class FileRule
+    
+    def initialize(exp, mode)
+      @mode = mode
+      @expression = Regexp.new(exp)
+    end
+    
+    # Decides whether or not a file should be included.
+    # Returns either true, false, or nil (for not a match at all)
+    def include?(file)
+      ret = (@mode == :deny) ? false : true
+      
+      if file =~ @expression
+        return ret
+      else
+        return nil
+      end
+    end
+    
+  end
+end

data/lib/buildtasks/helpers/file_rule_list.rb

@@ -0,0 +1,137 @@
+require "json"
+require "buildtasks/helpers/file_rule"
+
+module SproutCore
+  
+  # The FileRuleList applies a list of ordered rules to a file path to
+  # determine whether to reject it or approve it.
+  #
+  # The FileRuleList actually manages multiple sets of rules, separated by
+  # target name.
+  #
+  # The FileRuleList can read in JSON files (in either Allow or Deny mode)
+  # and SproutCore Approve Lists.
+  #
+  #     To read JSON: 
+  #     list.read_json(path, :allow)
+  #
+  #     To read Approve Lists
+  #     list.read(path)
+  #
+  class FileRuleList
+    attr_accessor :allow_by_default, :ignore_list
+    
+    ALWAYS_ACCEPTED_FILE_TYPES= [
+      '.manifest',
+      '.htm',
+      '.html',
+      '.rhtml',
+      '.png',
+      '.jpg',
+      '.jpeg',
+      '.gif'
+    ]
+    
+    def initialize
+      @allow_by_default = false
+      @ignore_list = true
+      @file_rule_lists = {}
+    end
+    
+    def add_rule(target, rule)
+      @ignore_list = false
+      
+      @file_rule_lists[target] ||= []
+      @file_rule_lists[target] << rule
+    end
+    
+    def include?(target, file)
+      return true if @ignore_list
+      return true if ALWAYS_ACCEPTED_FILE_TYPES.include?(File.extname file)
+      
+      list = @file_rule_lists[target.to_s]
+      return @allow_by_default if list.nil?
+      
+      approved = @allow_by_default
+      list.each {|rule|
+        _approved = rule.include? file
+        approved = _approved if not _approved.nil?
+      }
+      
+      approved
+    end
+    
+    #
+    # Read methods
+    #
+    def read_json(path, mode)
+      @ignore_list = false
+      
+      if mode != :allow and mode != :deny
+        raise "read_json must be given either mode :allow or mode :deny"
+      end
+      
+      content = JSON.parse(File.read(path))
+      
+      content.each do |target, list|
+        list = [list] if list.kind_of?(String)
+        
+        list.each do |expression|
+          rule = SproutCore::FileRule.new(expression, mode)
+          add_rule(target, rule)
+        end
+        
+      end
+    end
+    
+    def read(path)
+      @ignore_list = false
+      
+      mode = :allow
+      target = nil
+      line_number = 0
+      File.new(path).each_line {|line|
+        line_number += 1
+        
+        line.strip!
+        next if line == ""
+        next if line =~ /^#/
+        
+        target_match = /^TARGET\s+(?<target>[^\s]+)\s*$/.match line
+        if target_match
+          target = target_match[:target]
+          mode = :allow
+          next
+        end
+        
+        if target.nil?
+          raise "Expected TARGET (target name) in Accept list at #{path}, line #{line_number}"
+        end
+        
+        mode_match = /^(?<mode>ALLOW|DENY)(\s+(?<what>.*))?\s*$/i.match line
+        if mode_match
+          _mode = mode_match[:mode].downcase
+          _mode = (_mode == "allow" ? :allow : :deny)
+          
+          if mode_match[:what]
+            exp = mode_match[:what]
+            exp = ".*" if exp == "all"
+            rule = SproutCore::FileRule.new(exp, _mode)
+            
+            add_rule target, rule
+          else
+            mode = _mode
+          end
+          
+          next
+        end
+        
+        match = /(?<expression>.*)$/.match(line)
+        raise "Invalid rule: #{line}" if match.nil?
+
+        rule = SproutCore::FileRule.new(match[:expression], mode)
+        add_rule target, rule
+      }
+    end
+  end
+end