sproutcore 1.6.0.1-java → 1.7.1.beta-java

data/spec/buildtasks/manifest/prepare_build_tasks/packed_2x_spec.rb

@@ -111,7 +111,13 @@ describe "manifest:prepare_build_tasks:packed" do
 
      before do
        run_task
-       @entry = entry_for('stylesheet-packed.css')
+       
+       # for 1x (but not 2x) there should be an intermediary entry for a transform
+       # (split_css) that... splits the CSS. See its documentation.
+       #
+       # we are looking for the stylesheet-packed.css that is set on its source entry.
+       @entry = entry_for('stylesheet-packed.css')[:source_entry]
+       
        @entry_2x = entry_for('stylesheet@2x-packed.css')
      end
 
@@ -125,11 +131,6 @@ describe "manifest:prepare_build_tasks:packed" do
        @entry.source_entries.each do |entry|
          entry.filename.should == 'stylesheet.css'
        end
-
-       @entry_2x.source_entries.size.should > 0
-       @entry_2x.source_entries.each do |entry|
-         entry.filename.should == 'stylesheet@2x.css'
-       end
      end
 
      it "should include ordered_entries ordered by required target order" do
@@ -145,17 +146,6 @@ describe "manifest:prepare_build_tasks:packed" do
        @entry.ordered_entries.each do |entry|
          entry.target.should == targets.shift
        end
-
-       targets = @target.expand_required_targets(:theme => true) + [@target]
-       variation = @entry.manifest.variation
-       targets.reject! do |t|
-         t.manifest_for(variation).build!.entry_for('stylesheet@2x.css').nil?
-       end
-
-       @entry_2x.ordered_entries.each do |entry|
-         entry.target.should == targets.shift
-       end
-
      end
 
      it "should include the actual targets this packed version covers in the targets property (even those w no stylesheet.css)" do

data/spec/buildtasks/manifest/prepare_build_tasks/packed_spec.rb

@@ -40,8 +40,8 @@ describe "manifest:prepare_build_tasks:packed" do
     @manifest.entry_for('javascript-packed.js').should_not be_nil
     @manifest.entry_for('stylesheet-packed.css').should_not be_nil
 
-    # In this version, there should _not_ be an @2x entry.
-    @manifest.entry_for('stylesheet@2x-packed.css').should be_nil
+    # there must always be a 2x-packed entry
+    @manifest.entry_for('stylesheet@2x-packed.css').should_not be_nil
   end
 
   it "should remove non-packed JS entries from apps" do
@@ -132,16 +132,21 @@ describe "manifest:prepare_build_tasks:packed" do
 
        run_task
 
-       @entry = entry_for('stylesheet-packed.css')
+       # for 1x (but not 2x) there should be an intermediary entry for a transform
+       # (split_css) that... splits the CSS. See its documentation.
+       #
+       # we are looking for the stylesheet-packed.css that is set on its source entry.
+       @entry = entry_for('stylesheet-packed.css')[:source_entry]
+       
        @entry_2x = entry_for('stylesheet@2x-packed.css')
      end
 
      it "should generate a stylesheet-packed.css entry" do
        @entry.should_not be_nil
 
-       # should be _no_ @2x entry for this version (see packed_2x_spec)
-       # because the @2x version is only included as-needed.
-       @entry_2x.should be_nil
+       # There should always be a 2x packed entry, because default JS
+       # looks for 2x when running in 2x mode, and has no fallback.
+       @entry_2x.should_not be_nil
      end
 
      it "should include stylesheet.css entries from all required targets" do

data/spec/fixtures/builder_tests/Buildfile

@@ -19,4 +19,5 @@ config '/module_test/deferred_module',
 config :module_test,
   :deferred_modules => [:deferred_module],
   :prefetched_modules => [:required_target],
-  :inlined_modules => [:inlined_module]
+  :inlined_modules => [:inlined_module],
+  :required => [:required_module]

data/spec/lib/builders/module_spec.rb

@@ -45,7 +45,7 @@ describe 'SC::Builder::ModuleInfo' do
       req = @target.required_targets
 
       req.size.should == 1
-      req.first.target_name.should == :'/module_test/inlined_module'
+      req.first.target_name.should == :'/module_test/required_module'
     end
 
     it "should require one deferred module" do

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ require 'fileutils'
 require 'tempfile'
 
 require "sproutcore"
+Dir["#{File.dirname(__FILE__)}/../lib/buildtasks/helpers/*.rb"].each {|f| require f}
 
 module SC
 

data/sproutcore.gemspec

@@ -3,7 +3,6 @@ require "sproutcore/version"
 
 os = Gem::Platform.local.os
 is_jruby = (os == "java")
-is_mingw = (os == "mingw32")
 
 Gem::Specification.new do |s|
   s.name = 'sproutcore'
@@ -14,17 +13,17 @@ Gem::Specification.new do |s|
   s.summary = "SproutCore is a platform for building native look-and-feel applications on the web"
 
   s.platform = 'java'        if is_jruby
-  s.platform = 'x86-mingw32' if is_mingw
 
   s.add_dependency 'rack', '~> 1.2'
   s.add_dependency 'json_pure', "~> 1.4.6"
   s.add_dependency 'extlib', "~> 0.9.15"
   s.add_dependency 'erubis', "~> 2.6"
   s.add_dependency 'thor', '~> 0.14.3'
-  s.add_dependency 'haml', '~> 3.1.1'
-
-  s.add_dependency 'compass', '~> 0.11.1'
+  s.add_dependency 'sass', '~> 3.1.3'
+  s.add_dependency 'haml', '~> 3.1.2'
 
+  s.add_dependency 'compass', '~> 0.11.3'
+  s.add_dependency 'chunky_png', '~> 1.2.0'
   s.add_dependency 'em-http-request', '~> 1.0.0.beta'
 
   if is_jruby
@@ -33,10 +32,6 @@ Gem::Specification.new do |s|
     s.add_dependency 'thin', '~> 1.2.11'
   end
 
-  if is_mingw
-    s.add_dependency 'eventmachine', '~> 1.0.0.beta'
-  end
-
   s.add_development_dependency 'gemcutter', "~> 0.6.0"
   s.add_development_dependency 'rspec', "~> 2.5.0"
   s.add_development_dependency 'rake'

data/vendor/chance/lib/chance.rb

@@ -1,4 +1,5 @@
 require "chance/instance"
+require "chance/factory"
 
 require 'sass'
 
@@ -19,8 +20,10 @@ module Chance
 
   @files = {}
   
+  @clear_files_immediately = false
+  
   class << self
-    attr_accessor :files, :_current_instance
+    attr_accessor :files, :_current_instance, :clear_files_immediately
 
     def add_file(path, content=nil)
       mtime = 0
@@ -29,9 +32,7 @@ module Chance
       end
       
       if @files[path]
-        mtime = File.mtime(path).to_f
-        update_file(path, content) if mtime > @files[path][:mtime]
-        return
+        return update_file_if_needed(path, content)
       end
       
       file = {
@@ -67,6 +68,21 @@ module Chance
       puts "Updated " + path if Chance::CONFIG[:verbose]
     end
 
+    # if the path is a valid filesystem path and the mtime has changed, this invalidates
+    # the file. Returns the mtime if the file was updated.
+    def update_file_if_needed(path, content=nil)
+      if @files[path]
+        mtime = File.mtime(path).to_f
+        if mtime > @files[path][:mtime]
+          update_file(path, content)
+        end
+        
+        return mtime
+      else
+        return false
+      end
+    end
+
     def remove_file(path)
       if not @files.has_key? path
         puts "Could not remove " + path + " because it is not in system."
@@ -144,10 +160,13 @@ module Chance
       content = file[:content]
 
       requires = []
-      content = content.gsub(/sc_require\(['"]?(.*?)['"]?\);?/) {|match|
-        requires.push $1
+      content = content.gsub(/(sc_)?require\(['"]?(.*?)['"]?\);?/) {|match|
+        requires.push $2
         ""
       }
+      
+      # sc_resource will already be handled by the build tool. We just need to ignore it.
+      content.gsub!(/sc_resource\(['"]?(.*?)['"]?\);?/, '')
 
       file[:requires] = requires
       file[:content] = content

data/vendor/chance/lib/chance/factory.rb

@@ -0,0 +1,45 @@
+#
+# The Chance factory.
+# All methods require two parts: a key and a hash of options. The hash will be used in
+# the case of a cache missed.
+#
+module Chance
+  module ChanceFactory
+    
+    @instances = {}
+    @file_hashes = {}
+    class << self
+      def clear_instances
+        @file_hashes = {}
+        @instances = {}
+      end
+    
+      def instance_for_key(key, opts)
+        if not @instances.include? key
+          @instances[key] = Chance::Instance.new(opts)
+        end
+        
+        return @instances[key]
+      end
+    
+      # Call with a hash mapping instance paths to absolute paths. This will compare with
+      # the last 
+      def update_instance(key, opts, files)
+        instance = instance_for_key(key, opts)
+        last_hash = @file_hashes[key] || {}
+        
+        # If they are not equal, we might as well throw everything. The biggest cost is from
+        # Chance re-running, and it will have to anyway.
+        if not last_hash.eql? files
+          instance.unmap_all
+          files.each {|path, identifier|
+            instance.map_file path, identifier
+          }
+          
+          @file_hashes[key] = files
+        end
+      end
+      
+    end
+  end
+end

data/vendor/chance/lib/chance/instance.rb

@@ -10,6 +10,8 @@ require 'chance/instance/spriting'
 require 'chance/instance/data_url'
 require 'chance/instance/javascript'
 
+require 'digest/md5'
+
 
 Compass.discover_extensions!
 Compass.configure_sass_plugin!
@@ -21,7 +23,9 @@ module Chance
     attr_reader :path
     def initialize(path)
       @path = path
+      super(message)
     end
+
     def message
       "File not mapped in Chance instance: #{path}"
     end
@@ -48,18 +52,25 @@ module Chance
       "chance@2x.css"         => { :method => :css, :x2 => true },
       "chance-sprited.css"    => { :method => :css, :sprited => true },
       "chance-sprited@2x.css" => { :method => :css, :sprited => true, :x2 => true },
-      "chance.js"             => { :method => :javascript },
-      "chance-mhtml.txt"      => { :method => :mhtml },
 
       # For Testing Purposes...
       "chance-test.css"       => { :method => :chance_test }
     }
 
+    @@uid = 0
+    
     @@generation = 0
 
     def initialize(options = {})
       @options = options
       @options[:theme] = "" if @options[:theme].nil?
+      @options[:pad_sprites_for_debugging] = true if @options[:pad_sprites_for_debugging].nil?
+      @options[:optimize_sprites] = true if @options[:optimize_sprites].nil?
+      
+      @@uid += 1
+      @uid = @@uid
+      
+      @options[:instance_id] = @uid if @options[:instance_id].nil?
 
       if @options[:theme].length > 0 and @options[:theme][0] != "."
         @options[:theme] = "." + @options[:theme].to_s
@@ -68,6 +79,10 @@ module Chance
       # The mapped files are a map from file names in the Chance Instance to
       # their identifiers in Chance itself.
       @mapped_files = { }
+      
+      # The file mtimes are a collection of mtimes for all the files we have. Each time we
+      # read a file we record the mtime, and then we compare on check_all_files
+      @file_mtimes = { }
 
       # The @files set is a set cached generated output files, used by the output_for
       # method.
@@ -80,6 +95,10 @@ module Chance
 
       # Tracks whether _render has been called.
       @has_rendered = false
+      
+      # A generation number for the current render. This allows the slicing and spriting
+      # to be invalidated smartly.
+      @render_cycle = 0
     end
 
     # maps a path relative to the instance to a file identifier
@@ -90,6 +109,11 @@ module Chance
     # The identifier would be a name of a file that you added to
     # Chance using add_file.
     def map_file(path, identifier)
+      if @mapped_files[path] == identifier
+        # Don't do anything if there is nothing to do.
+        return
+      end
+      
       path = path.to_s
       file = Chance.has_file(identifier)
 
@@ -104,12 +128,35 @@ module Chance
     # unmaps a path from its identifier. In short, removes a file
     # from this Chance instance. The file will remain in Chance's "virtual filesystem".
     def unmap_file(path)
+      if not @mapped_files.include?(path)
+        # Don't do anything if there is nothing to do
+        return
+      end
+      
       path = path.to_s
       @mapped_files.delete path
 
       # Invalidate our render because things have changed.
       clean
     end
+    
+    # unmaps all files
+    def unmap_all
+      @mapped_files = {}
+    end
+
+    # checks all files to see if they have changed
+    def check_all_files
+      needs_clean = false
+      @mapped_files.each {|p, f|
+        mtime = Chance.update_file_if_needed(f)
+        if @file_mtimes[p].nil? or mtime > @file_mtimes[p]
+          needs_clean = true
+        end
+      }
+      
+      clean if needs_clean
+    end
 
     # Using a path relative to this instance, gets an actual Chance file
     # hash, with any necessary preprocessing already performed. For instance,
@@ -178,6 +225,9 @@ module Chance
     def _render
       return if @has_rendered
 
+      # Update the render cycle to invalidate sprites, slices, etc.
+      @render_cycle = @render_cycle + 1
+      
       @files = {}
       begin
         # SCSS code executing needs to know what the current instance of Chance is,
@@ -188,13 +238,25 @@ module Chance
         # The output of this process is a "virtual" file that imports all of the 
         # SCSS files used by this Chance instance. This also sets up the @slices hash.
         import_css = _preprocess
+        
+        # Because we encapsulate with instance_id, we should not have collisions even IF another chance
+        # instance were running at the same time (which it couldn't; if it were, there'd be MANY other issues)
+        image_css_path = File.join('./tmp/chance/image_css', @options[:instance_id].to_s, '_image_css.scss')
+        FileUtils.mkdir_p(File.dirname(image_css_path))
+        
+        file = File.new(image_css_path, "w")
+        file.write(_css_for_slices)
+        file.close
+        
+        image_css_path = File.join('./tmp/chance/image_css', @options[:instance_id].to_s, 'image_css')
+        
 
         # STEP 2: Preparing input CSS
         # The main CSS file we pass to the Sass Engine will have placeholder CSS for the
         # slices (the details will be postprocessed out).
         # After that, all of the individual files (using the import CSS generated
         # in Step 1)
-        css = _css_for_slices + "\n" + import_css
+        css = "@import \"#{image_css_path}\";\n" + import_css
 
         # Step 3: Apply Sass Engine
         engine = Sass::Engine.new(css, Compass.sass_engine_options.merge({
@@ -218,17 +280,24 @@ module Chance
     # slicing operation has not yet taken place. The postprocessing portion
     # receives sliced versions.
     def _css_for_slices
-      output = ""
+
+      output = []
       slices = @slices
 
       slices.each do |name, slice|
-        # so, the path should be the path in the chance instance
-        output += "." + slice[:css_name] + " { "
-        output += "_sc_chance: \"#{name}\";"
-        output += "} \n"
+        # Write out comments specifying all the files the slice is used from
+        output << "/* Slice #{name}, used in: \n"
+        slice[:used_by].each {|used_by|
+          output << "\t#{used_by[:path]}\n"
+        }
+        output << "*/"
+
+        output << "." + slice[:css_name] + " { "
+        output << "_sc_chance: \"#{name}\";"
+        output << "} \n"
       end
 
-      return output
+      return output.join ""
 
     end
 
@@ -241,16 +310,63 @@ module Chance
     # :sprited => whether to use spriting instead of data uris.
     def _postprocess_css(opts)
       if opts[:sprited]
-        postprocess_css_sprited(opts)
+        ret = postprocess_css_sprited(opts)
       else
-        postprocess_css_dataurl(opts)
+        ret = postprocess_css_dataurl(opts)
       end
+      
+      ret = _strip_slice_class_names(ret)
+    end
+    
+    #
+    # Strips dummy slice class names that were added by Chance so that SCSS could do its magic,
+    # but which are no longer needed.
+    #
+    def _strip_slice_class_names(css)
+      css.gsub! /\.__chance_slice[^{]*?,/, ""
+      css
     end
 
 
     # 
     # COMBINING CSS
     #
+    
+    # Determines the "Chance Header" to add at the beginning of the file. The
+    # Chance Header can set, for instance, the $theme variable.
+    #
+    # The Chance Header is loaded from the nearest _theme.css file in this folder
+    # or a containing folder (the file list specifically ignores such files; they are
+    # only used for this purpose)
+    #
+    # For backwards-compatibility, the fallback if no _theme.css file is present
+    # is to return code setting $theme to the now-deprecated @options[:theme] 
+    # passed to Chance
+    def chance_header_for_file(file)
+      # 'file' is the name of a file, so we actually need to start at dirname(file)
+      dir = File.dirname(file)
+      
+      # This should not be slow, as this is just a hash lookup
+      while dir.length > 0 and not dir == "."
+        header_file = @mapped_files[File.join(dir, "_theme.css")]
+        if not header_file.nil?
+          return Chance.get_file(header_file)
+        end
+        
+        dir = File.dirname(dir)
+      end
+      
+      # Make sure to look globally
+      header_file = @mapped_files["_theme.css"]
+      return Chance.get_file(header_file) if not header_file.nil?
+      
+      {
+        # Never changes (without a restart, at least)
+        :mtime => 0,
+        :content => "$theme: '" + @options[:theme] + "';\n"
+      }
+    end
+    
     #
     # _include_file is the recursive method in the depth-first-search
     # that creates the ordered list of files.
@@ -262,6 +378,9 @@ module Chance
     #
     def _include_file(file)
       return if not file =~ /\.css$/
+      
+      # skip _theme.css files
+      return if file =~ /_theme\.css$/
 
       file = Chance.get_file(file)
 
@@ -271,7 +390,13 @@ module Chance
       requires = file[:requires]
       file[:included] = @@generation
 
-      requires.each {|r| _include_file(@mapped_files[r]) } unless requires.nil?
+      if not requires.nil?
+        requires.each {|r|
+          # Add the .css extension if needed. it is optional for sc_require
+          r = r + ".css" if not r =~ /\.css$/
+          _include_file(@mapped_files[r])
+        }
+      end
 
 
 
@@ -289,35 +414,55 @@ module Chance
       @@generation = @@generation + 1
       files = @mapped_files.values
       @file_list = []
-
-      files.each {|f| _include_file(f) }
+      
+      # We have to sort alphabetically first...
+      tmp_file_list = []
+      @mapped_files.each {|p, f| tmp_file_list.push([p, f]) }
+      tmp_file_list.sort_by! {|a| a[0] }
+
+      tmp_file_list.each {|paths|
+        p, f = paths
+        
+        # Save the mtime for caching
+        mtime = Chance.update_file_if_needed(f)
+        @file_mtimes[p] = mtime
+        
+        _include_file(f)
+      }
 
       relative_paths = @mapped_files.invert
 
       @file_list.map {|file|
-        # The parser accepts single files that contain many files. As such,
-        # its method of determing the current file name is a marker in the
-        # file. We may want to consider changing this to a parser option
-        # now that we don't need this feature so much, but this works for now.
+        # NOTE: WE MUST CALL CHANCE PARSER NOW, because it generates our slicses.
+        # We can't be picky and just call it if something has changed. Thankfully,
+        # parser is fast. Unlike SCSS.
+        header_file = chance_header_for_file(relative_paths[file[:path]])
+        
         content = "@_chance_file " + relative_paths[file[:path]] + ";\n"
-        content += "$theme: '" + @options[:theme] + "';"
+        content += header_file[:content]
         content += file[:content]
 
         parser = Chance::Parser.new(content, @options)
         parser.parse
         file[:parsed_css] = parser.css
+        
+        # We used to use an md5 hash here, but this hides the original file name
+        # from SCSS, which makes the file name + line number comments useless.
+        #
+        # Instead, we sanitize the path.
+        path_safe = file[:path].gsub(/[^a-zA-Z0-9\-_\\\/]/, '-')
 
-        # Remove any non-letter characters that could cause a problem in filenames,
-        # i.e. colons in drive names on Windows
-        # Also removing leading slashes
-        cleaned_path = file[:path].gsub(/[^\w\/_-]+/,'_').sub(/^\//,'')
-        tmp_path = "./tmp/chance/#{cleaned_path}.scss"
+        tmp_path = "./tmp/chance/#{path_safe}.scss"
 
         FileUtils.mkdir_p(File.dirname(tmp_path))
-
-        f = File.new(tmp_path, "w")
-        f.write(parser.css)
-        f.close
+        
+        if (not file[:mtime] or not file[:wtime] or file[:wtime] < file[:mtime] or
+            not header_file[:mtime] or file[:wtime] < header_file[:mtime])
+          f = File.new(tmp_path, "w")
+          f.write(parser.css)
+          f.close
+          file[:wtime] = Time.now.to_f
+        end
 
         css = "@import \"" + tmp_path + "\";"