haml2erb 0.3.0.pre → 0.3.0.pre.2

data/lib/haml2erb/attributes_parser.rb

@@ -0,0 +1,77 @@
+module Haml2Erb
+  class AttributesParser
+    class DynamicAttributes < StandardError
+    end
+    
+    def initialize attributes
+      @attributes = attributes
+      @pairs = []
+    end
+    attr_reader :pairs, :attributes
+    
+    CONTENTS    = /^, \{(.*)\}$/
+    ROCKET      = '\=\>'
+    
+    SYMBOL_TEXT = '[\w_]+'
+    STRING_TEXT = '[\w_-]+'
+    
+    SYMBOL_KEY  = /^(?:\:(#{SYMBOL_TEXT})\s*#{ROCKET}|(#{SYMBOL_TEXT}):)\s*/
+    STRING_KEY  = /^(?:'(#{STRING_TEXT})'|"(#{STRING_TEXT})")\s*#{ROCKET}\s*/
+    
+    STRING_VALUE = /^:(#{SYMBOL_TEXT})\s*/
+    SYMBOL_VALUE = /^(?:"([^"]+)"|'([^']+)')\s*/
+    
+    def parse!
+      rest = attributes.strip.scan(CONTENTS).flatten.first
+
+      begin
+        while not rest.empty?
+          if rest =~ SYMBOL_KEY
+            key = $1 || $2
+            rest.gsub! SYMBOL_KEY, ''
+          elsif rest =~ STRING_KEY
+            key = $1 || $2
+            rest.gsub! STRING_KEY, ''
+          else
+            raise DynamicAttributes
+          end
+        
+          if rest =~ STRING_VALUE
+            value = $1
+          elsif rest =~ SYMBOL_VALUE
+            value = $1 || $2
+          else
+            raise DynamicAttributes
+          end
+        
+          pairs << [key, value]
+        end
+      rescue DynamicAttributes
+        @dynamic = true
+        return
+      end
+    end
+  
+    def dynamic?
+      @dynamic
+    end
+    
+    def to_html
+      if attributes.strip.empty?
+        return ''
+      else
+        parse!
+        if dynamic?
+          hash = attributes.scan(CONTENTS).flatten.first
+          hash.strip!
+          hash.gsub! /\s*,$/, ''
+          " <%= tag_options({#{hash}}, false) %>"
+        else
+          ' ' << pairs.map do |(key, value)|
+            "#{key}='#{value.gsub("'", '&#x27;')}'"
+          end.join(' ')
+        end
+      end
+    end
+  end
+end

data/lib/haml2erb/engine.rb

@@ -1,10 +1,10 @@
 require 'haml'
+require 'haml2erb/attributes_parser'
 
 module Haml2Erb
+  class Engine < Haml::Engine
 
-  # puts RUBY_VERSION
 
-  class Engine < Haml::Engine
     def push_silent(text, can_suppress = false)
       flush_merged_text
       return if can_suppress && options[:suppress_eval]
@@ -140,6 +140,105 @@ module Haml2Erb
       end
     end
 
-  end
+    def compile_tag
+      t = @node.value
+
+      # Get rid of whitespace outside of the tag if we need to
+      rstrip_buffer! if t[:nuke_outer_whitespace]
+
+      dont_indent_next_line =
+        (t[:nuke_outer_whitespace] && !block_given?) ||
+        (t[:nuke_inner_whitespace] && block_given?)
+
+      if @options[:suppress_eval]
+        object_ref = "nil"
+        parse = false
+        value = t[:parse] ? nil : t[:value]
+        attributes_hashes = {}
+        preserve_script = false
+      else
+        object_ref = t[:object_ref]
+        parse = t[:parse]
+        value = t[:value]
+        attributes_hashes = t[:attributes_hashes]
+        preserve_script = t[:preserve_script]
+      end
+
+      # Check if we can render the tag directly to text and not process it in the buffer
+      if object_ref == "nil" && attributes_hashes.empty? && !preserve_script
+        tag_closed = !block_given? && !t[:self_closing] && !parse
+
+        open_tag = prerender_tag(t[:name], t[:self_closing], t[:attributes])
+        if tag_closed
+          open_tag << "#{value}</#{t[:name]}>"
+          open_tag << "\n" unless t[:nuke_outer_whitespace]
+        elsif !(parse || t[:nuke_inner_whitespace] ||
+            (t[:self_closing] && t[:nuke_outer_whitespace]))
+          open_tag << "\n"
+        end
+
+        push_merged_text(open_tag,
+          tag_closed || t[:self_closing] || t[:nuke_inner_whitespace] ? 0 : 1,
+          !t[:nuke_outer_whitespace])
+
+        @dont_indent_next_line = dont_indent_next_line
+        return if tag_closed
+      else
+        # raise attributes_hashes.inspect unless attributes_hashes.empty?
+        if attributes_hashes.empty?
+          attributes_hashes = ''
+        elsif attributes_hashes.size == 1
+          attributes_hashes = ", #{attributes_hashes.first}"
+        else
+          attributes_hashes = ", (#{attributes_hashes.join(").merge(")})"
+        end
+
+        push_merged_text "<#{t[:name]}", 0, !t[:nuke_outer_whitespace]
+
+        # WAS:
+        # push_generated_script(
+        #   "_hamlout.attributes(#{inspect_obj(t[:attributes])}, #{object_ref}#{attributes_hashes})")
+        # NOW: attempt a simplistic parse of the attributes
+        concat_merged_text AttributesParser.new(attributes_hashes).to_html
+
+        concat_merged_text(
+          if t[:self_closing] && xhtml?
+            " />" + (t[:nuke_outer_whitespace] ? "" : "\n")
+          else
+            ">" + ((if t[:self_closing] && html?
+                      t[:nuke_outer_whitespace]
+                    else
+                      !block_given? || t[:preserve_tag] || t[:nuke_inner_whitespace]
+                    end) ? "" : "\n")
+          end)
+
+        if value && !parse
+          concat_merged_text("#{value}</#{t[:name]}>#{t[:nuke_outer_whitespace] ? "" : "\n"}")
+        else
+          @to_merge << [:text, '', 1] unless t[:nuke_inner_whitespace]
+        end
 
+        @dont_indent_next_line = dont_indent_next_line
+      end
+
+      return if t[:self_closing]
+
+      if value.nil?
+        @output_tabs += 1 unless t[:nuke_inner_whitespace]
+        yield if block_given?
+        @output_tabs -= 1 unless t[:nuke_inner_whitespace]
+        rstrip_buffer! if t[:nuke_inner_whitespace]
+        push_merged_text("</#{t[:name]}>" + (t[:nuke_outer_whitespace] ? "" : "\n"),
+          t[:nuke_inner_whitespace] ? 0 : -1, !t[:nuke_inner_whitespace])
+        @dont_indent_next_line = t[:nuke_outer_whitespace]
+        return
+      end
+
+      if parse
+        push_script(value, t.merge(:in_tag => true))
+        concat_merged_text("</#{t[:name]}>" + (t[:nuke_outer_whitespace] ? "" : "\n"))
+      end
+    end
+
+  end
 end

data/lib/haml2erb/version.rb

@@ -1,3 +1,3 @@
 module Haml2Erb
-  VERSION = '0.3.0.pre'
+  VERSION = '0.3.0.pre.2'
 end

data/spec/haml2erb_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-haml = %{
+haml = %q{
 !!!
 %html(lang="en")
-  %head
+  %head(dynamic="#{attribute}")
     - ciao
     - if 3
       = pippo
@@ -37,9 +37,9 @@ haml = %{
       %section#hammurabi
 }
 
-erb = %{<!DOCTYPE html>
+erb = %q{<!DOCTYPE html>
 <html lang='en'>
-  <head>
+  <head <%= tag_options({"dynamic" => "#{attribute}"}, false) %>>
     <% ciao %>
     <% if 3 %>
       <%= pippo %>

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: haml2erb
 version: !ruby/object:Gem::Version 
-  hash: 961915996
+  hash: 1923831965
   prerelease: 6
   segments: 
   - 0
   - 3
   - 0
   - pre
-  version: 0.3.0.pre
+  - 2
+  version: 0.3.0.pre.2
 platform: ruby
 authors: 
 - Elia Schito
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-09 00:00:00 Z
+date: 2011-11-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -81,6 +82,7 @@ files:
 - bin/haml2erb
 - haml2erb.gemspec
 - lib/haml2erb.rb
+- lib/haml2erb/attributes_parser.rb
 - lib/haml2erb/engine.rb
 - lib/haml2erb/version.rb
 - spec/haml2erb_spec.rb
@@ -116,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: haml2erb
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Convert Haml templates to Erb!