sproutcore 1.6.0.1 → 1.7.1.beta

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

@@ -23,15 +23,6 @@
 # - :theme: a selector that will make up the initial value of the $theme
 #   variable. For example: :theme => "ace.test-controls"
 #
-# - :compress: if true, the slice names in the CSS will be shortened.
-#   This has two drawbacks: 1) the slice names will not be helpful for
-#   debugging, and 2) if using Chance in a standalone way and committing
-#   the output to a source control system, the output can change dramatically
-#   between runs, even if the input CSS is unchanged.
-#
-#   As the most common use of Chance is as part of the SC build tools,
-#   and this debugging support is usually only required to debug Chance
-#   itself, :compress defaults to true
 #
 # How Slice & Slices work
 # -------------------------------
@@ -56,16 +47,15 @@ module Chance
     BEGIN_SCOPE = /\{/
     END_SCOPE = /\}/
     THEME_DIRECTIVE = /@theme\s*/
-    SELECTOR_THEME_VARIABLE = /\$theme\./
+    SELECTOR_THEME_VARIABLE = /\$theme(?=[^\w:-])/
     INCLUDE_SLICES_DIRECTIVE = /@include\s+slices\s*/
     INCLUDE_SLICE_DIRECTIVE = /@include\s+slice\s*/
     CHANCE_FILE_DIRECTIVE = /@_chance_file /
     NORMAL_SCAN_UNTIL = /[^{}@$]+/
 
-    @@uid = 0
 
     def initialize(string, opts = {})
-      @opts = { :theme => "", :compress => true }
+      @opts = { :theme => "" }
       @opts.merge!(opts)
       @path = ""
 
@@ -77,9 +67,6 @@ module Chance
 
       @theme = @opts[:theme]
 
-      @@uid += 1
-      @uid = @@uid
-
     end
 
     # SLICE MANAGEMENT
@@ -135,12 +122,8 @@ module Chance
         slice[:max_offset_x] = [slice[:max_offset_x], opts[:offset_x]].max
         slice[:max_offset_y] = [slice[:max_offset_y], opts[:offset_y]].max
       else
-        parts = slice_path.split("/")
-        css_name = "__slice_" + parts.join("_")
-
-        if @opts[:compress]
-          css_name = "__s" + @uid.to_s + "_" + @slices.length.to_s
-        end
+        modified_path = @opts[:instance_id].to_s.gsub(/[^a-zA-Z0-9]/, '_') + "_" + slice_path.gsub(/[^a-zA-Z0-9]/, '_')
+        css_name = "__chance_slice_#{modified_path}"
 
         slice = opts.merge({ 
           :name => slice_path, 
@@ -151,12 +134,16 @@ module Chance
           :max_offset_x => opts[:offset_x],
           :max_offset_y => opts[:offset_y],
           :imaged_offset_x => 0, # the imaging process will re-define these.
-          :imaged_offset_y => 0
+          :imaged_offset_y => 0,
+
+          :used_by => []
         })
 
         @slices[slice_path] = slice
       end
 
+      slice[:used_by] << { :path => @path }
+
       return slice
     end
 
@@ -358,7 +345,7 @@ module Chance
       scanner = @scanner
       scanner.scan SELECTOR_THEME_VARIABLE
 
-      output = "\#{$theme}."
+      output = "\#{$theme}"
 
       return output
     end
@@ -486,7 +473,7 @@ module Chance
 
       # We prefix with -chance; this should let everything be passed through more
       # or less as-is. Postprocessing will turn it into -background-position.
-      output += "-chance-offset: \"#{slice[:name]}\" #{slice[:offset_x]} #{slice[:offset_y]};"
+      output += "-chance-offset: \"#{slice[:name]}\" #{offset[0]} #{offset[1]};"
       output += "background-repeat: " + slice[:repeat]
       return output
     end
@@ -564,17 +551,25 @@ module Chance
       fill_width = Integer(fill[0])
       fill_height = Integer(fill[1])
 
-      skip_top_left = values.include? 'skip-top-left'
-      skip_top = values.include? 'skip-top'
-      skip_top_right = values.include? 'skip-top-right'
+      # skip control
+      skip = arguments[:skip]
+      if skip.nil?
+        skip = []
+      else
+        skip = skip.split /\s+/
+      end
+
+      skip_top_left = skip.include? 'top-left'
+      skip_top = skip.include? 'top'
+      skip_top_right = skip.include? 'skip-top-right'
 
-      skip_left = values.include? 'skip-left'
-      skip_middle = values.include? 'skip-middle'
-      skip_right = values.include? 'skip-right'
+      skip_left = skip.include? 'left'
+      skip_middle = skip.include? 'middle'
+      skip_right = skip.include? 'right'
 
-      skip_bottom_left = values.include? 'skip-bottom-left'
-      skip_bottom = values.include? 'skip-bottom'
-      skip_bottom_right = values.include? 'skip-bottom-right'
+      skip_bottom_left = skip.include? 'bottom-left'
+      skip_bottom = skip.include? 'bottom'
+      skip_bottom_right = skip.include? 'bottom-right'
 
       filename = parse_string(arguments[0])
 
@@ -645,7 +640,7 @@ module Chance
         :sprite_padding => arguments[:"middle-padding"],
         :offset => arguments[:"middle-offset"],
         :filename => filename,
-        :repeat => fill_height != 0 ? (fill_width != 0 ? "repeat-both" : "repeat-y") : (fill_width != 0 ? "repeat-x" : nil)
+        :repeat => fill_height != 0 ? (fill_width != 0 ? "repeat" : "repeat-y") : (fill_width != 0 ? "repeat-x" : nil)
 
 
         # fill in width, height or right, bottom depending on fill settings
@@ -734,9 +729,18 @@ module Chance
       output = ""
 
       # LEFT
-      if should_include_slice?(top_left_slice) and not skip_top_left
+      # NOTE: we write it even if we are supposed to skip; we only wrap the slice include portion in 
+      if should_include_slice?(top_left_slice)
         output += "& > .top-left {\n"
-        output += generate_slice_include(top_left_slice) + ";"
+
+        # IF we are skipping the top left slice, we don't want the actual slice include-- but the layout
+        # information we still want. So, only bracket the generate_slice_include.
+        #
+        # Potential issue: slice_layout doesn't handle repeat settings. In theory, this should rarely be
+        # an issue (because you aren't setting a background for the skipped slice.
+        if not skip_top_left
+          output += generate_slice_include(top_left_slice) + ";"
+        end
 
         output += "\nposition: absolute;\n"
         output += slice_layout(top_left_slice)
@@ -744,9 +748,12 @@ module Chance
         output += "}\n"
       end
 
-      if should_include_slice?(left_slice) and not skip_left
+      if should_include_slice?(left_slice)
         output += "& > .left {\n"
-        output += generate_slice_include(left_slice) + ";"
+
+        if not skip_left
+          output += generate_slice_include(left_slice) + ";"
+        end
 
         output += "\nposition: absolute;\n"
         output += slice_layout(left_slice.merge({ :bottom => bottom }))
@@ -754,9 +761,12 @@ module Chance
         output += "}\n"
       end
 
-      if should_include_slice?(bottom_left_slice) and not skip_bottom_left
+      if should_include_slice?(bottom_left_slice)
         output += "& > .bottom-left {\n"
-        output += generate_slice_include(bottom_left_slice) + ";"
+
+        if not skip_bottom_left
+          output += generate_slice_include(bottom_left_slice) + ";"
+        end
 
         output += "\nposition: absolute;\n"
         output += slice_layout(bottom_left_slice)
@@ -765,9 +775,12 @@ module Chance
       end
 
       # MIDDLE
-      if should_include_slice?(top_slice) and not skip_top
+      if should_include_slice?(top_slice)
         output += "& > .top {\n"
-        output += generate_slice_include(top_slice) + ";"
+
+        if not skip_top
+          output += generate_slice_include(top_slice) + ";"
+        end
 
         output += "\nposition: absolute;\n"
         output += slice_layout(top_slice.merge({ :right => right }))
@@ -775,9 +788,12 @@ module Chance
         output += "}\n"
       end
 
-      if should_include_slice?(middle_slice) and not skip_middle
+      if should_include_slice?(middle_slice)
         output += "& > .middle {\n"
-        output += generate_slice_include(middle_slice) + ";"
+
+        if not skip_middle
+          output += generate_slice_include(middle_slice) + ";"
+        end
 
         output += "\nposition: absolute;\n"
         output += slice_layout(middle_slice.merge({ :bottom => bottom, :right => right }))
@@ -786,9 +802,12 @@ module Chance
         output += "}\n"
       end
 
-      if should_include_slice?(bottom_slice) and not skip_bottom
+      if should_include_slice?(bottom_slice)
         output += "& > .bottom {\n"
-        output += generate_slice_include(bottom_slice) + ";"
+
+        if not skip_bottom
+          output += generate_slice_include(bottom_slice) + ";"
+        end
 
         output += "\nposition: absolute;\n"
         output += slice_layout(bottom_slice.merge({ :right => right }))
@@ -798,9 +817,12 @@ module Chance
       end
 
       # RIGHT
-      if should_include_slice?(top_right_slice) and not skip_top_right
+      if should_include_slice?(top_right_slice)
         output += "& > .top-right {\n"
-        output += generate_slice_include(top_right_slice) + ";"
+
+        if not skip_top_right
+          output += generate_slice_include(top_right_slice) + ";"
+        end
 
         output += "\nposition: absolute;\n"
         output += slice_layout(top_right_slice)
@@ -808,9 +830,12 @@ module Chance
         output += "}\n"
       end
 
-      if should_include_slice?(right_slice) and not skip_right
+      if should_include_slice?(right_slice)
         output += "& > .right {\n"
-        output += generate_slice_include(right_slice) + ";"
+
+        if not skip_right
+          output += generate_slice_include(right_slice) + ";"
+        end
 
         output += "\nposition: absolute;\n"
         output += slice_layout(right_slice.merge({ :bottom => bottom }))
@@ -818,9 +843,12 @@ module Chance
         output += "}\n"
       end
 
-      if should_include_slice?(bottom_right_slice) and not skip_bottom_right
+      if should_include_slice?(bottom_right_slice)
         output += "& > .bottom-right {\n"
-        output += generate_slice_include(bottom_right_slice) + ";"
+
+        if not skip_bottom_right
+          output += generate_slice_include(bottom_right_slice) + ";"
+        end
 
         output += "\nposition: absolute;\n"
         output += slice_layout(bottom_right_slice)

data/vendor/chance/lib/chance.rb

@@ -1,4 +1,5 @@
 require "chance/instance"
+require "chance/factory"
 
 require 'sass'
 
@@ -19,8 +20,10 @@ module Chance
 
   @files = {}
   
+  @clear_files_immediately = false
+  
   class << self
-    attr_accessor :files, :_current_instance
+    attr_accessor :files, :_current_instance, :clear_files_immediately
 
     def add_file(path, content=nil)
       mtime = 0
@@ -29,9 +32,7 @@ module Chance
       end
       
       if @files[path]
-        mtime = File.mtime(path).to_f
-        update_file(path, content) if mtime > @files[path][:mtime]
-        return
+        return update_file_if_needed(path, content)
       end
       
       file = {
@@ -67,6 +68,21 @@ module Chance
       puts "Updated " + path if Chance::CONFIG[:verbose]
     end
 
+    # if the path is a valid filesystem path and the mtime has changed, this invalidates
+    # the file. Returns the mtime if the file was updated.
+    def update_file_if_needed(path, content=nil)
+      if @files[path]
+        mtime = File.mtime(path).to_f
+        if mtime > @files[path][:mtime]
+          update_file(path, content)
+        end
+        
+        return mtime
+      else
+        return false
+      end
+    end
+
     def remove_file(path)
       if not @files.has_key? path
         puts "Could not remove " + path + " because it is not in system."
@@ -144,10 +160,13 @@ module Chance
       content = file[:content]
 
       requires = []
-      content = content.gsub(/sc_require\(['"]?(.*?)['"]?\);?/) {|match|
-        requires.push $1
+      content = content.gsub(/(sc_)?require\(['"]?(.*?)['"]?\);?/) {|match|
+        requires.push $2
         ""
       }
+      
+      # sc_resource will already be handled by the build tool. We just need to ignore it.
+      content.gsub!(/sc_resource\(['"]?(.*?)['"]?\);?/, '')
 
       file[:requires] = requires
       file[:content] = content