haml-edge 2.3.183 → 2.3.184

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.183
+2.3.184

data/README.md

@@ -38,7 +38,7 @@ Sass is a little more complicated;
 where they'll be automatically compiled
 to corresponding CSS files in `public/stylesheets` when needed
 (the Sass template directory is customizable...
-see [the Sass reference](http://sass-lang.com/docs/yardoc/SASS_REFERENCE.md.html#template_location-option) for details).
+see [the Sass reference](http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#template_location-option) for details).
 
 For Merb, `.html.haml` views will work without any further modification.
 To enable Sass, you also need to add a dependency.
@@ -129,7 +129,7 @@ like `if` and `while`:
         = "Happy new " + "year!"
 
 Haml provides far more tools than those presented here.
-Check out the [reference documentation](http://beta.haml-lang.com/docs/yardoc/file.HAML_REFERENCE.md)
+Check out the [reference documentation](http://beta.haml-lang.com/docs/yardoc/file.HAML_REFERENCE.html)
 for full details.
 
 #### Indentation
@@ -151,10 +151,10 @@ and get small stylesheets up and running quickly,
 particularly with the help of
 [the Compass style library](http://compass-style.org).
 
-[vars]:    http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.md#variables_
-[nested]:  http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.md#nested_rules_
+[vars]:    http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#variables_
+[nested]:  http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#nested_rules_
 [mixins]:  http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#mixins
-[imports]: http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.md#import
+[imports]: http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#import
 
 Sass has two syntaxes.
 The one presented here, known as "SCSS" (for "Sassy CSS"),
@@ -163,7 +163,7 @@ The other (older) syntax, known as the indented syntax or just "Sass",
 is whitespace-sensitive and indentation-based.
 For more information, see the [reference documentation][syntax].
 
-[syntax]: http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.md#syntax
+[syntax]: http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html#syntax
 
 To run the following examples and see the CSS they produce,
 put them in a file called `test.scss` and run `sass test.scss`.
@@ -232,7 +232,7 @@ You can even give them arguments.
     }
 
 A comprehensive list of features is available
-in the [Sass reference](http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.md).
+in the [Sass reference](http://beta.sass-lang.com/docs/yardoc/file.SASS_REFERENCE.html).
 
 ## Executables
 

data/Rakefile

@@ -70,7 +70,7 @@ at_exit { File.delete(scope('REVISION')) rescue nil }
 
 desc "Install Haml as a gem."
 task :install => [:package] do
-  sudo = RUBY_PLATFORM =~ /win32/ ? '' : 'sudo'
+  sudo = RUBY_PLATFORM =~ /win32|mingw/ ? '' : 'sudo'
   gem  = RUBY_PLATFORM =~ /java/  ? 'jgem' : 'gem' 
   sh %{#{sudo} #{gem} install --no-ri pkg/haml-#{File.read(scope('VERSION')).strip}}
 end
@@ -191,14 +191,16 @@ task :release_edge do
     sh %{git merge origin/master}
 
     # Get the current master branch version
-    version = File.read(scope('VERSION')).strip.split('.').map {|n| n.to_i}
-    unless version[1] % 2 == 1 && version[2] == 0
+    version = File.read(scope('VERSION')).strip.split('.')
+    pr = version[3]
+    version = version.map {|n| n.to_i}
+    unless pr || (version[1] % 2 == 1 && version[2] == 0)
       raise "#{version.join('.')} is not a development version" 
     end
 
     # Bump the edge gem version
     edge_version = File.read(scope('EDGE_GEM_VERSION')).strip.split('.').map {|n| n.to_i}
-    if edge_version[0..1] != version[0..1]
+    if !pr && (edge_version[0..1] != version[0..1])
       # A new master branch version was released, reset the edge gem version
       edge_version[0..1] = version[0..1]
       edge_version[2] = 0

data/VERSION

@@ -1 +1 @@
-2.3.183
+2.3.184

data/VERSION_NAME

@@ -1 +1 @@
-Bleeding Edge
+Classy Cassidy

data/lib/haml/filters.rb

@@ -100,7 +100,11 @@ module Haml
           if contains_interpolation?(text)
             return if options[:suppress_eval]
 
-            text = unescape_interpolation(text).gsub("\\n", "\n")
+            text = unescape_interpolation(text).gsub(/(\\+)n/) do |s|
+              escapes = $1.size
+              next s if escapes % 2 == 0
+              ("\\" * (escapes - 1)) + "\n"
+            end
             newline if text.gsub!(/\n"\Z/, "\\n\"")
             push_script <<RUBY.strip, :escape_html => false
 find_and_preserve(#{filter.inspect}.render_with_options(#{text}, _hamlout.options))

data/lib/sass/script/functions.rb

@@ -388,17 +388,38 @@ module Sass::Script
       Sass::Script::Number.new(color.lightness, ["%"])
     end
 
+    # Returns the alpha component (opacity) of a color.
+    # This is 1 unless otherwise specified.
+    #
+    # This function also supports the proprietary Microsoft
+    # `alpha(opacity=20)` syntax.
+    #
+    # @overload def alpha(color)
+    # @param color [Color]
+    # @return [Number]
+    # @raise [ArgumentError] If `color` isn't a color
+    def alpha(*args)
+      if args.all? do |a|
+          a.is_a?(Sass::Script::String) && a.type == :identifier &&
+            a.value =~ /^[a-zA-Z]+\s*=/
+        end
+        # Support the proprietary MS alpha() function
+        return Sass::Script::String.new("alpha(#{args.map {|a| a.to_s}.join(", ")})")
+      end
+
+      opacity(*args)
+    end
+
     # Returns the alpha component (opacity) of a color.
     # This is 1 unless otherwise specified.
     #
     # @param color [Color]
     # @return [Number]
     # @raise [ArgumentError] If `color` isn't a color
-    def alpha(color)
+    def opacity(color)
       assert_type color, :Color
       Sass::Script::Number.new(color.alpha)
     end
-    alias_method :opacity, :alpha
 
     # Makes a color more opaque.
     # Takes a color and an amount between 0 and 1,

data/lib/sass/script/lexer.rb

@@ -196,11 +196,12 @@ module Sass
       def read_token
         return if done?
         return unless value = token
+        type, val, size = value
+        size ||= @scanner.matched_size
 
-        value.last.line = @line if value.last.is_a?(Script::Node)
-        Token.new(value.first, value.last, @line,
-          current_position - @scanner.matched_size,
-          @scanner.pos - @scanner.matched_size)
+        val.line = @line if val.is_a?(Script::Node)
+        Token.new(type, val, @line,
+          current_position - size, @scanner.pos - size)
       end
 
       def whitespace
@@ -272,7 +273,8 @@ module Sass
         @offset = (c == 0 ? @offset + str2.size : str2[/\n(.*)/, 1].size)
         [:special_fun,
           Haml::Util.merge_adjacent_strings(
-            [str1] + Sass::Engine.parse_interp(str2, @line, @options))]
+            [str1] + Sass::Engine.parse_interp(str2, @line, @options)),
+          str1.size + str2.size]
       end
 
       def ident_op

data/lib/sass/script/literal.rb

@@ -120,6 +120,16 @@ MSG
       Sass::Script::String.new("#{self.to_s}, #{other.to_s}")
     end
 
+    # The SassScript `=` operation
+    # (used for proprietary MS syntax like `alpha(opacity=20)`).
+    #
+    # @param other [Literal] The right-hand side of the operator
+    # @return [Script::String] A string containing both literals
+    #   separated by `"="`
+    def single_eq(other)
+      Sass::Script::String.new("#{self.to_s}=#{other.to_s}")
+    end
+
     # The SassScript `+` operation.
     #
     # @param other [Literal] The right-hand side of the operator

data/lib/sass/script/parser.rb

@@ -127,7 +127,7 @@ module Sass
 
       # @private
       PRECEDENCE = [
-        :comma, :concat, :or, :and,
+        :comma, :single_eq, :concat, :or, :and,
         [:eq, :neq],
         [:gt, :gte, :lt, :lte],
         [:plus, :minus],
@@ -186,6 +186,7 @@ RUBY
       def lexer_class; Lexer; end
 
       production :expr, :interpolation, :comma
+      production :equals, :interpolation, :single_eq
 
       def interpolation
         e = concat
@@ -232,7 +233,7 @@ RUBY
           end
           node(Script::String.new(name.value, :identifier))
         else
-          args = arglist || []
+          args = fn_arglist || []
           assert_tok(:rparen)
           node(Script::Funcall.new(name.value, args))
         end
@@ -260,6 +261,12 @@ RUBY
         [[var, val], *defn_arglist(val)]
       end
 
+      def fn_arglist
+        return unless e = equals
+        return [e] unless try_tok(:comma)
+        [e, *fn_arglist]
+      end
+
       def arglist
         return unless e = interpolation
         return [e] unless try_tok(:comma)

data/test/haml/engine_test.rb

@@ -671,6 +671,15 @@ HAML
     assert_equal("<a href='#\"'></a>\n", render('%a(href="#\\"")'))
   end
 
+  def test_filter_with_newline_and_interp
+    assert_equal(<<HTML, render(<<HAML))
+\\n
+HTML
+:plain
+  \\n\#{""}
+HAML
+  end
+
   # HTML escaping tests
 
   def test_ampersand_equals_should_escape

data/test/sass/scss/css_test.rb

@@ -320,7 +320,7 @@ foo {
 SCSS
   end
 
-  def test_ms_filter_syntax
+  def test_ms_long_filter_syntax
     assert_equal <<CSS, render(<<SCSS)
 foo {
   filter: progid:DXImageTransform.Microsoft.gradient(GradientType=1, startColorstr=#c0ff3300, endColorstr=#ff000000);
@@ -332,6 +332,15 @@ foo {
 SCSS
   end
 
+  def test_ms_short_filter_syntax
+    assert_parses <<SCSS
+foo {
+  filter: alpha(opacity=20);
+  filter: alpha(opacity=20, enabled=true);
+  filter: blaznicate(foo=bar, baz=bang bip, bart=#fa4600); }
+SCSS
+  end
+
   def test_declaration_hacks
     assert_parses <<SCSS
 foo {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.183
+  version: 2.3.184
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -123,36 +123,6 @@ files:
 - lib/sass/scss/rx.rb
 - lib/sass/scss/script_lexer.rb
 - lib/sass/scss/script_parser.rb
-- vendor/fssm/LICENSE
-- vendor/fssm/README.markdown
-- vendor/fssm/Rakefile
-- vendor/fssm/VERSION.yml
-- vendor/fssm/example.rb
-- vendor/fssm/fssm.gemspec
-- vendor/fssm/lib/fssm.rb
-- vendor/fssm/lib/fssm/backends/fsevents.rb
-- vendor/fssm/lib/fssm/backends/inotify.rb
-- vendor/fssm/lib/fssm/backends/polling.rb
-- vendor/fssm/lib/fssm/backends/rubycocoa/fsevents.rb
-- vendor/fssm/lib/fssm/monitor.rb
-- vendor/fssm/lib/fssm/path.rb
-- vendor/fssm/lib/fssm/pathname.rb
-- vendor/fssm/lib/fssm/state/directory.rb
-- vendor/fssm/lib/fssm/state/file.rb
-- vendor/fssm/lib/fssm/support.rb
-- vendor/fssm/lib/fssm/tree.rb
-- vendor/fssm/profile/prof-cache.rb
-- vendor/fssm/profile/prof-fssm-pathname.html
-- vendor/fssm/profile/prof-pathname.rb
-- vendor/fssm/profile/prof-plain-pathname.html
-- vendor/fssm/profile/prof.html
-- vendor/fssm/spec/path_spec.rb
-- vendor/fssm/spec/root/duck/quack.txt
-- vendor/fssm/spec/root/file.css
-- vendor/fssm/spec/root/file.rb
-- vendor/fssm/spec/root/file.yml
-- vendor/fssm/spec/root/moo/cow.txt
-- vendor/fssm/spec/spec_helper.rb
 - bin/css2sass
 - bin/haml
 - bin/html2haml
@@ -187,10 +157,6 @@ files:
 - test/haml/results/tag_parsing.xhtml
 - test/haml/results/very_basic.xhtml
 - test/haml/results/whitespace_handling.xhtml
-- test/haml/spec/README.md
-- test/haml/spec/lua_haml_spec.lua
-- test/haml/spec/ruby_haml_test.rb
-- test/haml/spec/tests.json
 - test/haml/template_test.rb
 - test/haml/util_test.rb
 - test/haml/templates/_av_partial_1.haml
@@ -349,7 +315,6 @@ test_files:
 - test/haml/engine_test.rb
 - test/haml/helper_test.rb
 - test/haml/html2haml_test.rb
-- test/haml/spec/ruby_haml_test.rb
 - test/haml/template_test.rb
 - test/haml/util_test.rb
 - test/haml/spec_test.rb

data/test/haml/spec/README.md

@@ -1,97 +0,0 @@
-# Haml Spec #
-
-Haml Spec provides a basic suite of tests for Haml interpreters.
-
-It is intented for developers who are creating or maintaining an implementation
-of the [Haml](http://haml-lang.com) markup language.
-
-At the moment, there are test runners for the [original Haml](http://github.com/nex3/haml)
-in Ruby, and for [Lua Haml](http://github.com/norman/lua-haml). Support for
-other versions of Haml will be added if their developers/maintainers
-are interested in using it.
-
-## The Tests ##
-
-The tests are kept in JSON format for portability across languages.  Each test
-is a JSON object with expected input, output, local variables and configuration
-parameters (see below).  The test suite only provides tests for features which
-are portable, therefore no tests for script are provided, nor for external
-filters such as :markdown or :textile.
-
-The one major exception to this are the tests for interpolation, which you may
-need to modify with a regular expression to run under PHP or Perl, which
-require a symbol before variable names. These tests are included despite being
-less than 100% portable because interpolation is an important part of Haml and
-can be tricky to implement.
-
-## Running the Tests ##
-
-### Ruby ###
-
-In order to make it as easy as possible for non-Ruby programmers to run the
-Ruby Haml tests, the Ruby test runner uses test/unit, rather than something
-fancier like Rspec.  To run them you probably only need to install `haml`, and
-possibly `ruby` if your platform doesn't come with it by default. If you're
-using Ruby 1.8.x, you'll also need to install `json`:
-
-    sudo gem install haml
-    # for Ruby 1.8.x; check using "ruby --version" if unsure
-    sudo gem install json
-
-Then, running the Ruby test suite is easy:
-
-    ruby ruby_haml_test.rb
-
-### Lua ###
-
-The Lua test depends on [Telescope](http://telescope.luaforge.net/),
-[jason4lua](http://json.luaforge.net/), and
-[Lua Haml](http://github.com/norman/lua-haml). Install and
-run `tsc lua_haml_spec.lua`.
-
-## Contributing ##
-
-### Getting it ###
-
-You can access the [Git repository](http://github.com/norman/haml-spec) at:
-
-    git://github.com/norman/haml-spec.git
-
-Patches are *very* welcome, as are test runners for your Haml implementation.
-
-As long as any test you add run against Ruby Haml and are not redundant, I'll
-be very happy to add them.
-
-### Test JSON format ###
-
-    "test name" : {
-      "haml" : "haml input",
-      "html" : "expected html output",
-      "result" : "expected test result",
-      "locals" : "local vars",
-      "config" : "config params"
-    }
-
-* test name: This should be a *very* brief description of what's being tested. It can
-  be used by the test runners to name test methods, or to exclude certain tests from being
-  run.
-* haml: The Haml code to be evaluated. Always required.
-* html: The HTML output that should be generated. Required unless "result" is "error".
-* result: Can be "pass" or "error". If it's absent, then "pass" is assumed. If it's "error",
-  then the goal of the test is to make sure that malformed Haml code generates an error.
-* locals: An object containing local variables needed for the test.
-* config: An object containing configuration parameters used to run the test.
-  The configuration parameters should be usable directly by Ruby's Haml with no
-  modification.  If your implementation uses config parameters with different
-  names, you may need to process them to make them match your implementation.
-  If your implementation has options that do not exist in Ruby's Haml, then you
-  should add tests for this in your implementation's test rather than here.
-
-## License ##
-
-  This project is released under the [WTFPL](http://sam.zoy.org/wtfpl/) in order
-  to be as usable as possible in any project, commercial or free.
-
-## Author ##
-
-  [Norman Clarke](mailto:norman@njclarke.com)

data/test/haml/spec/lua_haml_spec.lua

@@ -1,30 +0,0 @@
-require 'luarocks.require'
-require 'json'
-require 'telescope'
-require 'haml'
-
-local function get_tests(filename)
-  local self = debug.getinfo(1).short_src
-  if self:match("/") then return "./" .. self:gsub("[^/]*%.lua$", "/" .. filename)
-  elseif self:match("\\") then return self:gsub("[^\\]*%.lua$", "\\" .. filename)
-  else return filename
-  end
-end
-
-local fh = assert(io.open(get_tests("tests.json")))
-local input = fh:read '*a'
-fh:close()
-
-local contexts = json.decode(input)
-
-describe("LuaHaml", function()
-   for context, expectations in pairs(contexts) do
-     describe("When handling " .. context, function()
-      for name, exp in pairs(expectations) do
-        it(string.format("should correctly render %s", name), function()
-            assert_equal(haml.render(exp.haml, exp.config or {}, exp.locals or {}), exp.html)
-        end)
-      end
-     end)
-   end
-end)

data/test/haml/spec/ruby_haml_test.rb

@@ -1,19 +0,0 @@
-require "test/unit"
-require "json"
-require "haml"
-
-class HamlTest < Test::Unit::TestCase
-  contexts = JSON.parse(File.read(File.dirname(__FILE__) + "/tests.json"))
-  contexts.each do |context|
-    context[1].each do |name, test|
-      class_eval(<<-EOTEST)
-        def test_#{name.gsub(/\s+|[^a-zA-Z0-9_]/, "_")}
-          locals = Hash[*(#{test}["locals"] || {}).collect {|k, v| [k.to_sym, v] }.flatten]
-          options = Hash[*(#{test}["config"] || {}).collect {|k, v| [k.to_sym, v.to_sym] }.flatten]
-          engine = Haml::Engine.new(#{test}["haml"], options)
-          assert_equal(engine.render(Object.new, locals).chomp, #{test}["html"])
-        end
-      EOTEST
-    end
-  end
-end