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

data/vendor/chance/lib/chance/parser.rb

@@ -461,7 +461,7 @@ module Chance
       # and preprocess any arguments, before we can call create_slice to get the real
       # slice definition
       slice[:offset] = "0 0" if slice[:offset].nil?
-      slice[:repeat] = "none" if slice[:repeat].nil?
+      slice[:repeat] = "no-repeat" if slice[:repeat].nil?
 
       # the offset will be given to us as one string; however, it has two parts.
       # splitting by whitespace doesn't handle everything, so we may want to refine

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

@@ -9,15 +9,47 @@ module Chance
     module Slicing
       # performs the slicing indicated by each slice definition, and puts the resulting
       # image in the slice definition's :image property.
-      def slice_images
+      #
+      # 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(x2=false)
         slices = @slices
         output = ""
 
         slices.each do |name, slice|
 
-          file = get_file(slice[:path])
+          path = slice[:path]
+          file = nil
+
+          slice_is_x2 = false
+          f = 1 # scale factor
+
+          # handle @2x
+          if x2
+            begin
+              file = get_file(path[0..-5] + "@2x.png")
+              slice_is_x2 = true
+              f = 2
+            rescue
+            end
+
+            # if we are in 2x mode, but there is no 2x file, we've already
+            # sliced it in the 1x pass. So, do nothing.
+            next if file.nil?
+          else
+            slice_is_2x = false
+            f = 1
+            file = get_file(path)
+          end
+
           raise "File does not exist: " + slice[:path] unless file
 
+          # we should have already loaded a chunkypng canvas for the png
+          canvas = file[:content]
+          rect = slice_rect(slice, canvas.width, canvas.height)
+          # we should have already loaded a chunkypng canvas for the png
+          canvas = file[:content]
+          rect = slice_rect(slice, canvas.width / f, canvas.height / f)
           if slice[:path] =~ /png$/
             # we should have already loaded a chunkypng canvas for the png
             canvas = file[:content]
@@ -53,9 +85,13 @@ module Chance
 
           # but, if we are slicing...
           if not rect.nil?
-            canvas = canvas.crop(rect[:left], rect[:top], rect[:width], rect[:height])
+            canvas = canvas.crop(rect[:left] * f, rect[:top] * f, rect[:width] * f, rect[:height] * f)
           end
 
+          slice[:target_width] = canvas.width / f
+          slice[:target_height] = canvas.height / f
+
+          slice[:x2] = slice_is_x2
           slice[:image] = canvas
         end
       end

metadata

@@ -2,7 +2,7 @@
 name: sproutcore
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.5.0.pre.4
+  version: 1.5.0.pre.4.1
 platform: ruby
 authors: 
 - Strobe, Inc., Apple Inc. and contributors
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 -08:00
+date: 2011-03-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -255,10 +255,12 @@ files:
 - lib/gen/app/Buildfile
 - lib/gen/app/README
 - lib/gen/app/USAGE
+- lib/gen/app/templates/apps/@target_name@/Buildfile
 - lib/gen/app/templates/apps/@target_name@/core.js
 - lib/gen/app/templates/apps/@target_name@/main.js
 - lib/gen/app/templates/apps/@target_name@/resources/loading.rhtml
 - lib/gen/app/templates/apps/@target_name@/resources/main_page.js
+- lib/gen/app/templates/apps/@target_name@/theme.js
 - lib/gen/controller/Buildfile
 - lib/gen/controller/README
 - lib/gen/controller/USAGE
@@ -325,7 +327,9 @@ files:
 - lib/gen/theme/Buildfile
 - lib/gen/theme/README
 - lib/gen/theme/USAGE
+- lib/gen/theme/templates/themes/@target_name@/Buildfile
 - lib/gen/theme/templates/themes/@target_name@/resources/theme_styles.css
+- lib/gen/theme/templates/themes/@target_name@/theme.js
 - lib/gen/view/Buildfile
 - lib/gen/view/README
 - lib/gen/view/USAGE
@@ -334,6 +338,8 @@ files:
 - lib/sproutcore.rb
 - lib/sproutcore/builders.rb
 - lib/sproutcore/builders/base.rb
+- lib/sproutcore/builders/chance.rb
+- lib/sproutcore/builders/chance_file.rb
 - lib/sproutcore/builders/combine.rb
 - lib/sproutcore/builders/handlebars.rb
 - lib/sproutcore/builders/html.rb
@@ -365,6 +371,7 @@ files:
 - lib/sproutcore/helpers/dom_id_helper.rb
 - lib/sproutcore/helpers/entry_sorter.rb
 - lib/sproutcore/helpers/html5_manifest.rb
+- lib/sproutcore/helpers/minifier.rb
 - lib/sproutcore/helpers/packed_optimizer.rb
 - lib/sproutcore/helpers/static_helper.rb
 - lib/sproutcore/helpers/tag_helper.rb
@@ -536,13 +543,15 @@ files:
 - spec/buildtasks/manifest/catalog_spec.rb
 - spec/buildtasks/manifest/hide_buildfiles_spec.rb
 - spec/buildtasks/manifest/localize_spec.rb
-- spec/buildtasks/manifest/prepare_build_tasks/bundle_spec.rb
+- spec/buildtasks/manifest/prepare_build_tasks/chance_spec.rb
 - spec/buildtasks/manifest/prepare_build_tasks/combine_spec.rb
 - spec/buildtasks/manifest/prepare_build_tasks/css_spec.rb
 - spec/buildtasks/manifest/prepare_build_tasks/handlebars_spec.rb
 - spec/buildtasks/manifest/prepare_build_tasks/html_spec.rb
 - spec/buildtasks/manifest/prepare_build_tasks/javascript_spec.rb
 - spec/buildtasks/manifest/prepare_build_tasks/minify_spec.rb
+- spec/buildtasks/manifest/prepare_build_tasks/module_info_spec.rb
+- spec/buildtasks/manifest/prepare_build_tasks/module_spec.rb
 - spec/buildtasks/manifest/prepare_build_tasks/packed_spec.rb
 - spec/buildtasks/manifest/prepare_build_tasks/sass_spec.rb
 - spec/buildtasks/manifest/prepare_build_tasks/strings_spec.rb
@@ -551,7 +560,15 @@ files:
 - spec/buildtasks/manifest/spec_helper.rb
 - spec/buildtasks/target_spec.rb
 - spec/fixtures/builder_tests/Buildfile
-- spec/fixtures/builder_tests/apps/bundle_test/bundle.js
+- spec/fixtures/builder_tests/apps/chance_test/Buildfile
+- spec/fixtures/builder_tests/apps/chance_test/core.js
+- spec/fixtures/builder_tests/apps/chance_test/main.js
+- spec/fixtures/builder_tests/apps/chance_test/resources/demo.css
+- spec/fixtures/builder_tests/apps/chance_test/resources/last_file.css
+- spec/fixtures/builder_tests/apps/chance_test/resources/loading.rhtml
+- spec/fixtures/builder_tests/apps/chance_test/resources/main_page.js
+- spec/fixtures/builder_tests/apps/chance_test/resources/z_first_file.css
+- spec/fixtures/builder_tests/apps/chance_test/theme.js
 - spec/fixtures/builder_tests/apps/combine_test/a.js
 - spec/fixtures/builder_tests/apps/combine_test/b.js
 - spec/fixtures/builder_tests/apps/combine_test/c.js
@@ -574,6 +591,19 @@ files:
 - spec/fixtures/builder_tests/apps/javascript_test/sc_super.js
 - spec/fixtures/builder_tests/apps/javascript_test/strings.js
 - spec/fixtures/builder_tests/apps/less_test/sample.less
+- spec/fixtures/builder_tests/apps/module_test/module.js
+- spec/fixtures/builder_tests/apps/module_test/modules/deferred_module/english.lproj/req_style_2.css
+- spec/fixtures/builder_tests/apps/module_test/modules/deferred_module/english.lproj/test.rhtml
+- spec/fixtures/builder_tests/apps/module_test/modules/deferred_module/javascript.js
+- spec/fixtures/builder_tests/apps/module_test/modules/deferred_module/lib/alt_layout.rhtml
+- spec/fixtures/builder_tests/apps/module_test/modules/deferred_module/req_js_2.js
+- spec/fixtures/builder_tests/apps/module_test/modules/dynamic_req_target_1/dynamic_req_js_1.js
+- spec/fixtures/builder_tests/apps/module_test/modules/dynamic_req_target_1/english.lproj/dynamic_req_style_1.css
+- spec/fixtures/builder_tests/apps/module_test/modules/inlined_module/README
+- spec/fixtures/builder_tests/apps/module_test/modules/required_target/english.lproj/req_style_1.css
+- spec/fixtures/builder_tests/apps/module_test/modules/required_target/english.lproj/strings.js
+- spec/fixtures/builder_tests/apps/module_test/modules/required_target/english.lproj/test.rhtml
+- spec/fixtures/builder_tests/apps/module_test/modules/required_target/req_js_1.js
 - spec/fixtures/builder_tests/apps/sass_test/sample.sass
 - spec/fixtures/builder_tests/apps/sass_test/sample.scss
 - spec/fixtures/builder_tests/apps/strings_test/lproj/strings.js
@@ -633,6 +663,7 @@ files:
 - spec/fixtures/find_targets/standard/frameworks/framework2/PLACEHOLDER
 - spec/fixtures/find_targets/standard/themes/theme1/PLACEHOLDER
 - spec/fixtures/find_targets/standard/themes/theme2/PLACEHOLDER
+- spec/fixtures/helper_tests/apps/minifier_test/core.js
 - spec/fixtures/languages/apps/caps_long_names/English.lproj/PLACEHOLDER
 - spec/fixtures/languages/apps/caps_long_names/FreNCH.lproj/PLACEHOLDER
 - spec/fixtures/languages/apps/caps_long_names/UnknOWN.lproj/PLACEHOLDER
@@ -682,12 +713,20 @@ files:
 - spec/fixtures/ordered_entries/apps/with_requires/english.lproj/d.js
 - spec/fixtures/real_world/Buildfile
 - spec/fixtures/real_world/apps/account/README
+- spec/fixtures/real_world/apps/account/modules/preferences/README
 - spec/fixtures/real_world/apps/calendar/README
+- spec/fixtures/real_world/apps/calendar/modules/preferences/README
 - spec/fixtures/real_world/apps/contacts/README_BEFORE_EDITING
+- spec/fixtures/real_world/apps/contacts/modules/preferences/README
+- spec/fixtures/real_world/apps/contacts/modules/printing/README
 - spec/fixtures/real_world/apps/files/README
 - spec/fixtures/real_world/apps/mail/README
+- spec/fixtures/real_world/apps/mail/modules/preferences/README
+- spec/fixtures/real_world/apps/mail/modules/printing/README
 - spec/fixtures/real_world/apps/mobile_photos/README
 - spec/fixtures/real_world/apps/photos/README
+- spec/fixtures/real_world/apps/photos/modules/email/README
+- spec/fixtures/real_world/apps/photos/modules/preferences/README
 - spec/fixtures/real_world/apps/uploader/README
 - spec/fixtures/real_world/frameworks/core_files/PLACEHOLDER
 - spec/fixtures/real_world/frameworks/core_photos/PLACEHOLDER
@@ -752,12 +791,14 @@ files:
 - spec/fixtures/real_world/generators/sample_custom/templates/{filename}.js
 - spec/fixtures/recursive_project/Buildfile
 - spec/fixtures/recursive_project/frameworks/sproutcore/frameworks/costello/PLACEHOLDER
-- spec/lib/builders/bundle_spec.rb
+- spec/lib/builders/chance_file_spec.rb
+- spec/lib/builders/chance_spec.rb
 - spec/lib/builders/combine_spec.rb
 - spec/lib/builders/handlebars_spec.rb
 - spec/lib/builders/html_spec.rb
 - spec/lib/builders/javascript_spec.rb
 - spec/lib/builders/less_spec.rb
+- spec/lib/builders/module_spec.rb
 - spec/lib/builders/sass_spec.rb
 - spec/lib/builders/spec_helper.rb
 - spec/lib/builders/strings_spec.rb
@@ -778,6 +819,7 @@ files:
 - spec/lib/buildfile_commands/proxies_spec.rb
 - spec/lib/buildfile_commands/replace_task_spec.rb
 - spec/lib/buildfile_commands/task_spec.rb
+- spec/lib/helpers/minifier.rb
 - spec/lib/helpers/packing_optimizer/optimize_spec.rb
 - spec/lib/models/hash_struct/deep_clone_spec.rb
 - spec/lib/models/hash_struct/has_options_spec.rb
@@ -1592,6 +1634,8 @@ files:
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/static_content.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/tab/methods.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/tab/ui.js
+- lib/frameworks/sproutcore/frameworks/desktop/tests/views/toolbar/method.js
+- lib/frameworks/sproutcore/frameworks/desktop/tests/views/toolbar/ui.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/web/methods.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/web/ui.js
 - lib/frameworks/sproutcore/frameworks/desktop/tests/views/well/ui.js
@@ -1708,12 +1752,12 @@ files:
 - lib/frameworks/sproutcore/frameworks/foundation/render_delegates/label.js
 - lib/frameworks/sproutcore/frameworks/foundation/render_delegates/render_delegate.js
 - lib/frameworks/sproutcore/frameworks/foundation/system/benchmark.js
+- lib/frameworks/sproutcore/frameworks/foundation/system/chance.js
 - lib/frameworks/sproutcore/frameworks/foundation/system/cookie.js
 - lib/frameworks/sproutcore/frameworks/foundation/system/core_query.js
 - lib/frameworks/sproutcore/frameworks/foundation/system/exception_handler.js
 - lib/frameworks/sproutcore/frameworks/foundation/system/gesture.js
 - lib/frameworks/sproutcore/frameworks/foundation/system/image_queue.js
-- lib/frameworks/sproutcore/frameworks/foundation/system/logger.js
 - lib/frameworks/sproutcore/frameworks/foundation/system/math.js
 - lib/frameworks/sproutcore/frameworks/foundation/system/module.js
 - lib/frameworks/sproutcore/frameworks/foundation/system/request.js
@@ -1743,8 +1787,10 @@ files:
 - lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/content_display.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/control/content.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/control/displayProperties.js
+- lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/editable/ui.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_text_field/api.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_text_field/beginEditing.js
+- lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_text_field/ui.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/staticLayout.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/string.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/validatable/ui.js
@@ -1753,7 +1799,6 @@ files:
 - lib/frameworks/sproutcore/frameworks/foundation/tests/private/tree_item_observer/outline_case.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/system/cookie.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/system/core_query/setClass.js
-- lib/frameworks/sproutcore/frameworks/foundation/tests/system/logger.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/system/math.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/system/request.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/system/routes.js

data/lib/frameworks/sproutcore/frameworks/foundation/system/logger.js

@@ -1,163 +0,0 @@
-// ==========================================================================
-// Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2011 Strobe Inc. and contributors.
-//            Portions ©2008-2010 Apple Inc. All rights reserved.
-// License:   Licensed under MIT license (see license.js)
-// ==========================================================================
-
-
-/** @class
-  @author Colin Campbell
-  @extends SC.Logger
-  @since Sproutcore 1.5
-*/
-SC.mixin(SC.Logger,
-/** @scope SC.Logger */ {
-
-  /**
-    @property {Boolean}
-    @default NO
-    @deprecated
-  */
-  debugEnabled: NO,
-
-  /**
-    @property {Boolean}
-    @default NO
-    @deprecated
-  */
-  exists: NO,
-
-  /**
-    @property {Boolean}
-    @default NO
-    @deprecated
-  */
-  fallBackOnLog: NO,
-  
-  
-  // ..........................................................
-  // LOGGING SUPPORT
-  //
-
-  /**
-    @returns {SC.Logger}
-  */
-  dirxml: function() {
-    var reporters = this.get('reporters'),
-        args = SC.A(arguments);
-
-    reporters.forEach(function(reporter) {
-      if (reporter.dirxml === undefined || reporter.dirxml.apply === undefined) return;
-      reporter.dirxml.apply(reporter, args);
-    }, this);
-
-    return this;
-  },
-
-  /**
-    @returns {SC.Logger}
-  */
-  group: function() {
-    var reporters = this.get('reporters'),
-        args = SC.A(arguments);
-
-    reporters.forEach(function(reporter) {
-      if (reporter.group === undefined || reporter.group.apply === undefined) return;
-      reporter.group.apply(reporter, args);
-    }, this);
-
-    return this;
-  },
-
-  /**
-    @returns {SC.Logger}
-  */
-  groupEnd: function() {
-    var reporters = this.get('reporters'),
-        args = SC.A(arguments);
-
-    reporters.forEach(function(reporter) {
-      if (reporter.groupEnd === undefined || reporter.groupEnd.apply === undefined) return;
-      reporter.groupEnd.apply(reporter, args);
-    }, this);
-
-    return this;
-  },
-
-  /**
-    @returns {SC.Logger}
-  */
-  profile: function() {
-    var reporters = this.get('reporters'),
-        args = SC.A(arguments);
-
-    reporters.forEach(function(reporter) {
-      if (reporter.profile === undefined || reporter.profile.apply === undefined) return;
-      reporter.profile.apply(reporter, args);
-    }, this);
-
-    return this;
-  },
-
-  /**
-    @returns {SC.Logger}
-  */
-  profileEnd: function() {
-    var reporters = this.get('reporters'),
-        args = SC.A(arguments);
-
-    reporters.forEach(function(reporter) {
-      if (reporter.profileEnd === undefined || reporter.profileEnd.apply === undefined) return;
-      reporter.profileEnd.apply(reporter, args);
-    }, this);
-
-    return this;
-  },
-
-  /**
-    @returns {SC.Logger}
-  */
-  time: function() {
-    var reporters = this.get('reporters'),
-        args = SC.A(arguments);
-
-    reporters.forEach(function(reporter) {
-      if (reporter.time === undefined || reporter.time.apply === undefined) return;
-      reporter.time.apply(reporter, args);
-    }, this);
-
-    return this;
-  },
-
-  /**
-    @returns {SC.Logger}
-  */
-  timeEnd: function() {
-    var reporters = this.get('reporters'),
-        args = SC.A(arguments);
-
-    reporters.forEach(function(reporter) {
-      if (reporter.timeEnd === undefined || reporter.timeEnd.apply === undefined) return;
-      reporter.timeEnd.apply(reporter, args);
-    }, this);
-
-    return this;
-  },
-
-  /**
-    @returns {SC.Logger}
-  */
-  trace: function() {
-    var reporters = this.get('reporters'),
-        args = SC.A(arguments);
-
-    reporters.forEach(function(reporter) {
-      if (reporter.trace === undefined || reporter.trace.apply === undefined) return;
-      reporter.trace.apply(reporter, args);
-    }, this);
-
-    return this;
-  }
-
-});

data/lib/frameworks/sproutcore/frameworks/foundation/tests/system/logger.js

@@ -1,44 +0,0 @@
-// ==========================================================================
-// SC.Logger Unit Test
-// ==========================================================================
-
-/*globals module test equals */
-
-
-// Test console needed because testing for null functions,
-// ie. setting the actual console.log = null means setting up
-// and tearing down no longer work properly.
-
-module("SC.Logger");
-
-test("dirxml", function() {
-  equals(SC.Logger.dirxml(), SC.Logger, "Function is defined and returns SC.Logger");
-});
-
-test("group", function() {
-  equals(SC.Logger.group(), SC.Logger, "Function is defined and returns SC.Logger");
-});
-
-test("groupEnd", function() {
-  equals(SC.Logger.groupEnd(), SC.Logger, "Function is defined and returns SC.Logger");
-});
-
-test("profile", function() {
-  equals(SC.Logger.profile(), SC.Logger, "Function is defined and returns SC.Logger");
-});
-
-test("profileEnd", function() {
-  equals(SC.Logger.profileEnd(), SC.Logger, "Function is defined and returns SC.Logger");
-});
-
-test("time", function() {
-  equals(SC.Logger.time(), SC.Logger, "Function is defined and returns SC.Logger");
-});
-
-test("timeEnd", function() {
-  equals(SC.Logger.timeEnd(), SC.Logger, "Function is defined and returns SC.Logger");
-});
-
-test("trace", function() {
-  equals(SC.Logger.trace(), SC.Logger, "Function is defined and returns SC.Logger");
-});