sproutcore 1.6.0.1 → 1.7.1.beta

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

@@ -53,48 +53,10 @@ describe "manifest:prepare_build_tasks:chance" do
       }
 
       x2_entry = entry_for(name + "@2x.css")
-      x2_entry[:chance_file].should == "chance@2x.css"
+      x2_entry[:chance_file].should == "chance-sprited@2x.css"
     end
     originals.size.should == 0
   end
 
-  it "generates js, and mhtml entries" do
-    run_task
-
-    have_entry('stylesheet.css')
-    have_entry('stylesheet@2x.css')
-    have_entry('__sc_chance.js')
-    have_entry('__sc_chance_mhtml.txt')
-
-    stylesheet = entry_for('stylesheet.css')
-  end
-
-  it "provides all chance instances to the mhtml and js entries" do
-    run_task
-
-    js_entry = entry_for('__sc_chance.js')
-    mhtml_entry = entry_for('__sc_chance_mhtml.txt')
-
-    resources = {}
-
-    originals = @manifest.entries(:hidden=>true).select {|entry|
-      entry.entry_type == :css and not entry.combined and not entry[:resource].nil?
-    }
-    originals.size.should > 0
-
-    originals.each do |entry|
-      next if entry[:resource].nil?
-
-      resources[entry[:resource]] ||= []
-      resources[entry[:resource]] << entry
-    end
-
-    resources.each do |name, entries|
-      chance_instance = entry_for(name + ".css")[:chance_instance]
-      js_entry.chance_instances.should include(chance_instance)
-      mhtml_entry.chance_instances.should include(chance_instance)
-    end
-
-  end
 end
 

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

@@ -62,43 +62,5 @@ describe "manifest:prepare_build_tasks:chance" do
     originals.size.should == 0
   end
 
-  it "generates js, and mhtml entries" do
-    run_task
-
-    have_entry('stylesheet.css')
-    have_entry('stylesheet@2x.css', false)
-    have_entry('__sc_chance.js')
-    have_entry('__sc_chance_mhtml.txt')
-
-    stylesheet = entry_for('stylesheet.css')
-  end
-
-  it "provides all chance instances to the mhtml and js entries" do
-    run_task
-
-    js_entry = entry_for('__sc_chance.js')
-    mhtml_entry = entry_for('__sc_chance_mhtml.txt')
-
-    resources = {}
-
-    originals = @manifest.entries(:hidden=>true).select {|entry|
-      entry.entry_type == :css and not entry.combined and not entry[:resource].nil?
-    }
-    originals.size.should > 0
-
-    originals.each do |entry|
-      next if entry[:resource].nil?
-
-      resources[entry[:resource]] ||= []
-      resources[entry[:resource]] << entry
-    end
-
-    resources.each do |name, entries|
-      chance_instance = entry_for(name + ".css")[:chance_instance]
-      js_entry.chance_instances.should include(chance_instance)
-      mhtml_entry.chance_instances.should include(chance_instance)
-    end
-
-  end
 end
 

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

@@ -201,7 +201,7 @@ describe "manifest:prepare_build_tasks:combine" do
 
         # get the expected set of ordered entries...based on contents of
         # project...
-        expected = %w(source/lproj/strings.js source/core.js source/utils.js __sc_chance.js source/1.js source/a.js source/a/a.js source/a/b.js source/B.js source/b/a.js source/c.js source/t.js source/resources/main_page.js source/main.js)
+        expected = %w(source/lproj/strings.js source/core.js source/utils.js source/1.js source/a.js source/a/a.js source/a/b.js source/B.js source/b/a.js source/c.js source/t.js source/resources/main_page.js source/main.js)
 
         entry.ordered_entries.should_not be_nil
         filenames = entry.ordered_entries.map { |e| e.filename }
@@ -241,7 +241,7 @@ describe "manifest:prepare_build_tasks:combine" do
 
         # get the expected set of ordered entries...based on contents of
         # project... note that we require 'd', which should match 'lproj/d'
-        expected = %w(__sc_chance.js source/c.js source/a.js source/lproj/d.js source/b.js)
+        expected = %w(source/c.js source/a.js source/lproj/d.js source/b.js)
 
         entry.ordered_entries.should_not be_nil
         filenames = entry.ordered_entries.map { |e| e.filename }
@@ -337,14 +337,14 @@ describe "manifest:prepare_build_tasks:combine" do
       run_task
     end
 
-    it " should be included in the requirements" do
+    it " should not be included in the requirements" do
       target = target_for('photos')
       target_requirements = target.required_targets
 
       preferences_module = target.target_for('photos/preferences')
       email_module = target.target_for('photos/email')
 
-      target_requirements.should include(preferences_module)
+      target_requirements.should_not include(preferences_module)
       target_requirements.should_not include(email_module)
     end
   end

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

@@ -69,14 +69,14 @@ describe "Target#modules" do
       run_task
     end
 
-    it "it should be included in the requirements" do
+    it "it should not be included in the requirements" do
       target = target_for('photos')
       target_requirements = target.required_targets
 
       preferences_module = target.target_for('photos/preferences')
       email_module = target.target_for('photos/email')
 
-      target_requirements.should include(preferences_module)
+      target_requirements.should_not include(preferences_module)
       target_requirements.should_not include(email_module)
     end
   end

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

@@ -115,7 +115,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
 
@@ -129,11 +135,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
@@ -151,16 +152,6 @@ describe "manifest:prepare_build_tasks:packed" do
          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_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/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/data_url.rb

@@ -23,11 +23,6 @@ module Chance
             output += "\n-webkit-background-size: #{width}px #{height}px;"
           end
 
-
-          # FOR IE < 8:
-          output += '*background-image: url("mhtml:chance-mhtml.txt!' + slice[:css_name] + '")'
-          output += "\n"
-
           output
         }
 
@@ -57,29 +52,5 @@ module Chance
       end
     end
 
-    def mhtml(opts)
-      # If there are no slices, ensure that we return an empty file.
-      return "" if @slices.length == 0
-
-      output = "Content-Type: multipart/related; boundary=\"CHANCE__\"\r\n"
-
-      @slices.each {|name, slice|
-        output += "\r\n--CHANCE__\r\n"
-        output += "Content-Location:" + slice[:css_name] + "\r\n"
-        output += "Content-Type:image/png\r\n"
-        output += "Content-Transfer-Encoding:base64\r\n\r\n"
-
-        base64Image = base64_for(slice)
-        output += base64Image.gsub("[^\r]\n", "\r\n")
-
-        output
-      }
-
-       output += "\r\n--CHANCE__--"
-
-      output
-    end
-
-
   end
 end

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

@@ -2,17 +2,57 @@ require "chance/perf"
 
 module Chance
   class Instance
-    
     # The Slicing module handles taking a collection of slice definitions to
     # produce sliced images. It uses ChunkyPNG to perform the slicing, and
     # stores the sliced image in the slice definition.
     module Slicing
+      class << self
+        def add_canvas_to_cache(canvas, file, rect)
+          if @canvas_cache.nil?
+            @canvas_cache = {}
+          end
+          
+          left = rect[:left]
+          top = rect[:top]
+          width = rect[:width]
+          height = rect[:height]
+          
+          key = "#{file[:path]}:#{left},#{top},#{width},#{height}"
+          @canvas_cache[key] = {
+            mtime: file[:mtime],
+            canvas: canvas
+          }
+        end
+        
+        def get_canvas_from_cache(file, rect)
+          if @canvas_cache.nil?
+            @canvas_cache = {}
+          end
+          
+          left = rect[:left]
+          top = rect[:top]
+          width = rect[:width]
+          height = rect[:height]
+          
+          key = "#{file[:path]}:#{left},#{top},#{width},#{height}"
+          hash = @canvas_cache[key]
+          
+          # Check to see if it is new enough
+          if not hash.nil? and hash[:mtime] == file[:mtime]
+            return hash[:canvas]
+          end
+          
+          @canvas_cache[key] = nil
+          nil
+        end
+      end
+      
       # performs the slicing indicated by each slice definition, and puts the resulting
       # image in the slice definition's :image property.
       #
       # if x2 is supplied, this will assume it is a second pass to locate any @2x images
       # and use them to replace the originals.
-      def slice_images(opts)
+      def slice_images(opts)        
         slices = @slices
         output = ""
 
@@ -21,7 +61,7 @@ module Chance
           # Otherwise, consumers will use slice[:file] [:canvas] or [:contents]
           # to get the original data as needed.
           slice[:canvas] = nil
-
+          
           # In any case, if there is one, we need to get the original file and canvas;
           # this process also tells us if the slice is 2x, etc.
           canvas = canvas_for slice, opts
@@ -53,7 +93,17 @@ module Chance
               rect = slice_rect(slice, canvas_width / f, canvas_height / f)
 
               if not rect.nil?
-                slice[:canvas] = canvas.crop(rect[:left] * f, rect[:top] * f, rect[:width] * f, rect[:height] * f)
+                
+                ## CHECK CACHE ##
+                file = file_for(slice, opts)
+                cached_canvas = Chance::Instance::Slicing.get_canvas_from_cache(file, rect)
+                if cached_canvas
+                  slice[:canvas] = cached_canvas
+                else
+                  slice[:canvas] = canvas.crop(rect[:left] * f, rect[:top] * f, rect[:width] * f, rect[:height] * f)
+                  Chance::Instance::Slicing.add_canvas_to_cache(slice[:canvas], file, rect)
+                end
+                
                 canvas_width = rect[:height] * f
                 canvas_height = rect[:width] * f
               end
@@ -62,8 +112,11 @@ module Chance
             slice[:target_width] = canvas_width / f
             slice[:target_height] = canvas_height / f
           end
+          
+          
 
         end
+        
       end
 
       # Returns either a RMagick image or a ChunkyPNG canvas for a slice, as applicable.