webs 0.1.30 → 0.1.31

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('webs', '0.1.30') do |p|
+Echoe.new('webs', '0.1.31') do |p|
   p.description    = "Reusable webs stuff."
   p.url            = "https://colczak@github.com/websdev/websgem.git"
   p.author         = "Chuck Olczak"

data/lib/helper/tags.rb

@@ -1,14 +1,34 @@
 module Webs
   module Helper
     module Tags
+      # Examples: 
+      #
+      # <%= fwml( :blah, :fw_attributes=>{:value=>fwml( :name, :uid=>'xxx') } ) do %>HELLO<% end %>
+      # 
+      # Renders:
+      #
+      # <fw:blah>HELLO<fw:fwml_attribute name="value"><fw:name uid="xxx"/></fw:fwml_attribute></fw:blah>
+
       def fwml tagname, options={}, &block
+        attributes = options.delete( :fw_attributes )
 #        Rails.logger.debug "****** fwml #{tagname} #{options.inspect}"
         if ['sanitize', 'wizzywig', 'intl'].include?(tagname.to_s)
-          self.send( "fw_#{tagname}", options, &block )
+          tag = self.send( "fw_#{tagname}", options, &block )
         else
-          return inline_tag( tagname, options ) unless block
-          render_tag_with_block tagname, options, false, &block
+          if block
+            tag = render_tag_with_block tagname, options, false, &block
+          else
+            tag = inline_tag( tagname, attributes, options )
+          end
         end
+
+        if attributes 
+          tagidx = tag.length - (tagname.length + 6)
+          attribute_str = attributes.keys.collect{ |k| %[<fw:fwml_attribute name="#{k}">#{attributes[k]}</fw:fwml_attribute>] }.join( "\n" )
+          tag = tag[0..tagidx-1] + attribute_str.html_safe + tag[tagidx..tag.length-1]
+        end
+
+        tag.html_safe 
       end
       
       private
@@ -27,8 +47,12 @@ module Webs
         output.safe_concat("</fw:#{tagname}>")
       end
       
-      def inline_tag tagname, options
-        "<fw:#{tagname}#{html_options(options)}/>"
+      def inline_tag tagname, attributes = nil, options
+        if attributes
+          "<fw:#{tagname}#{html_options(options)}></fw:#{tagname}>"
+        else
+          "<fw:#{tagname}#{html_options(options)}/>"
+        end
       end
       
       def fw_sanitize options={}, &block

data/lib/webs.rb

@@ -7,7 +7,7 @@ require dir + 'helper/params'
 require dir + 'helper/tags'
 
 module Webs
-  VERSION = '0.1.30'.freeze
+  VERSION = '0.1.31'.freeze
 
   def self.app_title
     APP_NAME.titleize

data/webs.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webs}
-  s.version = "0.1.30"
+  s.version = "0.1.31"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chuck Olczak"]

metadata

@@ -2,7 +2,7 @@
 name: webs
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.30
+  version: 0.1.31
 platform: ruby
 authors: 
 - Chuck Olczak