RubyGems - sass - Versions diffs - 3.5.0.pre.rc.1 → 3.5.0 - Mend

sass 3.5.0.pre.rc.1 → 3.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (104) hide show

checksums.yaml +4 -4
data/.yardopts +1 -1
data/README.md +1 -1
data/Rakefile +40 -11
data/VERSION +1 -1
data/VERSION_DATE +1 -1
data/extra/sass-spec-ref.sh +32 -0
data/lib/sass.rb +3 -3
data/lib/sass/css.rb +1 -1
data/lib/sass/deprecation.rb +55 -0
data/lib/sass/engine.rb +16 -12
data/lib/sass/environment.rb +1 -1
data/lib/sass/error.rb +3 -3
data/lib/sass/exec/base.rb +1 -1
data/lib/sass/plugin.rb +1 -1
data/lib/sass/plugin/compiler.rb +1 -1
data/lib/sass/plugin/configuration.rb +2 -2
data/lib/sass/plugin/rack.rb +3 -3
data/lib/sass/plugin/staleness_checker.rb +3 -3
data/lib/sass/script.rb +3 -3
data/lib/sass/script/functions.rb +23 -22
data/lib/sass/script/lexer.rb +17 -8
data/lib/sass/script/parser.rb +8 -7
data/lib/sass/script/tree/node.rb +2 -2
data/lib/sass/script/tree/operation.rb +43 -16
data/lib/sass/script/value/base.rb +3 -3
data/lib/sass/script/value/color.rb +15 -10
data/lib/sass/script/value/helpers.rb +13 -2
data/lib/sass/script/value/list.rb +2 -2
data/lib/sass/script/value/number.rb +4 -4
data/lib/sass/script/value/string.rb +5 -12
data/lib/sass/scss/parser.rb +7 -4
data/lib/sass/scss/rx.rb +1 -1
data/lib/sass/scss/static_parser.rb +12 -24
data/lib/sass/selector/abstract_sequence.rb +12 -11
data/lib/sass/selector/comma_sequence.rb +18 -3
data/lib/sass/selector/pseudo.rb +15 -2
data/lib/sass/selector/sequence.rb +9 -7
data/lib/sass/selector/simple.rb +5 -4
data/lib/sass/selector/simple_sequence.rb +7 -3
data/lib/sass/shared.rb +5 -3
data/lib/sass/source/map.rb +2 -2
data/lib/sass/source/position.rb +4 -4
data/lib/sass/tree/comment_node.rb +1 -1
data/lib/sass/tree/node.rb +3 -3
data/lib/sass/tree/prop_node.rb +1 -1
data/lib/sass/tree/rule_node.rb +15 -6
data/lib/sass/tree/visitors/cssize.rb +3 -5
data/lib/sass/tree/visitors/deep_copy.rb +1 -1
data/lib/sass/tree/visitors/extend.rb +2 -8
data/lib/sass/tree/visitors/perform.rb +3 -2
data/lib/sass/tree/visitors/to_css.rb +3 -3
data/lib/sass/util.rb +32 -5
data/lib/sass/version.rb +2 -4
data/test/sass/cache_test.rb +0 -1
data/test/sass/callbacks_test.rb +0 -1
data/test/sass/compiler_test.rb +0 -1
data/test/sass/conversion_test.rb +3 -4
data/test/sass/css2sass_test.rb +1 -2
data/test/sass/css_variable_test.rb +0 -1
data/test/sass/encoding_test.rb +0 -1
data/test/sass/engine_test.rb +63 -60
data/test/sass/exec_test.rb +0 -1
data/test/sass/extend_test.rb +40 -81
data/test/sass/functions_test.rb +8 -6
data/test/sass/importer_test.rb +0 -1
data/test/sass/logger_test.rb +0 -1
data/test/sass/more_templates/more1.sass +10 -10
data/test/sass/more_templates/more_import.sass +2 -2
data/test/sass/plugin_test.rb +3 -4
data/test/sass/results/script.css +1 -1
data/test/sass/results/units.css +2 -2
data/test/sass/script_conversion_test.rb +1 -2
data/test/sass/script_test.rb +55 -47
data/test/sass/scss/css_test.rb +2 -3
data/test/sass/scss/rx_test.rb +0 -1
data/test/sass/scss/scss_test.rb +26 -12
data/test/sass/source_map_test.rb +13 -14
data/test/sass/superselector_test.rb +0 -1
data/test/sass/templates/_partial.sass +1 -1
data/test/sass/templates/basic.sass +10 -10
data/test/sass/templates/bork1.sass +1 -1
data/test/sass/templates/bork5.sass +1 -1
data/test/sass/templates/compact.sass +10 -10
data/test/sass/templates/complex.sass +187 -187
data/test/sass/templates/compressed.sass +10 -10
data/test/sass/templates/expanded.sass +10 -10
data/test/sass/templates/import.sass +2 -2
data/test/sass/templates/importee.sass +3 -3
data/test/sass/templates/mixins.sass +22 -22
data/test/sass/templates/multiline.sass +4 -4
data/test/sass/templates/nested.sass +13 -13
data/test/sass/templates/parent_ref.sass +12 -12
data/test/sass/templates/script.sass +70 -70
data/test/sass/templates/subdir/nested_subdir/_nested_partial.sass +1 -1
data/test/sass/templates/subdir/nested_subdir/nested_subdir.sass +2 -2
data/test/sass/templates/subdir/subdir.sass +3 -3
data/test/sass/templates/units.sass +10 -10
data/test/sass/util/multibyte_string_scanner_test.rb +10 -3
data/test/sass/util/normalized_map_test.rb +0 -1
data/test/sass/util/subset_map_test.rb +0 -1
data/test/sass/util_test.rb +4 -3
data/test/sass/value_helpers_test.rb +0 -1
metadata +15 -13

data/test/sass/source_map_test.rb CHANGED

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/../test_helper'
 require File.dirname(__FILE__) + '/test_helper'
@@ -37,7 +36,7 @@ JSON
   end
   def test_simple_mapping_sass
-    assert_parses_with_sourcemap <<SASS, <<CSS, <<JSON, :syntax => :sass
+    silence_warnings {assert_parses_with_sourcemap <<SASS, <<CSS, <<JSON, :syntax => :sass}
 a
   foo: bar
   /* SOME COMMENT */
@@ -114,7 +113,7 @@ JSON
   def test_mapping_with_directory_sass
     options = {:filename => "sass/style.sass", :output => "css/style.css", :syntax => :sass}
-    assert_parses_with_sourcemap <<SASS, <<CSS, <<JSON, options
+    silence_warnings {assert_parses_with_sourcemap <<SASS, <<CSS, <<JSON, options}
 a
   foo: bar
   /* SOME COMMENT */
@@ -360,8 +359,7 @@ $translucent-red: rgba(255, 0, 0, 0.5);
     }
   }
   {{22}}&:active {{/22}}{
-    {{23}}color{{/23}}: {{24}}#010203 + #040506{{/24}};
-    {{25}}border{{/25}}: {{26}}$width solid black{{/26}};
+    {{23}}border{{/23}}: {{24}}$width solid black{{/24}};
   }
 {{2}}/* SOME COMMENT */{{/2}}
   {{3}}font{{/3}}: {{4}}2px/3px {{/4}}{
@@ -384,8 +382,7 @@ SCSS
     {{19}}a .special:after{{/19}} {
       {{20}}content{{/20}}: {{21}}"I ate 15 pies 2px thick!"{{/21}}; }
   {{22}}a:active{{/22}} {
-    {{23}}color{{/23}}: {{24}}#050709{{/24}};
-    {{25}}border{{/25}}: {{26}}2px solid black{{/26}}; }
+    {{23}}border{{/23}}: {{24}}2px solid black{{/24}}; }
 /*# sourceMappingURL=test.css.map */
 CSS
@@ -405,8 +402,7 @@ $translucent-red: rgba(255, 0, 0, 0.5)
     {{19}}&:after{{/19}}
       {{20}}content{{/20}}: {{21}}"I ate #{5 + 10} pies #{$width} thick!"{{/21}}
   {{22}}&:active{{/22}}
-    {{23}}color{{/23}}: {{24}}#010203 + #040506{{/24}}
-    {{25}}border{{/25}}: {{26}}$width solid black{{/26}}
+    {{23}}border{{/23}}: {{24}}$width solid black{{/24}}
   {{2}}/* SOME COMMENT */{{/2}}
   {{3}}font{{/3}}: {{4}}2px/3px{{/4}}
@@ -427,8 +423,7 @@ SASS
     {{19}}a .special:after{{/19}} {
       {{20}}content{{/20}}: {{21}}"I ate 15 pies 2px thick!"{{/21}}; }
   {{22}}a:active{{/22}} {
-    {{23}}color{{/23}}: {{24}}#050709{{/24}};
-    {{25}}border{{/25}}: {{26}}2px solid black{{/26}}; }
+    {{23}}border{{/23}}: {{24}}2px solid black{{/24}}; }
 /*# sourceMappingURL=test.css.map */
 CSS
@@ -665,7 +660,7 @@ CSS
   end
 def test_mixin_sourcemap_sass
-  assert_parses_with_mapping <<'SASS', <<'CSS', :syntax => :sass
+  silence_warnings {assert_parses_with_mapping <<'SASS', <<'CSS', :syntax => :sass}
 =large-text
   :font
     {{2}}size{{/2}}: {{3}}20px{{/3}}
@@ -759,7 +754,7 @@ CSS
   # Regression tests
   def test_properties_sass
-    assert_parses_with_mapping <<SASS, <<CSS, :syntax => :sass
+    silence_warnings {assert_parses_with_mapping <<SASS, <<CSS, :syntax => :sass}
 {{1}}.foo{{/1}}
   :{{2}}name{{/2}} {{3}}value{{/3}}
   {{4}}name{{/4}}: {{5}}value{{/5}}
@@ -986,7 +981,11 @@ CSS
   def assert_ranges_equal(expected, actual, lines, prefix)
     assert_positions_equal(expected.start_pos, actual.start_pos, lines, prefix + " start position")
     assert_positions_equal(expected.end_pos, actual.end_pos, lines, prefix + " end position")
-    assert_equal(expected.file, actual.file)
+    if expected.file.nil?
+      assert_nil(actual.file)
+    else
+      assert_equal(expected.file, actual.file)
+    end
   end
   def assert_sourcemaps_equal(source, css, expected, actual)

data/test/sass/superselector_test.rb CHANGED

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../test_helper'
 class SuperselectorTest < MiniTest::Test

data/test/sass/templates/_partial.sass CHANGED

@@ -1,2 +1,2 @@
 #foo
-  :background-color #baf
+  background-color: #baf

data/test/sass/templates/basic.sass CHANGED

@@ -1,23 +1,23 @@
 body
-  :font Arial
-  :background blue
+  font: Arial
+  background: blue
 #page
-  :width 700px
-  :height 100
+  width: 700px
+  height: 100
   #header
-    :height 300px
+    height: 300px
     h1
-      :font-size 50px
-      :color     blue
+      font-size: 50px
+      color:     blue
 #content.user.show
   #container.top
     #column.left
-      :width 100px
+      width: 100px
     #column.right
-      :width 600px
+      width: 600px
   #container.bottom
-    :background brown
+    background: brown

data/test/sass/templates/bork1.sass CHANGED

@@ -1,2 +1,2 @@
 bork
-  :bork $bork
+  bork: $bork

data/test/sass/templates/bork5.sass CHANGED

@@ -1,3 +1,3 @@
 bork
   /* foo */
-  :bork $bork
+  bork: $bork

data/test/sass/templates/compact.sass CHANGED

@@ -1,17 +1,17 @@
 #main
-  :width 15em
-  :color #0000ff
+  width: 15em
+  color: #0000ff
   p
-    :border
-      :style dotted
+    border:
+      style: dotted
       /* Nested comment
         More nested stuff
-      :width 2px
+      width: 2px
   .cool
-    :width 100px
+    width: 100px
 #left
-  :font
-    :size 2em
-    :weight bold
-  :float left
+  font:
+    size: 2em
+    weight: bold
+  float: left

data/test/sass/templates/complex.sass CHANGED

@@ -1,305 +1,305 @@
 body
-  :margin 0
-  :font   0.85em "Lucida Grande", "Trebuchet MS", Verdana, sans-serif
-  :color #fff
-  :background url(/images/global_bg.gif)
+  margin: 0
+  font:   0.85em "Lucida Grande", "Trebuchet MS", Verdana, sans-serif
+  color: #fff
+  background: url(/images/global_bg.gif)
 #page
-  :width      900px
-  :margin     0 auto
-  :background #440008
-  :border-top
-    :width 5px
-    :style solid
-    :color #ff8500
+  width:      900px
+  margin:     0 auto
+  background: #440008
+  border-top:
+    width: 5px
+    style: solid
+    color: #ff8500
 #header
-  :height  75px
-  :padding 0
+  height:  75px
+  padding: 0
   h1
-    :float  left
-    :width  274px
-    :height 75px
-    :margin 0
-    :background
-      :image url(/images/global_logo.gif)
+    float:  left
+    width:  274px
+    height: 75px
+    margin: 0
+    background:
+      image: url(/images/global_logo.gif)
       /* Crazy nested comment
-      :repeat no-repeat
-    :text-indent -9999px
+      repeat: no-repeat
+    text-indent: -9999px
   .status
-    :float   right
-    :padding
-      :top .5em
-      :left .5em
-      :right .5em
-      :bottom 0
+    float:   right
+    padding:
+      top: .5em
+      left: .5em
+      right: .5em
+      bottom: 0
     p
-      :float  left
-      :margin
-        :top 0
-        :right 0.5em
-        :bottom 0
-        :left 0
+      float:  left
+      margin:
+        top: 0
+        right: 0.5em
+        bottom: 0
+        left: 0
     ul
-      :float   left
-      :margin  0
-      :padding 0
+      float:   left
+      margin:  0
+      padding: 0
     li
-      :list-style-type none
-      :display inline
-      :margin 0 5px
+      list-style-type: none
+      display: inline
+      margin: 0 5px
     a:link, a:visited
-      :color #ff8500
-      :text-decoration none
+      color: #ff8500
+      text-decoration: none
     a:hover
-      :text-decoration underline
+      text-decoration: underline
   .search
-    :float  right
-    :clear  right
-    :margin 12px 0 0 0
+    float:  right
+    clear:  right
+    margin: 12px 0 0 0
     form
-      :margin 0
+      margin: 0
     input
-      :margin 0 3px 0 0
-      :padding 2px
-      :border none
+      margin: 0 3px 0 0
+      padding: 2px
+      border: none
 #menu
-  :clear both
-  :text-align right
-  :height 20px
-  :border-bottom 5px solid #006b95
-  :background #00a4e4
+  clear: both
+  text-align: right
+  height: 20px
+  border-bottom: 5px solid #006b95
+  background: #00a4e4
   .contests
     ul
-      :margin 0 5px 0 0
-      :padding 0
+      margin: 0 5px 0 0
+      padding: 0
       li
-        :list-style-type none
-        :margin 0 5px
-        :padding 5px 5px 0 5px
-        :display inline
-        :font-size 1.1em
+        list-style-type: none
+        margin: 0 5px
+        padding: 5px 5px 0 5px
+        display: inline
+        font-size: 1.1em
         // This comment is properly indented
-        :color #fff
-        :background #00a4e4
+        color: #fff
+        background: #00a4e4
     a:link, a:visited
-      :color #fff
-      :text-decoration none
-      :font-weight bold
+      color: #fff
+      text-decoration: none
+      font-weight: bold
     a:hover
-      :text-decoration underline
+      text-decoration: underline
 //General content information
 #content
-  :clear both
+  clear: both
   .container
-    :clear both
+    clear: both
     .column
-      :float left
+      float: left
       .right
-        :float right
+        float: right
   a:link, a:visited
-    :color #93d700
-    :text-decoration none
+    color: #93d700
+    text-decoration: none
   a:hover
-    :text-decoration underline
+    text-decoration: underline
 // A hard tab:
 #content
   p, div
-    :width 40em
+    width: 40em
     li, dt, dd
-      :color #ddffdd
-      :background-color #4792bb
+      color: #ddffdd
+      background-color: #4792bb
   .container.video
     .column.left
-      :width 200px
+      width: 200px
       .box
-        :margin-top 10px
+        margin-top: 10px
         p
-          :margin 0 1em auto 1em
+          margin: 0 1em auto 1em
       .box.participants
         img
-          :float  left
-          :margin 0 1em auto 1em
-          :border 1px solid #6e000d
-            :style solid
+          float:  left
+          margin: 0 1em auto 1em
+          border: 1px solid #6e000d
+            style: solid
         h2
-          :margin 0 0 10px 0
-          :padding 0.5em
+          margin: 0 0 10px 0
+          padding: 0.5em
           /* The background image is a gif!
-          :background #6e000d url(/images/hdr_participant.gif) 2px 2px no-repeat
+          background: #6e000d url(/images/hdr_participant.gif) 2px 2px no-repeat
           /* Okay check this out
             Multiline comments
             Wow dude
             I mean seriously, WOW
-          :text-indent -9999px
+          text-indent: -9999px
           // And also...
             Multiline comments that don't output!
             Snazzy, no?
-          :border
-            :top
-              :width 5px
-              :style solid
-              :color #a20013
-            :right
-              :width 1px
-              :style dotted
+          border:
+            top:
+              width: 5px
+              style: solid
+              color: #a20013
+            right:
+              width: 1px
+              style: dotted
     .column.middle
-      :width 500px
+      width: 500px
     .column.right
-      :width 200px
+      width: 200px
       .box
-        :margin-top 0
+        margin-top: 0
         p
-          :margin 0 1em auto 1em
+          margin: 0 1em auto 1em
     .column
       p
-        :margin-top 0
+        margin-top: 0
 #content.contests
   .container.information
     .column.right
       .box
-        :margin 1em 0
+        margin: 1em 0
       .box.videos
         .thumbnail img
-          :width         200px
-          :height        150px
-          :margin-bottom 5px
+          width:         200px
+          height:        150px
+          margin-bottom: 5px
         a:link, a:visited
-          :color #93d700
-          :text-decoration none
+          color: #93d700
+          text-decoration: none
         a:hover
-          :text-decoration underline
+          text-decoration: underline
       .box.votes
         a
-          :display block
-          :width  200px
-          :height 60px
-          :margin 15px 0
-          :background url(/images/btn_votenow.gif) no-repeat
-          :text-indent -9999px
-          :outline none
-          :border  none
+          display: block
+          width:  200px
+          height: 60px
+          margin: 15px 0
+          background: url(/images/btn_votenow.gif) no-repeat
+          text-indent: -9999px
+          outline: none
+          border:  none
         h2
-          :margin  52px 0 10px 0
-          :padding 0.5em
-          :background #6e000d url(/images/hdr_videostats.gif) 2px 2px no-repeat
-          :text-indent -9999px
-          :border-top 5px solid #a20013
+          margin:  52px 0 10px 0
+          padding: 0.5em
+          background: #6e000d url(/images/hdr_videostats.gif) 2px 2px no-repeat
+          text-indent: -9999px
+          border-top: 5px solid #a20013
 #content.contests
   .container.video
     .box.videos
       h2
-        :margin  0
-        :padding 0.5em
-        :background #6e000d url(/images/hdr_newestclips.gif) 2px 2px no-repeat
-        :text-indent -9999px
-        :border-top 5px solid #a20013
+        margin:  0
+        padding: 0.5em
+        background: #6e000d url(/images/hdr_newestclips.gif) 2px 2px no-repeat
+        text-indent: -9999px
+        border-top: 5px solid #a20013
       table
-        :width 100
+        width: 100
         td
-          :padding 1em
-          :width 25
-          :vertical-align top
+          padding: 1em
+          width: 25
+          vertical-align: top
           p
-            :margin 0 0 5px 0
+            margin: 0 0 5px 0
           a:link, a:visited
-            :color #93d700
-            :text-decoration none
+            color: #93d700
+            text-decoration: none
           a:hover
-            :text-decoration underline
+            text-decoration: underline
       .thumbnail
-        :float left
+        float: left
         img
-          :width  80px
-          :height 60px
-          :margin 0 10px 0 0
-          :border 1px solid #6e000d
+          width:  80px
+          height: 60px
+          margin: 0 10px 0 0
+          border: 1px solid #6e000d
 #content
   .container.comments
     .column
-      :margin-top 15px
+      margin-top: 15px
     .column.left
-      :width 600px
+      width: 600px
       .box
         ol
-          :margin  0
-          :padding 0
+          margin:  0
+          padding: 0
         li
-          :list-style-type none
-          :padding 10px
-          :margin 0 0 1em 0
-          :background #6e000d
-          :border-top 5px solid #a20013
+          list-style-type: none
+          padding: 10px
+          margin: 0 0 1em 0
+          background: #6e000d
+          border-top: 5px solid #a20013
           div
-            :margin-bottom 1em
+            margin-bottom: 1em
           ul
-            :text-align right
+            text-align: right
             li
-              :display inline
-              :border none
-              :padding 0
+              display: inline
+              border: none
+              padding: 0
     .column.right
-      :width        290px
-      :padding-left 10px
+      width:        290px
+      padding-left: 10px
       h2
-        :margin 0
-        :padding 0.5em
-        :background #6e000d url(/images/hdr_addcomment.gif) 2px 2px no-repeat
-        :text-indent -9999px
-        :border-top 5px solid #a20013
+        margin: 0
+        padding: 0.5em
+        background: #6e000d url(/images/hdr_addcomment.gif) 2px 2px no-repeat
+        text-indent: -9999px
+        border-top: 5px solid #a20013
       .box
         textarea
-          :width  290px
-          :height 100px
-          :border none
+          width:  290px
+          height: 100px
+          border: none
 #footer
-  :margin-top 10px
-  :padding    1.2em 1.5em
-  :background #ff8500
+  margin-top: 10px
+  padding:    1.2em 1.5em
+  background: #ff8500
   ul
-    :margin 0
-    :padding 0
-    :list-style-type none
+    margin: 0
+    padding: 0
+    list-style-type: none
     li
-      :display inline
-      :margin  0 0.5em
-      :color   #440008
+      display: inline
+      margin:  0 0.5em
+      color:   #440008
   ul.links
-    :float left
+    float: left
     a:link, a:visited
-      :color #440008
-      :text-decoration none
+      color: #440008
+      text-decoration: none
     a:hover
-      :text-decoration underline
+      text-decoration: underline
   ul.copyright
-    :float right
+    float: right
 .clear
-  :clear both
+  clear: both
 .centered
-  :text-align center
+  text-align: center
 img
-  :border none
+  border: none
 button.short
-  :width   60px
-  :height  22px
-  :padding 0 0 2px 0
-  :color   #fff
-  :border  none
-  :background url(/images/btn_short.gif) no-repeat
+  width:   60px
+  height:  22px
+  padding: 0 0 2px 0
+  color:   #fff
+  border:  none
+  background: url(/images/btn_short.gif) no-repeat
 table
-  :border-collapse collapse
+  border-collapse: collapse