haml-edge 3.1.76 → 3.1.77

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.76
+3.1.77

data/VERSION

@@ -1 +1 @@
-3.1.76
+3.1.77

data/extra/haml-mode.el

@@ -73,7 +73,7 @@ a specific level to which the current line could be indented.")
   `(,(concat haml-tag-beg-re "[><]*[ \t]*$")
     "^[ \t]*[&!]?[-=~].*do[ \t]*\\(|.*|[ \t]*\\)?$"
     ,(concat "^[ \t]*[&!]?[-=~][ \t]*\\("
-             (regexp-opt '("if" "unless" "while" "until" "else"
+             (regexp-opt '("if" "unless" "while" "until" "else" "for"
                            "begin" "elsif" "rescue" "ensure" "when"))
              "\\)")
     "^[ \t]*/\\(\\[.*\\]\\)?[ \t]*$"

data/lib/haml/exec.rb

@@ -280,7 +280,7 @@ END
           input = @options[:input]
           output = @options[:output]
 
-          @options[:syntax] ||= :scss if input.is_a?(File) && input.path =~ /\.scss$/
+          @options[:for_engine][:syntax] ||= :scss if input.is_a?(File) && input.path =~ /\.scss$/
           engine =
             if input.is_a?(File) && !@options[:check_syntax]
               ::Sass::Engine.for_file(input.path, @options[:for_engine])

data/lib/sass/script/functions.rb

@@ -66,6 +66,9 @@ module Sass::Script
   # \{#complement}
   # : Returns the complement of a color.
   #
+  # \{#invert}
+  # : Returns the inverse of a color.
+  #
   # ## Opacity Functions
   #
   # \{#alpha} / \{#opacity}
@@ -655,6 +658,20 @@ module Sass::Script
       adjust_hue color, Number.new(180)
     end
 
+    # Returns the inverse (negative) of a color.
+    # The red, green, and blue values are inverted, while the opacity is left alone.
+    #
+    # @param color [Color]
+    # @return [Color]
+    # @raise [ArgumentError] if `color` isn't a color
+    def invert(color)
+      assert_type color, :Color
+      color.with(
+        :red => (255 - color.red),
+        :green => (255 - color.green),
+        :blue => (255 - color.blue))
+    end
+
     # Removes quotes from a string if the string is quoted,
     # or returns the same string if it's not.
     #

data/lib/sass/script/parser.rb

@@ -246,7 +246,7 @@ RUBY
         return if @stop_at && @stop_at.include?(@lexer.peek.value)
 
         name = @lexer.next
-        if color = Color::HTML4_COLORS[name.value]
+        if color = Color::HTML4_COLORS[name.value.downcase]
           return node(Color.new(color))
         end
         node(Script::String.new(name.value, :identifier))

data/lib/sass/tree/rule_node.rb

@@ -134,7 +134,7 @@ module Sass::Tree
       per_rule_indent, total_indent = [:nested, :expanded].include?(style) ? [rule_indent, ''] : ['', rule_indent]
 
       total_rule = total_indent + resolved_rules.members.
-        map {|seq| seq.to_a.join}.
+        map {|seq| seq.to_a.join.gsub("\n", style == :compressed ? " " : "\n")}.
         join(rule_separator).split("\n").map do |line|
         per_rule_indent + line.strip
       end.join(line_separator)

data/test/sass/functions_test.rb

@@ -469,6 +469,15 @@ class SassFunctionTest < Test::Unit::TestCase
     assert_error_message("\"foo\" is not a color for `complement'", "complement(\"foo\")")
   end
 
+  def test_invert
+    assert_equal("#112233", evaluate("invert(#edc)"))
+    assert_equal("rgba(245, 235, 225, 0.5)", evaluate("invert(rgba(10, 20, 30, 0.5))"))
+  end
+
+  def test_invert_tests_types
+    assert_error_message("\"foo\" is not a color for `invert'", "invert(\"foo\")")
+  end
+
   def test_unquote
     assert_equal('foo', evaluate('unquote("foo")'))
     assert_equal('foo', evaluate('unquote(foo)'))

data/test/sass/script_test.rb

@@ -372,6 +372,12 @@ SASS
       "Colors must have either three or six digits: '#abcdEFA'") {eval("#abcdEFA")}
   end
 
+  def test_case_insensitive_color_names
+    assert_equal "blue", resolve("BLUE")
+    assert_equal "red", resolve("rEd")
+    assert_equal "#7f4000", resolve("mix(GrEeN, ReD)")
+  end
+
   # Regression Tests
 
   def test_funcall_has_higher_precedence_than_color_name

data/test/sass/scss/scss_test.rb

@@ -1071,4 +1071,18 @@ $bar : "#foo";
 ul li\#{$bar} a span.label { foo: bar; }
 SCSS
   end
+
+  def test_newlines_removed_from_selectors_when_compressed
+    assert_equal <<CSS, render(<<SCSS, :style=>:compressed)
+z a,z b{display:block}
+CSS
+a,
+b {
+  z & {
+    display: block;
+  }
+}
+SCSS
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 3.1.76
+  version: 3.1.77
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-13 00:00:00 -04:00
+date: 2010-09-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,17 +73,20 @@ files:
 - lib/haml/version.rb
 - lib/sass.rb
 - lib/sass/callbacks.rb
-- lib/sass/css.rb
 - lib/sass/engine.rb
-- lib/sass/environment.rb
+- lib/sass/css.rb
 - lib/sass/error.rb
-- lib/sass/less.rb
+- lib/sass/environment.rb
 - lib/sass/plugin.rb
+- lib/sass/importers.rb
+- lib/sass/less.rb
+- lib/sass/importers/base.rb
+- lib/sass/importers/filesystem.rb
 - lib/sass/plugin/configuration.rb
-- lib/sass/plugin/generic.rb
 - lib/sass/plugin/merb.rb
-- lib/sass/plugin/rack.rb
+- lib/sass/plugin/generic.rb
 - lib/sass/plugin/rails.rb
+- lib/sass/plugin/rack.rb
 - lib/sass/plugin/staleness_checker.rb
 - lib/sass/plugin/compiler.rb
 - lib/sass/repl.rb
@@ -136,9 +139,6 @@ files:
 - lib/sass/tree/warn_node.rb
 - lib/sass/tree/while_node.rb
 - lib/sass/cache_store.rb
-- lib/sass/importers.rb
-- lib/sass/importers/base.rb
-- lib/sass/importers/filesystem.rb
 - vendor/fssm/LICENSE
 - vendor/fssm/README.markdown
 - vendor/fssm/Rakefile
@@ -243,13 +243,15 @@ files:
 - test/haml/util/subset_map_test.rb
 - test/haml/util_test.rb
 - test/linked_rails.rb
+- test/sass/engine_test.rb
 - test/sass/callbacks_test.rb
 - test/sass/conversion_test.rb
 - test/sass/css2sass_test.rb
 - test/sass/data/hsl-rgb.txt
-- test/sass/engine_test.rb
+- test/sass/plugin_test.rb
 - test/sass/extend_test.rb
 - test/sass/functions_test.rb
+- test/sass/cache_test.rb
 - test/sass/less_conversion_test.rb
 - test/sass/more_results/more1.css
 - test/sass/more_results/more1_with_line_comments.css
@@ -257,7 +259,7 @@ files:
 - test/sass/more_templates/_more_partial.sass
 - test/sass/more_templates/more1.sass
 - test/sass/more_templates/more_import.sass
-- test/sass/plugin_test.rb
+- test/sass/importer_test.rb
 - test/sass/results/alt.css
 - test/sass/results/basic.css
 - test/sass/results/compact.css
@@ -320,8 +322,6 @@ files:
 - test/sass/templates/units.sass
 - test/sass/templates/warn.sass
 - test/sass/templates/warn_imported.sass
-- test/sass/cache_test.rb
-- test/sass/importer_test.rb
 - test/sass/test_helper.rb
 - test/test_helper.rb
 - extra/haml-mode.el
@@ -374,18 +374,18 @@ test_files:
 - test/haml/template_test.rb
 - test/haml/util/subset_map_test.rb
 - test/haml/util_test.rb
+- test/sass/engine_test.rb
 - test/sass/callbacks_test.rb
 - test/sass/conversion_test.rb
 - test/sass/css2sass_test.rb
-- test/sass/engine_test.rb
+- test/sass/plugin_test.rb
 - test/sass/extend_test.rb
 - test/sass/functions_test.rb
+- test/sass/cache_test.rb
 - test/sass/less_conversion_test.rb
-- test/sass/plugin_test.rb
+- test/sass/importer_test.rb
 - test/sass/script_conversion_test.rb
 - test/sass/script_test.rb
 - test/sass/scss/css_test.rb
 - test/sass/scss/rx_test.rb
 - test/sass/scss/scss_test.rb
-- test/sass/cache_test.rb
-- test/sass/importer_test.rb