fabulator 0.0.3 → 0.0.4

data/History.txt

@@ -1,7 +1,22 @@
-=== 0.0.1 2010-02-23
+=== 0.0.4 2010-08-16
 
-* 1 major enhancement:
-  * Initial release
+* 5 minor enhancements
+  * Add RedCloth gem dependence to gem spec
+  * f:string-length() returns 0 for nil values
+  * f:dump() now shows attributes
+  * compile-time context tree tracks line numbers of associated XML elements
+  * minor bug fixes in template tags
+  * tempate form XML element 'file' is now 'asset'
+
+* 1 major enhancement
+  * add_default_values() should now work for parsed templates
+  * to_html() can now return form contents only
+  * parsed templates will be returned as a string if they are not 
+
+=== 0.0.3 2010-08-10
+
+* 1 minor enhancement
+  * Add libxslt-ruby gem dependence to gem spec
 
 === 0.0.2 2010-08-10
 
@@ -13,7 +28,8 @@
   * Use LibXSLT to apply template to html transform (requires the
     libxslt-ruby gem)
 
-=== 0.0.3 2010-08-10
+=== 0.0.1 2010-02-23
+
+* 1 major enhancement:
+  * Initial release
 
-* 1 minor enhancement
-  * Add libxslt-ruby gem dependence to gem spec

data/README.rdoc

@@ -19,7 +19,7 @@ XML language coupled with an XQuery-like expression language.
  require 'fabulator'
 
  parser = Fabulator::Expr::Parser.new
- context = Fabulator::Expr::Context.new_context_environment
+ context = Fabulator::Expr::Context.new
 
  context.set_value( '/a', 'some_values' )
  expr = parser.parse( 'f:sum(/a[. > 0]' )
@@ -30,8 +30,9 @@ XML language coupled with an XQuery-like expression language.
 == REQUIREMENTS:
 
 The expression engine does not depend on any external libraries.  The
-XML framework depends on the Ruby libxml libraries at
-<http://libxml.rubyforge.org/>.
+XML framework depends on the Ruby libxml and libxslt libraries at
+<http://libxml.rubyforge.org/>.  It also needs the RedCloth and radius
+gems for the template engine.
 
 == INSTALL:
 

data/Rakefile

@@ -10,6 +10,7 @@ begin
     gem.add_dependency(%q<libxml-ruby>, [">= 1.1.3"])
     gem.add_dependency(%q<libxslt-ruby>, [">= 0.9.7"])
     gem.add_dependency(%q<radius>, [">= 0.6.1"]) 
+    gem.add_dependency(%q<RedCloth>, [">= 4.2.0"])
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/features/functions.feature

@@ -60,7 +60,6 @@ Feature: Function calls and lists
     Then I should get 1 item
      And item 0 should be [2]
 
-  @hist
   Scenario: Histogram of text
     Given a context
      And the prefix f as "http://dh.tamu.edu/ns/fabulator/1.0#"
@@ -68,7 +67,6 @@ Feature: Function calls and lists
     Then I should get 1 item
      And item 0 should be [4]
 
-  @hist
   Scenario: Histogram of text with attributes
     Given a context
      And the prefix f as "http://dh.tamu.edu/ns/fabulator/1.0#"

data/features/simple-math.feature

@@ -16,3 +16,20 @@ Feature: Simple Math
       | 30 | div | 6 |  5  |
       | 15 | mod | 4 |  3  |
 
+  @bool
+  Scenario Outline: boolean ops
+    Given a context
+      And that [/a] is set to [<a>]
+      And that [/b] is set to [<b>]
+    When I run the expression (a <op> b)
+    Then I should get 1 item
+      And item 0 should be <ans>
+
+    Examples:
+      |  a  |  op | b   | ans   |
+      |  0  |  =  | 1   | false |
+      |  2  |  =  | 2   | true  |
+      | 'a' |  =  | 'a' | true  |
+      | 'a' |  =  | 'b' | false |
+      | 'a' |  =  | 1   | false |
+      |  1  |  <  | 'a' | true  |

data/features/simple-statemachine.feature

@@ -190,3 +190,15 @@ Feature: Simple state machines
     Then it should be in the 'stop' state
      And the expression (/foo) should equal ['bar']
      And the expression (/bar) should equal ['baz']
+
+  @var
+  Scenario: simple machine with a <variable /> and <value />
+    Given the statemachine
+      """
+        <f:application xmlns:f="http://dh.tamu.edu/ns/fabulator/1.0#">
+          <f:variable f:name="foo" f:select="'baz'" />
+          <f:value f:path="/foo" f:select="$foo" />
+        </f:application>
+      """
+    Then it should be in the 'start' state
+     And the expression (/foo) should equal ['baz']

data/features/step_definitions/template_steps.rb

@@ -5,6 +5,7 @@ end
 When /^I render the template$/ do
   parser = Fabulator::Template::Parser.new
   @template_result = parser.parse(@context, @template_text)
+  #puts @template_result.to_html unless @template_result.is_a?(String)
 end
 
 When /^I set the captions to:$/ do |caption_table|
@@ -16,6 +17,16 @@ When /^I set the captions to:$/ do |caption_table|
   @template_result.add_captions(captions)
 end
 
+When /^I set the defaults to:$/ do |caption_table|
+  captions = { }
+  ctx = @context.with_root(@context.root.anon_node(nil))
+  caption_table.hashes.each do |h|
+    ctx.set_value(h['path'], Fabulator::Expr::Literal.new(h['default']))
+  end
+
+  @template_result.add_default_values(ctx)
+end
+
 Then /^the rendered text should equal$/ do |doc|
   @template_result.to_s.should == %{<?xml version="1.0" encoding="UTF-8"?>\n} + doc + "\n"
 end

data/features/templates.feature

@@ -96,5 +96,30 @@ Feature: Templates
     <textline id="foo"><caption>FooCaption</caption></textline>
     <submit id="submit"><caption>SubmitCaption</caption></submit>
   </form>
+</view>
+       """
+
+  @def
+  Scenario: Rendering a form with defaults
+   Given a context
+     And the prefix f as "http://dh.tamu.edu/ns/fabulator/1.0#"
+     And the template
+       """
+<view>
+  <form>
+    <textline id='foo'><caption>Foo</caption></textline>
+  </form>
+</view>
+       """
+   When I render the template
+    And I set the defaults to:
+      | path   | default       |
+      | foo    | FooDefault    |
+   Then the rendered text should equal
+       """
+<view>
+  <form>
+    <textline id="foo"><caption>Foo</caption><default>FooDefault</default></textline>
+  </form>
 </view>
        """

data/lib/fabulator/core/actions.rb

@@ -263,7 +263,7 @@ module Fabulator
     # f:string-length(node-list) => node-list
     #
     mapping 'string-length' do |ctx, arg|
-      arg.to_s.length
+      (arg.to_s.length rescue 0)
     end
 
     mapping 'normalize-space' do |ctx, arg|
@@ -347,7 +347,7 @@ module Fabulator
     ###
     ### Boolean
     ###
-
+ 
     function 'true', BOOLEAN do |ctx, args|
       return [ ctx.root.anon_node( true, [ FAB_NS, 'boolean' ] ) ]
     end

data/lib/fabulator/core/state_machine.rb

@@ -24,6 +24,7 @@ module Fabulator
 
     def compile_xml(xml, context = nil, callbacks = { })
       # /statemachine/states
+      XML.default_line_numbers = true
       if xml.is_a?(String)
         xml = LibXML::XML::Document.string xml
       end

data/lib/fabulator/expr/context.rb

@@ -10,6 +10,7 @@ module Fabulator
     @variables = { }
     @position = nil
     @last = nil
+    @line_num = nil
 
     if parent_c.nil?
        if xml.nil? || (xml.root rescue nil).nil?
@@ -23,6 +24,8 @@ module Fabulator
       if xml.is_a?(self.class)
         @run_time_parent = xml
       else
+        @line_num = xml.line_num
+
         parser = Fabulator::Expr::Parser.new
 
         xml.namespaces.each do |ns|
@@ -54,6 +57,12 @@ module Fabulator
     @last = !!l
   end
 
+  def line_num
+    return @line_num unless @line_num.nil?
+    return @parent.line_num unless @parent.nil?
+    return 0
+  end
+
   def position
     return @position unless @position.nil?
     return @position if @run_time_parent.nil?

data/lib/fabulator/expr/node_logic.rb

@@ -14,7 +14,10 @@ module Fabulator
         r[:children] = cs unless cs.empty?
         r[:value] = self.value unless self.value.nil?
         r[:type] = self.vtype.join('') unless self.vtype.nil?
-
+        r[:attributes] = { }
+        self.attributes.each do |a|
+          r[:attributes][a.name] = a.value
+        end
         r
       end
 

data/lib/fabulator/template/parse_result.rb

@@ -6,6 +6,7 @@ module Fabulator::Template
 
     @@fabulator_xslt_file = File.join(File.dirname(__FILE__), "..", "..", "..", "xslt", "form.xsl")
 
+
     @@fabulator_xslt_doc = LibXML::XML::Document.file(@@fabulator_xslt_file)
     @@fabulator_xslt = LibXSLT::XSLT::Stylesheet.new(@@fabulator_xslt_doc)
 
@@ -15,6 +16,7 @@ module Fabulator::Template
     end
 
     def add_default_values(context)
+      return if context.nil?
       each_form_element do |el|
         own_id = el.attributes['id']
         next if own_id.nil? || own_id.to_s == ''
@@ -22,42 +24,43 @@ module Fabulator::Template
         default = nil
         is_grid = false
         if el.name == 'grid'
-          default = el.find('./default | ./row/default | ./column/default')
+          default = el.find('./default | ./row/default | ./column/default').to_a
           is_grid = true
         else
-          default = el.find('./default')
+          default = el.find('./default').to_a
         end
 
         id = el_id(el)
         ids = id.split('/')
-        if !context.nil? && (default.is_a?(Array) && default.empty? || !default)
-          l = context.traverse_path(ids)
-          if !l.nil? && !l.empty?
-            if is_grid
-              count = (el.attributes['count'].to_s rescue '')
-              how_many = 'multiple' 
-              direction = 'both'
-              if count =~ %r{^(multiple|single)(-by-(row|column))?$}
-                how_many = $1
-                direction = $3 || 'both'
-              end
-              if direction == 'both' 
-                l.collect{|ll| ll.value}.each do |v|
-                  el << XML::Node.new('default', v)
-                end
-              elsif direction == 'row' || direction == 'column'
-                el.find("./#{direction}").each do |div|
-                  id = (div.attributes['id'].to_s rescue '')
-                  next if id == ''
-                  l.collect{|c| context.with_root(c).traverse_path(id)}.flatten.collect{|c| c.value}.each do |v|
-                    div << XML::Node.new('default', v)
-                  end
-                end
-              end
-            else
+        l = context.traverse_path(ids)
+        if !l.nil? && !l.empty?
+          if !default.nil? && !default.empty?
+            default.each { |d| d.remove! }
+          end
+          if is_grid
+            count = (el.attributes['count'].to_s rescue '')
+            how_many = 'multiple' 
+            direction = 'both'
+            if count =~ %r{^(multiple|single)(-by-(row|column))?$}
+              how_many = $1
+              direction = $3 || 'both'
+            end
+            if direction == 'both' 
               l.collect{|ll| ll.value}.each do |v|
                 el << XML::Node.new('default', v)
               end
+            elsif direction == 'row' || direction == 'column'
+              el.find("./#{direction}").each do |div|
+                id = (div.attributes['id'].to_s rescue '')
+                next if id == ''
+                l.collect{|c| context.with_root(c).traverse_path(id)}.flatten.collect{|c| c.value}.each do |v|
+                  div << XML::Node.new('default', v)
+                end
+              end
+            end
+          else
+            l.collect{|ll| ll.value}.each do |v|
+              el << XML::Node.new('default', v)
             end
           end
         end
@@ -111,8 +114,16 @@ module Fabulator::Template
       @doc.to_s
     end
 
-    def to_html
-      @@fabulator_xslt.apply(@doc).to_s
+    def to_html(popts = { })
+      opts = { :form => true }.update(popts)
+
+      res = @@fabulator_xslt.apply(@doc)
+
+      if opts[:form]
+        res.to_s
+      else
+        res.find('//form/*').collect{ |e| e.to_s}.join('')
+      end
     end
 
 protected

data/lib/fabulator/template/parser.rb

@@ -11,7 +11,8 @@ module Fabulator::Template
         @parser = Radius::Parser.new(@context, :tag_prefix => 'r')
       end
       @context.globals.context = context
-      Fabulator::Template::ParseResult.new(@parser.parse(text))
+      r = @parser.parse(text)
+      (Fabulator::Template::ParseResult.new(r) rescue r)
     end
   end
 end

data/lib/fabulator/template/standard_tags.rb

@@ -13,23 +13,22 @@ module Fabulator::Template
     selection = tag.attr['select']
     c = tag.locals.context || tag.globals.context
     # ns = get_fabulator_ns(tag)
-    items = c.nil? ? [] : c.eval_expression(selection, ns)
+    items = c.nil? ? [] : c.eval_expression(selection)
     sort_by = tag.attr['sort']
     sort_dir = tag.attr['order'] || 'asc'
                
     if !sort_by.nil? && sort_by != ''
       parser = Fabulator::Expr::Parser.new
-      sort_by_f = parser.parse(sort_by, ns)
-      items = items.sort_by { |i| i.eval_expression(sort_by, ns).first.value }
+      sort_by_f = parser.parse(sort_by, c)
+      items = items.sort_by { |i| c.with_root(i).eval_expression(sort_by_f).first.value }
       if sort_dir == 'desc'
         items.reverse!
       end
     end
     res = ''
-    #Rails.logger.info("Found #{items.size} items for for-each")
     items.each do |i|
       next if i.empty?
-      tag.locals.context = i
+      tag.locals.context = c.with_root(i)
       res = res + tag.expand
     end
     res
@@ -46,7 +45,7 @@ module Fabulator::Template
   tag 'value' do |tag|
     selection = tag.attr['select']
     c = tag.locals.context || tag.globals.context
-    items = c.nil? ? [] : c.eval_expression(selection, get_fabulator_ns(tag))
+    items = c.nil? ? [] : c.eval_expression(selection)
     items.collect{|i| i.to([Fabulator::FAB_NS, 'html']).value }.join('')
   end
 

data/xslt/form.xsl

@@ -730,7 +730,7 @@
           <xsl:attribute name="relation">
               <xsl:text>rel:</xsl:text><xsl:apply-templates select="ancestor::option[1]" mode="id"/>
           </xsl:attribute>
-          <xsl:apply-templates select="text|textline|textbox|editbox|file|grid|password|selection|form|group|textreader|list">
+          <xsl:apply-templates select="text|textline|textbox|editbox|asset|grid|password|selection|form|group|textreader|list">
             <!-- xsl:with-param name="form_id"><xsl:value-of select="@id"/></xsl:with-param -->
           <xsl:with-param name="form_level"><value-of select="$form_level"/></xsl:with-param>
           </xsl:apply-templates>
@@ -747,7 +747,7 @@
         </span>
       </xsl:when>
       <xsl:otherwise>
-        <xsl:apply-templates select="text|textline|textbox|editbox|file|grid|password|selection|form|group|textreader|list">
+        <xsl:apply-templates select="text|textline|textbox|editbox|asset|grid|password|selection|form|group|textreader|list">
           <!-- xsl:with-param name="form_id"><xsl:value-of select="@id"/></xsl:with-param -->
         <xsl:with-param name="form_level"><value-of select="$form_level"/></xsl:with-param>
         </xsl:apply-templates>
@@ -786,13 +786,13 @@
           <xsl:attribute name="method">
             <xsl:choose>
               <xsl:when test="@method = 'POST'">POST</xsl:when>
-              <xsl:when test=".//file">POST</xsl:when>
+              <xsl:when test=".//asset">POST</xsl:when>
               <xsl:when test=".//textbox">POST</xsl:when>
               <xsl:when test=".//editbox">POST</xsl:when>
               <xsl:otherwise>POST</xsl:otherwise>
             </xsl:choose>
           </xsl:attribute>
-          <xsl:if test=".//file">
+          <xsl:if test=".//asset">
             <xsl:attribute name="type">application/x-multipart</xsl:attribute>
           </xsl:if>
             <xsl:if test="./caption">
@@ -1232,14 +1232,13 @@
 
   <xsl:template match="text/caption"/>
 
-  <xsl:template match="form/file">
+  <xsl:template match="form/asset">
     <!-- xsl:param name="form_id"/ -->
-    <tr>
-      <td align="right" valign="top"> <!-- width="50%"> -->
+    <span class="form-element">
+      <span class="form-element-label">
         <xsl:apply-templates select="caption"/>
         <xsl:apply-templates select="help"/>
-      </td>
-      <td valign="top"> <!-- width="50%"> -->
+      </span>
         <input type="file">
           <!-- xsl:attribute name="name"><xsl:value-of select="$form_id"/>.<xsl:value-of select="@id"/></xsl:attribute -->
           <xsl:attribute name="name"><xsl:apply-templates select="." mode="id"/></xsl:attribute>
@@ -1247,8 +1246,7 @@
             <xsl:attribute name="accept"><xsl:value-of select="@accept"/></xsl:attribute>
           </xsl:if>
         </input>
-      </td>
-    </tr>
+    </span>
   </xsl:template>
 
  <xsl:template match="form//stored">
@@ -1334,7 +1332,7 @@
                   <xsl:apply-templates select="caption"/>
                   <xsl:text>: </xsl:text>
             </xsl:if>
-            <xsl:apply-templates select="text|grid|textline|textbox|editbox|file|password|selection|form|group|textreader">
+            <xsl:apply-templates select="text|grid|textline|textbox|editbox|asset|password|selection|form|group|textreader">
               <!-- xsl:with-param name="form_id">
                 <xsl:if test="@id">
                   <xsl:value-of select="@id"/>
@@ -1367,7 +1365,7 @@
           <xsl:attribute name="method">
             <xsl:choose>
               <xsl:when test="@method = 'POST'">POST</xsl:when>
-              <xsl:when test=".//file">POST</xsl:when>
+              <xsl:when test=".//asset">POST</xsl:when>
               <xsl:when test=".//textbox">POST</xsl:when>
               <xsl:when test=".//editbox">POST</xsl:when>
               <xsl:otherwise>POST</xsl:otherwise>
@@ -1376,14 +1374,14 @@
           <xsl:if test="@target">
             <xsl:attribute name="action"><xsl:value-of select="@target"/></xsl:attribute>
           </xsl:if>
-          <xsl:if test=".//file">
+          <xsl:if test=".//asset">
             <xsl:attribute name="type">application/x-multipart</xsl:attribute>
           </xsl:if>
             <xsl:if test="./caption">
                   <xsl:apply-templates select="caption"/>
                   <xsl:text>: </xsl:text>
             </xsl:if>
-            <xsl:apply-templates select="text|grid|textline|textbox|editbox|file|password|selection|form|group|textreader">
+            <xsl:apply-templates select="text|grid|textline|textbox|editbox|asset|password|selection|form|group|textreader">
               <!-- xsl:with-param name="form_id">
                 <xsl:if test="@id">
                   <xsl:value-of select="@id"/>
@@ -1728,6 +1726,7 @@
       <!-- xsl:attribute name="name"><xsl:if test="$form_id != ''"><xsl:value-of select="$form_id"/>.</xsl:if><xsl:value-of select="@id"/></xsl:attribute -->
       <xsl:attribute name="name"><xsl:apply-templates select="." mode="id"/></xsl:attribute>
       <xsl:value-of select="default"/>
+      <xsl:value-of select="' '"/>
     </textarea>
   </xsl:template>
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fabulator
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - James Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-10 00:00:00 +00:00
+date: 2010-08-17 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,6 +66,22 @@ dependencies:
         version: 0.6.1
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: RedCloth
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 4
+        - 2
+        - 0
+        version: 4.2.0
+  type: :runtime
+  version_requirements: *id004
 description: The fabulator library provides a state machine implementation of a core set of semantics for building data-driven applications using a simple XML language coupled with an XQuery-like expression language.
 email: jgsmith@tamu.edu
 executables: []
@@ -78,7 +94,6 @@ extra_rdoc_files:
 files: 
 - History.txt
 - Manifest.txt
-- PostInstall.txt
 - README.rdoc
 - Rakefile
 - VERSION

data/PostInstall.txt

@@ -1,7 +0,0 @@
-
-For more information on fabulator, see http://github.com/jgsmith/ruby-fabulator
-
-NOTE: Change this information in PostInstall.txt 
-You can also delete it if you don't want it.
-
-