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

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

@@ -24,15 +24,24 @@ describe "manifest:prepare_build_tasks:packed" do
     end
   end
 
-  it "should not add packed entries for apps" do
+  it "should add packed entries for apps" do
     @target = @project.target_for(:contacts)
     @target.target_type.should == :app # precondition
 
     @manifest = @target.manifest_for(:language => :en)
     run_task
 
-    @manifest.entry_for('javascript-packed.js').should be_nil
-    @manifest.entry_for('stylesheet-packed.css').should be_nil
+    @manifest.entry_for('javascript-packed.js').should_not be_nil
+    @manifest.entry_for('stylesheet-packed.css').should_not be_nil
+    @manifest.entry_for('stylesheet@2x-packed.css').should_not be_nil
+  end
+
+  it "should remove non-packed JS entries from apps" do
+    @manifest.entries.each do |entry|
+      if entry[:entry_type] == :javascript
+        entry[:filename].should eq 'javascript-packed.js'
+      end
+    end
   end
 
   it "should add packed entries for frameworks" do
@@ -104,10 +113,12 @@ describe "manifest:prepare_build_tasks:packed" do
      before do
        run_task
        @entry = entry_for('stylesheet-packed.css')
+       @entry_2x = entry_for('stylesheet@2x-packed.css')
      end
 
      it "should generate a stylesheet-packed.css entry" do
        @entry.should_not be_nil
+       @entry_2x.should_not be_nil
      end
 
      it "should include stylesheet.css entries from all required targets" do
@@ -115,12 +126,17 @@ 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
 
        # find targets, sorted by order.  remove any that don't have a
-       # javascript.js entry.
+       # stylesheet.css entry.
        targets = @target.expand_required_targets + [@target]
        variation = @entry.manifest.variation
        targets.reject! do |t|
@@ -130,21 +146,38 @@ describe "manifest:prepare_build_tasks:packed" do
        @entry.ordered_entries.each do |entry|
          entry.target.should == targets.shift
        end
+
+       targets = @target.expand_required_targets + [@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
        targets = @target.expand_required_targets + [@target]
        @entry.targets.should == targets
+       @entry_2x.targets.should == targets
      end
 
      it "should NOT include minified source entries" do
        @entry.source_entries.each do |entry|
          entry.should_not be_minified
        end
+
+       @entry_2x.source_entries.each do |entry|
+         entry.should_not be_minified
+       end
      end
 
      it "should be marked as packed" do
        @entry.should be_packed
+       @entry_2x.should be_packed
      end
 
    end

data/spec/buildtasks/manifest/spec_helper.rb

@@ -20,6 +20,10 @@ module SC::ManifestSpecHelpers
       :config =>   @config
   end
 
+  def target_for(targetname)
+    @target.target_for(targetname)
+  end
+
   def entry_for(filename, opts={})
     @manifest.entry_for(filename, opts) || @manifest.entry_for(filename, opts.merge(:hidden => true))
   end

data/spec/fixtures/builder_tests/Buildfile

@@ -1,13 +1,11 @@
+config :req_target_2, :required => [:req_target_1]
+#
 # needed for HTML test...
-config :html_test, 
-  :required => [:req_target_2],
+config :html_test,
+  :required => ['/req_target_2'],
   :layout   => 'lib/layout_template.rhtml',
   :debug_required => [:debug],
   :test_required  => [:qunit]
-  
-config :req_target_2,
-  :required => [:req_target_1],
-  :deferred_modules => [:dynamic_req_target_1]
 
 config :test_test,
   :test_layout   => 'lib/test_layout.rhtml',
@@ -15,6 +13,10 @@ config :test_test,
   :test_required  => [:qunit],
   :theme => nil
 
-config :bundle_test,
-  :required => [:req_target_1],
-  :deferred_modules => [:req_target_2]
+config '/module_test/deferred_module',
+  :required => [:required_target, '/module_test/dynamic_req_target_1']
+
+config :module_test,
+  :deferred_modules => [:deferred_module],
+  :prefetched_modules => [:required_target],
+  :inlined_modules => [:inlined_module]

data/spec/fixtures/builder_tests/apps/chance_test/Buildfile

@@ -0,0 +1,14 @@
+# ===========================================================================
+# Project:   ChanceTest
+# Copyright: ©2011 My Company, Inc.
+# ===========================================================================
+
+# This is your Buildfile for your app, ChanceTest. This tells SproutCore
+# how to build your app. These settings override those in your project
+# Buildfile, which contains default settings for all apps in your project.
+#
+# This line tells SproutCore's CSS preprocessor what class names to target.
+# Since your app has a theme named 'chance-test', and it is based on SproutCore's
+# Ace theme (named 'ace'), it is set to 'ace.chance-test'.
+config :chance_test, :css_theme => 'ace.chance-test'
+

data/spec/fixtures/builder_tests/apps/chance_test/core.js

@@ -0,0 +1,27 @@
+// ==========================================================================
+// Project:   ChanceTest
+// Copyright: ©2011 My Company, Inc.
+// ==========================================================================
+/*globals ChanceTest */
+
+/** @namespace
+
+  My cool new app.  Describe your application.
+  
+  @extends SC.Object
+*/
+ChanceTest = SC.Application.create(
+  /** @scope ChanceTest.prototype */ {
+
+  NAMESPACE: 'ChanceTest',
+  VERSION: '0.1.0',
+
+  // This is your application store.  You will use this store to access all
+  // of your model data.  You can also set a data source on this store to
+  // connect to a backend server.  The default setup below connects the store
+  // to any fixtures you define.
+  store: SC.Store.create().from(SC.Record.fixtures)
+  
+  // TODO: Add global constants or singleton objects needed by your app here.
+
+}) ;

data/spec/fixtures/builder_tests/apps/chance_test/main.js

@@ -0,0 +1,30 @@
+// ==========================================================================
+// Project:   ChanceTest
+// Copyright: ©2011 My Company, Inc.
+// ==========================================================================
+/*globals ChanceTest */
+
+// This is the function that will start your app running.  The default
+// implementation will load any fixtures you have created then instantiate
+// your controllers and awake the elements on your page.
+//
+// As you develop your application you will probably want to override this.
+// See comments for some pointers on what to do next.
+//
+ChanceTest.main = function main() {
+
+  // Step 1: Instantiate Your Views
+  // The default code here will make the mainPane for your application visible
+  // on screen.  If you app gets any level of complexity, you will probably 
+  // create multiple pages and panes.  
+  ChanceTest.getPath('mainPage.mainPane').append() ;
+
+  // Step 2. Set the content property on your primary controller.
+  // This will make your app come alive!
+
+  // TODO: Set the content property on your primary controller
+  // ex: ChanceTest.contactsController.set('content',ChanceTest.contacts);
+
+} ;
+
+function main() { ChanceTest.main(); }

data/spec/fixtures/builder_tests/apps/chance_test/resources/demo.css

@@ -0,0 +1,6 @@
+sc_require('z_first_file.css');
+.the-test {
+  wont: pick;
+  up: this;
+  file: without-any-content;
+}

data/spec/fixtures/builder_tests/apps/chance_test/resources/last_file.css

@@ -0,0 +1,7 @@
+sc_require('demo.css');
+.the-test {
+  wont: pick;
+  up: this;
+  file: without-any-content;
+}
+

data/spec/fixtures/builder_tests/apps/chance_test/resources/loading.rhtml

@@ -0,0 +1,9 @@
+<% content_for :loading do %>
+<% # Any HTML in this file will be visible on screen while your page loads
+   # its application JavaScript.  SproutCore applications are optimized for 
+   # caching and startup very fast, so your users will often only see this 
+   # content for a brief moment on their first app load, if at all.
+%>
+<p class="loading">Loading...<p>
+
+<% end %>

data/spec/fixtures/builder_tests/apps/chance_test/resources/main_page.js

@@ -0,0 +1,24 @@
+// ==========================================================================
+// Project:   ChanceTest - mainPage
+// Copyright: ©2011 My Company, Inc.
+// ==========================================================================
+/*globals ChanceTest */
+
+// This page describes the main user interface for your application.  
+ChanceTest.mainPage = SC.Page.design({
+
+  // The main pane is made visible on screen as soon as your app is loaded.
+  // Add childViews to this pane for views to display immediately on page 
+  // load.
+  mainPane: SC.MainPane.design({
+    childViews: 'labelView'.w(),
+    
+    labelView: SC.LabelView.design({
+      layout: { centerX: 0, centerY: 0, width: 200, height: 18 },
+      textAlign: SC.ALIGN_CENTER,
+      tagName: "h1", 
+      value: "Welcome to SproutCore!"
+    })
+  })
+
+});

data/spec/fixtures/builder_tests/apps/chance_test/resources/z_first_file.css

@@ -0,0 +1,6 @@
+.the-test {
+  wont: pick;
+  up: this;
+  file: without-any-content;
+}
+

data/spec/fixtures/builder_tests/apps/chance_test/theme.js

@@ -0,0 +1,27 @@
+// ==========================================================================
+// Project:   ChanceTest
+// Copyright: ©2011 My Company, Inc.
+// ==========================================================================
+/*globals ChanceTest */
+
+// This is the theme that defines how your app renders.
+//
+// Your app is given its own theme so it is easier and less
+// messy for you to override specific things just for your
+// app.
+//
+// You don't have to create the whole theme on your own, though:
+// your app's theme is based on SproutCore's Ace theme.
+//
+// NOTE: if you want to change the theme this one is based on, don't
+// forget to change the :css_theme property in your buildfile.
+ChanceTest.Theme = SC.AceTheme.create({
+  name: 'chance-test'
+});
+
+// SproutCore needs to know that your app's theme exists
+SC.Theme.addTheme(ChanceTest.Theme);
+
+// Setting it as the default theme makes every pane SproutCore
+// creates default to this theme unless otherwise specified.
+SC.defaultTheme = 'chance-test';

data/spec/fixtures/builder_tests/apps/module_test/module.js

@@ -0,0 +1 @@
+alert('module_test');

data/spec/fixtures/builder_tests/apps/module_test/modules/deferred_module/english.lproj/test.rhtml

@@ -0,0 +1 @@
+<h1><%= %w(req_target_2 sample).join('_') %></h1>

data/spec/fixtures/builder_tests/apps/module_test/modules/deferred_module/javascript.js

@@ -0,0 +1 @@
+// This is a pathological case.  What if the developer adds a file named javascript.js to their source.  Everything should still work.

data/spec/fixtures/builder_tests/apps/module_test/modules/required_target/english.lproj/strings.js

@@ -0,0 +1,4 @@
+// used by html_spec test
+SC.stringsFor('English', {
+  'req_string': 'REQ STRING'
+}) ;

data/spec/fixtures/builder_tests/apps/module_test/modules/required_target/english.lproj/test.rhtml

@@ -0,0 +1 @@
+<h1><%= %w(req_target_1 sample).join('_') %></h1>

data/spec/fixtures/helper_tests/apps/minifier_test/core.js

@@ -0,0 +1,8 @@
+// var Core = SC.Object.create({
+//   // Long, unnecessary comments should be stripped!
+//   init: function(param1, param2) {
+//     var localVariableShouldBeReplaced;
+//     
+//     param1.shouldBeReplaced();
+//   }
+// });

data/spec/fixtures/real_world/Buildfile

@@ -2,11 +2,21 @@
 
 # required because this buildfile lives inside of the source dir which itself
 # has a Buildfile
-project! 
+project!
 
 # This is the generic requirement for most apps.  Of course SproutCore will
 # override this for itself, so you don't have to worry about it causing 
 # trouble.
 config :all, :required => :sproutcore
 
+config :contacts, :deferred_modules => ['contacts/preferences']
+
+config :mail, :deferred_modules => ['mail/preferences']
+config 'mail/preferences', :required => 'mail/printing'
+
+config :photos, :inlined_modules => ['photos/preferences'],
+                :deferred_modules => ['photos/email']
+
 config :mobile_photos, :required => 'sproutcore/mobile'
+
+config :account, :prefetched_modules => ['account/preferences'],

data/spec/lib/builders/chance_file_spec.rb

@@ -0,0 +1,63 @@
+require "lib/builders/spec_helper"
+
+describe SC::Builder::Chance do
+
+  include SC::SpecHelpers
+  include SC::BuilderSpecHelper
+
+  before do
+    std_before :chance_test
+  end
+
+  after do
+    std_after
+  end
+
+  it "should extract files from Chance instance sc_require statements" do
+
+    # We create our own Chance instance and add custom files in this test.
+    instance = Chance::Instance.new()
+    instance.files["test-file.css"] = ".hello { background: static_url('test.png'); }"
+
+    # First, our fake Chance entry. We are going to set it up to copy "core.js"
+    # to "core_copied.js" so we know it ran.
+    chance_entry = @manifest.add_entry "core_copied.js",
+      :chance => instance,
+      :staging_path => File.join(@target.cache_root, 'core_copied.js'),
+      :build_path => File.join(@target.build_root, 'core_copied.js'),
+      :source_path => File.join(@target.source_root, 'core.js'),
+      :build_task => "build:copy"
+
+    # PRECONDITION: this file should not be copied yet!
+    File.exist?(chance_entry[:staging_path]).should be_false
+    File.exist?(chance_entry[:build_path]).should be_false
+
+    # We will hand the entries over in the WRONG order, because Chance parses
+    # the sc_require to determine the correct order. ordered entries should be ignored
+    filename = "stylesheet@test.css"
+    entry = @manifest.add_entry filename,
+      :chance_entry => chance_entry,
+      :chance_file => "test-file.css"
+
+    dest = entry.build_path
+
+    # Build using the entry we created
+    SC::Builder::ChanceFile.build(entry, dest)
+    result = File.readlines(dest)*""
+
+
+    # Chance should have "built"
+    # It should not stage. Since it will end up building anyway, if it stages it
+    # will have built twice. Given that Chance is not exactly fast, this would
+    # be a bug.
+    File.exist?(chance_entry[:staging_path]).should be_false
+    File.exist?(chance_entry[:build_path]).should be_true
+
+
+    # There is a static_url; it should be replaced, but the file does not
+    # exist so itw ill turn into ''
+    result.strip.should == ".hello { background: url(''); }"
+  end
+
+end
+