@@ -9,15 +9,15 @@ module Parkaby end template :tag do - _parkaby_current << "<#{name!}#{attr!}>#{content!}</#{name!}>" + _parkaby_current << "<#{name!}#{default!}#{attr!}>#{content!}</#{name!}>" end template :empty_tag do - _parkaby_current << "<#{name!}#{attr!}/>" + _parkaby_current << "<#{name!}#{default!}#{attr!}/>" end template :blocktag do - _parkaby_current << "<#{name!}#{attr!}>" + _parkaby_current << "<#{name!}#{default!}#{attr!}>" _parkaby_buffer << (_parkaby_current = []) _parkaby_value = content! @@ -30,9 +30,14 @@ module Parkaby _parkaby_temp = content! if _parkaby_temp.is_a?(Hash) - empty_tag(:name => name!, :attr => attributes(:content => _parkaby_temp)) + empty_tag(:name => name!, + :attr => attributes(:content => _parkaby_temp), + :default => default!) else - tag(:name => name!, :attr => nil, :content => _parkaby_temp) + tag(:name => name!, + :attr => nil, + :content => _parkaby_temp, + :default => default!) end end @@ -73,6 +78,7 @@ module Parkaby def parkaby_blocktag(exp) name = exp.shift data = exp.shift + default = build_default(exp.shift) type = data.shift content = process(data.shift) @@ -81,12 +87,14 @@ module Parkaby render :blocktag, :name => name, :attr => attr, - :content => content + :content => content, + :default => default end def parkaby_tag(exp) name = exp.shift data = exp.shift + default = build_default(exp.shift) type = data.shift @@ -99,13 +107,15 @@ module Parkaby render template, :name => name, :attr => attr, - :content => content + :content => content, + :default => default when :odata content = data.shift render :otag, :name => name, - :content => content + :content => content, + :default => default end end @@ -166,6 +176,19 @@ module Parkaby end end + def build_default(exp) + type = exp.shift + id = exp.shift + classes = exp.shift + + str = "" + + str << " id=\"#{id.to_s.chomp("!")}\"" if id + str << " class=\"#{classes.join(' ')}\"" unless classes.empty? + + str unless str.empty? + end + def teval(*args) sexp = render(*args) eval(Ruby2Ruby.new.process(sexp)) lib/parkaby/generator.rb @@ -89,7 +89,7 @@ module Parkaby s(:call, empty_class_proxy, id | class_name, - args % :args) + args % :css_args) end rule :tag_call do @@ -117,7 +117,7 @@ module Parkaby # Find classes and ids default = s(:default, data[:id], Array(data[:class])) # Process args using custom method - args = process_args_call(data[:args]) + args = process_args_call(data[:css_args] || data[:args]) s(:parkaby, :tag, data[:name], args, default) end @@ -125,7 +125,7 @@ module Parkaby # Find classes and ids default = s(:default, data[:id], Array(data[:class])) # Process args using custom method - args = process_args_iter(data[:args]) + args = process_args_iter(data[:css_args] || data[:args]) # Inject the content into the data-node: args[1] = process(data[:content]) s(:parkaby, :blocktag, data[:name], args, default) lib/parkaby/processor.rb 575774e47d6403a6ff9865583ec87b1839647e88 Magnus Holm judofyr@gmail.com http://github.com/judofyr/parkaby/commit/97620722125e2e835cb8488636747a2484f59d62 97620722125e2e835cb8488636747a2484f59d62 2009-07-14T14:55:12-07:00 2009-07-14T14:55:12-07:00 Naive implementation of CSS proxies. Closes #3. 49f25dd71e5ca35dc7c20f03b6b44530f7766cf5 Magnus Holm judofyr@gmail.com