haml 1.8.1 → 1.8.2

data/VERSION

@@ -1 +1 @@
-1.8.1
+1.8.2

data/lib/haml/engine.rb

@@ -20,6 +20,10 @@ module Haml
     # Allow reading and writing of the options hash
     attr :options, true
 
+    # This string contains the source code that is evaluated
+    # to produce the Haml document.
+    attr :precompiled, true
+
     # Creates a new instace of Haml::Engine that will compile the given
     # template string when <tt>render</tt> is called.
     # See README for available options.

data/lib/haml/helpers.rb

@@ -153,7 +153,7 @@ module Haml
     #   <strong>baz</strong>
     #
     def tab_up(i = 1)
-      buffer.tabulation += i
+      haml_buffer.tabulation += i
     end
 
     # Increments the number of tabs the buffer automatically adds
@@ -161,7 +161,7 @@ module Haml
     #
     # See tab_up.
     def tab_down(i = 1)
-      buffer.tabulation -= i
+      haml_buffer.tabulation -= i
     end
     
     # Surrounds the given block of Haml code with the given characters,
@@ -235,12 +235,12 @@ module Haml
     # the local variable <tt>foo</tt> would be assigned to "<p>13</p>\n".
     #
     def capture_haml(*args, &block)
-      capture_haml_with_buffer(buffer.buffer, *args, &block)
+      capture_haml_with_buffer(haml_buffer.buffer, *args, &block)
     end
 
     # Outputs text directly to the Haml buffer, with the proper tabulation
     def puts(text = "")
-      buffer.buffer << ('  ' * buffer.tabulation) << text.to_s << "\n"
+      haml_buffer.buffer << ('  ' * haml_buffer.tabulation) << text.to_s << "\n"
       nil
     end
 
@@ -285,7 +285,7 @@ module Haml
     #     </tr>
     #   </table>
     #
-    def open(name, attributes = {}, alt_atts = {}, &block)
+    def haml_tag(name, attributes = {}, alt_atts = {}, &block)
       text = nil
       if attributes.is_a? String
         text = attributes
@@ -293,11 +293,11 @@ module Haml
       end
 
       if text.nil? && block.nil?
-        puts "<#{name}#{Haml::Precompiler.build_attributes(buffer.options[:attr_wrapper], attributes)} />"
+        puts "<#{name}#{Haml::Precompiler.build_attributes(haml_buffer.options[:attr_wrapper], attributes)} />"
         return nil
       end
 
-      puts "<#{name}#{Haml::Precompiler.build_attributes(buffer.options[:attr_wrapper], attributes)}>"
+      puts "<#{name}#{Haml::Precompiler.build_attributes(haml_buffer.options[:attr_wrapper], attributes)}>"
       unless text && text.empty?
         tab_up
         # Print out either the text (using push_text) or call the block and add an endline
@@ -311,18 +311,27 @@ module Haml
       puts "</#{name}>"
       nil
     end
+
+    def open(*args, &block)
+              warn <<END
+DEPRECATION WARNING:
+The Haml #open helper is deprecated and will be removed in version 2.0.
+Use the #haml_tag method instead.
+END
+      haml_tag(*args, &block)
+    end
     
     private
 
     # Gets a reference to the current Haml::Buffer object.
-    def buffer
+    def haml_buffer
       @haml_stack[-1]
     end
     
     # Gives a proc the same local "_hamlout" and "_erbout" variables
     # that the current template has.
-    def bind_proc(&proc)
-      _hamlout = buffer
+    def haml_bind_proc(&proc)
+      _hamlout = haml_buffer
       _erbout = _hamlout.buffer
       proc { |*args| proc.call(*args) }
     end

data/lib/haml/helpers/action_view_mods.rb

@@ -31,7 +31,7 @@ if defined?(ActionView) and not defined?(Merb::Plugins)
       module TextHelper
         def concat_with_haml(string, binding = nil)
           if is_haml?
-            buffer.buffer.concat(string)
+            haml_buffer.buffer.concat(string)
           else
             concat_without_haml(string, binding)
           end
@@ -45,7 +45,7 @@ if defined?(ActionView) and not defined?(Merb::Plugins)
           if is_haml?
             if block_given?
               oldproc = proc
-              proc = bind_proc do |*args|
+              proc = haml_bind_proc do |*args|
                 concat "\n"
                 tab_up
                 oldproc.call(*args)
@@ -67,7 +67,7 @@ if defined?(ActionView) and not defined?(Merb::Plugins)
         def form_for_with_haml(object_name, *args, &proc)
           if block_given? && is_haml?
             oldproc = proc 
-            proc = bind_proc do |*args|
+            proc = haml_bind_proc do |*args|
               tab_up
               oldproc.call(*args)
               tab_down

data/lib/haml/precompiler.rb

@@ -122,7 +122,7 @@ END
       @tab_change  = 0
 
       old_line = Line.new
-      (@template + "\n-#\n-#").split("\n").each_with_index do |text, index|
+      (@template + "\n-#\n-#").split(/\n?\r|\r?\n/).each_with_index do |text, index|
         line = Line.new text.strip, text.lstrip.chomp, index
         line.spaces, line.tabs = count_soft_tabs(text)
 
@@ -473,15 +473,29 @@ END
     def prerender_tag(name, atomic, attributes)
       "<#{name}#{Precompiler.build_attributes(@options[:attr_wrapper], attributes)}#{atomic ? ' />' : '>'}"
     end
+    
+    # Parses a line into tag_name, attributes, attributes_hash, object_ref, action, value
+    def parse_tag(line)
+      raise SyntaxError.new("Invalid tag: \"#{line}\"") unless match = line.scan(/[%]([-:\w]+)([-\w\.\#]*)(.*)/)[0]
+      tag_name, attributes, rest = match
+      if rest[0] == ?{
+        scanner = StringScanner.new(rest)
+        attributes_hash, rest = balance(scanner, ?{, ?})
+        attributes_hash = attributes_hash[1, attributes_hash.length - 2] if attributes_hash
+      end
+      if rest
+        object_ref, rest = balance(rest, ?[, ?]) if rest[0] == ?[
+        action, value = rest.scan(/([=\/\~]?)?(.*)?/)[0]
+      end
+      value = value.to_s.strip
+      [tag_name, attributes, attributes_hash, object_ref, action, value]
+    end
 
     # Parses a line that will render as an XHTML tag, and adds the code that will
     # render that tag to <tt>@precompiled</tt>.
     def render_tag(line)
-      raise SyntaxError.new("Invalid tag: \"#{line}\"") unless match = line.scan(TAG_REGEX)[0]
-      tag_name, attributes, attributes_hash, object_ref, action, value = match
-      value = value.to_s.strip
-      attributes_hash = attributes_hash[1...-1] if attributes_hash
-
+      tag_name, attributes, attributes_hash, object_ref, action, value = parse_tag(line)
+      
       raise SyntaxError.new("Illegal element: classes and ids must have values.") if attributes =~ /[\.#](\.|#|\z)/
 
       case action
@@ -505,7 +519,7 @@ END
       Buffer.merge_attrs(attributes, static_attributes) if static_attributes
 
       raise SyntaxError.new("Illegal Nesting: Nesting within an atomic tag is illegal.") if @block_opened && atomic
-      raise SyntaxError.new("Illegal Nesting: Nesting within a tag that already has content is illegal.") if @block_opened && !value.empty?
+      raise SyntaxError.new("Illegal Nesting: Content can't be both given on the same line as %#{tag_name} and nested within it.") if @block_opened && !value.empty?
       raise SyntaxError.new("Tag has no content.") if parse && value.empty?
       raise SyntaxError.new("Atomic tags can't have content.") if atomic && !value.empty?
 
@@ -621,25 +635,26 @@ END
 
       while scan.scan(/(.*?)\\\#\{/)
         str << scan.matched[0...-3]
-        str << eval("\"\\\#{#{balance_brackets(scan)}}\"")
+        str << eval("\"\\\#{#{balance(scan, ?{, ?}, 1)[0][0...-1]}}\"")
       end
 
       str + scan.rest
     end
 
-    def balance_brackets(scanner)
+    def balance(scanner, start, finish, count = 0)
       str = ''
-      count = 1
-
-      while scanner.scan(/(.*?)[\{\}]/)
+      scanner = StringScanner.new(scanner) unless scanner.is_a? StringScanner
+      regexp = Regexp.new("(.*?)[\\#{start.chr}\\#{finish.chr}]")
+      while scanner.scan(regexp)
         str << scanner.matched
-        count += 1 if scanner.matched[-1] == ?{
-        count -= 1 if scanner.matched[-1] == ?}
-        return str[0...-1] if count == 0
+        count += 1 if scanner.matched[-1] == start
+        count -= 1 if scanner.matched[-1] == finish
+        return [str.strip, scanner.rest] if count == 0
       end
 
       raise SyntaxError.new("Unbalanced brackets.")
     end
+    
 
     # Counts the tabulation of a line.
     def count_soft_tabs(line)

data/lib/haml/template/plugin.rb

@@ -26,6 +26,16 @@ module Haml
       options = Haml::Template.options.dup
       Haml::Engine.new(template, options).send(:precompiled_with_ambles, [])
     end
+   
+    def cache_fragment(block, name = {}, options = nil)
+      @view.fragment_for(block, name, options) do
+        eval("_hamlout.buffer", block.binding)
+      end
+    end
+   
+    def read_template_file(template_path, extension)
+      File.read(template_path)
+    end
   end
 end
 

data/lib/sass/engine.rb

@@ -71,7 +71,7 @@ module Sass
         :style => :nested,
         :load_paths => ['.']
       }.merge! options
-      @template = template.split(/\n\r|\n/)
+      @template = template.split(/\n?\r|\r?\n/)
       @lines = []
       @constants = {"important" => "!important"}
     end

data/lib/sass/plugin.rb

@@ -13,6 +13,13 @@ module Sass
         :always_check       => true,
         :full_exception     => true
       }
+      @@checked_for_updates = false
+
+      # Whether or not Sass has *ever* checked if the stylesheets need updates
+      # (in this Ruby instance).
+      def checked_for_updates
+        @@checked_for_updates
+      end
 
       # Gets various options for Sass. See README for details.
       #--
@@ -35,6 +42,7 @@ module Sass
       def update_stylesheets
         return if options[:never_update]
 
+        @@checked_for_updates = true
         Dir.glob(File.join(options[:template_location], "**", "*.sass")).entries.each do |file|
 
           # Get the relative path to the file with no extension

data/lib/sass/plugin/merb.rb

@@ -18,12 +18,35 @@ unless defined?(Sass::MERB_LOADED)
   config.symbolize_keys!
   Sass::Plugin.options.merge!(config)
   
-  class MerbHandler # :nodoc:
-    def process_with_sass(request, response)
-      Sass::Plugin.update_stylesheets if Sass::Plugin.options[:always_update] || Sass::Plugin.options[:always_check]
-      process_without_sass(request, response)
+  if version[0] > 0 || version[1] >= 9
+
+    class Merb::Rack::Application # :nodoc:
+      def call_with_sass(env)
+        if !Sass::Plugin.checked_for_updates ||
+            Sass::Plugin.options[:always_update] || Sass::Plugin.options[:always_check]
+          Sass::Plugin.update_stylesheets
+        end
+
+        call_without_sass(env)
+      end
+      alias_method :call_without_sass, :call
+      alias_method :call, :call_with_sass
+    end
+
+  else
+
+    class MerbHandler # :nodoc:
+      def process_with_sass(request, response)
+        if !Sass::Plugin.checked_for_updates ||
+            Sass::Plugin.options[:always_update] || Sass::Plugin.options[:always_check]
+          Sass::Plugin.update_stylesheets
+        end
+
+        process_without_sass(request, response)
+      end
+      alias_method :process_without_sass, :process
+      alias_method :process, :process_with_sass
     end
-    alias_method :process_without_sass, :process
-    alias_method :process, :process_with_sass
+
   end
 end

data/lib/sass/plugin/rails.rb

@@ -11,7 +11,11 @@ unless defined?(Sass::RAILS_LOADED)
     class Base
       alias_method :sass_old_process, :process
       def process(*args)
-        Sass::Plugin.update_stylesheets if Sass::Plugin.options[:always_update] || Sass::Plugin.options[:always_check]
+        if !Sass::Plugin.checked_for_updates ||
+            Sass::Plugin.options[:always_update] || Sass::Plugin.options[:always_check]
+          Sass::Plugin.update_stylesheets
+        end
+
         sass_old_process(*args)
       end
     end

data/test/haml/engine_test.rb

@@ -97,6 +97,10 @@ class EngineTest < Test::Unit::TestCase
     assert_equal("<p>0</p>\n<p>1</p>\n<p>2</p>\n", render("- for i in (0...3)\n  %p= |\n   i |"))
   end
 
+  def test_cr_newline
+    assert_equal("<p>foo</p>\n<p>bar</p>\n<p>baz</p>\n<p>boom</p>\n", render("%p foo\r%p bar\r\n%p baz\n\r%p boom"))
+  end
+
   # Options tests
 
   def test_stop_eval
@@ -129,6 +133,18 @@ class EngineTest < Test::Unit::TestCase
     assert_equal("<p escaped='quo4te'>\n</p>\n", render("%p{ :escaped => \"quo\#{2 + 2}te\"}"))
   end
   
+  def test_correct_parsing_with_brackets
+    assert_equal("<p class='foo'>{tada} foo</p>\n", render("%p{:class => 'foo'} {tada} foo"))
+    assert_equal("<p class='foo'>deep {nested { things }}</p>\n", render("%p{:class => 'foo'} deep {nested { things }}"))
+    assert_equal("<p class='bar foo'>{a { d</p>\n", render("%p{{:class => 'foo'}, :class => 'bar'} {a { d"))
+    assert_equal("<p foo='bar'>a}</p>\n", render("%p{:foo => 'bar'} a}"))
+    
+    foo = []
+    foo[0] = Struct.new('Foo', :id).new
+    assert_equal("<p class='struct_foo' id='struct_foo_new'>New User]</p>\n",
+                 render("%p[foo[0]] New User]", :locals => {:foo => foo}))
+  end
+  
   def test_empty_attrs
     assert_equal("<p attr=''>empty</p>\n", render("%p{ :attr => '' } empty"))
     assert_equal("<p attr=''>empty</p>\n", render("%p{ :attr => x } empty", :locals => {:x => ''}))

data/test/haml/helper_test.rb

@@ -140,7 +140,7 @@ class HelperTest < Test::Unit::TestCase
     context.init_haml_helpers
 
     result = context.capture_haml do
-      context.open :p, :attr => "val" do
+      context.haml_tag :p, :attr => "val" do
         context.puts "Blah"
       end
     end

data/test/haml/templates/helpers.haml

@@ -31,10 +31,10 @@ click
 = succeed '.' do
   %a{:href=>"thing"} here
 %p baz
-- buffer.tabulation = 10
+- haml_buffer.tabulation = 10
 %p boom
 - concat "foo\n"
-- buffer.tabulation = 0
+- haml_buffer.tabulation = 0
 - def url_for(*stuff); stuff.join(' '); end
 -# The form URLs must be empty
 -# because of a weird bug that causes url_for to misbehave.
@@ -58,12 +58,12 @@ click
   - puts "boom"
   baz
   - puts "boom, again"
-- open :table do
-  - open :tr do
-    - open :td, {:class => 'cell'} do
-      - open :strong, "strong!"
+- haml_tag :table do
+  - haml_tag :tr do
+    - haml_tag :td, {:class => 'cell'} do
+      - haml_tag :strong, "strong!"
       - puts "data"
-    - open :td do
+    - haml_tag :td do
       - puts "more_data"
-- open :hr
-- open :div, ''
+- haml_tag :hr
+- haml_tag :div, ''

data/test/sass/engine_test.rb

@@ -204,6 +204,10 @@ END
     assert_equal(":focus {\n  a: b; }\n", render("\\:focus\n  a: b"))
     assert_equal("a {\n  b: c; }\n  a :focus {\n    d: e; }\n", render("\\a\n  b: c\n  \\:focus\n    d: e"))
   end
+
+  def test_cr_newline
+    assert_equal("foo {\n  a: b;\n  c: d;\n  e: f; }\n", render("foo\r  a: b\r\n  c: d\n\r  e: f"))
+  end
   
   private
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 1.8.1
-date: 2008-01-28 00:00:00 -08:00
+  version: 1.8.2
+date: 2008-02-24 00:00:00 -08:00
 summary: An elegant, structured XHTML/XML templating engine. Comes with Sass, a similar CSS templating engine.
 require_paths: 
 - lib
@@ -36,7 +36,6 @@ files:
 - lib/sass/plugin
 - lib/sass/plugin/rails.rb
 - lib/sass/plugin/merb.rb
-- lib/sass/constant.rb.rej
 - lib/sass/error.rb
 - lib/sass/tree
 - lib/sass/tree/value_node.rb
@@ -71,7 +70,6 @@ files:
 - lib/haml/precompiler.rb
 - lib/haml/helpers
 - lib/haml/helpers/action_view_extensions.rb
-- lib/haml/helpers/action_view_mods.rb.rej
 - lib/haml/helpers/action_view_mods.rb
 - lib/haml.rb
 - bin/css2sass
@@ -114,7 +112,6 @@ files:
 - test/sass/results/compressed.css
 - test/sass/results/parent_ref.css
 - test/sass/results/basic.css
-- test/sass/engine_test.rb.rej
 - test/sass/engine_test.rb
 - test/haml
 - test/haml/mocks

data/lib/haml/helpers/action_view_mods.rb.rej

@@ -1,30 +0,0 @@
-***************
-*** 1,11 ****
-- begin
--   require 'rubygems'
--   require 'active_support'
--   require 'action_controller'
--   require 'action_view'
--   action_view_included = true
-- rescue LoadError
--   action_view_included = false
-  end
-  
-  
---- 1,16 ----
-+ 
-+ # This obviously requires that ActiveSupport be present prior to Haml
-+ # being loaded.
-+ action_view_included = false
-+ if defined?(ActiveSupport)
-+   begin
-+     require 'rubygems'
-+     require 'active_support'
-+     require 'action_controller'
-+     require 'action_view'
-+     action_view_included = true
-+   rescue LoadError
-+   end
-  end
-  
-  

data/lib/sass/constant.rb.rej

@@ -1,42 +0,0 @@
-***************
-*** 106,121 ****
-                end
-  
-                # Time for a unary minus!
--               if negative_okay && symbol == :minus
--                 negative_okay = true
-                  to_return << :neg
-                  next
-                end
-  
-                # Are we looking at an operator?
-                if symbol && (str.empty? || symbol != :mod)
-                  str = reset_str.call
--                 negative_okay = true
-                  to_return << symbol
-                  next
-                end
---- 107,129 ----
-                end
-  
-                # Time for a unary minus!
-+               if beginning_of_token && symbol == :minus
-+                 beginning_of_token = true
-                  to_return << :neg
-                  next
-                end
-  
-+               # Is this a constant?
-+               if beginning_of_token && symbol == :const
-+                 beginning_of_token = true
-+                 to_return << :const
-+                 next
-+               end
-+ 
-                # Are we looking at an operator?
-                if symbol && (str.empty? || symbol != :mod)
-                  str = reset_str.call
-+                 beginning_of_token = true
-                  to_return << symbol
-                  next
-                end

data/test/sass/engine_test.rb.rej

@@ -1,18 +0,0 @@
-***************
-*** 44,49 ****
-      "@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    bar boom" => "Unknown compiler directive: \"@foo bar boom\"",
-    }
-    
-    def test_basic_render
---- 44,52 ----
-      "@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    bar boom" => "Unknown compiler directive: \"@foo bar boom\"",
-+     "!foo = bar baz -" => "Unterminated unary minus.",
-+     "!foo = bar baz !" => "Unterminated constant.",
-+     "!foo = !(foo)" => "Invalid constant.",
-    }
-    
-    def test_basic_render