haml-edge 2.3.3 → 2.3.4

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.3
+2.3.4

data/VERSION

@@ -1 +1 @@
-2.3.3
+2.3.4

data/lib/sass/script/lexer.rb

@@ -65,10 +65,11 @@ module Sass
       #   Used for error reporting
       # @param offset [Fixnum] The number of characters in on which the SassScript appears.
       #   Used for error reporting
-      def initialize(str, line, offset)
+      def initialize(str, line, offset, filename)
         @scanner = str.is_a?(StringScanner) ? str : StringScanner.new(str)
         @line = line
         @offset = offset
+        @filename = filename
         @prev = nil
       end
 
@@ -158,7 +159,18 @@ module Sass
       end
 
       def op
+        prev_chr = @scanner.string[@scanner.pos - 1].chr
         return unless op = @scanner.scan(REGULAR_EXPRESSIONS[:op])
+        if @prev && op == '-' && prev_chr !~ /\s/ &&
+            [:bool, :ident, :const].include?(@prev.type)
+          warn(<<END)
+DEPRECATION WARNING:
+On line #{@line}, character #{last_match_position}#{" of '#{@filename}'" if @filename}
+- will be allowed as part of variable names in version 2.4.
+Please add whitespace to separate it from the previous token.
+END
+        end
+
         [OPERATORS[op]]
       end
 

data/lib/sass/script/parser.rb

@@ -14,7 +14,7 @@ module Sass
       #   Used for error reporting
       def initialize(str, line, offset, filename = nil)
         @filename = filename
-        @lexer = Lexer.new(str, line, offset)
+        @lexer = Lexer.new(str, line, offset, filename)
       end
 
       # Parses a SassScript expression within an interpolated segment (`#{}`).

data/test/sass/script_test.rb

@@ -61,22 +61,22 @@ foo \#{"\\\#{" + "baz"} bang
 SASS
   end
 
-  def test_warning_reporting
+  def test_implicit_string_warning
     assert_warning(<<WARN) {eval("foo")}
 DEPRECATION WARNING:
-On line 1, character 1 of 'test_warning_reporting_inline.sass'
+On line 1, character 1 of 'test_implicit_string_warning_inline.sass'
 Implicit strings have been deprecated and will be removed in version 2.4.
 'foo' was not quoted. Please add double quotes (e.g. "foo").
 WARN
     assert_warning(<<WARN) {eval("1 + foo")}
 DEPRECATION WARNING:
-On line 1, character 5 of 'test_warning_reporting_inline.sass'
+On line 1, character 5 of 'test_implicit_string_warning_inline.sass'
 Implicit strings have been deprecated and will be removed in version 2.4.
 'foo' was not quoted. Please add double quotes (e.g. "foo").
 WARN
     assert_warning(<<WARN) {render("@if 1 + foo")}
 DEPRECATION WARNING:
-On line 1, character 9 of 'test_warning_reporting_inline.sass'
+On line 1, character 9 of 'test_implicit_string_warning_inline.sass'
 Implicit strings have been deprecated and will be removed in version 2.4.
 'foo' was not quoted. Please add double quotes (e.g. "foo").
 WARN
@@ -84,7 +84,7 @@ WARN
     # Regression
     assert_warning(<<WARN) {render("@if if")}
 DEPRECATION WARNING:
-On line 1, character 5 of 'test_warning_reporting_inline.sass'
+On line 1, character 5 of 'test_implicit_string_warning_inline.sass'
 Implicit strings have been deprecated and will be removed in version 2.4.
 'if' was not quoted. Please add double quotes (e.g. "if").
 WARN
@@ -102,6 +102,24 @@ WARN
     assert_equal "public_instance_methods()", resolve("public_instance_methods()")
   end
 
+  def test_hyphen_warning
+    a = Sass::Script::String.new("a")
+    b = Sass::Script::String.new("b")
+    assert_warning(<<WARN) {eval("!a-!b", {}, env("a" => a, "b" => b))}
+DEPRECATION WARNING:
+On line 1, character 3 of 'test_hyphen_warning_inline.sass'
+- will be allowed as part of variable names in version 2.4.
+Please add whitespace to separate it from the previous token.
+WARN
+
+    assert_warning(<<WARN) {eval("true-false")}
+DEPRECATION WARNING:
+On line 1, character 5 of 'test_hyphen_warning_inline.sass'
+- will be allowed as part of variable names in version 2.4.
+Please add whitespace to separate it from the previous token.
+WARN
+  end
+
   def test_ruby_equality
     assert_equal eval('"foo"'), eval('"foo"')
     assert_equal eval('1'), eval('1.0')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-10 00:00:00 -04:00
+date: 2009-07-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,9 +44,9 @@ extensions: []
 
 extra_rdoc_files: 
 - README.md
-- REVISION
-- MIT-LICENSE
 - VERSION
+- MIT-LICENSE
+- REVISION
 - VERSION_NAME
 - EDGE_GEM_VERSION
 files: 
@@ -249,9 +249,9 @@ files:
 - init.rb
 - .yardopts
 - README.md
-- REVISION
-- MIT-LICENSE
 - VERSION
+- MIT-LICENSE
+- REVISION
 - VERSION_NAME
 - EDGE_GEM_VERSION
 has_rdoc: true