haml-edge 2.1.34 → 2.1.35

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.1.34
+2.1.35

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2008 Hampton Catlin
+Copyright (c) 2006-2009 Hampton Catlin, Nathan Weizenbaum, and Chris Eppstein
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -11,24 +11,34 @@ and providing elegant, easily understandable, and powerful syntax.
 
 ## Using
 
-There are several ways to use Haml and Sass.
-They can be used as a plugin for Rails or Merb,
-or embedded on their own in other applications.
-The first step of all of these is to install the Haml gem:
+Haml and Sass can be used from the command line
+or as part of a Ruby web framework.
+The first step is to install the gem:
 
     gem install haml
 
+After you convert some HTML to Haml or some CSS to Sass,
+you can run
+
+    haml document.haml
+    sass style.sass
+
+to compile them.
+For more information on these commands, check out
+
+    haml --help
+    sass --help
+
 To install Haml and Sass as a Rails plugin,
 just run `haml --rails path/to/rails/app`
 and both Haml and Sass will be installed.
-Views with the `.haml` (or `.html.haml` for edge)
-extension will automatically use Haml.
+Views with the `.html.haml` extension will automatically use Haml.
 Sass is a little more complicated;
-`.sass` files should be placed in public/stylesheets/sass,
+`.sass` files should be placed in `public/stylesheets/sass`,
 where they'll be automatically compiled
-to corresponding CSS files in public/stylesheets when needed
+to corresponding CSS files in `public/stylesheets` when needed
 (the Sass template directory is customizable...
-see the Sass module docs for details).
+see [the Sass reference](http://sass-lang.com/docs/yardoc/SASS_REFERENCE.md.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.
@@ -36,11 +46,11 @@ To do so, just add
 
     dependency "merb-haml"
 
-to config/dependencies.rb (or config/init.rb in a flat/very flat Merb application).
+to `config/dependencies.rb` (or `config/init.rb` in a flat/very flat Merb application).
 Then it'll work just like it does in Rails.
 
 To use Haml and Sass programatically,
-check out the RDocs for the Haml and Sass modules.
+check out the [YARD documentation](http://haml-lang.com/docs/yardoc).
 
 ## Formatting
 
@@ -302,26 +312,27 @@ See `css2sass --help` for further information and options.
 
 ## Authors
 
-Haml and Sass are designed by Hampton Catlin (hcatlin) and he is the author
-of the original implementation. However, Hampton doesn't even know his way
-around the code anymore and mostly just concentrates on the language issues.
-Hampton lives in Toronto, Ontario (though he's an American by birth) and
-is a partner at Unspace Interactive.
-
-Nathan Weizenbaum is the primary maintainer and architect of the "modern" Ruby
-implementation of Haml. His hard work has kept the project alive by endlessly
-answering forum posts, fixing bugs, refactoring, finding speed improvements,
-writing documentation, implementing new features, and getting Hampton
-coffee (a fitting task for a boy-genius). Nathan lives in Seattle, Washington and
-while not being a student at University of Washington he consults for
-Unspace Interactive and Microsoft.
-
-Chris Eppstein is a core contributor to Sass and the creator of Compass, the first
-Sass-based framework. Chris focuses on making Sass more powerful, easy to use, and
-on ways to speed its adoption through the web development community. Chris lives in
-San Jose, CA with his wife and daughter. He is the Software Architect for Caring.com,
-a website devoted to the 34 Million caregivers whose parents are sick or elderly,
-that uses Haml and Sass.
+Haml and Sass were created by [Hampton Catlin](http://hamptoncatlin.com)
+(hcatlin) and he is the author of the original implementation. However, Hampton
+doesn't even know his way around the code anymore and now occasionally consults
+on the language issues.  Hampton lives in Jacksonville, Florida and is the lead
+mobile developer for Wikimedia.
+
+[Nathan Weizenbaum](http://nex-3.com) is the primary developer and architect of
+the "modern" Ruby implementation of Haml. His hard work has kept the project
+alive by endlessly answering forum posts, fixing bugs, refactoring, finding
+speed improvements, writing documentation, implementing new features, and
+getting Hampton coffee (a fitting task for a boy-genius). Nathan lives in
+Seattle, Washington and while not being a student at the University of
+Washington or working at an internship, he consults for Unspace Interactive.
+
+[Chris Eppstein](http://acts-as-architect.blogspot.com) is a core contributor to
+Sass and the creator of Compass, the first Sass-based framework. Chris focuses
+on making Sass more powerful, easy to use, and on ways to speed its adoption
+through the web development community. Chris lives in San Jose, California with
+his wife and daughter. He is the Software Architect for
+[Caring.com](http://caring.com), a website devoted to the 34 Million caregivers
+whose parents are sick or elderly, that uses Haml and Sass.
 
 If you use this software, you must pay Hampton a compliment. And
 buy Nathan some jelly beans. Maybe pet a kitten. Yeah. Pet that kitty.

data/Rakefile

@@ -81,6 +81,8 @@ task :release => [:package] do
 end
 
 task :release_edge do
+  puts "#{'=' * 50} Running rake release_edge"
+
   sh %{git checkout edge-gem}
   sh %{git reset --hard origin/edge-gem}
   sh %{git merge origin/master}
@@ -153,11 +155,12 @@ rescue LoadError
 end
 
 task :pages do
+  puts "#{'=' * 50} Running rake proj PROJ=#{ENV["PROJ"].inspect}"
   raise 'No ENV["PROJ"]!' unless proj = ENV["PROJ"]
   sh %{git checkout #{proj}-pages}
   sh %{git reset --hard origin/#{proj}-pages}
 
-  sh %{staticmatic build .}
+  sh %{rake build --trace}
   sh %{rsync -av --delete site/ /var/www/#{proj}-pages}
 end
 
@@ -246,15 +249,20 @@ end
 # ----- Handling Updates -----
 
 task :handle_update do
+  puts
+  puts
+  puts '=' * 150
+  puts "Running rake REF=#{ENV["REF"].inspect}"
+
   sh %{git checkout master}
   sh %{git fetch origin}
   sh %{git reset --hard origin/master}
 
   begin
     if ENV["REF"] == "refs/heads/master"
-      sh %{rake release_edge}
+      sh %{rake release_edge --trace}
     elsif ENV["REF"] =~ %r{^refs/heads/(haml|sass)-pages$}
-      sh %{rake pages PROJ=#{$1}}
+      sh %{rake pages --trace PROJ=#{$1}}
     end
   ensure
     sh %{git reset --hard HEAD}

data/VERSION

@@ -1 +1 @@
-2.1.34
+2.1.35

data/extra/update_watch.rb

@@ -6,5 +6,5 @@ set :environment, :production
 Dir.chdir(File.dirname(__FILE__) + "/..")
 
 post "/" do
-  system %{rake handle_update REF=#{JSON.parse(params["payload"])["ref"].inspect}}
+  system %{rake handle_update --trace REF=#{JSON.parse(params["payload"])["ref"].inspect}}
 end

data/lib/haml/exec.rb

@@ -87,10 +87,10 @@ module Haml
       def process_result
         input, output = @options[:input], @options[:output]
         input_file, output_file = if input
-                                    [nil, open_file(ARGV[0], 'w')]
+                                    [nil, open_file(@args[0], 'w')]
                                   else
-                                    @options[:filename] = ARGV[0]
-                                    [open_file(ARGV[0]), open_file(ARGV[1], 'w')]
+                                    @options[:filename] = @args[0]
+                                    [open_file(@args[0]), open_file(@args[1], 'w')]
                                   end
 
         input  ||= input_file

data/lib/sass/css.rb

@@ -181,13 +181,26 @@ module Sass
     #
     # @param re [Regexp] The regular expression to assert
     def assert_match(re)
-      if !@template.scan(re)
-        line = @template.string[0..@template.pos].count "\n"
-        # Display basic regexps as plain old strings
-        expected = re.source == Regexp.escape(re.source) ? "\"#{re.source}\"" : re.inspect
-        raise Exception.new("Invalid CSS on line #{line}: expected #{expected}")
+      if @template.scan(re)
+        whitespace
+        return
       end
-      whitespace
+
+      line = @template.string[0..@template.pos].count "\n"
+      pos = @template.pos
+
+      after = @template.string[pos - 15...pos]
+      after = "..." + after if pos >= 15
+
+      # Display basic regexps as plain old strings
+      expected = re.source == Regexp.escape(re.source) ? "\"#{re.source}\"" : re.inspect
+
+      was = @template.rest[0...15]
+      was += "..." if @template.rest.size >= 15
+      raise Exception.new(<<MESSAGE)
+Invalid CSS on line #{line + 1} after #{after.inspect}:
+  expected #{expected}, was #{was.inspect}
+MESSAGE
     end
 
     # Transform

data/lib/sass/engine.rb

@@ -170,7 +170,10 @@ module Sass
       lines = []
       string.gsub(/\r|\n|\r\n|\r\n/, "\n").scan(/^.*?$/).each_with_index do |line, index|
         index += (@options[:line] || 1)
-        next if line.strip.empty?
+        if line.strip.empty?
+          lines.last.text << "\n" if lines.last && lines.last.comment?
+          next
+        end
 
         line_tab_str = line[/^\s*/]
         unless line_tab_str.empty?
@@ -310,7 +313,7 @@ END
       when MIXIN_DEFINITION_CHAR
         parse_mixin_definition(line)
       when MIXIN_INCLUDE_CHAR
-        if line.text[1].nil?
+        if line.text[1].nil? || line.text[1] == ?\s
           Tree::RuleNode.new(line.text)
         else
           parse_mixin_include(line, root)

data/lib/sass/tree/comment_node.rb

@@ -50,9 +50,13 @@ module Sass::Tree
     def to_s(tabs = 0, _ = nil)
       return if invisible?
 
+      content = (value.split("\n") + lines.map {|l| l.text})
+      content.map! {|l| (l.empty? ? "" : " ") + l}
+      content.first.gsub!(/^ /, '')
+      content.last.gsub!(%r{ ?\*/ *$}, '')
+
       spaces = '  ' * (tabs - 1)
-      spaces + "/* " + (value.split("\n") + lines.map {|l| l.text}).
-        map{|l| l.sub(%r{ ?\*/ *$},'')}.join(style == :compact ? ' ' : "\n#{spaces} * ") + " */"
+      spaces + "/* " + content.join(style == :compact ? '' : "\n#{spaces} *") + " */"
     end
 
     # Returns `true` if this is a silent comment

data/lib/sass/tree/node.rb

@@ -130,7 +130,9 @@ module Sass
             result << child_str + (style == :compressed ? '' : "\n")
           end
         end
-        style == :compressed ? result+"\n" : result[0...-1]
+        result.rstrip!
+        return "" if result.empty?
+        return result + "\n"
       rescue Sass::SyntaxError => e; e.add_metadata(filename, line)
       end
 

data/test/sass/engine_test.rb

@@ -186,8 +186,8 @@ SASS
   end
 
   def test_css_import
-    assert_equal("@import url(./fonts.css) screen;", render("@import url(./fonts.css) screen"))
-    assert_equal("@import \"./fonts.css\" screen;", render("@import \"./fonts.css\" screen"))
+    assert_equal("@import url(./fonts.css) screen;\n", render("@import url(./fonts.css) screen"))
+    assert_equal("@import \"./fonts.css\" screen;\n", render("@import \"./fonts.css\" screen"))
   end
 
   def test_sass_import
@@ -273,7 +273,7 @@ SASS
   end
 
   def test_directive
-    assert_equal("@a b;", render("@a b"))
+    assert_equal("@a b;\n", render("@a b"))
 
     assert_equal("@a {\n  b: c; }\n", render("@a\n  :b c"))
     assert_equal("@a { b: c; }\n", render("@a\n  :b c", :style => :compact))
@@ -759,6 +759,30 @@ CSS
 SASS
   end
 
+  def test_plus_with_space
+    assert_equal(<<CSS, render(<<SASS))
+a + b {
+  color: green; }
+CSS
+a
+  + b
+    color: green
+SASS
+  end
+
+  def test_empty_line_comment
+    assert_equal(<<CSS, render(<<SASS))
+/* Foo
+ *
+ * Bar */
+CSS
+/*
+  Foo
+
+  Bar
+SASS
+  end
+
   private
   
   def render(sass, options = {})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.1.34
+  version: 2.1.35
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-19 00:00:00 -04:00
+date: 2009-06-25 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -24,8 +24,8 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- MIT-LICENSE
 - README.md
+- MIT-LICENSE
 - VERSION
 - REVISION
 - EDGE_GEM_VERSION
@@ -79,7 +79,6 @@ files:
 - lib/sass/script/unary_operation.rb
 - lib/sass/script/variable.rb
 - lib/sass/tree
-- lib/sass/tree/node.rb
 - lib/sass/tree/comment_node.rb
 - lib/sass/tree/debug_node.rb
 - lib/sass/tree/directive_node.rb
@@ -88,10 +87,11 @@ files:
 - lib/sass/tree/if_node.rb
 - lib/sass/tree/mixin_def_node.rb
 - lib/sass/tree/mixin_node.rb
+- lib/sass/tree/node.rb
+- lib/sass/tree/prop_node.rb
 - lib/sass/tree/rule_node.rb
 - lib/sass/tree/variable_node.rb
 - lib/sass/tree/while_node.rb
-- lib/sass/tree/prop_node.rb
 - bin/css2sass
 - bin/haml
 - bin/html2haml
@@ -227,8 +227,8 @@ files:
 - extra/update_watch.rb
 - Rakefile
 - init.rb
-- MIT-LICENSE
 - README.md
+- MIT-LICENSE
 - VERSION
 - REVISION
 - EDGE_GEM_VERSION