haml-edge 2.3.186 → 2.3.187

data/lib/sass/tree/rule_node.rb

@@ -114,7 +114,7 @@ module Sass::Tree
         if r.is_a?(String)
           r.gsub(/(,[ \t]*)?\n\s*/) {$1 ? $1 + "\n" : " "}
         else
-          "\#{#{r.to_sass}}"
+          "\#{#{r.to_sass(opts)}}"
         end
       end.join
       name = "\\" + name if name[0] == ?:
@@ -122,7 +122,7 @@ module Sass::Tree
     end
 
     def to_scss(tabs, opts = {})
-      name = rule.map {|r| r.is_a?(String) ? r : "\#{#{r.to_sass}}"}.
+      name = rule.map {|r| r.is_a?(String) ? r : "\#{#{r.to_sass(opts)}}"}.
         join.gsub(/^[ \t]*/, '  ' * tabs)
 
       res = name + children_to_src(tabs, opts, :scss)

data/lib/sass/tree/variable_node.rb

@@ -17,7 +17,7 @@ module Sass
       protected
 
       def to_src(tabs, opts, fmt)
-        "#{'  ' * tabs}$#{@name}: #{@expr.to_sass}#{' !default' if @guarded}#{semi fmt}\n"
+        "#{'  ' * tabs}$#{dasherize(@name, opts)}: #{@expr.to_sass(opts)}#{' !default' if @guarded}#{semi fmt}\n"
       end
 
       # Loads the new variable value into the environment.

data/lib/sass/tree/while_node.rb

@@ -14,7 +14,7 @@ module Sass::Tree
     protected
 
     def to_src(tabs, opts, fmt)
-      "#{'  ' * tabs}@while #{@expr.to_sass}" + children_to_src(tabs, opts, fmt)
+      "#{'  ' * tabs}@while #{@expr.to_sass(opts)}" + children_to_src(tabs, opts, fmt)
     end
 
     # Runs the child nodes until the continue expression becomes false.

data/test/sass/conversion_test.rb

@@ -833,6 +833,53 @@ foo
 SASS
   end
 
+  def test_nested_properties
+    assert_renders <<SASS, <<SCSS
+div
+  before: before
+  background:
+    color: blue
+    repeat: no-repeat
+  after: after
+SASS
+div {
+  before: before;
+  background: {
+    color: blue;
+    repeat: no-repeat; };
+  after: after; }
+
+SCSS
+  end
+
+  def test_dasherize
+    assert_sass_to_scss(<<SCSS,<<SASS, :dasherize => true)
+@mixin under-scored-mixin($under-scored-arg: $under-scored-default) {
+  bar: $under-scored-arg; }
+
+div {
+  foo: under-scored-fn($under-scored-var + "before" + $another-under-scored-var + "after");
+  @include under-scored-mixin($passed-arg);
+  selector-\#{$under-scored-interp}: bold; }
+
+@if $under-scored {
+  @for $for-var from $from-var to $to-var {
+    @while $while-var == true {
+      $while-var: false; } } }
+SCSS
+=under_scored_mixin($under_scored_arg: $under_scored_default)
+  bar: $under_scored_arg
+div
+  foo: under_scored_fn($under_scored_var + "before\#{$another_under_scored_var}after")
+  +under_scored_mixin($passed_arg)
+  selector-\#{$under_scored_interp}: bold
+@if $under_scored
+  @for $for_var from $from_var to $to_var
+    @while $while_var == true
+      $while_var : false
+SASS
+  end
+
   private
 
   def assert_sass_to_sass(sass, options = {})

data/test/sass/scss/css_test.rb

@@ -726,12 +726,12 @@ SCSS
   end
 
   def test_invalid_classes
-    assert_not_parses("identifier", 'p.<err> foo {a: b}')
-    assert_not_parses("identifier", 'p.<err>1foo {a: b}')
+    assert_not_parses("class name", 'p.<err> foo {a: b}')
+    assert_not_parses("class name", 'p.<err>1foo {a: b}')
   end
 
   def test_invalid_ids
-    assert_not_parses('"{"', 'p<err># foo {a: b}')
+    assert_not_parses("id name", 'p#<err> foo {a: b}')
   end
 
   def test_no_properties_at_toplevel

data/test/sass/scss/scss_test.rb

@@ -631,6 +631,46 @@ foo:nth-child(\#{5 + "n"}) {a: b}
 SCSS
   end
 
+  def test_selector_interpolation_at_class_begininng
+    assert_equal <<CSS, render(<<SCSS)
+.zzz {
+  a: b; }
+CSS
+$zzz: zzz;
+.\#{$zzz} { a: b; }
+SCSS
+  end
+
+  def test_selector_interpolation_at_id_begininng
+    assert_equal <<CSS, render(<<SCSS)
+#zzz {
+  a: b; }
+CSS
+$zzz: zzz;
+#\#{$zzz} { a: b; }
+SCSS
+  end
+
+  def test_selector_interpolation_at_pseudo_begininng
+    assert_equal <<CSS, render(<<SCSS)
+:zzz::zzz {
+  a: b; }
+CSS
+$zzz: zzz;
+:\#{$zzz}::\#{$zzz} { a: b; }
+SCSS
+  end
+
+  def test_selector_interpolation_at_attr_beginning
+    assert_equal <<CSS, render(<<SCSS)
+[zzz=foo] {
+  a: b; }
+CSS
+$zzz: zzz;
+[\#{$zzz}=foo] { a: b; }
+SCSS
+  end
+
   def test_basic_prop_val_interpolation
     assert_equal <<CSS, render(<<SCSS)
 foo {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.186
+  version: 2.3.187
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-01 00:00:00 -04:00
+date: 2010-04-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -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