haml-edge 2.3.173 → 2.3.174

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.173
+2.3.174

data/VERSION

@@ -1 +1 @@
-2.3.173
+2.3.174

data/lib/haml/helpers/xss_mods.rb

@@ -106,7 +106,12 @@ module ActionView
   module Helpers
     module CaptureHelper
       def with_output_buffer_with_haml_xss(*args, &block)
-        Haml::Util.html_safe(with_output_buffer_without_haml_xss(*args, &block))
+        res = with_output_buffer_without_haml_xss(*args, &block)
+        case res
+        when Array; res.map {|s| Haml::Util.html_safe(s)}
+        when String; Haml::Util.html_safe(res)
+        else; res
+        end
       end
       alias_method :with_output_buffer_without_haml_xss, :with_output_buffer
       alias_method :with_output_buffer, :with_output_buffer_with_haml_xss

data/lib/haml/util.rb

@@ -233,9 +233,10 @@ module Haml
     # With older versions of the Rails XSS-safety mechanism,
     # this destructively modifies the HTML-safety of `text`.
     #
-    # @param text [String]
-    # @return [String] `text`, marked as HTML-safe
+    # @param text [String, nil]
+    # @return [String, nil] `text`, marked as HTML-safe
     def html_safe(text)
+      return unless text
       return text.html_safe if defined?(ActiveSupport::SafeBuffer)
       text.html_safe!
     end

data/lib/sass/tree/rule_node.rb

@@ -285,7 +285,7 @@ module Sass::Tree
 
     def debug_info_rule
       node = DirectiveNode.new("@media -sass-debug-info")
-      debug_info.each do |k, v|
+      debug_info.map {|k, v| [k.to_s, v.to_s]}.sort.each do |k, v|
         rule = RuleNode.new(nil)
         rule.resolved_rules = [[k.to_s.gsub(/[^\w-]/, "\\\\\\0")]]
         val = v.to_s.gsub(/[^\w-]/, "\\\\\\0").

data/test/haml/template_test.rb

@@ -77,6 +77,9 @@ class TemplateTest < Test::Unit::TestCase
       base.send(:_evaluate_assigns_and_ivars)
     end
 
+    # This is needed by RJS in (at least) Rails 3
+    base.instance_variable_set('@template', base)
+
     # This is used by form_for.
     # It's usually provided by ActionController::Base.
     def base.protect_against_forgery?; false; end
@@ -389,6 +392,15 @@ HTML
   = f.text_field :title
   Body:
   = f.text_field :body
+HAML
+    end
+
+    def test_rjs
+      assert_equal(<<HTML, render(<<HAML, :action_view))
+window.location.reload();
+HTML
+= update_page do |p|
+  - p.reload
 HAML
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.173
+  version: 2.3.174
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -64,15 +64,15 @@ files:
 - lib/haml/helpers/xss_mods.rb
 - lib/haml/html.rb
 - lib/haml/precompiler.rb
-- lib/haml/util.rb
 - lib/haml/html/erb.rb
+- lib/haml/railtie.rb
+- lib/haml/util.rb
 - lib/haml/shared.rb
 - lib/haml/template.rb
 - lib/haml/template/patch.rb
 - lib/haml/template/plugin.rb
 - lib/haml/root.rb
 - lib/haml/version.rb
-- lib/haml/railtie.rb
 - lib/sass.rb
 - lib/sass/css.rb
 - lib/sass/engine.rb
@@ -113,36 +113,6 @@ files:
 - lib/sass/tree/root_node.rb
 - lib/sass/tree/variable_node.rb
 - lib/sass/tree/while_node.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
@@ -176,10 +146,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
@@ -328,7 +294,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