sproutcore 0.9.11 → 0.9.12

data/lib/sproutcore/build_tools/resource_builder.rb

@@ -1,30 +1,27 @@
 module SproutCore
-  
+
   module BuildTools
 
-    # Set to override the default behavior (which will follow the build mode)
-    def self.minify?; @minify.nil? ? (Bundle.build_mode != :development) : @minify; end
-    def self.minify=(setting); @minify = setting; end
-    
-    # The ResourceBuilder can combine all of the source files listed in the passed entry
-    # including some basic pre-processing.  The JavaScriptBuilder extends this to do some
-    # JavaScript specific rewriting of URLs, etc. as well.
+    # The ResourceBuilder can combine all of the source files listed in the 
+    # passed entry including some basic pre-processing.  The JavaScriptBuilder 
+    # extends this to do some JavaScript specific rewriting of URLs, etc. as 
+    # well.
     #
-    # The ResourceBuilder knows how 
+    # The ResourceBuilder knows how
     class ResourceBuilder
 
       attr_reader :bundle, :language, :filenames
-      
+
       # Utility method you can call to get the items sorted by load order
       def self.sort_entries_by_load_order(entries, language, bundle)
         filenames = entries.map { |e| e.filename }
         hashed = {}
         entries.each { |e| hashed[e.filename] = e }
-        
+
         sorted = self.new(filenames, language, bundle).required
         sorted.map { |filename| hashed[filename] }
       end
-      
+
       def initialize(filenames, language, bundle)
         @bundle = bundle; @language = language; @filenames = filenames
       end
@@ -37,26 +34,26 @@ module SproutCore
         end
         return lines
       end
-      
+
       # Actually perform the build.  Returns the compiled resource as a single string.
       def build
 
         # setup context
         lines = []
         required = []
-        
+
         # process files
         while filename = next_filename
           lines, required = _build_one(filename, lines, required)
         end
-        
+
         return join(lines)
       end
-      
-      # Join the lines together.  This is one last chance to do some prep of 
+
+      # Join the lines together.  This is one last chance to do some prep of
       # the data (such as minifcation and comment stripping)
       def join(lines); lines.join; end
-      
+
       # Rewrites any inline content such as static urls.  Subclasseses can
       # override this to rewrite any other inline content.
       #
@@ -67,8 +64,8 @@ module SproutCore
           static_url(entry.nil? ? '' : entry.url)
         end
       end
-      
-      # Tries to build a single resource.  This may call itself recursively to 
+
+      # Tries to build a single resource.  This may call itself recursively to
       # handle requires.
       #
       # ==== Returns
@@ -83,51 +80,52 @@ module SproutCore
           puts "WARNING: Could not find require file: #{filename}"
           return [lines, required]
         end
-        
+
         file_lines = []
         io = (entry.source_path.nil? || !File.exists?(entry.source_path)) ? [] : File.new(entry.source_path)
         io.each do | line |
-          
-          # check for requires.  Only follow a require if the require is in 
+
+          # check for requires.  Only follow a require if the require is in
           # the list of filenames.
-          required_file = _require_for(filename, line) 
+          required_file = _require_for(filename, line)
           unless required_file.nil? || !filenames.include?(required_file)
             lines, required = _build_one(required_file, lines, required, link_only)
           end
-          
-          file_lines << rewrite_inline_code(line, filename) unless link_only 
+
+          file_lines << rewrite_inline_code(line, filename) unless link_only
         end
 
-        # The list of already required filenames is slightly out of order from 
-        # the actual load order.  Instead, we use the lines array to hold the 
+        # The list of already required filenames is slightly out of order from
+        # the actual load order.  Instead, we use the lines array to hold the
         # list of filenames as they are processed.
         if link_only
           lines << filename
-          
+
         elsif file_lines.size > 0
-          lines += file_lines
-          lines << "\n"
+          lines << "/* Start ----------------------------------------------------- " << filename << "*/\n\n" 
+          lines +=  file_lines
+          lines << "\n\n/* End ------------------------------------------------------- "  << filename << "*/\n\n"
         end
-        
+
         return [lines, required]
       end
 
       # Overridden by subclasses to choose first filename.
       def next_filename; filenames.delete(filenames.first); end
 
-      # Overridden by subclass to handle static_url() in a language specific 
+      # Overridden by subclass to handle static_url() in a language specific
       # way.
       def static_url(url); "url('#{url}')"; end
-      
+
       # check line for required() pattern.  understands JS and CSS.
       def _require_for(filename,line)
         new_file = line.scan(/require\(['"](.*)['"]\)/)
-        ret = (new_file.size > 0) ? new_file.first.first : nil 
+        ret = (new_file.size > 0) ? new_file.first.first : nil
         ret.nil? ? nil : filename_for_require(ret)
       end
-      
+
       def filename_for_require(ret); "#{ret}.css"; end
-      
+
     end
 
     class JavaScriptResourceBuilder < ResourceBuilder
@@ -138,7 +136,7 @@ module SproutCore
         if bundle.minify?
           # first suck out any comments that should be retained
           comments = []
-          include_line = false 
+          include_line = false
           lines.each do | line |
             is_mark = (line =~ /@license/)
             unless include_line
@@ -152,34 +150,37 @@ module SproutCore
 
           # now minify and prepend any static
           comments.push "\n" unless comments.empty?
-          comments.push SproutCore::JSMin.run(lines * '') 
+          comments.push SproutCore::JSMin.run(lines * '')
           lines = comments
         end
-        
+
         lines.join
       end
-      
+
       # If the file is a strings.js file, then remove server-side strings...
       def rewrite_inline_code(line, filename)
         if filename == 'strings.js'
           line = line.gsub(/["']@@.*["']\s*?:\s*?["'].*["'],\s*$/,'')
+          
+        else
+          line = line.gsub(/sc_super\((.*)\)/, 'arguments.callee.base.apply(this, \1)')
         end
-        
+
         super(line, filename)
       end
-      
+
       def static_url(url); "'#{url}'"; end
       def filename_for_require(ret); "#{ret}.js"; end
-      
+
       def next_filename
         filenames.delete('strings.js') || filenames.delete('core.js') || filenames.delete('Core.js') || filenames.delete('utils.js') || filenames.delete(filenames.first)
       end
-      
+
     end
-    
+
     def self.build_stylesheet(entry, bundle)
-      filenames = entry.composite.nil? ? [entry.filename] : entry.composite
-      builder = ResourceBuilder.new(filenames, entry.language, bundle) 
+      filenames = entry.composite? ? entry.composite_filenames : [entry.filename]
+      builder = ResourceBuilder.new(filenames, entry.language, bundle)
       if output = builder.build
         FileUtils.mkdir_p(File.dirname(entry.build_path))
         f = File.open(entry.build_path, 'w')
@@ -189,8 +190,8 @@ module SproutCore
     end
 
     def self.build_javascript(entry, bundle)
-      filenames = entry.composite.nil? ? [entry.filename] : entry.composite
-      builder = JavaScriptResourceBuilder.new(filenames, entry.language, bundle) 
+      filenames = entry.composite? ? entry.composite_filenames : [entry.filename]
+      builder = JavaScriptResourceBuilder.new(filenames, entry.language, bundle)
       if output = builder.build
         FileUtils.mkdir_p(File.dirname(entry.build_path))
         f = File.open(entry.build_path, 'w')
@@ -198,9 +199,9 @@ module SproutCore
         f.close
       end
     end
-    
+
     def self.build_fixture(entry, bundle); build_javascript(entry, bundle); end
-    
+
   end
-  
-end
+
+end

data/lib/sproutcore/build_tools.rb

@@ -7,9 +7,9 @@ module SproutCore
   # You can add your own build tools to the system here .
   #
   module BuildTools
-    
-    # Resources are sometimes accessed through a symlink while running in devmode.  This 
-    # method should simply ensure that symlink exists.
+
+    # Resources are sometimes accessed through a symlink while running in 
+    # devmode.  This method should simply ensure that symlink exists.
     #
     def self.build_symlink(entry, bundle)
       symlink_path = File.join(bundle.build_root, '_src')
@@ -19,26 +19,26 @@ module SproutCore
         FileUtils.ln_sf(source_path, symlink_path)
       end
     end
-    
-    # Regular resources and tests are simply copied.  Note that normally in development mode,
-    # these resources will be accessed via a symlink
+
+    # Regular resources and tests are simply copied.  Note that normally in 
+    # development mode, these resources will be accessed via a symlink
     def self.copy_resource(entry, bundle)
       FileUtils.mkdir_p(File.dirname(entry.build_path))
-      
+
       # Make the source file exists
       unless File.exists?(entry.source_path)
         raise "Could not copy resource #{entry.filename} because source: #{entry.source_path} does not exist!"
       end
-      
+
       # Now do the copy
       FileUtils.cp_r(entry.source_path, entry.build_path)
     end
-    
+
     def self.build_resource(entry, bundle); copy_resource(entry, bundle); end
-    
+
   end
-  
+
 end
 
 # Load other build tools.  The above are the simple ones.
-Dir.glob(File.join(File.dirname(__FILE__),'build_tools','**','*.rb')).each { |x| require x }
+Dir.glob(File.join(File.dirname(__FILE__),'build_tools','**','*.rb')).each { |x| require x }