sproutcore 1.5.0.pre.4.1 → 1.5.0.pre.5

data/lib/sproutcore/buildfile/task.rb

@@ -12,8 +12,6 @@ module SC
   # Rake 0.8.3
   #
   class Buildfile::Task
-    include Cloneable
-
     # List of prerequisites for a task.
     attr_reader :prerequisites
 
@@ -64,16 +62,10 @@ module SC
       @sources.first if defined?(@sources)
     end
 
-    IGNORE = %w(@application)
-    def dup(app=nil)
-      app = application if app.nil?
-      sibling = self.class.new(name, app)
-      self.instance_variables.each do |key|
-        next if IGNORE.include?(key.to_s) # instance_variables is an array of symbols in Ruby 1.9
-        sibling.instance_variable_set(key, self.instance_variable_get(key))
-      end
-      sibling.taint if tainted?
-      sibling
+    def dup(app=application)
+      ret = super()
+      ret.application = app
+      return ret
     end
 
     # Create a task named +task_name+ with no actions or prerequisites. Use

data/lib/sproutcore/buildfile/task_manager.rb

@@ -15,15 +15,23 @@ module SC
 
     attr_accessor :last_task_options
 
+    attr_accessor :tasks
+    protected :tasks, :tasks=
+
     def initialize
       super
-      @task_cache = Hash.new {|h,k| h[k] = {} }
-      @tasks = Hash.new
-      @rules = Array.new
-      @scope = Array.new
+      @task_cache = {}
+      @tasks = {}
+      @rules = []
+      @scope = []
       @last_description = nil
     end
 
+    def initialize_copy(*)
+      @task_cache = {}
+      super
+    end
+
     def create_rule(*args, &block)
       pattern, arg_names, deps = resolve_args(args)
       pattern = Regexp.new(Regexp.quote(pattern) + '$') if String === pattern
@@ -135,6 +143,7 @@ module SC
     # are recognized.  If no scope argument is supplied, use the
     # current scope.  Return nil if the task cannot be found.
     def lookup(task_name, initial_scope=nil)
+      @task_cache[initial_scope] ||= {}
       @task_cache[initial_scope][task_name] ||= begin
         initial_scope ||= @scope
         task_name = task_name.to_s

data/lib/sproutcore/models/manifest.rb

@@ -310,7 +310,7 @@ module SC
       entry_extname = entry_rootname = ret = target_name = nil
 
       # optionally you can specify an explicit target name
-      split_index = fragment.index(':') # find first index
+      split_index = fragment.to_s.index(':') # find first index
       unless split_index.nil?
         target_name = '/' + fragment[0..(split_index-1)] if split_index>0
         fragment    = fragment[(split_index+1)..-1] # remove colon
@@ -324,11 +324,11 @@ module SC
         cur_manifest = self
       end
 
-      extname = File.extname(fragment)
+      extname = File.extname(fragment.to_s)
       extname = nil if extname.empty?
 
       # Add leading slash and remove extension
-      rootname = fragment.sub(/\/?/, '/').sub(/#{extname}$/, '')
+      rootname = fragment.to_s.sub(/\/?/, '/').sub(/#{extname}$/, '')
 
       # look on our own target only if target is named
       ret = cur_manifest.entries(opts).find do |entry|

data/lib/sproutcore/models/target.rb

@@ -199,7 +199,7 @@ module SC
           reqs = project.targets.values.select { |target| target[:target_type] == :module }
 
           reqs = reqs.select do |target|
-            target[:target_name].match(/^\/?#{self[:target_name]}/)
+            target[:target_name].to_s.match(/^\/?#{self[:target_name]}/)
           end
 
           ret = ret.concat(reqs)

data/spec/fixtures/real_world/Buildfile

@@ -19,4 +19,4 @@ config :photos, :inlined_modules => ['photos/preferences'],
 
 config :mobile_photos, :required => 'sproutcore/mobile'
 
-config :account, :prefetched_modules => ['account/preferences'],
+config :account, :prefetched_modules => ['account/preferences']

data/vendor/chance/lib/chance/imagers/data_url.rb

@@ -27,42 +27,60 @@ module Chance
 
     end
 
-    def postprocess_css(src, slices)
-      src.gsub (/_sc_chance\:\s*["'](.*)["']\s*;/) {|match|
-        slice = slices[$1]
+    def base64_image_for(slice)
 
-        output = 'background: url("data:image/png;base64,'
+      # ChunkyPNG & RMagick images respond to to_blob, other images will be encoded from their contents
+      if (slice[:image].respond_to? "to_blob")
+        method = slice[:image].method(:to_blob)
 
-        base64Image = Base64.encode64(slice[:image].to_blob(:fast_rgba)).gsub("\n", "")
-        output += base64Image
+        # ChunkyPNG takes an argument to to_blob
+        slice[:image] = (method.arity == 1) ? slice[:image].to_blob(:fast_rgba) : slice[:image].to_blob
+      end
 
-        output += '");'
-        output += "\n"
+      Base64.encode64(slice[:image]).gsub("\n", "")
+    end
+
+    def data_uri_for(slice)
+      output = 'background: url('
+
+      # set the mime type from the extension (while taking care of .jpg extensions)
+      mimeType = (slice[:path] =~ /jpg$/) ? "image/jpeg" : "image/" + slice[:path].slice(/(gif|jpeg|png)$/)
+
+      output += '"data:' + mimeType
+      output += ';base64,'
+
+      base64Image = base64_image_for(slice)
+
+      output += base64Image
+
+      output += '");'
+    end
+
+    def postprocess_css(src, slices)
+      src.gsub(/_sc_chance\:\s*["'](.*)["']\s*;/) do |match|
+        slice = slices[$1]
+
+        output = data_uri_for(slice)
 
         # FOR IE < 8:
-        output += '*background: url("mhtml:chance-mhtml.txt!' + slice[:css_name] + '");'
+        output += '\n*background: url("mhtml:chance-mhtml.txt!' + slice[:css_name] + '");'
         output += "\n"
 
         output
-      }
+      end
     end
 
     def postprocess_css_2x(src, slices)
-      src.gsub (/_sc_chance\:\s*["'](.*)["']\s*;/) {|match|
+      src.gsub(/_sc_chance\:\s*["'](.*)["']\s*;/) do |match|
         slice = slices[$1]
 
-        output = 'background: url("data:image/png;base64,'
-
-        base64Image = Base64.encode64(slice[:image].to_blob(:fast_rgba)).gsub("\n", "")
-        output += base64Image
-
-        output += '");'
+        output = data_uri_for(slice)
 
         output += "\n-webkit-background-size: " + slice[:target_width].to_s + "px "
         output += slice[:target_height].to_s + "px;\n"
 
         output
-      }
+      end
     end
 
     def preload_javascript
@@ -82,7 +100,8 @@ module Chance
         output += "Content-Location:" + slice[:css_name] + "\r\n"
         output += "Content-Transfer-Encoding:base64\r\n\r\n"
 
-        base64Image = Base64.encode64(slice[:image].to_blob(:fast_rgba)).gsub("\n", "")
+        base64Image = base64_image_for(slice)
+
         output += base64Image
         output += "\r\n"
 

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

@@ -8,6 +8,7 @@ require 'chance/sass_extensions'
 require 'chance/perf'
 require 'chance/slicing'
 
+require 'digest/md5'
 
 
 Compass.discover_extensions!
@@ -217,7 +218,7 @@ module Chance
         # 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.
-        content = "@_chance_file " + @mapped_files.key(file[:path]) + ";\n"
+        content = "@_chance_file " + @mapped_files.invert[file[:path]] + ";\n"
         content += "$theme: '" + @options[:theme] + "';"
         content += file[:content]
 
@@ -229,13 +230,9 @@ module Chance
         #if Chance::SUPPORTS_IMPORTERS
         #  css = "@import \"" + file [:path] + ".scss\";"
         #else
-          tmp_path = File.join("./tmp/chance/", file[:path])
-
-          # SCSS requires the file names to end with ".scss", but we may
-          # already be getting files named *.scss. So, only add the extension
-          # if it is not already there.
-          tmp_path += ".scss" unless tmp_path.end_with? ".scss"
 
+          path_hash = Digest::MD5.hexdigest(file[:path])
+          tmp_path = "./tmp/chance/#{path_hash}.scss"
           FileUtils.mkdir_p(File.dirname(tmp_path))
 
           f = File.new(tmp_path, "w")

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

@@ -44,17 +44,11 @@ module Chance
 
           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]
 
-            rect = slice_rect(slice, canvas.width, canvas.height)
+            rect = slice_rect(slice, canvas.width / f, canvas.height / f)
           else
 
             # If we're trying to slice a non-PNG, attempt to process the file with RMagick
@@ -71,7 +65,7 @@ module Chance
               rescue Exception
 
                 # Warns only if there are slice directives on an un-sliceable image
-                SC.logger.warn "Chance only supports slicing of PNG images, the image '#{slice[:filename]}' will be embedded unsliced"
+                SC.logger.warn "Chance only supports slicing of PNG images without RMagick, the image '#{slice[:filename]}' will be embedded unsliced"
 
                 # Use the whole image instead
                 canvas = file[:content]
@@ -88,8 +82,10 @@ module Chance
             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
+          if slice[:path] =~ /png$/
+            slice[:target_width] = canvas.width / f
+            slice[:target_height] = canvas.height / f
+          end
 
           slice[:x2] = slice_is_x2
           slice[:image] = canvas

metadata

@@ -2,7 +2,7 @@
 name: sproutcore
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.5.0.pre.4.1
+  version: 1.5.0.pre.5
 platform: ruby
 authors: 
 - Strobe, Inc., Apple Inc. and contributors
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 -08:00
+date: 2011-03-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -356,7 +356,6 @@ files:
 - lib/sproutcore/buildfile.rb
 - lib/sproutcore/buildfile/build_task.rb
 - lib/sproutcore/buildfile/buildfile_dsl.rb
-- lib/sproutcore/buildfile/cloneable.rb
 - lib/sproutcore/buildfile/early_time.rb
 - lib/sproutcore/buildfile/invocation_chain.rb
 - lib/sproutcore/buildfile/namespace.rb
@@ -934,7 +933,6 @@ files:
 - lib/frameworks/sproutcore/apps/greenhouse/english.lproj/css/modal.css
 - lib/frameworks/sproutcore/apps/greenhouse/english.lproj/css/picker.css
 - lib/frameworks/sproutcore/apps/greenhouse/english.lproj/css/search.css
-- lib/frameworks/sproutcore/apps/greenhouse/english.lproj/css/tabbed.css
 - lib/frameworks/sproutcore/apps/greenhouse/english.lproj/css/text-field.css
 - lib/frameworks/sproutcore/apps/greenhouse/english.lproj/dialogs.js
 - lib/frameworks/sproutcore/apps/greenhouse/english.lproj/fonts/museosans_500.eot
@@ -1243,6 +1241,7 @@ files:
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/core_query/within.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/json.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/locale.js
+- lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/ready/done.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/begin.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/element.js
 - lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/end.js
@@ -1426,6 +1425,7 @@ files:
 - lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/error_methods.js
 - lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/find.js
 - lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/init.js
+- lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/loadRecord.js
 - lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/pushChanges.js
 - lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/readDataHash.js
 - lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/readEditableDataHash.js
@@ -1440,7 +1440,6 @@ files:
 - lib/frameworks/sproutcore/frameworks/debug/core.js
 - lib/frameworks/sproutcore/frameworks/debug/invoke_once_last_debugging.js
 - lib/frameworks/sproutcore/frameworks/designer/coders/design.js
-- lib/frameworks/sproutcore/frameworks/designer/coders/localization.js
 - lib/frameworks/sproutcore/frameworks/designer/coders/object.js
 - lib/frameworks/sproutcore/frameworks/designer/controllers/controllers.js
 - lib/frameworks/sproutcore/frameworks/designer/controllers/design.js
@@ -1471,11 +1470,14 @@ files:
 - lib/frameworks/sproutcore/frameworks/designer/english.lproj/images/pane.png
 - lib/frameworks/sproutcore/frameworks/designer/english.lproj/images/view.png
 - lib/frameworks/sproutcore/frameworks/designer/english.lproj/selection_handles.css
+- lib/frameworks/sproutcore/frameworks/designer/ext/binding.js
 - lib/frameworks/sproutcore/frameworks/designer/ext/object.js
 - lib/frameworks/sproutcore/frameworks/designer/ext/page.js
 - lib/frameworks/sproutcore/frameworks/designer/ext/view.js
 - lib/frameworks/sproutcore/frameworks/designer/mixins/button.js
 - lib/frameworks/sproutcore/frameworks/designer/mixins/snap_lines.js
+- lib/frameworks/sproutcore/frameworks/designer/tests/coders/page.js
+- lib/frameworks/sproutcore/frameworks/designer/tests/designers/view_designer.js
 - lib/frameworks/sproutcore/frameworks/designer/views/designer_drop_target.js
 - lib/frameworks/sproutcore/frameworks/designer/views/drawing.js
 - lib/frameworks/sproutcore/frameworks/designer/views/high_light.js
@@ -1804,6 +1806,7 @@ files:
 - lib/frameworks/sproutcore/frameworks/foundation/tests/system/routes.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/system/task_queue.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/system/user_defaults.js
+- lib/frameworks/sproutcore/frameworks/foundation/tests/system/utils/pointInElement.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/system/utils/range.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/validators/credit_card.js
 - lib/frameworks/sproutcore/frameworks/foundation/tests/validators/date.js
@@ -1832,6 +1835,10 @@ files:
 - lib/frameworks/sproutcore/frameworks/foundation/views/image.js
 - lib/frameworks/sproutcore/frameworks/foundation/views/label.js
 - lib/frameworks/sproutcore/frameworks/foundation/views/text_field.js
+- lib/frameworks/sproutcore/frameworks/handlebars/extensions/bind.js
+- lib/frameworks/sproutcore/frameworks/handlebars/extensions/collection.js
+- lib/frameworks/sproutcore/frameworks/handlebars/extensions/localization.js
+- lib/frameworks/sproutcore/frameworks/handlebars/extensions/view.js
 - lib/frameworks/sproutcore/frameworks/handlebars/extensions.js
 - lib/frameworks/sproutcore/frameworks/handlebars/handlebars.js
 - lib/frameworks/sproutcore/frameworks/jquery/jquery-buffer.js
@@ -1862,6 +1869,7 @@ files:
 - lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array/replace.js
 - lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array/shiftObject.js
 - lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array/unshiftObject.js
+- lib/frameworks/sproutcore/frameworks/runtime/debug/test_suites/array.js
 - lib/frameworks/sproutcore/frameworks/runtime/license.js
 - lib/frameworks/sproutcore/frameworks/runtime/mixins/array.js
 - lib/frameworks/sproutcore/frameworks/runtime/mixins/comparable.js
@@ -2054,6 +2062,7 @@ files:
 - lib/frameworks/sproutcore/themes/ace/designs/psds/menu/menu_item.psd
 - lib/frameworks/sproutcore/themes/ace/designs/psds/menu/up.psd
 - lib/frameworks/sproutcore/themes/ace/designs/psds/panel/panel.psd
+- lib/frameworks/sproutcore/themes/ace/designs/psds/panel/pointers.psd
 - lib/frameworks/sproutcore/themes/ace/designs/psds/picker/popover/popover.psd
 - lib/frameworks/sproutcore/themes/ace/designs/psds/picker/popover/popover_empty.psd
 - lib/frameworks/sproutcore/themes/ace/designs/psds/picker/popover/popover_notoolbar.psd
@@ -2193,6 +2202,7 @@ files:
 - lib/frameworks/sproutcore/themes/ace/resources/disclosure/ace/disclosure_closed_active.png
 - lib/frameworks/sproutcore/themes/ace/resources/disclosure/ace/disclosure_open.png
 - lib/frameworks/sproutcore/themes/ace/resources/disclosure/ace/disclosure_open_active.png
+- lib/frameworks/sproutcore/themes/ace/resources/imagebutton/ace/imagebutton.css
 - lib/frameworks/sproutcore/themes/ace/resources/loading.css
 - lib/frameworks/sproutcore/themes/ace/resources/master-detail/master-detail.css
 - lib/frameworks/sproutcore/themes/ace/resources/menu/checkmark.png
@@ -2206,7 +2216,10 @@ files:
 - lib/frameworks/sproutcore/themes/ace/resources/panel/panel.css
 - lib/frameworks/sproutcore/themes/ace/resources/panel/panel.js
 - lib/frameworks/sproutcore/themes/ace/resources/panel/panel.png
+- lib/frameworks/sproutcore/themes/ace/resources/picker/ace/panel.png
+- lib/frameworks/sproutcore/themes/ace/resources/picker/ace/picker.css
 - lib/frameworks/sproutcore/themes/ace/resources/picker/ace/picker.js
+- lib/frameworks/sproutcore/themes/ace/resources/picker/ace/pointers.png
 - lib/frameworks/sproutcore/themes/ace/resources/picker/popover/picker.js
 - lib/frameworks/sproutcore/themes/ace/resources/picker/popover/popover.css
 - lib/frameworks/sproutcore/themes/ace/resources/picker/popover/popover.js

data/lib/frameworks/sproutcore/apps/greenhouse/english.lproj/css/tabbed.css

@@ -1,68 +0,0 @@
-/*
-==========================================================================
- Project: Greenhouse - Custom Tabbed Buttons
- Author: Matt Grantham - @MattGrantham
-==========================================================================
-*/
-
-/* Regular */
-
-.sc-theme .sc-button-view.sc-regular-size.square.dark {
-  background: static_url('images/buttons/dark/regular-r.png') no-repeat right;
-}
-
-.sc-theme .sc-button-view.sc-regular-size.square.dark .sc-button-inner {
-  background: static_url('images/buttons/dark/regular-l.png') no-repeat;
-}
-.sc-theme .sc-button-view.sc-regular-size.square.dark .sc-button-label {
-  background: static_url('images/buttons/dark/regular-m.png') repeat-x;
-  margin-left: 5px;
-  margin-right: 5px;
-  color: #fff;
-  text-shadow: 0 1px 0 #242424;
-}
-
-/* Active */
-.sc-theme .sc-button-view.sc-regular-size.square.active.dark {
-  background: static_url('images/buttons/dark/active-r.png') no-repeat right;
-}
-.sc-theme .sc-button-view.sc-regular-size.square.active.dark .sc-button-inner {
-  background: static_url('images/buttons/dark/active-l.png') no-repeat;
-}
-.sc-theme .sc-button-view.sc-regular-size.square.active.dark .sc-button-label {
-  background: static_url('images/buttons/dark/active-m.png') repeat-x;
-  color: #d0d0d0;
-  text-shadow: 0 -1px 0 #242424;
-}
-
-/* Selected  */
-.sc-theme .sc-button-view.sc-regular-size.square.dark.sel {
-  background: static_url('images/buttons/dark/sel-r.png') no-repeat right;
-}
-
-.sc-theme .sc-button-view.sc-regular-size.square.dark.sel .sc-button-inner {
-  background: static_url('images/buttons/dark/sel-l.png') no-repeat;
-}
-.sc-theme .sc-button-view.sc-regular-size.square.dark.sel .sc-button-label {
-  background: static_url('images/buttons/dark/sel-m.png') repeat-x;
-  margin-left: 5px;
-  margin-right: 5px;
-  color: #fff;
-  text-shadow: 0 1px 0 #242424;
-}
-
-/* Selected - Active*/
-.sc-theme .sc-button-view.sc-regular-size.square.dark.sel.active {
-  background: static_url('images/buttons/dark/sel-active-r.png') no-repeat right;
-}
-
-.sc-theme .sc-button-view.sc-regular-size.square.dark.sel.active .sc-button-inner {
-  background: static_url('images/buttons/dark/sel-active-l.png') no-repeat;
-}
-.sc-theme .sc-button-view.sc-regular-size.square.dark.sel.active .sc-button-label {
-  background: static_url('images/buttons/dark/sel-active-m.png') repeat-x;
-  margin-left: 5px;
-  margin-right: 5px;
-  color: #fff;
-  text-shadow: 0 1px 0 #242424;
-}