haml 3.1.0.alpha.33 → 3.1.0.alpha.36

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.0.alpha.33
+3.1.0.alpha.36

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.33
+3.1.0.alpha.36

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

@@ -9,6 +9,9 @@
 
 * Many performance optimizations have been made by [thedarkone](http://github.com/thedarkone).
 
+* Allow selectors to contain extra commas to make them easier to modify.
+  Extra commas will be removed when the selectors are converted to CSS.
+
 ### Keyword Arguments
 
 Both mixins and Sass functions now support the ability to pass in keyword arguments.
@@ -25,7 +28,7 @@ For example, with mixins:
 And with functions:
 
     p {
-      color: hsl($hue: 180, $saturation: 78%, lightness: 57%);
+      color: hsl($hue: 180, $saturation: 78%, $lightness: 57%);
     }
 
 Keyword arguments are of the form `$name: value` and come after normal arguments.
@@ -38,6 +41,117 @@ The argument names for the built-in functions are listed
 Sass functions defined in Ruby can use the {Sass::Script::Functions.declare} method
 to declare the names of the arguments they take.
 
+### Lists
+
+Lists are now a first-class data type in Sass,
+alongside strings, numbers, colors, and booleans.
+They can be assigned to variables, passed to mixins,
+and used in CSS declarations.
+Just like the other data types (except booleans),
+Sass lists look just like their CSS counterparts.
+They can be separated either by spaces (e.g. `1px 2px 0 10px`)
+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 {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`.
+  Note that lists in Sass start at 1, not at 0 like they do in some other languages.
+
+* The {Sass::Script::Functions#join `join($list1, $list2)` function}
+  joins together two lists into one.
+  For example, `join(1px 2px, 10px 5px)` returns `1px 2px 10px 5px`.
+
+* The {Sass::Script::Functions#append `append($list, $val)` function}
+  appends values to the end of a list.
+  For example, `append(1px 2px, 10px)` returns `1px 2px 10px`.
+
+* The {Sass::Script::Functions#join `length($list)` function}
+  returns the length of a list.
+  For example, `length(1px 2px 10px 5px)` returns `4`.
+
+For more details about lists see {file:SASS_REFERENCE.md#lists the reference}.
+
+#### `@each`
+
+There's also a new directive that makes use of lists.
+The {file:SASS_REFERENCE.md#each-directive `@each` directive} assigns a variable to each item in a list in turn,
+like `@for` does for numbers.
+This is useful for writing a bunch of similar styles
+without having to go to the trouble of creating a mixin.
+For example:
+
+    @each $animal in puma, sea-slug, egret, salamander {
+      .#{$animal}-icon {
+        background-image: url('/images/#{$animal}.png');
+      }
+    }
+
+is compiled to:
+
+    .puma-icon {
+      background-image: url('/images/puma.png'); }
+    .sea-slug-icon {
+      background-image: url('/images/sea-slug.png'); }
+    .egret-icon {
+      background-image: url('/images/egret.png'); }
+    .salamander-icon {
+      background-image: url('/images/salamander.png'); }
+
+### `@media` Bubbling
+
+Modern stylesheets often use `@media` rules to target styles
+at certain sorts of devices, screen resolutions, or even orientations.
+They're also useful for print and aural styling.
+Unfortunately, it's annoying and repetitive to break the flow of a stylesheet
+and add a `@media` rule containing selectors you've already written
+just to tweak the style a little.
+
+Thus, Sass 3.1 now allows you to nest `@media` rules within selectors.
+It will automatically bubble them up to the top level,
+putting all the selectors on the way inside the rule.
+For example:
+
+    .sidebar {
+      width: 300px;
+      @media screen and (orientation: landscape) {
+        width: 500px;
+      }
+    }
+
+is compiled to:
+
+    .sidebar {
+      width: 300px;
+    }
+    @media screen and (orientation: landscape) {
+      .sidebar {
+        width: 500px;
+      }
+    }
+
+You can also nest `@media` directives within one another.
+The queries will then be combined using the `and` operator.
+For example:
+
+    @media screen {
+      .sidebar {
+        @media (orientation: landscape) {
+          width: 500px;
+        }
+      }
+    }
+
+is compiled to:
+
+    @media screen and (orientation: landscape) {
+      .sidebar {
+        width: 500px;
+      }
+    }
+
 ### Backwards Incompatibilities -- Must Read!
 
 * When `@import` is given a path without `.sass`, `.scss`, or `.css` extension,
@@ -49,10 +163,71 @@ to declare the names of the arguments they take.
   This flag hasn't been necessary since Rails 2.0.
   Existing Rails 2.0 installations will continue to work.
 
-## 3.0.23 (Unreleased)
+## 3.0.25 (Unreleased)
+
+* When displaying a Sass error in an imported stylesheet,
+  use the imported stylesheet's contents rather than the top-level stylesheet.
+
+* Fix a bug that caused some lines with non-ASCII characters to be ignored in Ruby 1.8.
+
+* Fix a bug where boolean operators (`and`, `or`, and `not`) wouldn't work at the end of a line
+  in a multiline SassScript expression.
+
+## 3.0.24
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.24).
+
+* Raise an error when `@else` appears without an `@if` in SCSS.
+
+* Fix some cases where `@if` rules were causing the line numbers in error reports
+  to become incorrect.
+
+* IronRuby compatibility. This is sort of a hack: IronRuby reports its version as 1.9,
+  but it doesn't support the encoding APIs, so we treat it as 1.8 instead.
+
+* The `--quiet` option now silences informational output from `--update` and `--watch`.
+
+## 3.0.23
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.23).
 
 * Fix the error message for unloadable modules when running the executables under Ruby 1.9.2.
 
+### `@charset` Change
+
+The behavior of `@charset` has changed in version 3.0.23
+in order to work around a bug in Safari,
+where `@charset` declarations placed anywhere other than the beginning of the document
+cause some CSS rules to be ignored.
+This change also makes `@charset`s in imported files behave in a more useful way.
+
+#### Ruby 1.9
+
+When using Ruby 1.9, which keeps track of the character encoding of the Sass document internally,
+`@charset` directive in the Sass stylesheet and any stylesheets it imports
+are no longer directly output to the generated CSS.
+They're still used for determining the encoding of the input and output stylesheets,
+but they aren't rendered in the same way other directives are.
+
+Instead, Sass adds a single `@charset` directive at the beginning of the output stylesheet
+if necessary, whether or not the input stylesheet had a `@charset` directive.
+It will add this directive if and only if the output stylesheet contains non-ASCII characters.
+By default, the declared charset will be UTF-8,
+but if the Sass stylesheet declares a different charset then that will be used instead if possible.
+
+One important consequence of this scheme is that it's possible for a Sass file
+to import partials with different encodings (e.g. one encoded as UTF-8 and one as IBM866).
+The output will then be UTF-8, unless the importing stylesheet
+declares a different charset.
+
+#### Ruby 1.8
+
+Ruby 1.8 doesn't have good support for encodings, so it uses a simpler but less accurate
+scheme for figuring out what `@charset` declaration to use for the output stylesheet.
+It just takes the first `@charset` declaration to appear in the stylesheet
+or any of its imports and moves it to the beginning of the document.
+This means that under Ruby 1.8 it's *not* safe to import files with different encodings.
+
 ## 3.0.22
 
 [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.22).

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

@@ -188,10 +188,10 @@ Available options are:
   don't write to it if it doesn't.
 
 {#cache_store-option} `:cache_store`
-: If this is set to an instance of a subclass of {Sass::CacheStore},
+: If this is set to an instance of a subclass of {Sass::CacheStores::Base},
   that cache store will be used to store and retrieve
   cached compilation results.
-  Defaults to a {Sass::FileCacheStore} that is
+  Defaults to a {Sass::CacheStores::Filesytem} that is
   initialized using the [`:cache_location` option](#cache_location-option).
 
 {#never_update-option} `:never_update`
@@ -343,6 +343,23 @@ Note that Sass does not support the obscure `UTF-32-2143`,
 since Ruby does not have support for them
 and they're highly unlikely to ever be used in practice.
 
+#### Output Encoding
+
+In general, Sass will try to encode the output stylesheet
+using the same encoding as the input stylesheet.
+In order for it to do this, though, the input stylesheet must have a `@charset` declaration;
+otherwise, Sass will default to encoding the output stylesheet as UTF-8.
+In addition, it will add a `@charset` declaration to the output
+if it's not plain ASCII.
+
+When other stylesheets with `@charset` declarations are `@import`ed,
+Sass will convert them to the same encoding as the main stylesheet.
+
+Note that Ruby 1.8 does not have good support for character encodings,
+and so Sass behaves somewhat differently when running under it than under Ruby 1.9 and later.
+In Ruby 1.8, Sass simply uses the first `@charset` declaration in the stylesheet
+or any of the other stylesheets it `@import`s.
+
 ## CSS Extensions
 
 ### Nested Rules
@@ -589,6 +606,7 @@ SassScript supports four main data types:
 * strings of text, with and without quotes (e.g. `"foo"`, `'bar'`, `baz`)
 * colors (e.g. `blue`, `#04a3f9`, `rgba(255, 0, 0, 0.5)`)
 * booleans (e.g. `true`, `false`)
+* lists of values, separated by spaces or commas (e.g. `1.5em 1em 0 2em`, `Helvetica, Arial, sans-serif`)
 
 SassScript also supports all other types of CSS property value,
 such as Unicode ranges and `!important` declarations.
@@ -625,6 +643,42 @@ It's also worth noting that when using the [deprecated `=` property syntax](#sas
 all strings are interpreted as unquoted,
 regardless of whether or not they're written with quotes.
 
+#### Lists
+
+Lists are how Sass represents the values of CSS declarations
+like `margin: 10px 15px 0 0` or `font-face: Helvetica, Arial, sans-serif`.
+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 {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,
+and the {Sass::Script::Functions#append append function} can add items to lists.
+The [`@each` rule](#each-directive) can also add styles for each item in a list.
+
+In addition to containing simple values, lists can contain other lists.
+For example, `1px 2px, 5px 6px` is a two-item list
+containing the list `1px 2px` and the list `5px 6px`.
+If the inner lists have the same separator as the outer list,
+you'll need to use parentheses to make it clear
+where the inner lists start and stop.
+For example, `(1px 2px) (5px 6px)` is also a two-item list
+containing the list `1px 2px` and the list `5px 6px`.
+The difference is that the outer list is space-separated,
+where before it was comma-separated.
+
+When lists are turned into plain CSS, Sass doesn't add any parentheses,
+since CSS doesn't understand them.
+That means that `(1px 2px) (5px 6px)` and `1px 2px 5px 6px`
+will look the same when they become CSS.
+However, they aren't the same when they're Sass:
+the first is a list containing two lists,
+while the second is a list containing four numbers.
+
+It's not possible to have a list with zero elements in Sass.
+
 ### Operations
 
 All types support equality operations (`==` and `!=`).
@@ -833,6 +887,12 @@ is compiled to:
 SassScript supports `and`, `or`, and `not` operators
 for boolean values.
 
+#### List Operations
+
+Lists don't support any special operations.
+Instead, they're manipulated using the
+{file:Sass/Script/Functions.html#list-functions list functions}.
+
 ### Parentheses
 
 Parentheses can be used to affect the order of operations:
@@ -1021,6 +1081,56 @@ and you can do
 
 and `_colors.scss` would be imported.
 
+### `@media` {#media}
+
+`@media` directives in Sass behave just like they do in plain CSS,
+with one extra capability: they can be nested in CSS rules.
+If a `@media` directive appears within a CSS rule,
+it will be bubbled up to the top level of the stylesheet,
+putting all the selectors on the way inside the rule.
+This makes it easy to add media-specific styles
+without having to repeat selectors
+or break the flow of the stylesheet.
+For example:
+
+    .sidebar {
+      width: 300px;
+      @media screen and (orientation: landscape) {
+        width: 500px;
+      }
+    }
+
+is compiled to:
+
+    .sidebar {
+      width: 300px;
+    }
+    @media screen and (orientation: landscape) {
+      .sidebar {
+        width: 500px;
+      }
+    }
+
+`@media` queries can also be nested within one another.
+The queries will then be combined using the `and` operator.
+For example:
+
+    @media screen {
+      .sidebar {
+        @media (orientation: landscape) {
+          width: 500px;
+        }
+      }
+    }
+
+is compiled to:
+
+    @media screen and (orientation: landscape) {
+      .sidebar {
+        width: 500px;
+      }
+    }
+
 ### `@extend` {#extend}
 
 There are often cases when designing a page
@@ -1416,6 +1526,33 @@ is compiled to:
     .item-3 {
       width: 6em; }
 
+### `@each` {#each-directive}
+
+The `@each` rule has the form `@each $var in <list>`.
+`$var` can be any variable name, like `$length` or `$name`,
+and `<list>` is a SassScript expression that returns a list.
+
+The `@each` rule sets `$var` to each item in the list,
+then outputs the styles it contains using that value of `$var`.
+For example:
+
+    @each $animal in puma, sea-slug, egret, salamander {
+      .#{$animal}-icon {
+        background-image: url('/images/#{$animal}.png');
+      }
+    }
+
+is compiled to:
+
+    .puma-icon {
+      background-image: url('/images/puma.png'); }
+    .sea-slug-icon {
+      background-image: url('/images/sea-slug.png'); }
+    .egret-icon {
+      background-image: url('/images/egret.png'); }
+    .salamander-icon {
+      background-image: url('/images/salamander.png'); }
+
 ### `@while`
 
 The `@while` directive takes a SassScript expression
@@ -1725,7 +1862,7 @@ on the filesystem indicated by [`:cache_location`](#cache_location-option). If y
 cannot write to the filesystem or need to share cache across ruby processes or machines,
 then you can define your own cache store and set the[`:cache_store`
 option](#cache_store-option). For details on creating your own cache store, please
-see the {Sass::CacheStore source documentation}.
+see the {Sass::CacheStores::Base source documentation}.
 
 ### Custom Importers
 

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

@@ -0,0 +1,14 @@
+require 'stringio'
+
+module Sass
+  # Sass cache stores are in charge of storing cached information,
+  # especially parse trees for Sass documents.
+  #
+  # User-created importers must inherit from {CacheStores::Base}.
+  module CacheStores
+  end
+end
+
+require 'sass/cache_stores/base'
+require 'sass/cache_stores/filesystem'
+require 'sass/cache_stores/memory'

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

@@ -0,0 +1,28 @@
+module Sass
+  module CacheStores
+    # A cache store that wraps an ActiveSupport cache store.
+    # This is useful for integrating with an app that uses ActiveSupport,
+    # or for taking advantage of the wide variety of ActiveSupport cache backends.
+    #
+    # This is automatically used within Rails.
+    class ActiveSupport < Base
+      # @param store [::ActiveSupport::Cache::Store] The cache store to wrap.
+      def initialize(store)
+        @store = store
+      end
+
+      # @see Base#_retrieve
+      def _retrieve(key, version, sha)
+        return unless val = @store.fetch('_sass/' + key)
+        return unless val[:version] == version
+        return unless val[:sha] == sha
+        return val[:contents]
+      end
+
+      # @see Base#_store
+      def _store(key, version, sha, contents)
+        @store.write('_sass/' + key, :version => version, :sha => sha, :contents => contents)
+      end
+    end
+  end
+end