haml2erb 0.3.0.pre.2 → 0.3.0.pre.3

data/lib/haml2erb/attributes_parser.rb

@@ -9,7 +9,7 @@ module Haml2Erb
     end
     attr_reader :pairs, :attributes
     
-    CONTENTS    = /^, \{(.*)\}$/
+    CONTENTS    = /^, \{?(.*)\}?$/
     ROCKET      = '\=\>'
     
     SYMBOL_TEXT = '[\w_]+'
@@ -18,14 +18,14 @@ module Haml2Erb
     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*/
+    SYMBOL_VALUE = /^:(#{SYMBOL_TEXT})\s*/
+    STRING_VALUE = /^(?:"([^"]+)"|'([^']+)')\s*/
+    STRING_INTERPOLATION = /^("[^\\]*)#\{/
     
     def parse!
       rest = attributes.strip.scan(CONTENTS).flatten.first
-
       begin
-        while not rest.empty?
+        while rest and not(rest.empty?)
           if rest =~ SYMBOL_KEY
             key = $1 || $2
             rest.gsub! SYMBOL_KEY, ''
@@ -38,6 +38,7 @@ module Haml2Erb
         
           if rest =~ STRING_VALUE
             value = $1
+            raise DynamicAttributes if rest =~ STRING_INTERPOLATION
           elsif rest =~ SYMBOL_VALUE
             value = $1 || $2
           else
@@ -56,6 +57,12 @@ module Haml2Erb
       @dynamic
     end
     
+    def self.hash_to_html hash
+      hash.each_pair.map do |key, value|
+        " #{key}='#{value.gsub("'", ''')}'"
+      end.join('')
+    end
+    
     def to_html
       if attributes.strip.empty?
         return ''
@@ -67,9 +74,9 @@ module Haml2Erb
           hash.gsub! /\s*,$/, ''
           " <%= tag_options({#{hash}}, false) %>"
         else
-          ' ' << pairs.map do |(key, value)|
+          pairs.map do |(key, value)|
             "#{key}='#{value.gsub("'", '&#x27;')}'"
-          end.join(' ')
+          end.join('')
         end
       end
     end

data/lib/haml2erb/engine.rb

@@ -1,6 +1,7 @@
 require 'haml'
 require 'haml2erb/attributes_parser'
 
+
 module Haml2Erb
   class Engine < Haml::Engine
 
@@ -140,6 +141,7 @@ module Haml2Erb
       end
     end
 
+
     def compile_tag
       t = @node.value
 
@@ -184,7 +186,6 @@ module Haml2Erb
         @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
@@ -199,7 +200,8 @@ module Haml2Erb
         # 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 AttributesParser.hash_to_html(t[:attributes])+
+                           AttributesParser.new(attributes_hashes).to_html
 
         concat_merged_text(
           if t[:self_closing] && xhtml?

data/lib/haml2erb/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: haml2erb
 version: !ruby/object:Gem::Version 
-  hash: 1923831965
+  hash: 1923831967
   prerelease: 6
   segments: 
   - 0
   - 3
   - 0
   - pre
-  - 2
-  version: 0.3.0.pre.2
+  - 3
+  version: 0.3.0.pre.3
 platform: ruby
 authors: 
 - Elia Schito
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-15 00:00:00 Z
+date: 2011-11-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime