sproutcore 1.5.0.pre.4 → 1.5.0.pre.4.1

data/lib/sproutcore/tools.rb

@@ -37,7 +37,6 @@ module SC
     class_option "logfile",      :type => :string
     class_option "build",        :type => :string
     class_option "build-targets",:type => :string
-    class_option "no-chance",    :type => :boolean
     class_option "yui-minification",     :type => :boolean
     class_option "dont-minify",     :type => :boolean
     class_option "verbose",      :type => :boolean, :aliases => "-v"
@@ -123,12 +122,6 @@ module SC
         else
           SC.env[:build_targets] = ''
         end
-
-        if options[:'no-chance']
-          SC.env[:no_chance] = true
-        else
-          SC.env[:no_chance] = false
-        end
       end
       
       def yui_minification!

data/lib/sproutcore/tools/build.rb

@@ -8,7 +8,6 @@
 require "sproutcore/tools/manifest"
 require 'pathname'
 
-$to_minify = []
 $to_html5_manifest = []
 $to_html5_manifest_networks = []
 
@@ -79,6 +78,8 @@ module SC
             info "  #{entry.filename} -> #{dst}"
             entry.build!
           end
+
+          SC::Helpers::Minifier.minify_queue! unless SC.env[:no_minify]
         end
       end
 
@@ -87,43 +88,7 @@ module SC
           SC::Helpers::HTML5Manifest.new.build(entry)
         end
       end
-      $to_minify.uniq!
-      if $to_minify.length > 0 and !SC.env[:dont_minify]
-        yui_root = File.expand_path("../../../../vendor/sproutcore", __FILE__)
-        jar_path = File.join(yui_root, 'SCCompiler.jar')
-        if SC.env[:yui_minification]
-          filecompress = "java -Xmx256m -jar \"" + jar_path + "\" -yuionly \"" + $to_minify * "\" \"" + "\" 2>&1"
-        else
-          filecompress = "java -Xmx256m -jar \"" + jar_path + "\" \"" + $to_minify * "\" \"" + "\" 2>&1"
-        end
-        SC.logger.info  'Minifying...'
-        SC.logger.info  filecompress
-        
-        output = `#{filecompress}`      # It'd be nice to just read STDERR, but
-                                        # I can't find a reasonable, commonly-
-                                        # installed, works-on-all-OSes solution.
-        SC.logger.info output
-        if $?.exitstatus != 0
-          SC.logger.fatal(output)
-          SC.logger.fatal("!!!!Minifying failed, please check that your js code is valid")
-          SC.logger.fatal("!!!!Failed compiling ... "+ $to_minify.join(','))
-          exit(1)
-        end
 
-        paths = $to_minify.join(',')
-        paths = paths.gsub("javascript-packed.js","javascript.js")
-        paths = paths.gsub("stylesheet-packed.css","stylesheet.css")
-        puts "Removing unnecessary files..."
-        paths_array = paths.split(",")
-        paths_array.each do |entry|
-          # We won't have tests unless :load_tests => true in Buildfile in which case we want to keep them
-          next if entry.include?("index.html") || entry.include?("tests")
-          if File.exist?(entry)
-            puts "Deleting "+entry
-            File.delete(entry)
-          end
-        end
-      end
       t2 = Time.now
       seconds = t2-t1
       minutes = seconds/60

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

@@ -0,0 +1,100 @@
+require "buildtasks/manifest/spec_helper"
+
+describe "manifest:prepare_build_tasks:chance" do
+  include SC::SpecHelpers
+  include SC::ManifestSpecHelpers
+
+  before do
+    std_before
+  end
+
+  def run_task
+    @manifest.prepare!
+    super('manifest:prepare_build_tasks:chance')
+  end
+
+  it "should run manifest:prepare_build_tasks:setup as prereq" do
+    should_run('manifest:prepare_build_tasks:setup') { run_task }
+  end
+
+
+  def have_entry(name)
+    entry = @manifest.entry_for name
+    entry.should_not be_nil
+  end
+
+  it "generates @2x for each resource" do
+    run_task
+
+    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|
+      have_entry(name + ".css")
+      have_entry(name + "@2x.css")
+
+      # check that transforms are created
+      entries.each {|entry|
+        entry.should be_transform
+        entry.source_entry.should_not be_nil
+        originals.should include(entry)
+        originals.delete(entry)
+      }
+
+      x2_entry = entry_for(name + "@2x.css")
+      x2_entry[:chance_file].should == "chance@2x.css"
+      x2_entry[:chance_entry].should == entry_for(name + ".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 entries 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_entry = entry_for(name + ".css")
+      js_entry.chance_entries.should include(chance_entry)
+      mhtml_entry.chance_entries.should include(chance_entry)
+    end
+
+  end
+end

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

@@ -18,8 +18,8 @@ describe "manifest:prepare_build_tasks:combine" do
     }
   end
 
-  it "should run setup, javascript, css, sass, scss & less as prereq" do
-    %w(setup javascript css sass scss less).each do |task_name|
+  it "should run setup, javascript, css, sass, & less as prereq" do
+    %w(setup javascript css sass less).each do |task_name|
       should_run("manifest:prepare_build_tasks:#{task_name}") { run_task }
     end
   end
@@ -27,7 +27,7 @@ describe "manifest:prepare_build_tasks:combine" do
   #######################################
   # stylesheet.css support
   #
-  describe "whem CONFIG.combine_stylesheets = true" do
+  describe "when CONFIG.combine_stylesheets = true" do
 
     before do
       @config.combine_stylesheets = true
@@ -60,15 +60,15 @@ describe "manifest:prepare_build_tasks:combine" do
       entry.source_entries.should include(expected)
     end
 
-    it "entries have a build_task = build:combine:css" do
-      entry_for('stylesheet.css').build_task.should == 'build:combine'
-      entry_for('bar.css').build_task.should == 'build:combine'
+    it "entries have a build_task = build:chance" do
+      entry_for('stylesheet.css').build_task.should == 'build:chance'
+      entry_for('bar.css').build_task.should == 'build:chance'
     end
 
     it "hides source entries" do
       %w(stylesheet.css bar.css).each do |filename|
         entry_for(filename).source_entries.each do |entry|
-          entry.should be_hidden
+          entry.should be_hidden if entry[:entry_type] == :css
         end
       end
     end
@@ -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(bundle_info.js 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)
+        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)
 
         entry.ordered_entries.should_not be_nil
         filenames = entry.ordered_entries.map { |e| e.filename }
@@ -221,7 +221,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(bundle_info.js source/c.js source/a.js source/lproj/d.js source/b.js)
+        expected = %w(__sc_chance.js 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 }
@@ -251,4 +251,81 @@ describe "manifest:prepare_build_tasks:combine" do
     end
   end
 
+  describe "when no modules are specified for an app"  do
+
+    before do
+      run_task
+    end
+
+    it "contains all modules as requirements" do
+      target = target_for('calendar')
+      requirements = target.required_targets
+
+      preferences_modules = target_for('calendar/preferences')
+      requirements.should include(preferences_modules)
+    end
+  end
+
+  describe "when a subset of modules are specified "  do
+
+    before do
+      run_task
+    end
+
+    it "does not require any modules in its requried_targets" do
+      target = target_for('contacts')
+      requirements = target.required_targets
+
+      modules = requirements.select{ |target| target[:target_type] == :module }
+
+      modules.should be_empty
+    end
+
+    it "contains only the specified modules" do
+      target = target_for('contacts')
+      modules = target.modules
+
+      preferences_module = target_for('contacts/preferences')
+      printing_module = target_for('contacts/printing')
+
+      modules.should include(preferences_module)
+      modules.should_not include(printing_module)
+    end
+  end
+
+  describe "when a deferred modules requires another module "  do
+    before do
+      run_task
+    end
+
+    it "the deferred module should list the required module in its requirements" do
+      target = target_for('mail')
+      target_requirements = target.required_targets
+
+      preferences_module = target.target_for('mail/preferences')
+      printing_module = target.target_for('mail/printing')
+
+      preferences_requirements = preferences_module.required_targets
+
+      target_requirements.should_not include(preferences_module)
+      preferences_requirements.should include(printing_module)
+    end
+  end
+
+  describe "when an inline_module is defined"  do
+    before do
+      run_task
+    end
+
+    it " should 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(email_module)
+    end
+  end
 end

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

@@ -41,7 +41,7 @@ describe "manifest:prepare_build_tasks:css" do
     originals.size.should > 0 # precondition
 
     # transformed entries
-    entries = @manifest.entries.select { |e| e.entry_type == :css }
+    entries = @manifest.entries.select { |e| e.entry_type == :css and not e.from_scss }
     entries.size.should == originals.size #precondition
 
     # one transformed entry should exist for each original entry.

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

@@ -15,7 +15,7 @@ describe "manifest:prepare_build_tasks:minify" do
   end
 
   it "should run setup, javascript, css, and combine as prereq" do
-    %w(setup javascript css sass scss less combine).each do |task_name|
+    %w(setup javascript css sass less combine).each do |task_name|
       should_run("manifest:prepare_build_tasks:#{task_name}") { run_task }
     end
   end

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

@@ -0,0 +1,96 @@
+require "buildtasks/manifest/spec_helper"
+
+describe "manifest:prepare_build_tasks:module_info" do
+
+  include SC::SpecHelpers
+  include SC::ManifestSpecHelpers
+
+  before do
+    std_before :builder_tests, :module_test
+
+    # run std rules to run manifest.  Then verify preconditions to make sure
+    # no other changes to the build system effect the ability of these tests
+    # to run properly.
+    @manifest.build!
+
+  end
+
+  describe "when a target defines a deferred module" do
+
+    it "should include a module_info entry" do
+      module_info_entry = @manifest.entry_for('module_info.js')
+
+      module_info_entry.should_not be nil
+    end
+
+    it "should contain all the modules and their requirements" do 
+      module_info = @manifest.entry_for('module_info.js')
+      targets = module_info[:targets]
+
+      targets.length.should be 4
+    end
+
+  end
+
+  describe "when a target defines an inlined module" do
+
+    it "should include a module_info entry" do
+      module_info_entry = @manifest.entry_for('module_info.js')
+
+      module_info_entry.should_not be nil
+    end
+
+    it "should contain that module" do
+      module_info = @manifest.entry_for('module_info.js')
+      targets = module_info[:targets]
+
+      inline_module = target_for('/module_test/inlined_module')
+
+      targets.should include(inline_module)
+    end
+
+    it "should be marked as an inline module" do
+      module_info = @manifest.entry_for('module_info.js')
+      targets = module_info[:targets]
+
+      inline_module = target_for('/module_test/inlined_module')
+
+      inline_module[:inlined_module].should_not be nil
+    end
+
+  end
+
+  describe "when a deferred module requires another module but that required module is defined as a prefetched module in the app" do
+
+    it "it should be a prefetched module" do
+      module_info = @manifest.entry_for('module_info.js')
+      targets = module_info[:targets]
+
+      required_target = target_for('/module_test/required_target')
+
+      required_target[:prefetched_module].should be true
+      targets.should include(required_target)
+    end
+
+    it "should be marked as a deferred module" do
+      module_info = @manifest.entry_for('module_info.js')
+      targets = module_info[:targets]
+
+      required_target = target_for('/module_test/required_target')
+
+      required_target[:deferred_module].should be nil
+    end
+
+  end
+
+  describe "when a deferred module requires another module" do
+
+    it "it includes its requirements in the module_info entry" do
+      module_info = @manifest.entry_for('module_info.js')
+      targets = module_info[:targets]
+
+      targets.should include(target_for('/module_test/dynamic_req_target_1'))
+    end
+
+  end
+end

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

@@ -0,0 +1,83 @@
+require "buildtasks/manifest/spec_helper"
+
+# Creates combined entries for javascript & css
+describe "Target#modules" do
+
+  include SC::SpecHelpers
+  include SC::ManifestSpecHelpers
+
+  before do
+    std_before
+  end
+
+  def run_task
+    # capture any log warnings...
+    @msg = capture('stderr') {
+      @manifest.prepare!
+      super('manifest:prepare_build_tasks:combine')
+    }
+  end
+
+  describe "when a subset of modules are specified "  do
+
+    before do
+      run_task
+    end
+
+    it "does not require any modules in its requried_targets" do
+      target = target_for('contacts')
+      requirements = target.required_targets
+
+      modules = requirements.select{ |target| target[:target_type] == :module }
+
+      modules.should be_empty
+    end
+
+    it "contains only the specified modules" do
+      target = target_for('contacts')
+      modules = target.modules
+
+      preferences_module = target_for('contacts/preferences')
+      printing_module = target_for('contacts/printing')
+
+      modules.should include(preferences_module)
+      modules.should_not include(printing_module)
+    end
+  end
+
+  describe "when a deferred modules requires another module "  do
+    before do
+      run_task
+    end
+
+    it "the deferred module should list the required module in its requirements" do
+      target = target_for('mail')
+      target_requirements = target.required_targets
+
+      preferences_module = target.target_for('mail/preferences')
+      printing_module = target.target_for('mail/printing')
+
+      preferences_requirements = preferences_module.required_targets
+
+      target_requirements.should_not include(preferences_module)
+      preferences_requirements.should include(printing_module)
+    end
+  end
+
+  describe "when an inline_module is defined"  do
+    before do
+      run_task
+    end
+
+    it "it should 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(email_module)
+    end
+  end
+end