fabulator 0.0.11 → 0.0.12

data/History.txt

@@ -1,3 +1,12 @@
+=== 0.0.12 2010-12-03
+
+* 1 major enhancement:
+  * Added <template /> element to libraries
+
+* 2 minor enhancements:
+  * Fixed various XSLT issues with form markup
+  * Fixed scope issue that caused <for-each /> failure with @as
+
 === 0.0.11 2010-11-11
 
 * 1 bug fix

data/VERSION

@@ -1 +1 @@
-0.0.11
+0.0.12

data/lib/fabulator/core/actions/for_each.rb

@@ -13,19 +13,37 @@ module Fabulator
 
     def run(context, autovivify = false)
       @context.with(context) do |ctx|
-        items = self.select(ctx) #@select.run(ctx)
+        items = self.select(ctx)
         res = nil
         ctx.in_context do |c|
           if !@sorts.empty?
-            items = items.sort_by{ |i| 
-              c.set_var(self.as, i) unless self.as.nil? 
-              @sorts.collect{|s| s.run(c.with_root(i)) }.join("\0") 
-            }
+            if self.as.nil?
+              items = items.sort_by{ |i| 
+                @sorts.collect{|s| s.run(c.with_root(i)) }.join("\0") 
+              }
+            else
+              items = items.sort_by{ |i| 
+                r = nil
+                c.in_context do |cc|
+                  cc.set_var(self.as, i)
+                  r = @sorts.collect{|s| s.run(cc.with_root(i)) }.join("\0") 
+                end
+                r
+              }
+            end
           end
           res = [ ]
-          items.each do |i|
-            c.set_var(self.as, i) unless self.as.nil?
-            res = res + self.run_actions(c.with_root(i))
+          if self.as.nil?
+            items.each do |i|
+              res = res + self.run_actions(c.with_root(i))
+            end
+          else
+            items.each do |i|
+              c.in_context do |cc|
+                cc.set_var(self.as, i) unless self.as.nil?
+                res = res + self.run_actions(cc.with_root(i))
+              end
+            end
           end
         end
         return res

data/lib/fabulator/expr/parser.rb

@@ -48,7 +48,7 @@ module_eval(<<'...end xsm_expression_parser.racc/module_eval...', 'xsm_expressio
     @yydebug = true
 
     @last_token = nil
-      
+
     do_parse
   end
 

data/lib/fabulator/lib.rb

@@ -62,6 +62,7 @@ module Fabulator
     structural :mapping, Mapping
     structural :reduction, Reduction
     structural :consolidation, Consolidation
+    structural :template, Template
     #structural :type, Type
     #structural :filter, Filter
     #structural :constraint, Constraint

data/lib/fabulator/lib/function.rb

@@ -31,6 +31,82 @@ module Fabulator
 
       has_actions
     end
+
+    class Template < Fabulator::Structural
+      namespace FAB_LIB_NS
+
+      attribute :name, :static => true
+
+      def compile_xml(xml, context)
+        super
+
+        @actions = [ ]
+        @wrapper = [ ]
+
+        if !xml.nil?
+          ctx = nil
+          if xml.name == 'template' && xml.namespaces.namespace.href == FAB_LIB_NS
+            ctx = @context.merge(xml)
+            @wrapper = [ '', '' ]
+          else
+            ctx = @context.merge
+            # we need to set @wrapper to [ begin, end ]
+            s = ""
+            if (xml.namespaces.namespace.prefix rescue nil)
+              s += xml.namespaces.namespace.prefix + ":"
+            end
+            s += xml.name
+            e = "</" + s + ">"
+            s = "<" + s
+            xml.each_attr do |attr|
+              s += " "
+              if attr.ns?
+                s += attr.ns.prefix + ":"
+              end
+              s += attr.name + "="
+              if attr.value =~ /"/
+                s += "'" + attr.value.gsub(/&/, '&amp;').gsub(/</, '&lt;').gsub(/'/, '&quot;') + "'"
+              else
+                s += '"' + attr.value.gsub(/&/, '&amp;').gsub(/</, '&lt;') + '"'
+              end
+            end
+            s += ">"
+            @wrapper = [ s, e ]
+          end
+          xml.each_child do |node|
+            if node.element?
+              if ctx.action_exists?((node.namespaces.namespace.href rescue nil), node.name)
+                @actions << ctx.compile_action(node)
+              else 
+                a = self.class.new
+                a.compile_xml(node, ctx)
+                @actions << a
+              end
+            elsif node.text? || node.cdata?
+              @actions << node.content
+            end
+          end
+        end
+
+        self
+      end
+
+      def run(context, autovivify = false)
+        s = ''
+        @context.with(context) do |ctx|
+          @actions.each do |action|
+            if action.is_a?(String)
+              s += action
+            else
+              r = action.run(ctx, autovivify)
+              s += r.collect { |v| v.to([FAB_NS, 'string'], ctx).value }.join('')
+            end
+          end
+        end
+        s = @wrapper.first + s + @wrapper.last
+        return [ context.root.anon_node(s, [ FAB_NS, 'string' ]) ]
+      end
+    end
   end
 end
 

data/lib/fabulator/lib/lib.rb

@@ -14,6 +14,7 @@ module Fabulator
     contains :mapping, :storage => :hash, :key => :name, :delayable => true
     contains :reduction, :storage => :hash, :key => :name, :delayable => true
     contains :consolidation, :storage => :hash, :key => :name, :delayable => true
+    contains :template, :storage => :hash, :key => :name, :delayable => true
     contains :type, :storage => :hash, :key => :name, :delayable => true
     contains :filter, :storage => :hash, :key => :name, :delayable => true
     contains :constraint, :storage => :hash, :key => :name, :delayable => true
@@ -73,6 +74,10 @@ module Fabulator
           fctn = @reductions[nom]
           fctn_type = :reduction
         end
+        if fctn.nil?
+          fctn = @templates[nom]
+          fctn_type = :function
+        end
       end
 
       if !fctn.nil?

data/xslt/form.xsl

@@ -51,7 +51,7 @@
     <xsl:param name="form_level" />
     <xsl:choose>
       <xsl:when test="f:caption">
-        <tr><td colspan="2">
+        <tr><td colspan="2" class="form-subform">
         <fieldset>
           <legend><xsl:apply-templates select="f:caption" /></legend>
           <xsl:call-template name="form-content">
@@ -71,9 +71,8 @@
   </xsl:template>
 
   <xsl:template match="f:text">
-    <tr><td class="form-caption" valign="top">
-      <xsl:apply-templates select="f:caption" />
-    </td><td class="form-element" valign="top">
+    <tr><xsl:call-template name="form-caption" />
+    <td class="form-element" valign="top">
       <xsl:choose>
         <xsl:when test="@f:rows > 1 or @rows > 1">
           <textarea>
@@ -114,9 +113,8 @@
   </xsl:template>
 
   <xsl:template match="f:password">
-    <tr><td class="form-caption" valign="top">
-      <xsl:apply-templates select="f:caption" />
-    </td><td class="form-element" valign="top">
+    <tr><xsl:call-template name="form-caption" />
+    <td class="form-element" valign="top">
       <input>
         <xsl:attribute name="type">password</xsl:attribute>
         <xsl:attribute name="name"><xsl:apply-templates select="." mode="id" /></xsl:attribute>
@@ -125,8 +123,8 @@
   </xsl:template>
 
   <xsl:template match="f:asset">
-    <div class="form-element">
-      <xsl:apply-templates select="f:caption" />
+    <tr><xsl:call-template name="form-caption" />
+    <td class="form-element" valign="top">
       <span class="form-fluid-asset"></span>
       <input>
         <xsl:attribute name="class">form-asset</xsl:attribute>
@@ -136,56 +134,28 @@
           <xsl:attribute name="accept"><xsl:value-of select="@f:accept" /></xsl:attribute>
         </xsl:if>
       </input>
-    </div>
+    </td></tr>
   </xsl:template>
 
   <xsl:template match="f:selection">
     <!-- for now, just handle simple selections -->
     <xsl:param name="form_level"/>
-    <xsl:choose>
-      <xsl:when test="./f:option//f:form//f:selection">
-        <span class="form-element">
-            <xsl:apply-templates select="f:caption"/>
-            <xsl:apply-templates select="f:help"/>
-          <xsl:call-template name="field-selection">
-            <!-- xsl:with-param name="form_id"><xsl:value-of select="$form_id"/></xsl:with-param -->
-            <xsl:with-param name="form_level"><xsl:value-of select="$form_level"/></xsl:with-param>
-          </xsl:call-template>
-        </span>
-      </xsl:when>
-      <xsl:when test="./f:option//f:help|./f:option//f:form">
-        <span class="form-element">
-            <xsl:apply-templates select="f:caption"/>
-            <xsl:apply-templates select="f:help"/>
-          <xsl:call-template name="field-selection">
-            <!-- xsl:with-param name="form_id"><xsl:value-of select="$form_id"/></xsl:with-param -->
-            <xsl:with-param name="form_level"><xsl:value-of select="$form_level" /></xsl:with-param>
-          </xsl:call-template>
-       </span>
-      </xsl:when>
-      <xsl:otherwise>
-        <span class="form-element">
-          <!-- label class="form-element-label">
-            <xsl:attribute name="for">
-              <xsl:apply-templates select="." mode="id"/>
-            </xsl:attribute -->
-            <xsl:apply-templates select="f:caption"/>
-            <xsl:apply-templates select="f:help"/>
-          <!-- /label -->
-          <xsl:call-template name="field-selection">
-            <xsl:with-param name="form_level"><xsl:value-of select="$form_level" /></xsl:with-param>
-          </xsl:call-template>
-        </span>
-      </xsl:otherwise>
-    </xsl:choose>
+    <tr><xsl:call-template name="form-caption" />
+    <td class="form-element" valign="top">
+      <xsl:call-template name="field-selection">
+        <xsl:with-param name="form_level"><xsl:value-of select="$form_level"/></xsl:with-param>
+      </xsl:call-template>
+    </td></tr>
   </xsl:template>
 
   <xsl:template match="f:group">
-     <xsl:param name="form_level" />
-     <xsl:apply-templates select="f:caption" />
+   <xsl:param name="form_level" />
+   <tr><xsl:call-template name="form-caption" />
+     <td class="form-element" valign="top">
      <xsl:call-template name="form-content">
        <xsl:with-param name="form_level"><xsl:value-of select="$form_level" /></xsl:with-param>
      </xsl:call-template>
+    </td></tr>
   </xsl:template>
 
   <xsl:template match="f:submission">
@@ -468,6 +438,13 @@
     </xsl:choose>
   </xsl:template>
 
+  <xsl:template name="form-caption">
+    <td class="form-caption" valign="top">
+      <xsl:apply-templates select="f:caption" />
+    </td>
+  </xsl:template>
+
+
 
   <xsl:template match="*" mode="id">
     <xsl:for-each select="ancestor::*[@id != '']">

data/xsm_expression_parser.racc

@@ -232,7 +232,7 @@ end
     @yydebug = true
 
     @last_token = nil
-      
+
     do_parse
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fabulator
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - James Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-11 00:00:00 +00:00
+date: 2010-12-03 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency