sass 3.3.0.alpha.8 → 3.3.0.alpha.9

data/README.md

@@ -173,10 +173,11 @@ See `sass-convert --help` for further information and options.
 
 ## Authors
 
-Sass was envisioned by [Hampton Catlin](http://hamptoncatlin.com) (hcatlin).
-However, Hampton doesn't even know his way around the code anymore and now
-occasionally consults on the language issues. Hampton lives in Cambridge, UK and
-is the owner of [Catlin Software](http://www.catlinsoftware.com/).
+Sass was envisioned by [Hampton Catlin](http://www.hamptoncatlin.com)
+(@hcatlin). However, Hampton doesn't even know his way around the code anymore
+and now occasionally consults on the language issues. Hampton lives in San
+Francisco, California and works as VP of Technology
+at [Moovweb](http://www.moovweb.com/).
 
 [Nathan Weizenbaum](http://nex-3.com) is the primary developer and architect of
 Sass. His hard work has kept the project alive by endlessly answering forum

data/REVISION

@@ -1 +1 @@
-a47f79a8dcc0166c1b528858c23e8ec5b25f8a39
+86b12c98ecd0fa693a80ffb679dbb14fdfe30ce3

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.8
+3.3.0.alpha.9

data/VERSION_DATE

@@ -1 +1 @@
-01 November 2012 22:46:46 GMT
+03 November 2012 01:08:14 GMT

data/lib/sass/exec.rb

@@ -125,6 +125,7 @@ module Sass
       def puts_action(name, color, arg)
         return if @options[:for_engine][:quiet]
         printf color(color, "%11s %s\n"), name, arg
+        STDOUT.flush
       end
 
       # Same as \{Kernel.puts}, but doesn't print anything if the `--quiet` option is set.

data/lib/sass/script/functions.rb

@@ -1235,8 +1235,8 @@ module Sass::Script
     # arguments.
     #
     # @example
-    #   max(1px, 4px) => 1px
-    #   max(5em, 3em, 4em) => 3em
+    #   max(1px, 4px) => 4px
+    #   max(5em, 3em, 4em) => 5em
     # @return [Number] The maximum value
     # @raise [ArgumentError] if any argument isn't a number, or if not all of
     #   the arguments have comparable units

data/lib/sass/scss/parser.rb

@@ -332,7 +332,7 @@ module Sass
       def use_css_import?; false; end
 
       def media_directive
-        block(node(Sass::Tree::MediaNode.new(media_query_list.to_a)), :directive)
+        block(node(Sass::Tree::MediaNode.new(expr!(:media_query_list).to_a)), :directive)
       end
 
       # http://www.w3.org/TR/css3-mediaqueries/#syntax
@@ -1024,6 +1024,7 @@ MESSAGE
 
       EXPR_NAMES = {
         :media_query => "media query (e.g. print, screen, print and screen)",
+        :media_query_list => "media query (e.g. print, screen, print and screen)",
         :media_expr => "media expression (e.g. (min-device-width: 800px))",
         :pseudo_arg => "expression (e.g. fr, 2n+1)",
         :interp_ident => "identifier",

data/test/sass/scss/css_test.rb

@@ -1042,6 +1042,18 @@ body {
 SCSS
   end
 
+  def test_malformed_media
+    render <<SCSS
+@media {
+  margin: 0;
+}
+SCSS
+    assert(false, "Expected syntax error")
+  rescue Sass::SyntaxError => e
+    assert_equal 'Invalid CSS after "@media ": expected media query (e.g. print, screen, print and screen), was "{"', e.message
+    assert_equal 1, e.sass_line
+  end
+
   private
 
   def assert_selector_parses(selector)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302877
+  hash: 592302879
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - alpha
-  - 8
-  version: 3.3.0.alpha.8
+  - 9
+  version: 3.3.0.alpha.9
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-01 00:00:00 -04:00
+date: 2012-11-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency