haml 3.1.0 → 3.1.1

data/VERSION

@@ -1 +1 @@
-3.1.0
+3.1.1

data/vendor/sass/Rakefile

@@ -11,7 +11,7 @@ task :default => :test
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
-  t.libs << 'lib'
+  t.libs << 'test'
   test_files = FileList[scope('test/**/*_test.rb')]
   test_files.exclude(scope('test/rails/*'))
   test_files.exclude(scope('test/plugins/*'))
@@ -25,8 +25,12 @@ end
 # before we load the gemspec.
 desc "Build all the packages."
 task :package => [:revision_file, :submodules, :permissions] do
+  version = get_version
+  File.open(scope('VERSION'), 'w') {|f| f.puts(version)}
   load scope('sass.gemspec')
   Gem::Builder.new(SASS_GEMSPEC).build
+  sh %{git checkout VERSION}
+
   pkg = "#{SASS_GEMSPEC.name}-#{SASS_GEMSPEC.version}"
   mkdir_p "pkg"
   verbose(true) {mv "#{pkg}.gem", "pkg/#{pkg}.gem"}
@@ -65,7 +69,7 @@ at_exit { File.delete(scope('REVISION')) rescue nil }
 desc "Install Sass as a gem. Use SUDO=1 to install with sudo."
 task :install => [:package] do
   gem  = RUBY_PLATFORM =~ /java/  ? 'jgem' : 'gem' 
-  sh %{#{'sudo ' if ENV["SUDO"]}#{gem} install --no-ri pkg/sass-#{File.read(scope('VERSION')).strip}}
+  sh %{#{'sudo ' if ENV["SUDO"]}#{gem} install --no-ri pkg/sass-#{get_version}}
 end
 
 desc "Release a new Sass package to Rubyforge."
@@ -123,57 +127,29 @@ task :release_edge do
   ensure_git_cleanup do
     puts "#{'=' * 50} Running rake release_edge"
 
-    sh %{git checkout edge-gem}
-    sh %{git reset --hard origin/edge-gem}
-    sh %{git merge origin/master}
-
-    unless edge_version = bump_edge_version
-      puts "master is already a prerelease version, no use building an edge gem"
-      next
-    end
-
-    File.open(scope('EDGE_GEM_VERSION'), 'w') {|f| f.puts(edge_version)}
-    sh %{git commit -m "Bump edge gem version to #{edge_version}." EDGE_GEM_VERSION}
-    sh %{git push origin edge-gem}
-
-    # Package the edge gem with the proper version
-    File.open(scope('VERSION'), 'w') {|f| f.puts(edge_version)}
+    sh %{git checkout master}
+    sh %{git reset --hard origin/master}
     sh %{rake package}
-    sh %{git checkout VERSION}
-
-    sh %{rubyforge add_release sass sass "Bleeding Edge (v#{edge_version})" pkg/sass-#{edge_version}.gem}
-    sh %{gem push pkg/sass-#{edge_version}.gem}
+    version = get_version
+    sh %{rubyforge add_release sass sass "Bleeding Edge (v#{version})" pkg/sass-#{version}.gem}
+    sh %{gem push pkg/sass-#{version}.gem}
   end
 end
 
-# Reads the master version and the edge gem version,
-# bump the latter, and return it.
-#
-# Returns nil if the current master version is already a non-alpha prerelease.
-def bump_edge_version
+# Get the version string. If this is being installed from Git,
+# this includes the proper prerelease version.
+def get_version
+  written_version = File.read(scope('VERSION').strip)
+  return written_version unless File.exist?(scope('.git'))
+
   # Get the current master branch version
-  version = File.read(scope('VERSION')).strip.split('.')
+  version = written_version.split('.')
   version.map! {|n| n =~ /^[0-9]+$/ ? n.to_i : n}
-  unless version.size == 5 # prerelease
-    raise "master version #{version.join('.')} is not a prerelease version" 
-  end
-
-  # Bump the edge gem version
-  edge_version = File.read(scope('EDGE_GEM_VERSION')).strip.split('.')
-  edge_version.map! {|n| n =~ /^[0-9]+$/ ? n.to_i : n}
-
-  if version[3] != "alpha"
-    return
-  elsif edge_version[0..2] != version[0..2]
-    # A new master branch version was released, reset the edge gem version
-    edge_version[0..2] = version[0..2]
-    edge_version[4] = 1
-  else
-    # Just bump the teeny version
-    edge_version[4] += 1
-  end
+  return written_version unless version.size == 5 && version[3] == "alpha" # prerelease
 
-  edge_version.join('.')
+  return written_version if (commit_count = `git log --pretty=oneline --first-parent stable.. | wc -l`).empty?
+  version[4] = commit_count.strip
+  version.join('.')
 end
 
 task :watch_for_update do

data/vendor/sass/VERSION

@@ -1 +1 @@
-3.1.0.alpha.0
+3.1.0

data/vendor/sass/VERSION_NAME

@@ -1 +1 @@
-Bleeding Edge
+Brainy Betty

data/vendor/sass/bin/scss

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+# The command line Sass parser.
+
+require File.dirname(__FILE__) + '/../lib/sass'
+require 'sass/exec'
+
+opts = Sass::Exec::Scss.new(ARGV)
+opts.parse!

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

@@ -3,15 +3,58 @@
 * Table of contents
 {:toc}
 
-## 3.2.0 (Unreleased)
+## 3.1.0 (Unreleased)
 
 * Add an {Sass::Script::Functions#invert `invert` function} that takes the inverse of colors.
 
+* A new sass function called `if` can be used to emit one of two values
+  based on the truth value of the first argument.
+  For example, `if(true, 1px, 2px)` returns `1px` and `if(false, 1px, 2px)` returns `2px`.
+
+* Compass users can now use the `--compass` flag
+  to make the Compass libraries available for import.
+  This will also load the Compass project configuration
+  if run from the project root.
+
 * 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.
 
+* `@import` may now be used within CSS or `@media` rules.
+  The imported file will be treated as though it were nested within the rule.
+  Files with mixins may not be imported in nested contexts.
+
+* If a comment starts with `!`, that comment will now be interpolated
+  (`#{...}` will be replaced with the resulting value of the expression
+  inside) and the comment will always be printed out in the generated CSS
+  file -- even with compressed output. This is useful for adding copyright
+  notices to your stylesheets.
+
+* A new executable named `scss` is now available. It is exactly like the
+  `sass` executable except it defaults to assuming input is in the SCSS syntax.
+  Both programs will use the source file's extension to determine the syntax where
+  possible.
+
+### Sass-based Functions
+
+While it has always been possible to add functions to Sass with Ruby, this release adds the ability to define new functions within Sass files directly.
+For example:
+
+    $grid-width: 40px;
+    $gutter-width: 10px;
+    
+    @function grid-width($n) {
+      @return $n * $grid-width + ($n - 1) * $gutter-width;
+    }
+    
+    #sidebar { width: grid-width(5); }
+
+Becomes:
+
+    #sidebar {
+      width: 240px; }
+
 ### Keyword Arguments
 
 Both mixins and Sass functions now support the ability to pass in keyword arguments.
@@ -41,6 +84,44 @@ 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.
 
+#### New Keyword Functions
+
+The new keyword argument functionality enables new Sass color functions
+that use keywords to encompass a large amount of functionality in one function.
+
+* The {Sass::Script::Functions#adjust_color adjust-color} function works like the old
+  `lighten`, `saturate`, and `adjust-hue` methods.
+  It increases and/or decreases the values of a color's properties by fixed amounts.
+  For example, `adjust-color($color, $lightness: 10%)` is the same as `lighten($color, 10%)`:
+  it returns `$color` with its lightness increased by 10%.
+
+* The {Sass::Script::Functions#scale_color scale_color} function
+  is similar to {Sass::Script::Functions#adjust adjust},
+  but instead of increasing and/or decreasing a color's properties by fixed amounts,
+  it scales them fluidly by percentages.
+  The closer the percentage is to 100% (or -100%),
+  the closer the new property value will be to its maximum (or minimum).
+  For example, `scale-color(hsl(120, 70, 80), $lightness: 50%)`
+  will change the lightness from 80% to 90%,
+  because 90% is halfway between 80% and 100%.
+  Similarly, `scale-color(hsl(120, 70, 50), $lightness: 50%)`
+  will change the lightness from 50% to 75%.
+
+* The {Sass::Script::Functions#change_color change-color} function simply changes a color's properties
+  regardless of their old values.
+  For example `change-color($color, $lightness: 10%)` returns `$color` with 10% lightness,
+  and `change-color($color, $alpha: 0.7)` returns color with opacity 0.7.
+
+Each keyword function accepts `$hue`, `$saturation`, `$value`,
+`$red`, `$green`, `$blue`, and `$alpha` keywords,
+with the exception of `scale-color()` which doesn't accept `$hue`.
+These keywords modify the respective properties of the given color.
+
+Each keyword function can modify multiple properties at once.
+For example, `adjust-color($color, $lightness: 15%, $saturation: -10%)`
+both lightens and desaturates `$color`.
+HSL properties cannot be modified at the same time as RGB properties, though.
+
 ### Lists
 
 Lists are now a first-class data type in Sass,
@@ -152,6 +233,19 @@ is compiled to:
       }
     }
 
+### Nested `@import`
+
+The `@import` statement can now be nested within other structures
+such as CSS rules and `@media` rules. For example:
+
+    @media print {
+      @import "print";
+    }
+
+This imports `print.scss` and places all rules so imported within the `@media print` block.
+This makes it easier to create stylesheets for specific media or sections of the document
+and distributing those stylesheets across multiple files.
+
 ### Backwards Incompatibilities -- Must Read!
 
 * When `@import` is given a path without `.sass`, `.scss`, or `.css` extension,
@@ -163,7 +257,32 @@ is compiled to:
   This flag hasn't been necessary since Rails 2.0.
   Existing Rails 2.0 installations will continue to work.
 
-## 3.0.25 (Unreleased)
+* Removed deprecated support for ! prefixed variables. Use $ to prefix variables now.
+
+* Removed the deprecated css2sass executable. Use sass-convert now.
+
+* Removed support for the equals operator in variable assignment. Use : now.
+
+* Removed the sass2 mode from sass-convert. Users who have to migrate from sass2
+  should install Sass 3.0 and quiet all deprecation warnings before installing Sass 3.1.
+
+### Sass Internals
+
+* It is now possible to define a custom importer that can be used to find imports using different import semantics than the default filesystem importer that Sass provides. For instance, you can use this to generate imports on the fly, look them up from a database, or implement different file naming conventions. See the {Sass::Importers::Base Importer Base class} for more information.
+
+* It is now possible to define a custom cache store to allow for efficient caching of Sass files using alternative cache stores like memcached in environments where a writable filesystem is not available or where the cache need to be shared across many servers for dynamically generated stylesheet environments. See the {Sass::CacheStores::Base CacheStore Base class} for more information.
+
+## 3.0.26 (Unreleased)
+
+* Fix a performance bug in large SCSS stylesheets with many nested selectors.
+  This should dramatically decrease compilation time of such stylesheets.
+
+* Upgrade the bundled FSSM to version 0.2.3.
+  This means `sass --watch` will work out of the box with Rubinius.
+
+## 3.0.25
+
+[Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.25).
 
 * When displaying a Sass error in an imported stylesheet,
   use the imported stylesheet's contents rather than the top-level stylesheet.
@@ -173,6 +292,8 @@ is compiled to:
 * Fix a bug where boolean operators (`and`, `or`, and `not`) wouldn't work at the end of a line
   in a multiline SassScript expression.
 
+* When using `sass --update`, only update individual files when they've changed.
+
 ## 3.0.24
 
 [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.24).
@@ -182,11 +303,6 @@ is compiled to:
 * 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).
@@ -1385,7 +1501,7 @@ This is also available via the `--debug-info` command-line flag.
 
 [Tagged on GitHub](http://github.com/nex3/haml/commit/2.2.21).
 
-* Fix a few bugs in the git-revision-reporting in {Haml::Version#version}.
+* Fix a few bugs in the git-revision-reporting in {Sass::Version#version}.
   In particular, it will still work if `git gc` has been called recently,
   or if various files are missing.
 
@@ -1506,7 +1622,7 @@ There were no changes made to Sass between versions 2.2.18 and 2.2.19.
 These changes only affect people defining their own Sass functions
 using {Sass::Script::Functions}.
 
-* {Sass::Script::Color#value} attribute is deprecated.
+* Sass::Script::Color#value attribute is deprecated.
   Use {Sass::Script::Color#rgb} instead.
   The returned array is now frozen as well.
 

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

@@ -150,7 +150,7 @@ in `environment.rb` in Rails or `config.ru` in Rack...
 
 ...or by passing an options hash to {Sass::Engine#initialize}.
 All relevant options are also available via flags
-to the `sass` command-line executable.
+to the `sass` and `scss` command-line executables.
 Available options are:
 
 {#style-option} `:style`
@@ -191,7 +191,7 @@ Available options are:
 : 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::CacheStores::Filesytem} that is
+  Defaults to a {Sass::CacheStores::Filesystem} that is
   initialized using the [`:cache_location` option](#cache_location-option).
 
 {#never_update-option} `:never_update`
@@ -309,14 +309,18 @@ Available options are:
 : An option that's available for individual applications to set
   to make data available to {Sass::Script::Functions custom Sass functions}.
 
-{#sass2-option} `:sass2`
-: Parses the document using semantics closer to that of Sass v2.
-  Currently, this just means that strings in mixin arguments
-  are treated as though they were in [an `=` context](#sass-script-strings).
-
 {#quiet-option} `:quiet`
 : When set to true, causes warnings to be disabled.
 
+### Syntax Selection
+
+The Sass command-line tool will use the file extension to determine which
+syntax you are using, but there's not always a filename. The `sass`
+command-line program defaults to the indented syntax but you can pass the
+`--scss` option to it if the input should be interpreted as SCSS syntax.
+Alternatively, you can use the `scss` command-line program which is exactly
+like the `sass` program but it defaults to assuming the syntax is SCSS.
+
 ### Encodings
 
 When running on Ruby 1.9 and later, Sass is aware of the character encoding of documents
@@ -541,6 +545,9 @@ is compiled to:
     a {
       color: green; }
 
+When the first letter of a comment is `!`, the comment will be interpolated
+and always rendered into css output even in compressed output modes. This is useful for adding Copyright notices to your generated CSS.
+
 ## SassScript {#sassscript}
 
 In addition to the plain CSS property syntax,
@@ -677,7 +684,12 @@ 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.
+Lists can also have no items in them at all.
+These lists are represented as `()`.
+They can't be output directly to CSS;
+if you try to do e.g. `font-family: ()`, Sass will raise an error.
+If a list contains empty lists, as in `1px 2px () 3px`,
+the empty list will be removed before it's turned into CSS.
 
 ### Operations
 
@@ -1081,6 +1093,38 @@ and you can do
 
 and `_colors.scss` would be imported.
 
+#### Nested `@import` {#nested-import}
+
+Although most of the time it's most useful to just have `@import`s
+at the top level of the document,
+it is possible to include them within CSS rules and `@media` rules.
+Like a base-level `@import`, this includes the contents of the `@import`ed file.
+However, the imported rules will be nested in the same place as the original `@import`.
+
+For example, if `example.scss` contains
+
+    .example {
+      color: red;
+    }
+
+then
+
+    #main {
+      @import "example";
+    }
+
+would compile to
+
+    #main .example {
+      color: red;
+    }
+
+Directives that are only allowed at the base level of a document,
+like `@mixin` or `@charset`, are not allowed in files that are `@import`ed
+in a nested context.
+
+It's not possible to nest `@import` within mixins or control directives.
+
 ### `@media` {#media}
 
 `@media` directives in Sass behave just like they do in plain CSS,
@@ -1760,6 +1804,38 @@ providing many arguments without becoming difficult to call.
 Named arguments can be passed in any order, and arguments with default values can be omitted.
 Since the named arguments are variable names, underscores and dashes can be used interchangeably.
 
+## Function Directives {#functions}
+
+It is possible to define your own functions in sass and use them in any
+value or script context. For example:
+
+    $grid-width: 40px;
+    $gutter-width: 10px;
+    
+    @function grid-width($n) {
+      @return $n * $grid-width + ($n - 1) * $gutter-width;
+    }
+    
+    #sidebar { width: grid-width(5); }
+
+Becomes:
+
+    #sidebar {
+      width: 240px; }
+
+As you can see functions can access any globally defined variables as well as
+accept arguments just like a mixin. A function may have several statements
+contained within it, and you must call `@return` to set the return value of
+the function.
+
+As with mixins, you can call Sass-defined functions using keyword arguments.
+In the above example we could have called the function like this:
+
+    #sidebar { width: grid-width($n: 5); }
+
+It is recommended that you prefix your functions to avoid naming conflicts
+and so that readers of your stylesheets know they are not part of Sass or CSS. For example, if you work for ACME Corp, you might have named the function above `-acme-grid-width`.
+
 ## Output Style
 
 Although the default CSS style that Sass outputs is very nice