sproutcore 1.0.1046 → 1.0.1049.pre.1

data/lib/sproutcore/buildfile/task_manager.rb

@@ -6,7 +6,7 @@
 # ===========================================================================
 
 module SC
-  
+
   # Manages a set of tasks.  Borrowed from Rake 0.8.3
   module TaskManager
     # Track the last comment made in the Rakefile.
@@ -14,9 +14,10 @@ module SC
     alias :last_comment :last_description    # Backwards compatibility
 
     attr_accessor :last_task_options
-    
+
     def initialize
       super
+      @task_cache = Hash.new {|h,k| h[k] = {} }
       @tasks = Hash.new
       @rules = Array.new
       @scope = Array.new
@@ -51,8 +52,7 @@ module SC
 
     # Find a matching task for +task_name+.
     def [](task_name, scopes=nil)
-      task_name = task_name.to_s
-      self.lookup(task_name, scopes) or
+      lookup(task_name, scopes) or
         raise "Don't know how to build task '#{task_name}'"
     end
 
@@ -86,7 +86,7 @@ module SC
       [task_name, arg_names, []]
     end
     private :resolve_args_without_dependencies
-    
+
     # Resolve task arguments for a task or rule when there are
     # dependencies declared.
     #
@@ -117,7 +117,7 @@ module SC
       [task_name, arg_names, deps]
     end
     private :resolve_args_with_dependencies
-    
+
     # List of all defined tasks in this application.
     def tasks
       @tasks.values.sort_by { |t| t.name }
@@ -135,18 +135,20 @@ module SC
     # are recognized.  If no scope argument is supplied, use the
     # current scope.  Return nil if the task cannot be found.
     def lookup(task_name, initial_scope=nil)
-      initial_scope ||= @scope
-      task_name = task_name.to_s
-      if task_name =~ /^rake:/
-        scopes = []
-        task_name = task_name.sub(/^rake:/, '')
-      elsif task_name =~ /^(\^+)/
-        scopes = initial_scope[0, initial_scope.size - $1.size]
-        task_name = task_name.sub(/^(\^+)/, '')
-      else
-        scopes = initial_scope
+      @task_cache[initial_scope][task_name] ||= begin
+        initial_scope ||= @scope
+        task_name = task_name.to_s
+        if task_name =~ /^rake:/
+          scopes = []
+          task_name = task_name.sub(/^rake:/, '')
+        elsif task_name =~ /^(\^+)/
+          scopes = initial_scope[0, initial_scope.size - $1.size]
+          task_name = task_name.sub(/^(\^+)/, '')
+        else
+          scopes = initial_scope
+        end
+        lookup_in_scope(task_name, scopes)
       end
-      lookup_in_scope(task_name, scopes)
     end
 
     # Lookup the task name

data/lib/sproutcore/deprecated/view_helper.rb

@@ -129,7 +129,7 @@ module SproutCore
           end
         end
       end
-      
+
       def to_s
         "RenderContext #{view_helper_id}[#{item_id}]"
       end
@@ -571,7 +571,7 @@ module SproutCore
         view_settings = { :id => item_id, :class => view_class, :properties => rc.render_view, :lazy => opts[:lazy], :outlet_path => opts[:outlet_path] }
 
         # if an outlet item is passed, then register this as an outlet.
-        outlet = opts[:outlet] 
+        outlet = opts[:outlet]
         if outlet.nil?
           outlet = opts[:field].nil? ? !cur_rc.nil? : [opts[:field].to_s, 'field'].join('_').to_sym
         end

data/lib/sproutcore/helpers.rb

@@ -0,0 +1,11 @@
+require "sproutcore/helpers/capture_helper"
+require "sproutcore/helpers/cssmin"
+require "sproutcore/helpers/dom_id_helper"
+require "sproutcore/helpers/entry_sorter"
+require "sproutcore/helpers/html5_manifest"
+require "sproutcore/helpers/packed_optimizer"
+require "sproutcore/helpers/static_helper"
+require "sproutcore/helpers/tag_helper"
+require "sproutcore/helpers/text_helper"
+
+

data/lib/sproutcore/helpers/cssmin.rb

@@ -12,11 +12,11 @@
 #
 # == About
 #
-# Rainpress is a compressor for CSS. It's written in ruby, but should not be 
+# Rainpress is a compressor for CSS. It's written in ruby, but should not be
 # limited to ruby projects.
 #
-# Rainpress does not apply common compression algorithms like gzip, it removes 
-# unnecessary characters and replaces some attributes with a shorter equivalent 
+# Rainpress does not apply common compression algorithms like gzip, it removes
+# unnecessary characters and replaces some attributes with a shorter equivalent
 # name.
 #
 # == Links
@@ -42,12 +42,12 @@ module SC::Helpers
   #   packer = SproutCore::CSSPacker.new
   #   compressed_style = packer.compress(style)
   class CSSPacker
-  
+
     # Use always this functions if you want to compress your CSS-style
     #
     # <b>Options:</b>
     #
-    # * <tt>:preserveComments</tt> - if set to true, comments will not be 
+    # * <tt>:preserveComments</tt> - if set to true, comments will not be
     #   removed
     # * <tt>:preserveNewline</tt> - if set to true, newlines will not be removed
     # * <tt>:preserveSpaces</tt> - if set to true, spaces will not be removed
@@ -57,30 +57,30 @@ module SC::Helpers
     def compress(style, options = {})
       # remove comments
       style = remove_comments(style) unless options[:preserveComments]
-    	
+
   	  # remove newlines
       style = remove_newlines(style) unless options[:preserveNewlines]
-    	
+
 	  # remove unneeded spaces
       style = remove_spaces(style) unless options[:preserveSpaces]
-    	
+
 	  # replace colours with shorter names
       style = shorten_colors(style) unless options[:preserveColors]
-      
+
       # make all other things
       style = do_misc(style) unless options[:skipMisc]
-      
+
 	  style
 	end
-  
+
     # Remove all comments out of the CSS-Document
   	def remove_comments(script)
       input = script
       script = ''
-      
+
       while input.length > 0 do
         pos = input.index("/*");
-        
+
         # No more comments
         if pos == nil
           script += input
@@ -93,7 +93,7 @@ module SC::Helpers
           input = input[(pos+2)..-1]
         end
       end
-      
+
       # return
   		script
   	end
@@ -102,7 +102,7 @@ module SC::Helpers
   	def remove_newlines(script)
   		script.gsub(/\n|\r/,'')
   	end
-  	
+
     # 1. Turn mutiple spaces into a single
     # 2. Remove spaces around ;:{},
     # 3. Remove tabs
@@ -115,7 +115,7 @@ module SC::Helpers
       script = script.gsub(/\s*,\s*/,',')
       script.gsub("\t",'');
   	end
-  	
+
   	# Replace color values with their shorter equivalent
   	#
   	# 1. Turn rgb(,,)-colors into #-values
@@ -130,7 +130,7 @@ module SC::Helpers
       style = style.gsub(/rgb\s*\(\s*([0-9,\s]+)\s*\)/) do |match|
         out = '#'
         $1.split(',').each do |num|
-          if num.to_i < 16 
+          if num.to_i < 16
             out += '0'
           end
           out += num.to_i.to_s(16) # convert to hex
@@ -139,9 +139,9 @@ module SC::Helpers
       end
       # #AABBCC to #ABC, keep if preceed by a '='
       style = style.gsub(/([^\"'=\s])(\s*)#([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])/) do |match|
-        out = match        
+        out = match
         if ($3.downcase == $4.downcase) and ($5.downcase == $6.downcase) and ($7.downcase == $8.downcase)
-          out = $1 + '#' + $3.downcase + $5.downcase + $7.downcase 
+          out = $1 + '#' + $3.downcase + $5.downcase + $7.downcase
         end
         out
       end
@@ -153,10 +153,10 @@ module SC::Helpers
       # shotern several numbers to names
       style = style.gsub(/:[\s]*#([fF]00|[fF]{2}0000);/, ':red;')
       style = style.gsub(/:[\s]*#([fF]00|[fF]{2}0000)\}/, ':red}')
-      
+
   	  style
     end
-  
+
     # Do miscellaneous compression methods on the style
     def do_misc(script)
       # Replace 0(pt,px,em,%) with 0 but only when preceded by : or a white-space
@@ -193,10 +193,10 @@ module SC::Helpers
       script = script.gsub(/font[\s]*:[\s]*bold[\s;\}]*/) do |match|
         match.sub('bold', '700')
       end
-      
+
       script
     end
-    
+
   end
-  
+
 end

data/lib/sproutcore/helpers/dom_id_helper.rb

@@ -18,4 +18,4 @@ module SC
     end
 
   end
-end
+end

data/lib/sproutcore/helpers/entry_sorter.rb

@@ -5,135 +5,111 @@
 #            and contributors
 # ===========================================================================
 
+require "set"
+
 module SC
-  
+
   module Helpers
-    
+
     # Sorts a set of entries, respecting any "requires" found in the entries.
     # To use the sorter, just call the class method EntrySorter.sort() passing
     # the entries to sort along with any filenames you prefer to have added to
     # the top.  If you don't specify any filenames, then the entries will be
     # sorted alphabetically except for requires.
-    # 
+    #
     # When bundle_info.js is present, it will always be sorted first.
     # When bundle_loaded.js is present, it will always be sorted last.
     class EntrySorter
-    
+
       def self.sort(entries, preferred_filenames = [])
         self.new(preferred_filenames).sort(entries)
       end
-    
+
       def initialize(preferred_filenames = [])
         @preferred_filenames = preferred_filenames
       end
-    
+
       attr_reader :preferred_filenames
-    
+
       def sort(entries)
         bundleInfoEntry = []
         bundleLoadedEntry = []
-        
+
+        all_entries = {}
+        entries.each do |e|
+          name = e.extensionless_filename
+          all_entries[name] = e
+        end
+
+
         # first remove bundle entries which MUST be first or last
         entries = entries.select do |entry|
-          if entry.filename == 'bundle_info.js'
+          if entry.normalized_filename == 'bundle_info.js'
             bundleInfoEntry = [entry]
             false
-          elsif entry.filename == 'bundle_loaded.js'
+          elsif entry.normalized_filename == 'bundle_loaded.js'
             bundleLoadedEntry = [entry]
             false
           else
             true
           end
         end
-        
-        # then sort remaining entries by filename - ignoring case
-        entries = entries.sort do |a,b| 
-          a = (a.filename || '').to_s.downcase
-          b = (b.filename || '').to_s.downcase
-
-          # lproj/foo_page.js and main.js are loaded last
-          a_kind = (a =~ /(lproj|resources)\/.+_page\.js$/) ? 1 : -1
-          a_kind = 2 if a =~ /main.js$/
-
-          b_kind = (b =~ /(lproj|resources)\/.+_page\.js$/) ? 1 : -1
-          b_kind = 2 if b =~ /main.js$/
-          
-          if a_kind != b_kind
-            a_kind <=> b_kind
+
+        entries.sort_by! do |entry|
+          name = entry.normalized_filename
+
+          result = case name
+          when /main\.js$/
+            [2, name]
+          when /(?:lproj|resources)\/.+_page\.js$/
+            [1, name]
           else
-            a <=> b
+            [-1, name]
           end
-          
+
+          # force preferred filenames to the front on the list
+          result.unshift (@preferred_filenames.include?(name) ? -2 : 1)
         end
-        all_entries = entries.dup # needed for sort...
-       
+
         # now process each entry to handle requires
-        seen = [] 
-        ret = [] 
-        while cur = next_entry(entries)
+        seen = Set.new
+        ret = []
+        while cur = entries.shift
           add_entry_to_set(cur, ret, seen, entries, all_entries)
         end
-      
+
         return bundleInfoEntry + ret + bundleLoadedEntry
       end
 
       protected
-    
+
       # Converts a passed set of requires into entries
       def required_entries(required, entries, requiring_entry, all_entries)
-        return [] if required.nil?
+        return [] unless required
+
         required.map do |filename|
-          filename = filename.to_s.downcase.ext('')
-          source_filename = "source/#{filename}"
-          entry = all_entries.find do |e| 
-            e.filename.to_s.downcase.ext('') == source_filename
-          end
-        
-          # try localized version...
-          if entry.nil? && !(filename =~ /^lproj\//)
-            source_filename = "source/lproj/#{filename}"
-            entry = all_entries.find do |e| 
-              e.filename.to_s.downcase.ext('') == source_filename
-            end
-          end
-        
-          if entry.nil?
-            SC.logger.warn "Could not find entry '#{filename}' required in #{requiring_entry.target.target_name.to_s.sub(/^\//,'')}:#{requiring_entry.filename}"
+          entry = all_entries["source/#{filename}"] || all_entries["source/lproj/#{filename}"]
+
+          unless entry
+            SC.logger.warn "Could not find entry '#{filename}' required in #{requiring_entry.target[:target_name].to_s.sub(/^\//,'')}:#{requiring_entry[:filename]}"
           end
-          
+
           entry
-        end
-      end
-    
-      # Returns the next entry from the set of entries based on required order.
-      # Removed entry from array.
-      def next_entry(entries)
-        ret = nil
-      
-        # look for preferred entries first...
-        @preferred_filenames.each do |filename|
-          ret = entries.find { |e| e.filename.to_s.downcase == filename }
-          break if ret
-        end
-      
-        ret ||= entries.first # else fallback to first entry in set
-        entries.delete(ret) if ret
-        return ret 
+        end.compact
       end
-      
+
       # Adds the specified entry to the ordered array, adding required first
       def add_entry_to_set(entry, ret, seen, entries, all_entries)
         return if seen.include?(entry)
 
         seen << entry
-        req = required_entries(entry.required, entries, entry, all_entries)
+        req = required_entries(entry[:required], entries, entry, all_entries)
         req.each do |required|
-          next if required.nil?
           add_entry_to_set(required, ret, seen, entries, all_entries)
         end
         ret << entry
-      end    
-    
+      end
+
     end
   end
-end
+end

data/lib/sproutcore/helpers/html5_manifest.rb

@@ -0,0 +1,88 @@
+# ===========================================================================
+# Project:   Abbot - SproutCore Build Tools
+# Copyright: ©2010 Apple Inc.
+#            portions copyright @2006-2009 Sprout Systems, Inc.
+#            and contributors
+# ===========================================================================
+require 'fileutils'
+
+module SC::Helpers
+
+  # Creates an HTML5 manifest file for application caching
+  class HTML5Manifest
+
+    def build(dst_path)
+      @files = []
+
+      @files << "CACHE MANIFEST\n# List of all resources required by this project\n"
+
+      path = dst_path.split('/tmp/build')
+
+      inspect_files(path[0] + '/tmp/build', path[1])
+
+      networks = $to_html5_manifest_networks
+      if networks
+        @files << "\n\nNETWORK:"
+        networks.each do |network|
+          @files << network
+        end
+        @files << "\n"
+      end
+
+      manifest_path = dst_path.sub('index.html', '') + 'app.manifest'
+      writelines manifest_path, @files
+    end
+
+    # writes the passed lines to the named file
+    def writelines(dst_path, lines)
+      FileUtils.mkdir_p(File.dirname(dst_path))
+      f = File.open(dst_path, 'w')
+      f.write joinlines(lines)
+      f.close
+    end
+
+    def joinlines(lines)
+      lines.join("\n")
+    end
+
+    # Reads the lines from the source file.  If the source file does not
+    # exist, returns empty array.
+    def readlines(src_path)
+      if File.exist?(src_path) && !File.directory?(src_path)
+        File.readlines(src_path)
+      else
+        []
+      end
+    end
+
+    def inspect_files(base_path, dst_path)
+      path = base_path + dst_path
+      content = readlines(path)
+
+      content.each do |line|
+        line.scan(/['"]([^\s]+?(?=\.(css|js|png|gif|jpg|jpeg))\.\2)['"]/i) do |x, y, z|
+          file_location = x
+          # in case of hyperdomaining, strip off the http part and then look
+          # for the file
+          if x[0,4] == 'http'
+            file_location = '/' + x.gsub(/https?\:\/\/.*?\//, '')
+          end
+
+          next unless File.exist?(base_path + file_location)
+
+          if !@files.include?(x)
+            @files << x
+          end
+
+          if y == 'css' || y == 'js'
+            inspect_files(base_path, file_location)
+          end
+
+        end
+      end
+
+    end
+
+  end
+
+end