haml 2.2.23 → 2.2.24

data/.yardopts

@@ -3,6 +3,7 @@
 --markup-provider maruku
 --default-return  ""
 --title           "Haml/Sass Documentation"
+--query           'object.type != :classvariable'
 --hide-void-return
 --protected
 --no-private

data/REMEMBER

@@ -1,13 +1,2 @@
-Deprecate .foo& in stable
-Make .#{} work in extend
-Test newly-invalid selectors, including post-resolution parse errors in Sass
 Be smart about default namespaces (http://www.w3.org/TR/css3-namespace/#declaration)
-Don't conflict with Object#extend.
-
-http://camendesign.com/design/ provides some interesting formatting and nesting issues for sass-convert
-Charles Roper's example code for media queries doesn't fare well in css2sass either
-
-Add period to SCSS syntax errors?
-Better #{} in prop names
-Faster than Less
-Comma multiline for Haml
+Extending nested selectors?

data/Rakefile

@@ -226,7 +226,7 @@ end
 begin
   require 'yard'
 
-  namespace :yard do
+  namespace :doc do
     task :sass do
       require scope('lib/sass')
       Dir[scope("yard/default/**/*.sass")].each do |sass|
@@ -235,12 +235,27 @@ begin
         end
       end
     end
+
+    desc "List all undocumented methods and classes."
+    task :undocumented do
+      opts = ENV["YARD_OPTS"] || ""
+      ENV["YARD_OPTS"] = opts.dup + <<OPTS
+ --list --query "
+  object.docstring.blank? &&
+  !(object.type == :method && object.is_alias?)"
+OPTS
+      Rake::Task['yard'].execute
+    end
   end
 
   YARD::Rake::YardocTask.new do |t|
     t.files = FileList.new(scope('lib/**/*.rb')) do |list|
       list.exclude('lib/haml/template/*.rb')
+      list.exclude('lib/haml/railtie.rb')
       list.exclude('lib/haml/helpers/action_view_mods.rb')
+      list.exclude('lib/haml/helpers/xss_mods.rb')
+      list.exclude('lib/sass/plugin/merb.rb')
+      list.exclude('lib/sass/plugin/rails.rb')
     end.to_a
     t.options << '--incremental' if Rake.application.top_level_tasks.include?('redoc')
     t.options += FileList.new(scope('yard/*.rb')).to_a.map {|f| ['-e', f]}.flatten
@@ -248,8 +263,15 @@ begin
     t.options << '--files' << files.join(',')
     t.options << '--template-path' << scope('yard')
     t.options << '--title' << ENV["YARD_TITLE"] if ENV["YARD_TITLE"]
+
+    t.before = lambda do
+      if ENV["YARD_OPTS"]
+        require 'shellwords'
+        t.options.concat(Shellwords.shellwords(ENV["YARD_OPTS"]))
+      end
+    end
   end
-  Rake::Task['yard'].prerequisites.insert(0, 'yard:sass')
+  Rake::Task['yard'].prerequisites.insert(0, 'doc:sass')
   Rake::Task['yard'].instance_variable_set('@comment', nil)
 
   desc "Generate Documentation"

data/VERSION

@@ -1 +1 @@
-2.2.23
+2.2.24

data/lib/haml/filters.rb

@@ -308,6 +308,8 @@ END
         ::RedCloth.new(text).to_html(:textile)
       end
     end
+    # An alias for the Textile filter,
+    # since the only available Textile parser is RedCloth.
     RedCloth = Textile
     Filters.defined['redcloth'] = RedCloth
 

data/lib/haml/helpers.rb

@@ -1,8 +1,3 @@
-if defined?(ActionView)
-  require 'haml/helpers/action_view_mods'
-  require 'haml/helpers/action_view_extensions'
-end
-
 module Haml
   # This module contains various helpful methods to make it easier to do various tasks.
   # {Haml::Helpers} is automatically included in the context
@@ -52,8 +47,7 @@ MESSAGE
 
     self.extend self
 
-    @@action_view_defined = defined?(ActionView)
-    @@force_no_action_view = false
+    @@action_view_defined = false
 
     # @return [Boolean] Whether or not ActionView is loaded
     def self.action_view?
@@ -572,11 +566,10 @@ END
       _erbout = _hamlout.buffer
       proc { |*args| proc.call(*args) }
     end
-
-    include ActionViewExtensions if self.const_defined? "ActionViewExtensions"
   end
 end
 
+# @private
 class Object
   # Haml overrides various `ActionView` helpers,
   # which call an \{#is\_haml?} method

data/lib/haml/helpers/action_view_extensions.rb

@@ -1,7 +1,7 @@
-require 'haml/helpers/action_view_mods'
-
 module Haml
   module Helpers
+    @@action_view_defined = true
+
     # This module contains various useful helper methods
     # that either tie into ActionView or the rest of the ActionPack stack,
     # or are only useful in that context.
@@ -51,5 +51,7 @@ module Haml
         @_haml_concat_raw = old
       end
     end
+
+    include ActionViewExtensions
   end
 end

data/lib/haml/helpers/action_view_mods.rb

@@ -126,7 +126,11 @@ module ActionView
       end
 
       def content_tag(*args)
-        content_tag_with_haml(*args)
+        html_tag = content_tag_with_haml(*args)
+        return html_tag unless respond_to?(:error_wrapping)
+        return error_wrapping(html_tag) if method(:error_wrapping).arity == 1
+        return html_tag unless object.respond_to?(:errors) && object.errors.respond_to?(:on)
+        return error_wrapping(html_tag, object.errors.on(@method_name))
       end
     end
 
@@ -156,9 +160,7 @@ module ActionView
         def form_for_with_haml(object_name, *args, &proc)
           if block_given? && is_haml?
             oldproc = proc
-            proc = haml_bind_proc do |*args|
-              with_tabs(1) {oldproc.call(*args)}
-            end
+            proc = proc {|*args| with_tabs(1) {oldproc.call(*args)}}
           end
           res = form_for_without_haml(object_name, *args, &proc)
           res << "\n" if block_given? && is_haml?

data/lib/haml/precompiler.rb

@@ -146,6 +146,7 @@ END
     class Line < Struct.new(:text, :unstripped, :full, :index, :precompiler, :eod)
       alias_method :eod?, :eod
 
+      # @private
       def tabs
         line = self
         @tabs ||= precompiler.instance_eval do

data/lib/haml/railtie.rb

@@ -3,7 +3,11 @@
 # Yehuda promises there will be soon,
 # and once there is we should switch to that.
 
-if defined?(Rails::Railtie)
+if defined?(ActiveSupport) && Haml::Util.has?(:public_method, ActiveSupport, :on_load)
+  # Rails 3.0.0.beta.2+
+  ActiveSupport.on_load(:action_view) {Haml.init_rails(binding)}
+elsif defined?(Rails::Railtie)
+  # Rails 3.0.0.beta1
   module Haml
     class Railtie < Rails::Railtie
       initializer :haml do

data/lib/haml/template.rb

@@ -1,4 +1,6 @@
 require 'haml/engine'
+require 'haml/helpers/action_view_mods'
+require 'haml/helpers/action_view_extensions'
 
 module Haml
   # The class that keeps track of the global options for Haml within Rails.
@@ -17,7 +19,11 @@ module Haml
     #
     # @return [Boolean] Whether the XSS integration was enabled.
     def try_enabling_xss_integration
-      return false unless ActionView::Base.respond_to?(:xss_safe?) && ActionView::Base.xss_safe?
+      return false unless (ActionView::Base.respond_to?(:xss_safe?) && ActionView::Base.xss_safe?) ||
+        # We check for ActiveSupport#on_load here because if we're loading Haml that way, it means:
+        # A) we're in Rails 3 so XSS support is always on, and
+        # B) we might be in Rails 3 beta 3 where the load order is broken and xss_safe? is undefined
+        (defined?(ActiveSupport) && Haml::Util.has?(:public_method, ActiveSupport, :on_load))
 
       Haml::Template.options[:escape_html] = true
 
@@ -53,10 +59,14 @@ else
   require 'haml/template/patch'
 end
 
-# Enable XSS integration. Use Rails' after_initialize method if possible
+# Enable XSS integration. Use Rails' after_initialize method
 # so that integration will be checked after the rails_xss plugin is loaded
 # (for Rails 2.3.* where it's not enabled by default).
-if defined?(Rails.configuration.after_initialize)
+#
+# If we're running under Rails 3, though, we don't want to use after_intialize,
+# since Haml loading has already been deferred via ActiveSupport.on_load.
+if defined?(Rails.configuration.after_initialize) &&
+    !(defined?(ActiveSupport) && Haml::Util.has?(:public_method, ActiveSupport, :on_load))
   Rails.configuration.after_initialize {Haml::Template.try_enabling_xss_integration}
 else
   Haml::Template.try_enabling_xss_integration

data/lib/haml/util.rb

@@ -182,6 +182,30 @@ module Haml
           ActionPack::VERSION::TINY == "0.beta")
     end
 
+    # Returns whether this environment is using ActionPack
+    # version 3.0.0.beta.3 or greater.
+    #
+    # @return [Boolean]
+    def ap_geq_3_beta_3?
+      # The ActionPack module is always loaded automatically in Rails >= 3
+      return false unless defined?(ActionPack) && defined?(ActionPack::VERSION)
+
+      version =
+        if defined?(ActionPack::VERSION::MAJOR)
+          ActionPack::VERSION::MAJOR
+        else
+          # Rails 1.2
+          ActionPack::VERSION::Major
+        end
+      version >= 3 &&
+        ((defined?(ActionPack::VERSION::TINY) &&
+          ActionPack::VERSION::TINY.is_a?(Fixnum) &&
+          ActionPack::VERSION::TINY >= 1) ||
+         (defined?(ActionPack::VERSION::BUILD) &&
+          ActionPack::VERSION::BUILD =~ /beta(\d+)/ &&
+          $1.to_i >= 3))
+    end
+
     # Returns an ActionView::Template* class.
     # In pre-3.0 versions of Rails, most of these classes
     # were of the form `ActionView::TemplateFoo`,
@@ -227,6 +251,10 @@ module Haml
       raise Haml::Error.new("Expected #{text.inspect} to be HTML-safe.")
     end
 
+    # The class for the Rails SafeBuffer XSS protection class.
+    # This varies depending on Rails version.
+    #
+    # @return [Class]
     def rails_safe_buffer_class
       return ActionView::SafeBuffer if defined?(ActionView::SafeBuffer)
       ActiveSupport::SafeBuffer

data/lib/sass/script/number.rb

@@ -106,7 +106,7 @@ module Sass::Script
     # @raise [NoMethodError] if `other` is an invalid type
     def times(other)
       if other.is_a? Number
-        self.operate(other, :*)
+        operate(other, :*)
       elsif other.is_a? Color
         other.times(self)
       else
@@ -284,7 +284,7 @@ module Sass::Script
                  end, num_units, den_units)
     end
 
-    protected
+    private
 
     def operate(other, operation)
       this = self

data/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/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/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 = {})
@@ -153,6 +164,18 @@ HTML
 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/test/haml/template_test.rb

@@ -268,7 +268,7 @@ END
   <input id="article_body" name="article[body]" size="30" type="text" value="World" />
 </form>
 HTML
-- form_for :article, @article, :url => '' do |f|
+- form_for #{form_for_calling_convention(:article)}, :url => '' do |f|
   Title:
   = f.text_field :title
   Body:
@@ -367,7 +367,7 @@ HAML
   <input id="article_body" name="article[body]" size="30" type="text" value="World" />
 </form>
 HTML
-#{rails_block_helper_char} form_for :article, @article, :url => '' do |f|
+#{rails_block_helper_char} form_for #{form_for_calling_convention(:article)}, :url => '' do |f|
   Title:
   = f.text_field :title
   Body:

data/test/haml/templates/helpers.haml

@@ -62,6 +62,19 @@ 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 ''

data/test/test_helper.rb

@@ -42,4 +42,9 @@ class Test::Unit::TestCase
     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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 2
-  - 23
-  version: 2.2.23
+  - 24
+  version: 2.2.24
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-11 00:00:00 -07:00
+date: 2010-04-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency