compass 1.0.0.alpha.15 → 1.0.0.alpha.16

data/RELEASE_VERSION

@@ -1 +1 @@
-1.0.0.alpha.15
+1.0.0.alpha.16

data/VERSION

@@ -1 +1 @@
-1.0.0.alpha.14
+1.0.0.alpha.15

data/lib/compass/commands/update_project.rb

@@ -14,6 +14,10 @@ module Compass
           Options:
         }.split("\n").map{|l| l.gsub(/^ */,'')}.join("\n")
 
+        opts.on("--[no-]sourcemap", "Generate a sourcemap during compilation.") do |sm|
+          self.options[:sourcemap] = sm
+        end
+
         opts.on("--time", "Display compilation times.") do
           self.options[:time] = true
         end
@@ -64,6 +68,7 @@ module Compass
           compiler_opts.merge!(options)
           compiler_opts[:sass_files] = explicit_sass_files
           compiler_opts[:cache_location] = determine_cache_location
+          compiler_opts[:sourcemap] = Compass.configuration.sourcemap if compiler_opts[:sourcemap].nil?
           if options.include?(:debug_info) && options[:debug_info]
             compiler_opts[:sass][:debug_info] = options.delete(:debug_info)
           end

data/lib/compass/compiler.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module Compass
   class Compiler
 
@@ -55,10 +57,18 @@ module Compass
       @css_files ||= sass_files.map{|sass_file| corresponding_css_file(sass_file)}
     end
 
+    def sourcemap_files
+      @sourcemap_files ||= sass_files.map{|sass_file| corresponding_sourcemap_file(sass_file)}
+    end
+
     def corresponding_css_file(sass_file)
       "#{to}/#{stylesheet_name(sass_file)}.css"
     end
 
+    def corresponding_sourcemap_file(sass_file)
+      "#{to}/#{stylesheet_name(sass_file)}.map"
+    end
+
     def target_directories
       css_files.map{|css_file| File.dirname(css_file)}.uniq.sort.sort_by{|d| d.length }
     end
@@ -86,10 +96,18 @@ module Compass
       nil
     end
 
+    def reset!
+      reset_staleness_checker!
+      @sass_files = nil
+      @css_files = nil
+      @sourcemap_files = nil
+    end
+
     def clean!
       remove options[:cache_location]
-      css_files.each do |css_file|
+      css_files.zip(sourcemap_files).each do |css_file, sourcemap_file|
         remove css_file
+        remove sourcemap_file
       end
     end
 
@@ -106,9 +124,9 @@ module Compass
 
       # Compile each sass file.
       result = timed do
-        sass_files.zip(css_files).each do |sass_filename, css_filename|
+        sass_files.zip(css_files, sourcemap_files).each do |sass_filename, css_filename, sourcemap_filename|
           begin
-            compile_if_required sass_filename, css_filename
+            compile_if_required sass_filename, css_filename, sourcemap_filename
           rescue Sass::SyntaxError => e
             failure_count += 1
             handle_exception(sass_filename, css_filename, e)
@@ -121,11 +139,12 @@ module Compass
       return failure_count
     end
 
-    def compile_if_required(sass_filename, css_filename)
-      if should_compile?(sass_filename, css_filename)
-        compile sass_filename, css_filename
+    def compile_if_required(sass_filename, css_filename, sourcemap_filename = nil)
+      if should_compile?(sass_filename, css_filename, sourcemap_filename)
+        compile sass_filename, css_filename, sourcemap_filename
       else
         logger.record :unchanged, basename(sass_filename) unless options[:quiet]
+        remove(sourcemap_filename) if sourcemap_filename && !options[:sourcemap]
       end
     end
 
@@ -141,20 +160,40 @@ module Compass
     end
 
     # Compile one Sass file
-    def compile(sass_filename, css_filename)
+    def compile(sass_filename, css_filename, sourcemap_filename = nil)
       start_time = end_time = nil
-      css_content = logger.red do
+      css_content, sourcemap = logger.red do
         timed do
-          engine(sass_filename, css_filename).render
+          engine = engine(sass_filename, css_filename)
+          if sourcemap_filename && options[:sourcemap]
+            engine.render_with_sourcemap(relative_path(css_filename, sourcemap_filename))
+          else
+            [engine.render, nil]
+          end
         end
       end
       duration = options[:time] ? "(#{(css_content.__duration * 1000).round / 1000.0}s)" : ""
       write_file(css_filename, css_content, options.merge(:force => true, :extra => duration), sass_options[:unix_newlines])
+      if sourcemap
+        sourcemap_content = sourcemap.to_json(:css_path => css_filename,
+                                              :sourcemap_path => sourcemap_filename)
+        write_file(sourcemap_filename, sourcemap_content, options.merge(:force => true), sass_options[:unix_newlines])
+      elsif File.exist?(sourcemap_filename)
+        remove sourcemap_filename
+      end
       Compass.configuration.run_stylesheet_saved(css_filename)
     end
 
-    def should_compile?(sass_filename, css_filename)
-      options[:force] || needs_update?(css_filename, sass_filename)
+    def relative_path(from_path, to_path)
+      Pathname.new(to_path).relative_path_from(Pathname.new(from_path).dirname).to_s
+    end
+
+    def should_compile?(sass_filename, css_filename, sourcemap_filename = nil)
+      return true if css_filename && !File.exist?(css_filename)
+      return true if sourcemap_filename && options[:sourcemap] && !File.exist?(sourcemap_filename)
+      options[:force] ||
+        needs_update?(css_filename, sass_filename) ||
+        (options[:sourcemap] && needs_update?(sourcemap_filename, sass_filename))
     end
 
     # A sass engine for compiling a single file.

data/lib/compass/configuration/serialization.rb

@@ -43,6 +43,10 @@ module Compass
         (required_libraries || []).each do |lib|
           contents << %Q{require '#{lib}'\n}
         end
+        unless (required_libraries || []).include?("compass/import-once/activate") ||
+               (required_libraries || []).include?("compass/import-once")
+          contents << "require 'compass/import-once/activate'\n"
+        end
         (loaded_frameworks || []).each do |lib|
           contents << %Q{load '#{lib}'\n}
         end

data/lib/compass/sass_extensions/functions/sprites.rb

@@ -1,10 +1,13 @@
 module Compass::SassExtensions::Functions::Sprites
 
   extend Compass::SassExtensions::Functions::SassDeclarationHelper
+  extend Sass::Script::Value::Helpers
+  include Sass::Script::Value::Helpers
 
-  ZERO = Sass::Script::Number::new(0)
-  BOOL_FALSE = Sass::Script::Bool::new(false)
+  ZERO = number(0)
+  BOOL_FALSE = bool(false)
   VALID_SELECTORS = %w(hover active target focus)
+
   # Provides a consistent interface for getting a variable in ruby
   # from a keyword argument hash that accounts for underscores/dash equivalence
   # and allows the caller to pass a symbol instead of a string.
@@ -19,7 +22,7 @@ module Compass::SassExtensions::Functions::Sprites
     verify_map(map, 'sprite-width')
     file = get_sprite_file(map, sprite)
     width, _ = image_dimensions(file)
-    Sass::Script::Number.new(width, ["px"])
+    number(width, "px")
   end
   declare :sprite_width, [:map]
   declare :sprite_width, [:map, :sprite]
@@ -29,7 +32,7 @@ module Compass::SassExtensions::Functions::Sprites
     verify_map(map, 'sprite-height')
     file = get_sprite_file(map, sprite)
     _, height = image_dimensions(file)
-    Sass::Script::Number.new(height, ["px"])
+    number(height, "px")
   end
   declare :sprite_height, [:map]
   declare :sprite_height, [:map, :sprite]
@@ -37,14 +40,14 @@ module Compass::SassExtensions::Functions::Sprites
   # Returns a list of all sprite names
   def sprite_names(map)
     verify_map(map, 'sprite-names')
-    Sass::Script::List.new(map.sprite_names.map { |f| Sass::Script::String.new(f) }, ' ')
+    list(map.sprite_names.map { |f| identifier(f) }, :comma)
   end
   declare :sprite_names, [:map]
 
   # Returns the system path of the sprite file
   def sprite_path(map)
     verify_map(map, 'sprite-path')
-    Sass::Script::String.new(map.filename)
+    identifier(map.filename)
   end
   declare :sprite_path, [:map]
 
@@ -96,7 +99,7 @@ module Compass::SassExtensions::Functions::Sprites
     verify_sprite(sprite)
     url = sprite_url(map)
     position = sprite_position(map, sprite, offset_x, offset_y, use_percentages)
-    Sass::Script::List.new([url] + position.value, :space)
+    list([url] + position.value, :space)
   end
   declare :sprite, [:map, :sprite]
   declare :sprite, [:map, :sprite, :offset_x]
@@ -107,7 +110,7 @@ module Compass::SassExtensions::Functions::Sprites
   # The name is derived from the folder than contains the sprites.
   def sprite_map_name(map)
     verify_map(map, "sprite-map-name")
-    Sass::Script::String.new(map.name)
+    identifier(map.name)
   end
   declare :sprite_name, [:sprite]
 
@@ -117,7 +120,7 @@ module Compass::SassExtensions::Functions::Sprites
     verify_map(map, "sprite")
     verify_sprite(sprite)
     if image = map.image_for(sprite.value)
-      Sass::Script::String.new(image.file)
+      identifier(image.file)
     else
       missing_image!(map, sprite)
     end
@@ -129,9 +132,8 @@ module Compass::SassExtensions::Functions::Sprites
     sprite = convert_sprite_name(sprite)
     verify_map map
     verify_sprite sprite
-    Sass::Script::Bool.new map.image_for(sprite.value).parent.nil?
+    bool(map.image_for(sprite.value).parent.nil?)
   end
-  
   declare :sprite_does_not_have_parent, [:map, :sprite]
 
   #return the name of the selector file
@@ -139,7 +141,7 @@ module Compass::SassExtensions::Functions::Sprites
     sprite = convert_sprite_name(sprite)
     image = map.image_for(sprite)
     if map.send(:"has_#{selector.value}?", sprite.value)
-      return Sass::Script::String.new(image.send(selector.value).name)
+      return identifier(image.send(selector.value).name)
     end
 
     raise Sass::SyntaxError, "Sprite: #{sprite.value} does not have a #{selector} state"
@@ -155,7 +157,7 @@ module Compass::SassExtensions::Functions::Sprites
     unless VALID_SELECTORS.include?(selector.value)
       raise Sass::SyntaxError, "Invalid Selctor did you mean one of: #{VALID_SELECTORS.join(', ')}"
     end
-    Sass::Script::Bool.new map.send(:"has_#{selector.value}?", sprite.value)
+    bool map.send(:"has_#{selector.value}?", sprite.value)
   end
   
   declare :sprite_has_selector, [:map, :sprite, :selector]
@@ -166,14 +168,14 @@ module Compass::SassExtensions::Functions::Sprites
     unless selector.value =~ IDENTIFIER_RX
       raise Sass::SyntaxError, "#{selector} must be a legal css identifier"
     end
-    Sass::Script::Bool.new true
+    bool true
   end
 
   # Returns a url to the sprite image.
   def sprite_url(map)
     verify_map(map, "sprite-url")
     map.generate
-    generated_image_url(Sass::Script::String.new("#{map.path}-s#{map.uniqueness_hash}.png"))
+    generated_image_url(identifier("#{map.path}-s#{map.uniqueness_hash}.png"))
   end
   declare :sprite_url, [:map]
 
@@ -211,7 +213,7 @@ module Compass::SassExtensions::Functions::Sprites
     assert_type offset_y, :Number
     sprite = convert_sprite_name(sprite)
     verify_map(map, "sprite-position")
-    unless sprite.is_a?(Sass::Script::String) || sprite.is_a?(Sass::Script::Number)
+    unless sprite.is_a?(Sass::Script::Value::String) || sprite.is_a?(Sass::Script::Value::Number)
       raise Sass::SyntaxError, %Q(The second argument to sprite-position must be a sprite name. See http://beta.compass-style.org/help/tutorials/spriting/ for more information.)
     end
     image = map.image_for(sprite.value)
@@ -221,21 +223,21 @@ module Compass::SassExtensions::Functions::Sprites
     if use_percentages.value
       xdivis = map.width - image.width;
       x = (offset_x.value + image.left.to_f) / (xdivis.nonzero? || 1) * 100
-      x = Sass::Script::Number.new(x, x == 0 ? [] : ["%"])
+      x = x == 0 ? number(x) : number(x, "%")
       ydivis = map.height - image.height;
       y = (offset_y.value + image.top.to_f) / (ydivis.nonzero? || 1) * 100
-      y = Sass::Script::Number.new(y, y == 0 ? [] : ["%"])
+      y = y == 0 ? number(y) : number(y, "%")
     else
       if offset_x.unit_str == "%"
         x = offset_x # CE: Shouldn't this be a percentage of the total width?
       else
         x = offset_x.value - image.left
-        x = Sass::Script::Number.new(x, x == 0 ? [] : ["px"])
+        x = x == 0 ? number(x) : number(x, "px")
       end
       y = offset_y.value - image.top
-      y = Sass::Script::Number.new(y, y == 0 ? [] : ["px"])
+      y = y == 0 ? number(y) : number(y, "px")
     end
-    Sass::Script::List.new([x, y],:space)
+    list(x, y, :space)
   end
   declare :sprite_position, [:map]
   declare :sprite_position, [:map, :sprite]
@@ -254,25 +256,25 @@ protected
   end
 
   def reversed_color_names
-    if Sass::Script::Color.const_defined?(:HTML4_COLORS_REVERSE)
-      Sass::Script::Color::HTML4_COLORS_REVERSE
+    if Sass::Script::Value::Color.const_defined?(:HTML4_COLORS_REVERSE)
+      Sass::Script::Value::Color::HTML4_COLORS_REVERSE
     else
-      Sass::Script::Color::COLOR_NAMES_REVERSE
+      Sass::Script::Value::Color::COLOR_NAMES_REVERSE
     end
   end
 
   def convert_sprite_name(sprite)
     case sprite
-      when Sass::Script::Color
+      when Sass::Script::Value::Color
         rgb = if reversed_color_names.keys.first.size == 3
                 sprite.rgb
               else
                 # Sass 3.3 includes the alpha channel
                 sprite.rgba
               end
-        Sass::Script::String.new(reversed_color_names[rgb])
-      when Sass::Script::Bool
-        Sass::Script::String.new(sprite.to_s)
+        identifier(reversed_color_names[rgb])
+      when Sass::Script::Value::Bool
+        identifier(sprite.to_s)
       else
         sprite
     end
@@ -285,7 +287,7 @@ protected
   end
 
   def verify_sprite(sprite)
-    unless sprite.is_a?(Sass::Script::String) || sprite.is_a?(Sass::Script::Number)
+    unless sprite.is_a?(Sass::Script::Value::String) || sprite.is_a?(Sass::Script::Value::Number)
       raise Sass::SyntaxError, %Q(The second argument to sprite() must be a sprite name. See http://beta.compass-style.org/help/tutorials/spriting/ for more information.)
     end
   end

data/lib/compass/sass_extensions/sprites/image.rb

@@ -2,6 +2,7 @@ module Compass
   module SassExtensions
     module Sprites
       class Image
+        include Sass::Script::Value::Helpers
         ACTIVE = %r{[_-]active$}
         TARGET = %r{[_-]target$}
         HOVER = %r{[_-]hover$}
@@ -58,7 +59,7 @@ module Compass
         # Value of <tt> $#{name}-repeat </tt> or <tt> $repeat </tt>
         def repeat
           @repeat ||= begin
-            rep = (get_var_file("repeat") || options.get_var("repeat") || Sass::Script::String.new(NO_REPEAT)).value
+            rep = (get_var_file("repeat") || options.get_var("repeat") || identifier(NO_REPEAT)).value
             unless VALID_REPEATS.include? rep
               raise SpriteException, "Invalid option for repeat \"#{rep}\" - valid options are #{VALID_REPEATS.join(', ')}"
             end
@@ -81,7 +82,7 @@ module Compass
 
         # Value of <tt> $#{name}-position </tt> or <tt> $position </tt> defaults to <tt>0px</tt>
         def position
-          @position ||= get_var_file("position") || options.get_var("position") || Sass::Script::Number.new(0, ["px"])
+          @position ||= get_var_file("position") || options.get_var("position") || number(0, "px")
         end
 
         # Offset within the sprite
@@ -91,7 +92,7 @@ module Compass
 
         # Spacing between this image and the next
         def spacing
-          @spacing ||= (get_var_file("spacing") || options.get_var("spacing") || Sass::Script::Number.new(0, ['px'])).value
+          @spacing ||= (get_var_file("spacing") || options.get_var("spacing") || number(0, 'px')).value
         end
 
         # MD5 hash of this file

data/lib/compass/sass_extensions/sprites/image_methods.rb

@@ -4,7 +4,7 @@ module Compass
       module ImageMethods
         # Fetches the Sprite::Image object for the supplied name
          def image_for(name)
-          if name.is_a?(Sass::Script::String)
+          if name.is_a?(Sass::Script::Value::String)
             name = name.value
           end
           name = name.to_s
@@ -49,4 +49,4 @@ module Compass
       end
     end
   end
-end
+end

data/lib/compass/sass_extensions/sprites/sprite_map.rb

@@ -1,13 +1,14 @@
 module Compass
   module SassExtensions
     module Sprites
-      class SpriteMap < Sass::Script::Literal
+      class SpriteMap < Sass::Script::Value::Base
         attr_accessor :image_names, :path, :name, :map, :kwargs
         attr_accessor :images, :width, :height, :engine
 
         include SpriteMethods
         include ImageMethods
         include LayoutMethods
+        include Sass::Script::Value::Helpers
 
 
         # Initialize a new sprite object from a relative file path
@@ -38,9 +39,9 @@ module Compass
           @path = path
           @name = name
           @kwargs = kwargs
-          @kwargs['cleanup'] ||= Sass::Script::Bool.new(true)
-          @kwargs['layout'] ||= Sass::Script::String.new('vertical')
-          @kwargs['sort_by'] ||= Sass::Script::String.new('none')
+          @kwargs['cleanup'] ||= bool(true)
+          @kwargs['layout'] ||= identifier('vertical')
+          @kwargs['sort_by'] ||= identifier('none')
           @images = nil
           @width = nil
           @height = nil
@@ -89,4 +90,4 @@ module Compass
       end
     end
   end
-end
+end

data/lib/compass/stats.rb

@@ -11,7 +11,7 @@ module Compass
       def visit(node)
         self.prop_count += 1 if node.is_a?(Sass::Tree::PropNode) && !node.children.any?
         if node.is_a?(Sass::Tree::RuleNode)
-          self.rule_count += node.rule.reject{|r| r.is_a?(Sass::Script::Node)}.map{|r| r.split(/,/)}.flatten.compact.size
+          self.rule_count += node.rule.reject{|r| r.is_a?(Sass::Script::Tree::Node)}.map{|r| r.split(/,/)}.flatten.compact.size
         end
         self.mixin_def_count += 1 if node.is_a?(Sass::Tree::MixinDefNode)
         self.mixin_count += 1 if node.is_a?(Sass::Tree::MixinNode)

data/lib/compass/watcher/compiler.rb

@@ -16,7 +16,7 @@ module Compass
 
       def compile
         @memory_cache.reset! if @memory_cache
-        compiler.reset_staleness_checker!
+        compiler.reset!
         if file = compiler.out_of_date?
           begin
             time = Time.now.strftime("%T")
@@ -34,6 +34,7 @@ module Compass
       def create_compiler_options(additional_options)
         compiler_opts = {:sass => Compass.sass_engine_options, :cache_store => @cache_store, :quiet => true, :loud => [:identical, :overwrite, :create]}.merge(additional_options)
         compiler_opts[:cache_location] ||= determine_cache_location
+        compiler_opts[:sourcemap] = Compass.configuration.sourcemap if compiler_opts[:sourcemap].nil?
         if compiler_opts.include?(:debug_info)
           compiler_opts[:sass][:debug_info] = compiler_opts.delete(:debug_info)
         end
@@ -56,4 +57,4 @@ module Compass
       end
     end
   end
-end
+end