haml 3.0.0.rc.2 → 3.0.0.rc.3

data/Rakefile

@@ -39,15 +39,19 @@ END
 
 # ----- Packaging -----
 
-require 'rake/gempackagetask'
-load scope('haml.gemspec')
-
-Rake::GemPackageTask.new(HAML_GEMSPEC) do |pkg|
-  if Rake.application.top_level_tasks.include?('release')
-    pkg.need_tar_gz  = true
-    pkg.need_tar_bz2 = true
-    pkg.need_zip     = true
-  end
+# Don't use Rake::GemPackageTast because we want prerequisites to run
+# before we load the gemspec.
+desc "Build all the packages."
+task :package => [:revision_file, :submodules] do
+  load scope('haml.gemspec')
+  Gem::Builder.new(HAML_GEMSPEC).build
+  pkg = "#{HAML_GEMSPEC.name}-#{HAML_GEMSPEC.version}"
+  mkdir_p "pkg"
+  verbose(true) {mv "#{pkg}.gem", "pkg/#{pkg}.gem"}
+
+  sh %{rm -f pkg/#{pkg}.tar.gz}
+  verbose(false) {HAML_GEMSPEC.files.each {|f| sh %{tar rf pkg/#{pkg}.tar #{f}}}}
+  sh %{gzip pkg/#{pkg}.tar}
 end
 
 task :revision_file do
@@ -62,8 +66,6 @@ task :revision_file do
     File.open(scope('REVISION'), 'w') { |f| f.puts "(unknown)" }
   end
 end
-Rake::Task[:package].prerequisites.insert(0, :revision_file)
-Rake::Task[:package].prerequisites.insert(0, :submodules)
 
 # We also need to get rid of this file after packaging.
 at_exit { File.delete(scope('REVISION')) rescue nil }
@@ -81,8 +83,6 @@ task :release => [:check_release, :release_elpa, :package] do
   version = File.read(scope("VERSION")).strip
   sh %{rubyforge add_release haml haml "#{name} (v#{version})" pkg/haml-#{version}.gem}
   sh %{rubyforge add_file    haml haml "#{name} (v#{version})" pkg/haml-#{version}.tar.gz}
-  sh %{rubyforge add_file    haml haml "#{name} (v#{version})" pkg/haml-#{version}.tar.bz2}
-  sh %{rubyforge add_file    haml haml "#{name} (v#{version})" pkg/haml-#{version}.zip}
   sh %{gem push pkg/haml-#{version}.gem}
 end
 

data/VERSION

@@ -1 +1 @@
-3.0.0.rc.2
+3.0.0.rc.3

data/lib/haml/exec.rb

@@ -23,7 +23,8 @@ module Haml
         rescue Exception => e
           raise e if @options[:trace] || e.is_a?(SystemExit)
 
-          $stderr.puts e.message
+          $stderr.puts "#{e.class}: #{e.message}"
+          $stderr.puts "  Use --trace for backtrace."
           exit 1
         end
         exit 0
@@ -559,7 +560,11 @@ END
       rescue LoadError => err
         dep = err.message.scan(/^no such file to load -- (.*)/)[0]
         raise err if @options[:trace] || dep.nil? || dep.empty?
-        $stderr.puts "Required dependency #{dep} not found!\n  Use --trace for backtrace."
+        $stderr.puts <<MESSAGE
+Required dependency #{dep} not found!
+  Run "gem install #{dep}" to get it.
+  Use --trace for backtrace.
+MESSAGE
         exit 1
       end
     end

data/lib/haml/railtie.rb

@@ -3,16 +3,7 @@
 # Yehuda promises there will be soon,
 # and once there is we should switch to that.
 
+# Rails 3.0.0.beta.2+
 if defined?(ActiveSupport) && Haml::Util.has?(:public_method, ActiveSupport, :on_load)
-  # Rails 3.0.0.beta.2+
   ActiveSupport.on_load(:action_view) {Haml.init_rails(binding)}
-elsif defined?(Rails::Railtie)
-  # Rails 3.0.0.beta1
-  module Haml
-    class Railtie < Rails::Railtie
-      ActiveSupport.on_load(:action_view) do
-        Haml.init_rails(binding)
-      end
-    end
-  end
 end

data/lib/haml/template.rb

@@ -19,7 +19,11 @@ module Haml
     #
     # @return [Boolean] Whether the XSS integration was enabled.
     def try_enabling_xss_integration
-      return false unless ActionView::Base.respond_to?(:xss_safe?) && ActionView::Base.xss_safe?
+      return false unless (ActionView::Base.respond_to?(:xss_safe?) && ActionView::Base.xss_safe?) ||
+        # We check for ActiveSupport#on_load here because if we're loading Haml that way, it means:
+        # A) we're in Rails 3 so XSS support is always on, and
+        # B) we might be in Rails 3 beta 3 where the load order is broken and xss_safe? is undefined
+        (defined?(ActiveSupport) && Haml::Util.has?(:public_method, ActiveSupport, :on_load))
 
       Haml::Template.options[:escape_html] = true
 
@@ -55,10 +59,14 @@ else
   require 'haml/template/patch'
 end
 
-# Enable XSS integration. Use Rails' after_initialize method if possible
+# Enable XSS integration. Use Rails' after_initialize method
 # so that integration will be checked after the rails_xss plugin is loaded
 # (for Rails 2.3.* where it's not enabled by default).
-if defined?(Rails.configuration.after_initialize)
+#
+# If we're running under Rails 3, though, we don't want to use after_intialize,
+# since Haml loading has already been deferred via ActiveSupport.on_load.
+if defined?(Rails.configuration.after_initialize) &&
+    !(defined?(ActiveSupport) && Haml::Util.has?(:public_method, ActiveSupport, :on_load))
   Rails.configuration.after_initialize {Haml::Template.try_enabling_xss_integration}
 else
   Haml::Template.try_enabling_xss_integration

data/lib/haml/util.rb

@@ -274,13 +274,7 @@ module Haml
           ActionPack::VERSION::Major
         end
 
-      # 3.0.0.beta1 acts more like ActionPack 2
-      # for purposes of this method
-      # (checking whether block helpers require = or -).
-      # This extra check can be removed when beta2 is out.
-      version >= 3 &&
-        !(defined?(ActionPack::VERSION::TINY) &&
-          ActionPack::VERSION::TINY == "0.beta")
+      version >= 3
     end
 
     # Returns whether this environment is using ActionPack

data/lib/sass/plugin.rb

@@ -291,6 +291,15 @@ module Sass
         raise e
       end
 
+      unless individual_files.empty? && FSSM::Backends::Default.name == "FSSM::Backends::FSEvents"
+        # As of FSSM 0.1.4, it doesn't support FSevents on individual files,
+        # but it also isn't smart enough to switch to polling itself.
+        require 'fssm/backends/polling'
+        Haml::Util.silence_warnings do
+          FSSM::Backends.const_set(:Default, FSSM::Backends::Polling)
+        end
+      end
+
       # TODO: Keep better track of what depends on what
       # so we don't have to run a global update every time anything changes.
       FSSM.monitor do |mon|

data/lib/sass/plugin/merb.rb

@@ -24,27 +24,6 @@ unless defined?(Sass::MERB_LOADED)
 
   Sass::Plugin.options.merge!(config)
 
-  if version[0] > 0 || version[1] >= 9
-
-    class Merb::Rack::Application
-      def call_with_sass(env)
-        Sass::Plugin.check_for_updates
-        call_without_sass(env)
-      end
-      alias_method :call_without_sass, :call
-      alias_method :call, :call_with_sass
-    end
-
-  else
-
-    class MerbHandler
-      def process_with_sass(request, response)
-        Sass::Plugin.check_for_updates
-        process_without_sass(request, response)
-      end
-      alias_method :process_without_sass, :process
-      alias_method :process, :process_with_sass
-    end
-
-  end
+  require 'sass/plugin/rack'
+  Merb::Config[:app].use Sass::Plugin::Rack
 end

data/lib/sass/plugin/rack.rb

@@ -31,7 +31,6 @@ module Sass
       # @param app [#call] The Rack application
       def initialize(app)
         @app = app
-        self.class.disable_native_plugin!
       end
 
       # Process a request, checking the Sass stylesheets for changes
@@ -43,23 +42,6 @@ module Sass
         Sass::Plugin.check_for_updates
         @app.call(env)
       end
-
-      # Disable the native Rails or Merb plugins, if they're enabled.
-      # This is automatically done once the Rack plugin is activated.
-      # This is done so that the stylesheets aren't checked twice for each request.
-      def self.disable_native_plugin!
-        if defined?(Merb::Rack) && defined?(Merb::Rack::Application) &&
-            Haml::Util.has?(:instance_method, Merb::Rack::Application, :call_without_sass)
-          Merb::Rack::Application.instance_eval {alias_method :call, :call_without_sass}
-        end
-
-        if defined?(ActionDispatch::Callbacks) && defined?(ActionDispatch::Callbacks.to_prepare)
-          ActionDispatch::Callbacks.skip_callback(:prepare, :__sass_process)
-        elsif defined?(ActionController::Base) &&
-            Haml::Util.has?(:instance_method, ActionController::Base, :sass_old_process)
-          ActionController::Base.instance_eval {alias_method :process, :sass_old_process}
-        end
-      end
     end
   end
 end

data/lib/sass/plugin/rails.rb

@@ -8,10 +8,10 @@ unless defined?(Sass::RAILS_LOADED)
                               :quiet             => Haml::Util.rails_env != "production",
                               :full_exception    => Haml::Util.rails_env != "production")
 
-  if defined?(Rails.configuration) && defined?(Rails.configuration.middleware)
+  if defined?(ActionController::Metal)
     # Rails >= 3.0
     require 'sass/plugin/rack'
-    Rails.configuration.middleware.use(Sass::Plugin::Rack)
+    ActionController::Metal.use(Sass::Plugin::Rack)
   elsif defined?(ActionController::Dispatcher) &&
       defined?(ActionController::Dispatcher.middleware)
     # Rails >= 2.3

data/lib/sass/script/lexer.rb

@@ -99,7 +99,7 @@ module Sass
       class << self
         private
         def string_re(open, close)
-          /#{open}((?:\\.|\#(?!\{)|[^#{close}\\#])*)(#{close}|(?=#\{))/
+          /#{open}((?:\\.|\#(?!\{)|[^#{close}\\#])*)(#{close}|#\{)/
         end
       end
 
@@ -114,8 +114,8 @@ module Sass
         [:single, false] => string_re("'", "'"),
         [:double, true] => string_re('', '"'),
         [:single, true] => string_re('', "'"),
-        [:uri, false] => /url\(#{W}(#{URLCHAR}*?)(#{W}\)|(?=#\{))/,
-        [:uri, true] => /(#{URLCHAR}*?)(#{W}\)|(?=#\{))/,
+        [:uri, false] => /url\(#{W}(#{URLCHAR}*?)(#{W}\)|#\{)/,
+        [:uri, true] => /(#{URLCHAR}*?)(#{W}\)|#\{)/,
       }
 
       # @param str [String, StringScanner] The source text to lex
@@ -251,10 +251,13 @@ module Sass
 
       def string(re, open)
         return unless scan(STRING_REGULAR_EXPRESSIONS[[re, open]])
-        @interpolation_stack << re if @scanner[2].empty? # Started an interpolated section
+        if @scanner[2] == '#{' #'
+          @scanner.pos -= 2 # Don't actually consume the #{
+          @interpolation_stack << re
+        end
         str =
           if re == :uri
-            Script::String.new("#{'url(' unless open}#{@scanner[1]}#{')' unless @scanner[2].empty?}")
+            Script::String.new("#{'url(' unless open}#{@scanner[1]}#{')' unless @scanner[2] == '#{'}")
           else
             Script::String.new(@scanner[1].gsub(/\\(['"]|\#\{)/, '\1'), :string)
           end

data/lib/sass/scss/parser.rb

@@ -645,7 +645,11 @@ MESSAGE
 
         mid_re = Sass::Script::Lexer::STRING_REGULAR_EXPRESSIONS[[type, true]]
         # @scanner[2].empty? means we've started an interpolated section
-        res << expr!(:interpolation) << tok(mid_re) while @scanner[2].empty?
+        while @scanner[2] == '#{'
+          @scanner.pos -= 2 # Don't consume the #{
+          res.last.slice!(-2..-1)
+          res << expr!(:interpolation) << tok(mid_re)
+        end
         res
       end
 

data/lib/sass/selector/sequence.rb

@@ -76,10 +76,10 @@ module Sass
       #   by extending this selector with `extends`.
       #   These correspond to a {CommaSequence}'s {CommaSequence#members members array}.
       # @see CommaSequence#do_extend
-      def do_extend(extends, supers = [])
+      def do_extend(extends, seen = Set.new)
         paths = Haml::Util.paths(members.map do |sseq_or_op|
             next [[sseq_or_op]] unless sseq_or_op.is_a?(SimpleSequence)
-            extended = sseq_or_op.do_extend(extends, supers)
+            extended = sseq_or_op.do_extend(extends, seen)
             choices = extended.map {|seq| seq.members}
             choices.unshift([sseq_or_op]) unless extended.any? {|seq| seq.superselector?(sseq_or_op)}
             choices
@@ -87,6 +87,16 @@ module Sass
         Haml::Util.flatten(paths.map {|path| weave(path)}, 1).map {|p| Sequence.new(p)}
       end
 
+      # Returns whether or not this selector matches all elements
+      # that the given selector matches (as well as possibly more).
+      #
+      # @example
+      # (.foo).superselector?(.foo.bar) #=> true
+      # (.foo).superselector?(.bar) #=> false
+      # (.bar .foo).superselector?(.foo) #=> false
+      #
+      # @param sseq [SimpleSequence]
+      # @return [Boolean]
       def superselector?(sseq)
         return false unless members.size == 1
         members.last.superselector?(sseq)

data/lib/sass/selector/simple_sequence.rb

@@ -61,7 +61,7 @@ module Sass
       # @return [Array<Sequence>] A list of selectors generated
       #   by extending this selector with `extends`.
       # @see CommaSequence#do_extend
-      def do_extend(extends, supers = [])
+      def do_extend(extends, seen = Set.new)
         extends.get(members.to_set).map do |seq, sels|
           # If A {@extend B} and C {...},
           # seq is A, sels is B, and self is C
@@ -69,13 +69,10 @@ module Sass
           self_without_sel = self.members - sels
           next unless unified = seq.members.last.unify(self_without_sel)
           [sels, seq.members[0...-1] + [unified]]
-        end.compact.map {|sels, seq| [sels, Sequence.new(seq)]}.map do |sels, seq|
-          seqs = seq.do_extend(extends, supers.unshift(sels))
-          supers.shift
-          seqs
+        end.compact.map do |sels, seq|
+          seq = Sequence.new(seq)
+          seen.include?(sels) ? [] : seq.do_extend(extends, seen + [sels])
         end.flatten.uniq
-      rescue SystemStackError
-        handle_extend_loop(supers)
       end
 
       # Unifies this selector with another {SimpleSequence}'s {SimpleSequence#members members array},
@@ -99,6 +96,15 @@ module Sass
         SimpleSequence.new(sseq)
       end
 
+      # Returns whether or not this selector matches all elements
+      # that the given selector matches (as well as possibly more).
+      #
+      # @example
+      # (.foo).superselector?(.foo.bar) #=> true
+      # (.foo).superselector?(.bar) #=> false
+      #
+      # @param sseq [SimpleSequence]
+      # @return [Boolean]
       def superselector?(sseq)
         (base.nil? || base.eql?(sseq.base)) && rest.subset?(sseq.rest)
       end
@@ -131,33 +137,6 @@ module Sass
         other.class == self.class && other.base.eql?(self.base) &&
           Haml::Util.set_eql?(other.rest, self.rest)
       end
-
-      private
-
-      # Raise a {Sass::SyntaxError} describing a loop of `@extend` directives.
-      #
-      # @param supers [Array<Simple>] The stack of selectors that contains the loop,
-      #   ordered from deepest to most shallow.
-      # @raise [Sass::SyntaxError] Describing the loop
-      def handle_extend_loop(supers)
-        supers.inject([]) do |sseqs, sseq|
-          next sseqs.push(sseq) unless sseqs.first.eql?(sseq)
-          conses = Haml::Util.enum_cons(sseqs.push(sseq), 2).to_a
-          _, i = Haml::Util.enum_with_index(conses).max do |((_, sseq1), _), ((_, sseq2), _)|
-            sseq1.first.line <=> sseq2.first.line
-          end
-          loop = (conses[i..-1] + conses[0...i]).map do |sseq1, sseq2|
-            sel1 = SimpleSequence.new(sseq1).inspect
-            sel2 = SimpleSequence.new(sseq2).inspect
-            str = "  #{sel1} extends #{sel2} on line #{sseq2.first.line}"
-            str << " of " << sseq2.first.filename if sseq2.first.filename
-            str
-          end.join(",\n")
-          raise Sass::SyntaxError.new("An @extend loop was found:\n#{loop}")
-        end
-        # Should never get here
-        raise Sass::SyntaxError.new("An @extend loop exists, but the exact loop couldn't be found")
-      end
     end
   end
 end

data/test/sass/extend_test.rb

@@ -1100,6 +1100,61 @@ CSS
 SCSS
   end
 
+  # Loops
+
+  def test_extend_self_loop
+    assert_equal <<CSS, render(<<SCSS)
+.foo {
+  a: b; }
+CSS
+.foo {a: b; @extend .foo}
+SCSS
+  end
+
+  def test_basic_extend_loop
+    assert_equal <<CSS, render(<<SCSS)
+.bar, .foo {
+  a: b; }
+
+.foo, .bar {
+  c: d; }
+CSS
+.foo {a: b; @extend .bar}
+.bar {c: d; @extend .foo}
+SCSS
+  end
+
+  def test_three_level_extend_loop
+    assert_equal <<CSS, render(<<SCSS)
+.baz, .bar, .foo {
+  a: b; }
+
+.foo, .baz, .bar {
+  c: d; }
+
+.bar, .foo, .baz {
+  e: f; }
+CSS
+.foo {a: b; @extend .bar}
+.bar {c: d; @extend .baz}
+.baz {e: f; @extend .foo}
+SCSS
+  end
+
+  def test_nested_extend_loop
+    assert_equal <<CSS, render(<<SCSS)
+.bar, .bar .foo {
+  a: b; }
+  .bar .foo, .bar .foo .foo {
+    c: d; }
+CSS
+.bar {
+  a: b;
+  .foo {c: d; @extend .bar}
+}
+SCSS
+  end
+
   def test_multiple_extender_merges_with_superset_selector
     assert_equal <<CSS, render(<<SCSS)
 a.bar.baz, a.foo {

data/vendor/fssm/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 3
+:patch: 4
 :build: 

data/vendor/fssm/fssm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fssm}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Travis Tilley"]
-  s.date = %q{2010-01-30}
+  s.date = %q{2010-03-10}
   s.description = %q{file system state monitor}
   s.email = %q{ttilley@gmail.com}
   s.extra_rdoc_files = [
@@ -53,12 +53,12 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/ttilley/fssm}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{file system state monitor}
   s.test_files = [
     "spec/path_spec.rb",
-     "spec/root/file.rb",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "spec/root/file.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - rc
-  - 2
-  version: 3.0.0.rc.2
+  - 3
+  version: 3.0.0.rc.3
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-27 00:00:00 -07:00
+date: 2010-04-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,7 +62,6 @@ extra_rdoc_files:
 - VERSION_NAME
 - CONTRIBUTING
 - README.md
-- REMEMBER
 - MIT-LICENSE
 - VERSION
 - REVISION
@@ -340,7 +339,6 @@ files:
 - VERSION_NAME
 - CONTRIBUTING
 - README.md
-- REMEMBER
 - MIT-LICENSE
 - VERSION
 - REVISION

data/REMEMBER

@@ -1,5 +0,0 @@
-Be smart about default namespaces (http://www.w3.org/TR/css3-namespace/#declaration)
-Extending nested selectors?
-
-Less
-  including mixins across imports