haml 3.1.8 → 3.2.0.alpha.2

data/test/haml/html2haml_test.rb

@@ -219,7 +219,7 @@ HTML
   end
 
   def test_style_to_css_filter
-    assert_equal(<<HAML.rstrip, render(<<HTML))
+    assert_equal(<<HAML.rstrip, render_erb(<<HTML))
 :css
   foo {
       bar: baz;

data/test/haml/results/whitespace_handling.xhtml

@@ -1,26 +1,28 @@
 <div id='whitespace_test'>
   <div class='text_area_test_area'>
-  <textarea>Oneline</textarea>
-</div>
-<textarea>BLAH
-</textarea>
+    <textarea>Oneline</textarea>
+  </div>
+  <textarea>BLAH
+  </textarea>
   <div class='text_area_test_area'>
-  <textarea>Two&#x000A;lines</textarea>
-</div>
-<textarea>BLAH
-</textarea>
+    <textarea>Two&#x000A;lines</textarea>
+  </div>
+  <textarea>BLAH
+  </textarea>
   <div class='text_area_test_area'>
-  <textarea>Oneline</textarea>
-</div>
-<textarea>BLAH</textarea>
+    <textarea>Oneline</textarea>
+  </div>
+  <textarea>BLAH</textarea>
   <div class='text_area_test_area'>
-  <textarea>Two&#x000A;lines</textarea>
-</div>
-<textarea>BLAH</textarea>
-  <div id='flattened'><div class='text_area_test_area'>
-  <textarea>Two&#x000A;lines</textarea>
-</div>
-<textarea>BLAH</textarea></div>
+    <textarea>Two&#x000A;lines</textarea>
+  </div>
+  <textarea>BLAH</textarea>
+  <div id='flattened'>
+    <div class='text_area_test_area'>
+      <textarea>Two&#x000A;lines</textarea>
+    </div>
+    <textarea>BLAH</textarea>
+  </div>
 </div>
 <div class='hithere'>
   Foo bar
@@ -28,40 +30,42 @@
   <pre>foo&#x000A;bar</pre>
   <p><pre>foo&#x000A;bar</pre></p>
   <p>
-        foo
-        bar
-      </p>
+    foo
+    bar
+  </p>
 </div>
 <div class='foo'>
   13
-        <textarea>
-      a
-      </textarea>
+    <textarea>
+  a
+  </textarea>
 <textarea>&#x000A;a</textarea>
 </div>
 <div id='whitespace_test'>
   <div class='text_area_test_area'>
-  <textarea>Oneline</textarea>
-</div>
-<textarea>BLAH
-</textarea>
+    <textarea>Oneline</textarea>
+  </div>
+  <textarea>BLAH
+  </textarea>
   <div class='text_area_test_area'>
-  <textarea>Two&#x000A;lines</textarea>
-</div>
-<textarea>BLAH
-</textarea>
+    <textarea>Two&#x000A;lines</textarea>
+  </div>
+  <textarea>BLAH
+  </textarea>
   <div class='text_area_test_area'>
-  <textarea>Oneline</textarea>
-</div>
-<textarea>BLAH</textarea>
+    <textarea>Oneline</textarea>
+  </div>
+  <textarea>BLAH</textarea>
   <div class='text_area_test_area'>
-  <textarea>Two&#x000A;lines</textarea>
-</div>
-<textarea>BLAH</textarea>
-  <div id='flattened'><div class='text_area_test_area'>
-  <textarea>Two&#x000A;lines</textarea>
-</div>
-<textarea>BLAH</textarea></div>
+    <textarea>Two&#x000A;lines</textarea>
+  </div>
+  <textarea>BLAH</textarea>
+  <div id='flattened'>
+    <div class='text_area_test_area'>
+      <textarea>Two&#x000A;lines</textarea>
+    </div>
+    <textarea>BLAH</textarea>
+  </div>
 </div>
 <div class='hithere'>
   Foo bar
@@ -69,9 +73,9 @@
   <pre>foo&#x000A;bar</pre>
   <p><pre>foo&#x000A;bar</pre></p>
   <p>
-            foo
-            bar
-          </p>
+    foo
+    bar
+  </p>
   <pre>                                                 ___&#x000A;                                              ,o88888&#x000A;                                           ,o8888888'&#x000A;                     ,:o:o:oooo.        ,8O88Pd8888"&#x000A;                 ,.::.::o:ooooOoOoO. ,oO8O8Pd888'"&#x000A;               ,.:.::o:ooOoOoOO8O8OOo.8OOPd8O8O"&#x000A;              , ..:.::o:ooOoOOOO8OOOOo.FdO8O8"&#x000A;             , ..:.::o:ooOoOO8O888O8O,COCOO"&#x000A;            , . ..:.::o:ooOoOOOO8OOOOCOCO"&#x000A;             . ..:.::o:ooOoOoOO8O8OCCCC"o&#x000A;                . ..:.::o:ooooOoCoCCC"o:o&#x000A;                . ..:.::o:o:,cooooCo"oo:o:&#x000A;             `   . . ..:.:cocoooo"'o:o:::'&#x000A;             .`   . ..::ccccoc"'o:o:o:::'&#x000A;            :.:.    ,c:cccc"':.:.:.:.:.'&#x000A;          ..:.:"'`::::c:"'..:.:.:.:.:.'  http://www.chris.com/ASCII/&#x000A;        ...:.'.:.::::"'    . . . . .'&#x000A;       .. . ....:."' `   .  . . ''&#x000A;     . . . ...."'&#x000A;     .. . ."'     -hrr-&#x000A;    .&#x000A;&#x000A;&#x000A;                                              It's a planet!&#x000A;%strong This shouldn't be bold!</pre>
   <strong>This should!</strong>
   <textarea>      ___           ___           ___           ___ &#x000A;     /\__\         /\  \         /\__\         /\__\&#x000A;    /:/  /        /::\  \       /::|  |       /:/  /&#x000A;   /:/__/        /:/\:\  \     /:|:|  |      /:/  / &#x000A;  /::\  \ ___   /::\~\:\  \   /:/|:|__|__   /:/  /  &#x000A; /:/\:\  /\__\ /:/\:\ \:\__\ /:/ |::::\__\ /:/__/   &#x000A; \/__\:\/:/  / \/__\:\/:/  / \/__/~~/:/  / \:\  \   &#x000A;      \::/  /       \::/  /        /:/  /   \:\  \  &#x000A;      /:/  /        /:/  /        /:/  /     \:\  \ &#x000A;     /:/  /        /:/  /        /:/  /       \:\__\&#x000A;     \/__/         \/__/         \/__/         \/__/&#x000A;     &#x000A;     Many&#x000A;                   thanks&#x000A;           to&#x000A;                                http://www.network-science.de/ascii/
@@ -82,4 +86,4 @@
 </div>
 <pre>       __     ______        __               ______&#x000A;.----.|  |--.|__    |.----.|  |--..--------.|  __  |&#x000A;|  __||     ||__    ||  __||    < |        ||  __  |&#x000A;|____||__|__||______||____||__|__||__|__|__||______|</pre>
 <pre>foo
-bar</pre>
+bar</pre>

data/test/haml/template_test.rb

@@ -297,22 +297,6 @@ HAML
     end
   end
 
-  if ActionPack::VERSION::MAJOR >= 3
-    # Rails 3's #label helper can take a block.
-    def test_form_builder_label_with_block
-      assert_equal(<<HTML, render(<<HAML, :action_view))
-<form #{rails_form_attr}action="" method="post">#{rails_form_opener}
-  <label for="article_title">Block content
-  </label>
-</form>
-HTML
-#{rails_block_helper_char} form_for #{form_for_calling_convention(:article)}, :url => '' do |f|
-  = f.label :title do
-    Block content
-HAML
-    end
-  end
-
   ## XSS Protection Tests
 
   # In order to enable these, either test against Rails 3.0
@@ -339,14 +323,6 @@ HAML
       assert_equal("Foo &amp; Bar\n", render('Foo #{"&"} Bar', :action_view))
     end
 
-    def test_xss_protection_in_attributes
-      assert_equal("<div data-html='&lt;foo&gt;bar&lt;/foo&gt;'></div>\n", render('%div{ "data-html" => "<foo>bar</foo>" }', :action_view))
-    end
-
-    def test_xss_protection_in_attributes_with_safe_strings
-      assert_equal("<div data-html='<foo>bar</foo>'></div>\n", render('%div{ "data-html" => "<foo>bar</foo>".html_safe }', :action_view))
-    end
-
     def test_xss_protection_with_bang_in_interpolation
       assert_equal("Foo & Bar\n", render('! Foo #{"&"} Bar', :action_view))
     end
@@ -418,15 +394,13 @@ HTML
 HAML
     end
 
-    if defined?(ActionView::Helpers::PrototypeHelper)
-      def test_rjs
-        assert_equal(<<HTML, render(<<HAML, :action_view))
+    def test_rjs
+      assert_equal(<<HTML, render(<<HAML, :action_view))
 window.location.reload();
 HTML
 = update_page do |p|
   - p.reload
 HAML
-      end
     end
 
     def test_cache

data/test/haml/templates/partial_layout.haml

@@ -1,8 +1,5 @@
 %h1 Partial layout used with for block:
-- if Haml::Util.ap_geq?("3.2.0.alpha1")
-  = render :layout => 'layout_for_partial' do
-    %p Some content within a layout
-- elsif Haml::Util.ap_geq_3?
+- if Haml::Util.ap_geq_3?
   = render :layout => 'layout_for_partial.haml' do
     %p Some content within a layout
 - else

data/test/linked_rails.rb

@@ -8,16 +8,16 @@ if File.exists?(linked_rails) && !$:.include?(linked_rails + '/activesupport/lib
   $:.unshift linked_rails + '/railties/lib'
 end
 require 'rubygems'
-require 'action_pack'
 require 'action_controller'
 require 'action_view'
 
-if ActionPack::VERSION::MAJOR >= 3
+begin
   # Necessary for Rails 3
   require 'rails'
-else
-  # Necessary for Rails 2.3.*
+rescue LoadError
+  # Necessary for Rails 2.3.7
   require 'initializer'
+rescue LoadError
 end
 
 if defined?(Rails::Application) # Rails 3

data/vendor/sass/VERSION

@@ -1 +1 @@
-3.1.11
+3.1.0

data/vendor/sass/doc-src/SASS_CHANGELOG.md

@@ -3,120 +3,7 @@
 * Table of contents
 {:toc}
 
-## 3.1.11
-
-* Allow control directives (such as `@if`) to be nested beneath properties.
-* Allow property names to begin with a hyphen followed by interpolation (e.g. `-#{...}`).
-* Fix a parsing error with interpolation in comma-separated lists.
-* Make `--cache-store` with with `--update`.
-* Properly report `ArgumentError`s that occur within user-defined functions.
-* Don't crash on JRuby if the underlying Java doesn't support every Unicode encoding.
-* Add new `updated_stylesheet` callback, which is run after each stylesheet has
-  been successfully compiled. Thanks to [Christian Peters](https://github.com/ChristianPeters).
-* Allow absolute paths to be used in an importer with a different root.
-* Don't destructively modify the options when running `Sass::Plugin.force_update`.
-
-### Deprecations -- Must Read!
-
-* The `updating_stylesheet` is deprecated and will be removed in a
-  future release. Use the new `updated_stylesheet` callback instead.
-
-## 3.1.10
-
-* Fix another aspect of the 3.1.8 regression relating to `+`.
-
-## 3.1.9
-
-* Fix a regression in 3.1.8 that broke the `+` combinator in selectors.
-
-* Deprecate the loud-comment flag when used with silent comments (e.g. `//!`).
-  Using it with multi-line comments (e.g. `/*!`) still works.
-
-## 3.1.8
-
-* Deprecate parent selectors followed immediately by identifiers (e.g. `&foo`).
-  This should never have worked, since it violates the rule
-  of `&` only being usable where an element selector would.
-
-* Add a `--force` option to the `sass` executable which makes `--update`
-  always compile all stylesheets, even if the CSS is newer.
-
-* Disallow semicolons at the end of `@import` directives in the indented syntax.
-
-* Don't error out when being used as a library without requiring `fileutil`.
-
-* Don't crash when Compass-style sprite imports are used with `StalenessChecker`
-  (thanks to [Matthias Bauer](https://github.com/moeffju)).
-
-* The numeric precision of numbers in Sass can now be set using the
-  `--precision` option to the command line. Additionally, the default
-  number of digits of precision in Sass output can now be
-  changed by setting `Sass::Script::Number.precision` to an integer
-  (defaults to 3). Since this value can now be changed, the `PRECISION`
-  constant in `Sass::Script::Number` has been deprecated. In the unlikely
-  event that you were using it in your code, you should now use
-   `Sass::Script::Number.precision_factor` instead.
-
-* Don't crash when running `sass-convert` with selectors with two commas in a row.
-
-* Explicitly require Ruby >= 1.8.7 (thanks [Eric Mason](https://github.com/ericmason)).
-
-* Properly validate the nesting of elements in imported stylesheets.
-
-* Properly compile files in parent directories with `--watch` and `--update`.
-
-* Properly null out options in mixin definitions before caching them. This fixes
-  a caching bug that has been plaguing some Rails 3.1 users.
-
-## 3.1.7
-
-* Don't crash when doing certain operations with `@function`s.
-
-## 3.1.6
-
-* The option `:trace_selectors` can now be used to emit a full trace
-  before each selector. This can be helpful for in-browser debugging of
-  stylesheet imports and mixin includes. This option supersedes the
-  `:line_comments` option and is superseded by the `:debug_info`
-  option.
-
-* Fix a bug where long `@if`/`@else` chains would cause exponential slowdown
-  under some circumstances.
-
-## 3.1.5
-
-* Updated the vendored FSSM version, which will avoid segfaults on OS
-  X Lion when using `--watch`.
-
-## 3.1.4
-
-* Sass no longer unnecessarily caches the sass options hash.
-  This allows objects that cannot be marshaled to be placed into the
-  options hash.
-
-## 3.1.3
-
-* Sass now logs message thru a logger object which can be changed to
-  provide integration with other frameworks' logging infrastructure.
-
-
-## 3.1.2
-
-* Fix some issues that were breaking Sass when running within Rubinius.
-* Fix some issues that were affecting Rails 3.1 integration.
-* New function `zip` allows several lists to be combined into one
-  list of lists. For example:
-  `zip(1px 1px 3px, solid dashed solid, red green blue)` becomes
-  `1px solid red, 1px dashed green, 3px solid blue`
-* New function `index` returns the list index of a value
-  within a list. For example: `index(1px solid red, solid)`
-  returns `2`. When the value is not found `false` is returned.
-
-## 3.1.1
-
-* Make sure `Sass::Plugin` is loaded at the correct time in Rails 3.
-
-## 3.1.0
+## 3.1.0 (Unreleased)
 
 * Add an {Sass::Script::Functions#invert `invert` function} that takes the inverse of colors.
 
@@ -248,7 +135,7 @@ or by commas (e.g. `Helvetica, Arial, sans-serif`).
 In addition, individual values count as single-item lists.
 
 Lists won't behave any differently in Sass 3.1 than they did in 3.0.
-However, you can now do more with them using the new [list functions](Sass/Script/Functions.html#list-functions):
+However, you can now do more with them using the new {file:Sass/Script/Functions.html#list-functions list functions}:
 
 * The {Sass::Script::Functions#nth `nth($list, $n)` function} returns the nth item in a list.
   For example, `nth(1px 2px 10px, 2)` returns the second item, `2px`.

data/vendor/sass/doc-src/SASS_REFERENCE.md

@@ -295,15 +295,7 @@ Available options are:
   and mixins.
   This option may also be called `:line_comments`.
   Automatically disabled when using the `:compressed` output style
-  or the `:debug_info`/`:trace_selectors` options.
-
-{#trace_selectors-option} `:trace_selectors`
-: When set to true, emit a full trace of imports and mixins before
-  each selector. This can be helpful for in-browser debugging of
-  stylesheet imports and mixin includes. This option supersedes
-  the `:line_comments` option and is superseded by the
-  `:debug_info` option. Automatically disabled when using the
-  `:compressed` output style.
+  or the `:debug_info` option.
 
 {#debug_info-option} `:debug_info`
 : When set to true, causes the line number and file
@@ -484,7 +476,7 @@ are all in the `font` namespace.
 In CSS, if you want to set a bunch of properties in the same namespace,
 you have to type it out each time.
 Sass provides a shortcut for this:
-just write the namespace once,
+just write the namespace one,
 then nest each of the sub-properties within it.
 For example:
 
@@ -666,7 +658,7 @@ Lists are just a series of other values, separated by either spaces or commas.
 In fact, individual values count as lists, too: they're just lists with one item.
 
 On their own, lists don't do much,
-but the [Sass list functions](Sass/Script/Functions.html#list-functions)
+but the {file:Sass/Script/Functions.html#list-functions Sass list functions}
 make them useful.
 The {Sass::Script::Functions#nth nth function} can access items in a list,
 the {Sass::Script::Functions#join join function} can join multiple lists together,
@@ -911,7 +903,7 @@ for boolean values.
 
 Lists don't support any special operations.
 Instead, they're manipulated using the
-[list functions](Sass/Script/Functions.html#list-functions).
+{file:Sass/Script/Functions.html#list-functions list functions}.
 
 ### Parentheses
 

data/vendor/sass/lib/sass.rb

@@ -65,7 +65,6 @@ module Sass
   end
 end
 
-require 'sass/logger'
 require 'sass/util'
 
 require 'sass/engine'

data/vendor/sass/lib/sass/cache_stores/base.rb

@@ -49,8 +49,6 @@ module Sass
       # @param obj [Object] The object to cache.
       def store(key, sha, root)
         _store(key, Sass::VERSION, sha, Marshal.dump(root))
-      rescue TypeError, LoadError => e
-        Sass::Util.sass_warn "Warning. Error encountered while saving cache #{path_to(key)}: #{e}"
       end
 
       # Retrieve a {Sass::Tree::RootNode}.
@@ -61,7 +59,7 @@ module Sass
       def retrieve(key, sha)
         contents = _retrieve(key, Sass::VERSION, sha)
         Marshal.load(contents) if contents
-      rescue EOFError, TypeError, ArgumentError, LoadError => e
+      rescue EOFError, TypeError, ArgumentError => e
         Sass::Util.sass_warn "Warning. Error encountered while reading cache #{path_to(key)}: #{e}"
       end
 

data/vendor/sass/lib/sass/cache_stores/filesystem.rb

@@ -1,5 +1,3 @@
-require 'fileutils'
-
 module Sass
   module CacheStores
     # A backend for the Sass cache using the filesystem.

data/vendor/sass/lib/sass/css.rb

@@ -75,7 +75,7 @@ module Sass
     #
     # @return [Tree::Node] The root node of the parsed tree
     def build_tree
-      root = Sass::SCSS::CssParser.new(@template, @options[:filename]).parse
+      root = Sass::SCSS::CssParser.new(@template).parse
       expand_commas      root
       parent_ref_rules   root
       remove_parent_refs root
@@ -106,7 +106,6 @@ module Sass
           next child
         end
         child.rule.first.split(',').map do |rule|
-          next if rule.strip.empty?
           node = Tree::RuleNode.new([rule.strip])
           node.children = child.children
           node