haml-edge 3.1.50 → 3.1.51

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.50
+3.1.51

data/VERSION

@@ -1 +1 @@
-3.1.50
+3.1.51

data/lib/haml/exec.rb

@@ -388,9 +388,6 @@ END
         ::Sass::Plugin.options.merge! @options[:for_engine]
         ::Sass::Plugin.options[:unix_newlines] = @options[:unix_newlines]
 
-        p [colon_path?(@args[0]), split_colon_path(@args[0])]
-        exit
-
         if @args[1] && !colon_path?(@args[0])
           flag = @options[:update] ? "--update" : "--watch"
           err =
@@ -446,7 +443,7 @@ MSG
 
       def split_colon_path(path)
         one, two = path.split(':', 2)
-        if one && two && #::Haml::Util.windows? &&
+        if one && two && ::Haml::Util.windows? &&
             one =~ /\A[A-Za-z]\Z/ && two =~ /\A[\/\\]/
           # If we're on Windows and we were passed a drive letter path,
           # don't split on that colon.

data/lib/sass/engine.rb

@@ -592,25 +592,38 @@ WARNING
       raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath import directives.",
         :line => @line + 1) unless line.children.empty?
 
-      if (match = value.match(Sass::SCSS::RX::STRING) || value.match(Sass::SCSS::RX::URI)) &&
-          match.offset(0).first == 0 && !match.post_match.strip.empty? &&
-          match.post_match.strip[0] != ?,
-        # @import "filename" media-type
-        return Tree::DirectiveNode.new("@import #{value}")
-      end
+      scanner = StringScanner.new(value)
+      values = []
 
-      value.split(/,\s*/).map do |f|
-        if f =~ Sass::SCSS::RX::URI
-          # All url()s are literal CSS @imports
-          next Tree::DirectiveNode.new("@import #{f}")
-        elsif f =~ Sass::SCSS::RX::STRING
-          f = $1 || $2
+      loop do
+        unless node = parse_import_arg(scanner)
+          raise SyntaxError.new("Invalid @import: expected file to import, was #{scanner.rest.inspect}",
+            :line => @line)
         end
+        values << node
+        break unless scanner.scan(/,\s*/)
+      end
+
+      return values
+    end
 
-        # http:// URLs are always literal CSS imports
-        next Tree::DirectiveNode.new("@import url(#{f})") if f =~ /^http:\/\//
+    def parse_import_arg(scanner)
+      return if scanner.eos?
+      unless (str = scanner.scan(Sass::SCSS::RX::STRING)) ||
+          (uri = scanner.scan(Sass::SCSS::RX::URI))
+        return Tree::ImportNode.new(scanner.scan(/[^,]+/))
+      end
 
-        Tree::ImportNode.new(f)
+      val = scanner[1] || scanner[2]
+      scanner.scan(/\s*/)
+      if media = scanner.scan(/[^,].*/)
+        Tree::DirectiveNode.new("@import #{str || uri} #{media}")
+      elsif uri
+        Tree::DirectiveNode.new("@import #{uri}")
+      elsif val =~ /^http:\/\//
+        Tree::DirectiveNode.new("@import url(#{val})")
+      else
+        Tree::ImportNode.new(val)
       end
     end
 

data/test/haml/helper_test.rb

@@ -118,7 +118,7 @@ HAML
     # This is usually provided by ActionController::Base.
     def @base.protect_against_forgery?; false; end
     assert_equal(<<HTML, render(<<HAML, :action_view))
-<form action="foo" method="post">
+<form #{rails_form_attr}action="foo" method="post">#{rails_form_opener}
   <p>bar</p>
   <strong>baz</strong>
 </form>
@@ -167,7 +167,7 @@ HAML
     def @base.protect_against_forgery?; false; end
     error_class = Haml::Util.ap_geq_3? ? "field_with_errors" : "fieldWithErrors"
     assert_equal(<<HTML, render(<<HAML, :action_view))
-<form action="" method="post">
+<form #{rails_form_attr}action="" method="post">#{rails_form_opener}
   <div class="#{error_class}"><label for="post_error_field">Error field</label></div>
 </form>
 HTML

data/test/haml/results/helpers.xhtml

@@ -45,29 +45,6 @@ click
 <p>baz</p>
                     <p>boom</p>
 foo
-<p>
-  <form action="" method="post">
-</p>
-<div>
-  <form action="" method="post">
-    <div><input name="commit" type="submit" value="save" /></div>
-    <p>
-      @foo =
-      value one
-    </p>
-    Toplevel? false
-    <p>
-      @foo =
-      value three
-    </p>
-  </form>
-  <form action="" method="post">
-    Title:
-    <input id="article_title" name="article[title]" size="30" type="text" value="Hello" />
-    Body:
-    <input id="article_body" name="article[body]" size="30" type="text" value="World" />
-  </form>
-</div>
 <li><a href='http://www.google.com'>google</a></li>
 <p>
   foo

data/test/haml/template_test.rb

@@ -280,7 +280,7 @@ END
     def test_av_block_deprecation_warning
       assert_warning(/^DEPRECATION WARNING: - style block helpers are deprecated\. Please use =\./) do
         assert_equal <<HTML, render(<<HAML, :action_view)
-<form action="" method="post">
+<form #{rails_form_attr}action="" method="post">#{rails_form_opener}
   Title:
   <input id="article_title" name="article[title]" size="30" type="text" value="Hello" />
   Body:
@@ -379,7 +379,7 @@ HAML
 
     def test_xss_protection_with_form_for
       assert_equal(<<HTML, render(<<HAML, :action_view))
-<form action="" method="post">
+<form #{rails_form_attr}action="" method="post">#{rails_form_opener}
   Title:
   <input id="article_title" name="article[title]" size="30" type="text" value="Hello" />
   Body:

data/test/haml/templates/helpers.haml

@@ -35,72 +35,6 @@ click
 %p boom
 - concat "foo\n"
 - haml_buffer.tabulation = 0
--#
--# ActionPack pre-2.0 has weird url_for issues here.
-- if ActionPack::VERSION::MAJOR < 2
-  :plain
-    <p>
-      <form action="" method="post">
-    </p>
-    <div>
-      <form action="" method="post">
-        <div><input name="commit" type="submit" value="save" /></div>
-        <p>
-          @foo =
-          value one
-        </p>
-        Toplevel? false
-        <p>
-          @foo =
-          value three
-        </p>
-      </form>
-      <form action="" method="post">
-        Title:
-        <input id="article_title" name="article[title]" size="30" type="text" value="Hello" />
-        Body:
-        <input id="article_body" name="article[body]" size="30" type="text" value="World" />
-      </form>
-    </div>
-- elsif Haml::Util.ap_geq?("3.0.0.beta3")
-  %p
-    = form_tag ''
-  %div
-    = form_tag '' do
-      %div= submit_tag 'save'
-      - @foo = 'value one'
-      = test_partial 'partial'
-    = form_for @article, :as => :article, :url => '', :html => {:class => nil, :id => nil} do |f|
-      Title:
-      = f.text_field :title
-      Body:
-      = f.text_field :body
-- elsif Haml::Util.ap_geq_3?
-  %p
-    = form_tag ''
-  %div
-    = form_tag '' do
-      %div= submit_tag 'save'
-      - @foo = 'value one'
-      = test_partial 'partial'
-    = form_for :article, @article, :url => '' do |f|
-      Title:
-      = f.text_field :title
-      Body:
-      = f.text_field :body
-- else
-  %p
-    = form_tag ''
-  %div
-    - form_tag '' do
-      %div= submit_tag 'save'
-      - @foo = 'value one'
-      = test_partial 'partial'
-    - form_for :article, @article, :url => '' do |f|
-      Title:
-      = f.text_field :title
-      Body:
-      = f.text_field :body
 = list_of({:google => 'http://www.google.com'}) do |name, link|
   %a{ :href => link }= name
 %p

data/test/sass/engine_test.rb

@@ -493,6 +493,12 @@ CSS
   def test_media_import
     assert_equal("@import \"./fonts.sass\" all;\n",
       render("@import \"./fonts.sass\" all"))
+    assert_equal(<<CSS, render(<<SASS))
+@import "./fonts.sass" all;
+@import url(./fonts.scss);
+CSS
+@import "./fonts.sass" all, url(./fonts.scss)
+SASS
   end
 
   def test_http_import
@@ -2044,6 +2050,14 @@ SASS
     end
   end
 
+  def test_import_with_commas_in_url
+    assert_equal <<CSS, render(<<SASS)
+@import url(foo.css?bar,baz);
+CSS
+@import url(foo.css?bar,baz)
+SASS
+  end
+
   # Encodings
 
   unless Haml::Util.ruby1_8?

data/test/test_helper.rb

@@ -68,4 +68,14 @@ class Test::Unit::TestCase
     return "@#{name}, :as => :#{name}, :html => {:class => nil, :id => nil}" if Haml::Util.ap_geq_3?
     return ":#{name}, @#{name}"
   end
+
+  def rails_form_attr
+    return 'accept-charset="UTF-8" ' if Haml::Util.ap_geq?("3.0.0.rc")
+    return ''
+  end
+
+  def rails_form_opener
+    return '' unless Haml::Util.ap_geq?("3.0.0.rc")
+    return '<div style="margin:0;padding:0;display:inline"><input name="_snowman" type="hidden" value="&#9731;" /></div>'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 3.1.50
+  version: 3.1.51
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-26 00:00:00 -04:00
+date: 2010-07-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -289,7 +289,6 @@ files:
 - test/sass/scss/test_helper.rb
 - test/sass/templates/_partial.sass
 - test/sass/templates/alt.sass
-- test/sass/templates/basic.sass
 - test/sass/templates/bork1.sass
 - test/sass/templates/bork2.sass
 - test/sass/templates/bork3.sass

data/test/sass/templates/basic.sass

@@ -1,23 +0,0 @@
-
-
-body  
-  :font Arial
-  :background blue
-
-#page
-  :width 700px
-  :height 100
-  #header
-    :height 300px
-    h1
-      :font-size 50px
-      :color     blue
-
-#content.user.show
-  #container.top
-    #column.left
-      :width 100px
-    #column.right
-      :width 600px
-  #container.bottom
-    :background brown