compass 0.12.alpha.4 → 0.12.rc.0

data/VERSION.yml

@@ -1,6 +1,6 @@
 --- 
 :major: 0
 :minor: 12
-:state: alpha
-:build: 4
+:state: rc
+:build: 0
 :name: Alnilam

data/bin/compass

@@ -21,6 +21,10 @@ fallback_load_path(File.join(File.dirname(__FILE__), '..', 'lib')) do
   require 'compass/exec'
 end
 
+if defined?(Bundler)
+  Bundler.require :assets
+end
+
 runner = Proc.new do
   Compass::Exec::SubCommandUI.new(ARGV).run!
 end

data/features/command_line.feature

@@ -77,16 +77,6 @@ Feature: Command Line
     Then an error message is printed out: A bare project cannot be created when a framework is specified.
     And the command exits with a non-zero error code
 
-  Scenario: Initializing a rails project
-    Given ruby supports fork
-    Given I'm in a newly created rails project: my_rails_project
-    When I initialize a project using: compass init rails --sass-dir app/stylesheets --css-dir public/stylesheets/compiled
-    Then a config file config/compass.rb is reported created
-    Then a config file config/compass.rb is created
-    And a sass file app/stylesheets/screen.scss is created
-    And a sass file app/stylesheets/print.scss is created
-    And a sass file app/stylesheets/ie.scss is created
-
   Scenario: Compiling an existing project.
     Given I am using the existing project in test/fixtures/stylesheets/compass
     When I run: compass compile

data/features/extensions.feature

@@ -12,16 +12,6 @@ Feature: Extensions
     When I run: compass frameworks
     Then the list of frameworks includes "testing"
 
-  @listframeworks
-  Scenario: Extensions directory for rails projects
-    Given ruby supports fork
-    And I'm in a newly created rails project: extension_test_rails_project
-    And I run: compass init rails
-    And the "vendor/plugins/compass_extensions" directory exists
-    And and I have a fake extension at vendor/plugins/compass_extensions/testing
-    When I run: compass frameworks
-    Then the list of frameworks includes "testing"
-
   @listframeworks
   Scenario: Shared extensions directory
     Given the "~/.compass/extensions" directory exists

data/features/step_definitions/command_line_steps.rb

@@ -6,7 +6,6 @@ require 'compass/exec'
 include Compass::TestCaseHelper
 include Compass::CommandLineHelper
 include Compass::IoHelper
-include Compass::RailsHelper
 
 Before do
   Compass.reset_configuration!
@@ -41,17 +40,6 @@ Given %r{^I am in the parent directory$} do
   Dir.chdir ".."
 end
 
-Given %r{^I'm in a newly created rails project: (.+)$} do |project_name|
-  dir = File.join(Dir.pwd, project_name)
-  @cleanup_directories << dir
-  begin
-    generate_rails_app project_name, Dir.pwd
-    Dir.chdir dir
-  rescue LoadError
-    pending "Missing Ruby-on-rails gems: sudo gem install rails"
-  end
-end
-
 Given /^I should clean up the directory: (\w+)$/ do |directory|
   @cleanup_directories << directory
 end

data/frameworks/compass/stylesheets/compass/css3/_background-clip.scss

@@ -35,8 +35,8 @@ $default-background-clip: padding-box !default;
   @include experimental(background-clip, $clip,
     not -moz,
     not -webkit,
-    -o,
-    -ms,
+    not -o,
+    not -ms,
     -khtml,
     official
   );

data/frameworks/compass/stylesheets/compass/css3/_font-face.scss

@@ -30,7 +30,7 @@
   $weight: false,
   $style: false
 ) {
-  $iefont: unquote("#{$eot}?iefix");
+  $iefont: unquote("#{$eot}?#iefix");
   @font-face {
     font-family: quote($name);
     @if $eot {

data/lib/compass/app_integration.rb

@@ -1,24 +1,39 @@
-%w(stand_alone rails merb).each do |lib|
-  require "compass/app_integration/#{lib}"
-end
+require "compass/app_integration/stand_alone"
 
 module Compass
   module AppIntegration
     module Helpers
-      def lookup(project_type)
-        eval "Compass::AppIntegration::#{camelize(project_type)}"
-      rescue NameError
-        raise Compass::Error, "No application integration exists for #{project_type}"
+      #attr_accessor :project_types
+      DEAFULT_PROJECT_TYPES = {
+        :stand_alone => "Compass::AppIntegration::StandAlone"
+      }
+
+      def init
+        @project_types ||= DEAFULT_PROJECT_TYPES.dup
+      end
+
+      def project_types
+        @project_types
       end
 
-      protected
+      def default?
+        @project_types.keys === DEAFULT_PROJECT_TYPES.keys
+      end
+
+      def lookup(type)
+        unless @project_types[type].nil?
+          eval @project_types[type]
+        else
+          raise Compass::Error, "No application integration exists for #{type}"
+        end
+      end
 
-      # Stolen from ActiveSupport
-      def camelize(s)
-        s.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+      def register(type, klass)
+        @project_types[type] = klass
       end
 
     end
     extend Helpers
+    init
   end
 end

data/lib/compass/commands/project_structure.rb

@@ -0,0 +1,93 @@
+require 'compass/commands/project_base'
+require 'compass/commands/update_project'
+
+module Compass
+  module Commands
+    module StructureOptionsParser
+      def set_options(opts)
+        opts.banner = %Q{
+          Usage: compass structure [path/to/project] [options]
+
+          Description:
+            Display the import structure of your stylesheets.
+
+          Options:
+        }.strip.split("\n").map{|l| l.gsub(/^ {0,10}/,'')}.join("\n")
+
+        super
+      end
+    end
+    class ProjectStats < UpdateProject
+
+      register :structure
+
+      def initialize(working_path, options)
+        super
+        assert_project_directory_exists!
+      end
+
+      def perform
+        @compiler = new_compiler_instance
+        (options[:sass_files] || sorted_sass_files).each do |sass_file|
+          print_tree(Compass.projectize(sass_file))
+        end
+      end
+
+      def print_tree(file, depth = 0, importer = @compiler.importer)
+        puts ((depth > 0 ? "|  " : "   ") * depth) + "+- " + Compass.deprojectize(file)
+        @compiler.staleness_checker.send(:compute_dependencies, file, importer).each do |(dep, dep_importer)|
+          print_tree(dep, depth + 1, dep_importer)# unless Compass.deprojectize(dep)[0...1] == "/"
+        end
+      end
+
+      def sorted_sass_files
+        sass_files = @compiler.sass_files
+        sass_files.map! do |s| 
+          filename = Compass.deprojectize(s, File.join(Compass.configuration.project_path, Compass.configuration.sass_dir))
+          [s, File.dirname(filename), File.basename(filename)]
+        end
+        sass_files = sass_files.sort_by do |s,d,f|
+          File.join(d, f[0] == ?_ ? f[1..-1] : f)
+        end
+        sass_files.map!{|s,d,f| s}
+      end
+
+      class << self
+
+        def option_parser(arguments)
+          parser = Compass::Exec::CommandOptionParser.new(arguments)
+          parser.extend(Compass::Exec::GlobalOptionsParser)
+          parser.extend(Compass::Exec::ProjectOptionsParser)
+          parser.extend(StructureOptionsParser)
+        end
+
+        def usage
+          option_parser([]).to_s
+        end
+
+        def description(command)
+          "Report statistics about your stylesheets"
+        end
+
+        def primary; false; end
+
+        def parse!(arguments)
+          parser = option_parser(arguments)
+          parser.parse!
+          parse_arguments!(parser, arguments)
+          parser.options
+        end
+
+        def parse_arguments!(parser, arguments)
+          if arguments.size > 0
+            parser.options[:project_name] = arguments.shift if File.directory?(arguments.first)
+            parser.options[:sass_files] = arguments
+          end
+        end
+
+      end
+
+    end
+  end
+end
+

data/lib/compass/commands/update_project.rb

@@ -67,7 +67,6 @@ module Compass
           if options.include?(:debug_info) && options[:debug_info]
             compiler_opts[:sass][:debug_info] = options.delete(:debug_info)
           end
-          puts compiler_opts.inspect
           compiler_opts
         end
 

data/lib/compass/commands/watch_project.rb

@@ -81,6 +81,7 @@ module Compass
         action = FSSM::Backends::Default.to_s == "FSSM::Backends::Polling" ? "polling" : "watching"
 
         puts ">>> Compass is #{action} for changes. Press Ctrl-C to Stop."
+        $stdout.flush
 
         begin
         FSSM.monitor do |monitor|
@@ -100,14 +101,17 @@ module Compass
               path.glob glob
               path.update do |base, relative|
                 puts ">>> Change detected to: #{relative}"
+                $stdout.flush
                 callback.call(base, relative)
               end
               path.create do |base, relative|
                 puts ">>> New file detected: #{relative}"
+                $stdout.flush
                 callback.call(base, relative)
               end
               path.delete do |base, relative|
                 puts ">>> File Removed: #{relative}"
+                $stdout.flush
                 callback.call(base, relative)
               end
             end
@@ -138,7 +142,8 @@ module Compass
         compiler = new_compiler_instance(:quiet => true, :loud => [:identical, :overwrite, :create])
         if file = compiler.out_of_date?
           begin
-            puts ">>> Change detected to: #{relative || compiler.relative_stylesheet_name(file)}"
+            puts ">>> Change detected at "+Time.now.strftime("%T")+" to: #{relative || compiler.relative_stylesheet_name(file)}"
+            $stdout.flush
             compiler.run
             GC.start
           rescue StandardError => e

data/lib/compass/compiler.rb

@@ -12,6 +12,7 @@ module Compass
       sass_opts = options.delete(:sass) || {}
       self.options = options
       self.sass_options = options.dup
+      self.sass_options.delete(:quiet)
       self.sass_options.update(sass_opts)
       self.sass_options[:cache_location] ||= determine_cache_location
       self.sass_options[:importer] = self.importer = Sass::Importers::Filesystem.new(from)
@@ -36,7 +37,7 @@ module Compass
 
     def stylesheet_name(sass_file)
       if sass_file.index(from) == 0
-        sass_file[(from.length + 1)..-6]
+        sass_file[(from.length + 1)..-6].sub(/\.css$/,'')
       else
         raise Compass::Error, "You must compile individual stylesheets from the project directory."
       end

data/lib/compass/configuration.rb

@@ -25,7 +25,6 @@ module Compass
       attributes_for_directory(:fonts),
       attributes_for_directory(:extensions, nil),
       # Compilation options
-      :sprite_load_path,
       :output_style,
       :environment,
       :relative_assets,
@@ -44,6 +43,12 @@ module Compass
       :chunky_png_options
     ].flatten
 
+    ARRAY_ATTRIBUTES = [
+      :sprite_load_path,
+      :required_libraries,
+      :loaded_frameworks,
+      :framework_path
+    ]
     # Registers a new configuration property.
     # Extensions can use this to add new configuration options to compass.
     #

data/lib/compass/configuration/data.rb

@@ -57,10 +57,11 @@ module Compass
       chained_method :run_stylesheet_error
 
       inherited_accessor *ATTRIBUTES
-      inherited_accessor :required_libraries, :loaded_frameworks, :framework_path #XXX we should make these arrays add up cumulatively.
 
       strip_trailing_separator *ATTRIBUTES.select{|a| a.to_s =~ /dir|path/}
 
+      inherited_array *ARRAY_ATTRIBUTES
+
       def initialize(name, attr_hash = nil)
         raise "I need a name!" unless name
         @name = name
@@ -91,7 +92,9 @@ module Compass
       # The block will be passed the root-relative url of the asset.
       # When called without a block, returns the block that was previously set.
       def asset_host(&block)
+        @set_attributes ||= {}
         if block_given?
+          @set_attributes[:asset_host] = true
           @asset_host = block
         else
           if @asset_host
@@ -116,16 +119,19 @@ module Compass
       #
       #     asset_cache_buster :none
       def asset_cache_buster(simple = nil, &block)
+        @set_attributes ||= {}
         if block_given?
+          @set_attributes[:asset_cache_buster] = true
           @asset_cache_buster = block
         elsif !simple.nil?
           if simple == :none
+            @set_attributes[:asset_cache_buster] = true
             @asset_cache_buster = Proc.new {|_,_| nil}
           else
             raise ArgumentError, "Unexpected argument: #{simple.inspect}"
           end
         else
-          if @asset_cache_buster
+          if set?(:asset_cache_buster)
             @asset_cache_buster
           elsif inherited_data.respond_to?(:asset_cache_buster)
             inherited_data.asset_cache_buster
@@ -173,7 +179,7 @@ module Compass
       private
 
       def assert_valid_keys!(attr_hash)
-        illegal_attrs = attr_hash.keys - ATTRIBUTES
+        illegal_attrs = attr_hash.keys - ATTRIBUTES - ARRAY_ATTRIBUTES
         if illegal_attrs.size == 1
           raise Error, "#{illegal_attrs.first.inspect} is not a valid configuration attribute."
         elsif illegal_attrs.size > 0

data/lib/compass/configuration/helpers.rb

@@ -84,13 +84,6 @@ module Compass
         end
       end
 
-      def configure_rails!(app)
-        return unless app.config.respond_to?(:sass)
-        app.config.compass.to_sass_engine_options.each do |key, value|
-          app.config.sass.send(:"#{key}=", value)
-        end
-      end
-
       def sass_engine_options
         configuration.to_sass_engine_options
       end
@@ -99,18 +92,9 @@ module Compass
       def add_project_configuration(*args)
         options = args.last.is_a?(Hash) ? args.pop : {}
         configuration_file_path = args.shift || detect_configuration_file
-        
-        # TODO make this better i don't think it belongs here but it gets the job done
-        # This will allow compass to boot rails and load the config if its configured in the application.rb file via railtie
-        # if File.exists?(projectize('config/boot.rb')) && configuration_file_path.nil?
-        #   require 'rails'
-        #   require projectize('config/application.rb')
-        #   options[:project_type] = :rails
-        # end
-
-        
+
         raise ArgumentError, "Too many arguments" if args.any?
-        if data = configuration_for(configuration_file_path, nil, configuration_for(options[:defaults]))
+        if AppIntegration.default? && data = configuration_for(configuration_file_path, nil, configuration_for(options[:defaults]))
           if data.raw_project_type
             add_configuration(data.raw_project_type.to_sym)
           elsif options[:project_type]
@@ -118,10 +102,12 @@ module Compass
           else
             add_configuration(:stand_alone)
           end
-
-          add_configuration(data)
+          
+          
+          add_configuration(data)  
+          
         else
-          add_configuration(options[:project_type] || configuration.project_type_without_default || (yield if block_given?) || :stand_alone)
+          add_configuration(options[:project_type] || configuration.project_type_without_default || (yield if block_given?) || :stand_alone)  
         end
       end
 

data/lib/compass/configuration/inheritance.rb

@@ -61,6 +61,101 @@ module Compass
           inherited_writer(*attributes)
         end
 
+        class ArrayProxy
+          def initialize(data, attr)
+            @data, @attr = data, attr
+          end
+          def to_ary
+            @data.send(:"read_inherited_#{@attr}_array")
+          end
+          def to_a
+            to_ary
+          end
+          def <<(v)
+            @data.send(:"add_to_#{@attr}", v)
+          end
+          def >>(v)
+            @data.send(:"remove_from_#{@attr}", v)
+          end
+          def serialize_to_config(prop)
+            if v = @data.raw(prop)
+              "#{prop} = #{v.inspect}"
+            else
+              s = ""
+              if added = @data.instance_variable_get("@added_to_#{@attr}")
+                added.each do |a|
+                  s << "#{prop} << #{a.inspect}\n"
+                end
+              end
+              if removed = @data.instance_variable_get("@removed_from_#{@attr}")
+                removed.each do |r|
+                  s << "#{prop} >> #{r.inspect}\n"
+                end
+              end
+              if s[-1..-1] == "\n"
+                s[0..-2]
+              else
+                s
+              end
+            end
+          end
+          def method_missing(m, *args, &block)
+            a = to_ary
+            if a.respond_to?(m)
+              a.send(m,*args, &block)
+            else
+              super
+            end
+          end
+        end
+
+        def inherited_array(*attributes)
+          inherited_reader(*attributes)
+          inherited_writer(*attributes)
+          attributes.each do |attr|
+            line = __LINE__ + 1
+            class_eval %Q{
+              def #{attr}                                          # def sprite_load_paths
+                ArrayProxy.new(self, #{attr.inspect})              #   ArrayProxy.new(self, :sprite_load_paths)
+              end                                                  # end
+              def #{attr}=(value)                                  # def sprite_load_paths=(value)
+                @set_attributes ||= {}                             #   @set_attributes ||= {}
+                @set_attributes[#{attr.inspect}] = true            #   @set_attributes[:sprite_load_paths] = true
+                @#{attr} = Array(value)                            #   @sprite_load_paths = Array(value)
+                @added_to_#{attr} = []                             #   @added_to_sprite_load_paths = []
+                @removed_from_#{attr} = []                         #   @removed_from_sprite_load_paths = []
+              end                                                  # end
+              def read_inherited_#{attr}_array                     # def read_inherited_sprite_load_paths_array
+                if #{attr}_set?                                    #  if sprite_load_paths_set?
+                  @#{attr}                                         #    Array(@#{attr})
+                else                                               #  else
+                  value = if inherited_data                        #    value = Array(read(:sprite_load_paths))
+                    Array(inherited_data.#{attr})
+                  else
+                    Array(read(#{attr.inspect}))
+                  end
+                  value -= Array(@removed_from_#{attr})            #    value -= Array(@removed_from_sprite_load_paths)
+                  Array(@added_to_#{attr}) + value                 #    Array(@added_to_sprite_load_paths) + value
+                end                                                #  end
+              end                                                  # end
+              def add_to_#{attr}(v)                                # def add_to_sprite_load_paths(v)
+                if #{attr}_set?                                    #   if sprite_load_paths_set?
+                  raw_#{attr} << v                                 #     raw_sprite_load_paths << v
+                else                                               #   else
+                  (@added_to_#{attr} ||= []) << v                  #     (@added_to_sprite_load_paths ||= []) << v
+                end                                                #   end
+              end                                                  # end
+              def remove_from_#{attr}(v)                           # def remove_from_sprite_load_paths(v)
+                if #{attr}_set?                                    #   if sprite_load_paths_set?
+                  raw_#{attr}.reject!{|e| e == v}                  #     raw_sprite_load_path.reject!{|e| e == v}s
+                else                                               #   else
+                  (@removed_from_#{attr} ||= []) << v              #     (@removed_from_sprite_load_paths ||= []) << v
+                end                                                #   end
+              end                                                  # end
+            }, __FILE__, line
+          end
+        end
+
         def chained_method(method)
           line = __LINE__ + 1
           class_eval %Q{
@@ -146,6 +241,12 @@ module Compass
           end
         end
 
+        # Reads the raw value that was set on this object.
+        # you generally should call raw_<attribute>() instead.
+        def raw(attribute)
+          instance_variable_get("@#{attribute}")
+        end
+
         # Read a value that is either inherited or set on this instance, if we get to the bottom-most configuration instance,
         # we ask for the default starting at the top level.
         def read(attribute)