radiant 0.9.0.rc2 → 0.9.1

data/vendor/plugins/haml/lib/sass/tree/if_node.rb

@@ -30,6 +30,7 @@ module Sass::Tree
       @last_else = node
     end
 
+    # @see Node#options=
     def options=(options)
       super
       self.else.options = options if self.else

data/vendor/plugins/haml/lib/sass/tree/rule_node.rb

@@ -202,7 +202,15 @@ module Sass::Tree
       while scanner.rest?
         rules.last << scanner.scan(/[^",&]*/)
         case scanner.scan(/./)
-        when '&'; rules.last << :parent
+        when '&'
+          warn <<END unless rules.last.empty? || rules.last.last =~ /(^|\s)$/
+DEPRECATION WARNING:
+On line #{@line}#{" of '#{@filename}'" if @filename}
+In Sass 3, parent selectors will only be able to appear
+at the beginning of simple selector sequences.
+For example, ".foo &.bar" is allowed but ".bar&" is not.
+END
+          rules.last << :parent
         when ','
           scanner.scan(/\s*/)
           rules << [] if scanner.rest?

data/vendor/plugins/haml/test/haml/engine_test.rb

@@ -36,7 +36,14 @@ class EngineTest < Test::Unit::TestCase
     "%p{:a => 'b',\n:c => 'd',\n:e => raise('foo')}" => ["foo", 3],
     " %p foo" => "Indenting at the beginning of the document is illegal.",
     "  %p foo" => "Indenting at the beginning of the document is illegal.",
-    "- end" => "You don't need to use \"- end\" in Haml. Use indentation instead:\n- if foo?\n  %strong Foo!\n- else\n  Not foo.",
+    "- end" => <<MESSAGE.rstrip,
+You don't need to use "- end" in Haml. Un-indent to close a block:
+- if foo?
+  %strong Foo!
+- else
+  Not foo.
+%p This line is un-indented, so it isn't part of the "if" block
+MESSAGE
     " \n\t\n %p foo" => ["Indenting at the beginning of the document is illegal.", 3],
     "\n\n %p foo" => ["Indenting at the beginning of the document is illegal.", 3],
     "%p\n  foo\n foo" => ["Inconsistent indentation: 1 space was used for indentation, but the rest of the document was indented using 2 spaces.", 3],
@@ -73,6 +80,11 @@ class EngineTest < Test::Unit::TestCase
     "!!!\n\n  bar" => ["Illegal nesting: nesting within a header command is illegal.", 3],
     "foo\n:ruby\n  1\n  2\n  3\n- raise 'foo'" => ["foo", 6],
     "foo\n:erb\n  1\n  2\n  3\n- raise 'foo'" => ["foo", 6],
+    "foo\n:plain\n  1\n  2\n  3\n- raise 'foo'" => ["foo", 6],
+    "foo\n:plain\n  1\n  2\n  3\n4\n- raise 'foo'" => ["foo", 7],
+    "foo\n:plain\n  1\n  2\n  3\#{''}\n- raise 'foo'" => ["foo", 6],
+    "foo\n:plain\n  1\n  2\n  3\#{''}\n4\n- raise 'foo'" => ["foo", 7],
+    "foo\n:plain\n  1\n  2\n  \#{raise 'foo'}" => ["foo", 5],
     "= raise 'foo'\nfoo\nbar\nbaz\nbang" => ["foo", 1],
   }
 
@@ -592,8 +604,9 @@ HAML
 <p>foo-end</p>
 <p>bar-end</p>
 HTML
-- "foo-end-bar-end".gsub(/\\w+-end/) do |s|
+- ("foo-end-bar-end".gsub(/\\w+-end/) do |s|
   %p= s
+- end; nil)
 HAML
   end
 
@@ -616,6 +629,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/vendor/plugins/haml/test/haml/helper_test.rb

@@ -15,7 +15,18 @@ module Haml::Helpers
 end
 
 class HelperTest < Test::Unit::TestCase
-  Post = Struct.new('Post', :body)
+  Post = Struct.new('Post', :body, :error_field, :errors)
+  class PostErrors
+    def on(name)
+      return unless name == 'error_field'
+      ["Really bad error"]
+    end
+    alias_method :full_messages, :on
+
+    def [](name)
+      on(name) || []
+    end
+  end
   
   def setup
     @base = ActionView::Base.new
@@ -26,7 +37,7 @@ class HelperTest < Test::Unit::TestCase
       @base.controller.response = ActionController::Response.new
     end
 
-    @base.instance_variable_set('@post', Post.new("Foo bar\nbaz"))
+    @base.instance_variable_set('@post', Post.new("Foo bar\nbaz", nil, PostErrors.new))
   end
 
   def render(text, options = {})
@@ -65,7 +76,21 @@ class HelperTest < Test::Unit::TestCase
     assert_equal("foo\n  bar\nbaz\n", render("foo\n- tab_up\nbar\n- tab_down\nbaz"))
     assert_equal("          <p>tabbed</p>\n", render("- buffer.tabulation=5\n%p tabbed"))
   end
-  
+
+  def test_with_tabs
+    assert_equal(<<HTML, render(<<HAML))
+Foo
+    Bar
+    Baz
+Baz
+HTML
+Foo
+- with_tabs 2 do
+  = "Bar\\nBaz"
+Baz
+HAML
+  end
+
   def test_helpers_dont_leak
     # Haml helpers shouldn't be accessible from ERB
     render("foo")
@@ -93,9 +118,16 @@ class HelperTest < Test::Unit::TestCase
   def test_form_tag
     # This is usually provided by ActionController::Base.
     def @base.protect_against_forgery?; false; end
-    result = render("- form_tag 'foo' do\n  %p bar\n  %strong baz", :action_view)
-    should_be = "<form action=\"foo\" method=\"post\">\n  <p>bar</p>\n  <strong>baz</strong>\n</form>\n"
-    assert_equal(should_be, result)
+    assert_equal(<<HTML, render(<<HAML, :action_view))
+<form action="foo" method="post">
+  <p>bar</p>
+  <strong>baz</strong>
+</form>
+HTML
+#{rails_block_helper_char} form_tag 'foo' do
+  %p bar
+  %strong baz
+HAML
   end
 
   def test_text_area
@@ -110,21 +142,40 @@ class HelperTest < Test::Unit::TestCase
   end
   
   def test_capture_haml
-    assert_equal("\"<p>13</p>\\n\"\n", render("- foo = capture_haml(13) do |a|\n  %p= a\n= foo.dump"))
+    assert_equal(<<HTML, render(<<HAML))
+"<p>13</p>\\n"
+HTML
+- (foo = capture_haml(13) do |a|
+  %p= a
+- end; nil)
+= foo.dump
+HAML
   end
 
   def test_content_tag_block
-    assert_equal(<<HTML.strip, render(<<HAML, :action_view))
+    assert_equal(<<HTML.strip, render(<<HAML, :action_view).strip)
 <div><p>bar</p>
 <strong>bar</strong>
 </div>
 HTML
-- content_tag :div do
+#{rails_block_helper_char} content_tag :div do
   %p bar
   %strong bar
 HAML
   end
 
+  def test_content_tag_error_wrapping
+    def @base.protect_against_forgery?; false; end
+    assert_equal(<<HTML, render(<<HAML, :action_view))
+<form action="" method="post">
+  <div class="fieldWithErrors"><label for="post_error_field">Error field</label></div>
+</form>
+HTML
+#{rails_block_helper_char} form_for #{form_for_calling_convention('post')}, :url => '' do |f|
+  = f.label 'error_field'
+HAML
+  end
+
   def test_haml_tag_attribute_html_escaping
     assert_equal("<p id='foo&amp;bar'>baz</p>\n", render("%p{:id => 'foo&bar'} baz", :escape_html => true))
   end

data/vendor/plugins/haml/test/haml/template_test.rb

@@ -70,17 +70,27 @@ class TemplateTest < Test::Unit::TestCase
     end
     
     if Haml::Util.has?(:private_method, base, :evaluate_assigns)
+      # Rails < 3.0
       base.send(:evaluate_assigns)
-    else
+    elsif Haml::Util.has?(:private_method, base, :_evaluate_assigns_and_ivars)
       # Rails 2.2
       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
 
-    base.controller = DummyController.new
+    # In Rails <= 2.1, a fake controller object was needed
+    # to provide the controller path.
+    if ActionPack::VERSION::MAJOR < 2 ||
+        (ActionPack::VERSION::MAJOR == 2 && ActionPack::VERSION::MINOR < 2)
+      base.controller = DummyController.new
+    end
+
     base
   end
 
@@ -204,10 +214,13 @@ baz
 HTML
 %p
   foo
-  - with_output_buffer do
+  -# Parenthesis required due to Rails 3.0 deprecation of block helpers
+  -# that return strings.
+  - (with_output_buffer do
     bar
     = "foo".gsub(/./) do |s|
       - "flup"
+  - end; nil)
   baz
 HAML
   end
@@ -243,6 +256,28 @@ END
     end
   end
 
+  if defined?(ActionView::OutputBuffer) &&
+      Haml::Util.has?(:instance_method, ActionView::OutputBuffer, :append_if_string=)
+    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">
+  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>
+HTML
+- form_for #{form_for_calling_convention(:article)}, :url => '' do |f|
+  Title:
+  = f.text_field :title
+  Body:
+  = f.text_field :body
+HAML
+      end
+    end
+  end
+
   ## XSS Protection Tests
 
   # In order to enable these, either test against Rails 3.0
@@ -306,5 +341,47 @@ END
         assert_equal("Foo & Bar", render('- safe_concat "Foo & Bar"', :action_view))
       end
     end
+
+    ## Regression
+
+    def test_xss_protection_with_nested_haml_tag
+      assert_equal(<<HTML, render(<<HAML, :action_view))
+<div>
+  <ul>
+    <li>Content!</li>
+  </ul>
+</div>
+HTML
+- haml_tag :div do
+  - haml_tag :ul do
+    - haml_tag :li, "Content!"
+HAML
+    end
+
+    def test_xss_protection_with_form_for
+      assert_equal(<<HTML, render(<<HAML, :action_view))
+<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>
+HTML
+#{rails_block_helper_char} form_for #{form_for_calling_convention(:article)}, :url => '' do |f|
+  Title:
+  = 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
 end

data/vendor/plugins/haml/test/haml/templates/helpers.haml

@@ -62,6 +62,32 @@ click
         <input id="article_body" name="article[body]" size="30" type="text" value="World" />
       </form>
     </div>
+- elsif Haml::Util.ap_geq_3_beta_3?
+  %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 ''

data/vendor/plugins/haml/test/haml/templates/partial_layout.haml

@@ -1,3 +1,7 @@
 %h1 Partial layout used with for block:
-- render :layout => 'layout_for_partial.haml' do
-  %p Some content within a layout
+- if Haml::Util.ap_geq_3?
+  = render :layout => 'layout_for_partial.haml' do
+    %p Some content within a layout
+- else
+  - render :layout => 'layout_for_partial.haml' do
+    %p Some content within a layout

data/vendor/plugins/haml/test/sass/engine_test.rb

@@ -55,7 +55,12 @@ MSG
     "a," => "Rules can\'t end in commas.",
     "a,\n!b = 1" => ["Rules can\'t end in commas.", 1],
     "!a = b\n  :c d\n" => "Illegal nesting: Nothing may be nested beneath variable declarations.",
-    "@import foo.sass" => "File to import not found or unreadable: foo.sass.",
+    "@import foo.sass" => <<MSG,
+File to import not found or unreadable: foo.sass.
+Load paths:
+  #{File.dirname(__FILE__)}
+  .
+MSG
     "@import templates/basic\n  foo" => "Illegal nesting: Nothing may be nested beneath import directives.",
     "foo\n  @import templates/basic" => "Import directives may only be used at the root of a document.",
     "foo\n  @import #{File.dirname(__FILE__)}/templates/basic" => "Import directives may only be used at the root of a document.",

data/vendor/plugins/haml/test/test_helper.rb

@@ -24,7 +24,12 @@ class Test::Unit::TestCase
   def assert_warning(message)
     the_real_stderr, $stderr = $stderr, StringIO.new
     yield
-    assert_equal message.strip, $stderr.string.strip
+
+    if message.is_a?(Regexp)
+      assert_match message, $stderr.string.strip
+    else
+      assert_equal message.strip, $stderr.string.strip
+    end
   ensure
     $stderr = the_real_stderr
   end
@@ -32,4 +37,14 @@ class Test::Unit::TestCase
   def silence_warnings(&block)
     Haml::Util.silence_warnings(&block)
   end
+
+  def rails_block_helper_char
+    return '=' if Haml::Util.ap_geq_3?
+    return '-'
+  end
+
+  def form_for_calling_convention(name)
+    return "@#{name}, :as => :#{name}, :html => {:class => nil, :id => nil}" if Haml::Util.ap_geq_3_beta_3?
+    return ":#{name}, @#{name}"
+  end
 end

data/vendor/radius/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2006-2010, John W. Long
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/vendor/radius/QUICKSTART.rdoc

@@ -256,8 +256,8 @@ tags to redefine variables. This is valuable when defining context sensitive tag
   parser.parse('<r:name />') # raises a Radius::UndefinedTagError exception
 
 Notice how TagBinding#locals enables intelligent nesting. "<r:jill:name />" evaluates to
-"Jill", but "<r:jill:friend:name />" evaluates to "Jack". Locals loose scope as soon as
-the tag they were defined in closes. Globals on the other hand, never loose scope.
+"Jill", but "<r:jill:friend:name />" evaluates to "Jack". Locals lose scope as soon as
+the tag they were defined in closes. Globals on the other hand, never lose scope.
 
 The final line in the example above demonstrates that calling "<r:name />" raises a
 TagMissing error. This is because of the way the name tag was defined:
@@ -315,8 +315,8 @@ specificity a tag could be assigned would be:
 
 One point for each of the levels.
 
-A deep understanding of tag specificity is not necessary to be effective with
-Radius. For the most part you will find that Radius resolves tags precisely the
-way that you would expect. If you find this section confusing forget about it and
-refer back to it if you find that tags are resolving differently from the way that
-you expected.
+In practice, you don't need to understand this topic to be effective with Radius.
+For the most part you will find that Radius resolves tags precisely the way that
+you would expect. If you find this section confusing forget about it and refer
+back to it if you find that tags are resolving differently from the way that you
+expected.