fabulator 0.0.8 → 0.0.9

data/History.txt

@@ -1,4 +1,33 @@
-=== 0.0.8
+=== 0.0.9
+
+* 11 major enhancements:
+  * Form markup is now namespaced and limited to the structural elements
+    (form, container, group, option) and interactive elements (asset,
+    selection, password, submission, text)
+  * Tuples in expressions are now [...] instead of ([...])
+  * Tag libraries can now specify an XSLT for transforming to HTML to
+    add presentation capabilities
+  * Tag libraries can specify which presentation elements in their
+    namespace should get default data from the application memory
+  * Tag libraries can specify which presentation elements participate
+    in the path construction for default data, caption, and error
+    markup
+  * Type conversions now are passed a context with the root node being
+    converted
+  * f:uri converts strings using namespace prefixes based on the namespace
+    context of the string instead of the namespace context of the function
+    call
+  * appended '?' to the following functions: f:first, f:last, f:ends-with,
+    f:empty, f:exists, f:only-one, f:one-or-more, and f:zero-or-one
+  * added f:first(list), f:last(list), f:all-but-first(list), and
+    f:all-but-last(list) for working with sequences
+  * added basic Type object to manage conversions and type information
+  * library actions can refer to other actions defined in the same library
+
+1 minor enhancement
+  * Type converters are now mappings
+
+=== 0.0.8 2010-09-11
 
 * 1 major enhancement:
   * Extensions can now define structural elements to be contained within

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/features/functions.feature

@@ -160,3 +160,10 @@ Feature: Function calls and lists
     When I run the expression (f:not(f:true()))
     Then I should get 1 item
       And item 0 should be [f:false()]
+  @ns
+  Scenario: Negating logic
+    Given a context
+     And the prefix f as "http://dh.tamu.edu/ns/fabulator/1.0#"
+    When I run the expression (let xmlns:ff:="http://dh.tamu.edu/ns/fabulator/1.0#"; ff:not(ff:true()))
+    Then I should get 1 item
+      And item 0 should be [f:false()]

data/features/primitives.feature

@@ -4,6 +4,6 @@ Feature: Expression primitives
  Scenario: Simple 1-tuple
    Given a context
      And the prefix f as "http://dh.tamu.edu/ns/fabulator/1.0#"
-     And that [/a] is set to [([1,1])]
+     And that [/a] is set to [[1,1]]
    Then the expression (/a/@size) should equal [2]
      And the expression (f:string(/a/@type)) should equal [f:uri-prefix('f') + "tuple"]

data/features/step_definitions/template_steps.rb

@@ -5,7 +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)
+  #puts @template_result.to_s
 end
 
 When /^I set the captions to:$/ do |caption_table|
@@ -28,9 +28,46 @@ When /^I set the defaults to:$/ do |caption_table|
 end
 
 Then /^the rendered text should equal$/ do |doc|
-  @template_result.to_s.should == %{<?xml version="1.0" encoding="UTF-8"?>\n} + doc + "\n"
+  r = @template_result.to_s
+ 
+  cmd = 'xmllint --c14n --nsclean -'
+  IO.popen(cmd, "r+") { |x|
+    x << r
+    x.close_write
+    r = x.readlines.join("")
+  }
+  IO.popen(cmd, "r+") { |x|
+    x << doc
+    x.close_write
+    doc = x.readlines.join("")
+  }
+
+  #@template_result.to_s.should == doc + "\n"
+  r = r.gsub(/xmlns(:\S+)?=['"][^'"]*['"]/, '').gsub(/\s+/, ' ').gsub(/\s+>/, '>').gsub(/>\s*</, ">\n<")
+  doc = doc.gsub(/xmlns(:\S+)?=['"][^'"]*['"]/, '').gsub(/\s+/, ' ').gsub(/\s+>/, '>').gsub(/>\s*</, ">\n<")
+  r.should == doc
 end
 
 Then /^the rendered html should equal$/ do |doc|
-  @template_result.to_html.should == doc
+  r = @template_result.to_html
+
+  cmd = 'xmllint --html --c14n --nsclean -'
+  IO.popen(cmd, "r+") { |x|
+    x << r
+    x.close_write
+    r = x.readlines.join("")
+  }
+  IO.popen(cmd, "r+") { |x|
+    x << doc
+    x.close_write
+    doc = x.readlines.join("")
+  }
+
+  #puts "html from template: #{r}"
+  #puts "html from doc     : #{doc}"
+  r = r.gsub(/xmlns(:\S+)?=['"][^'"]*['"]/, '').gsub(/\s+/, ' ').gsub(/\s+>/, '>').gsub(/>\s*</, ">\n<")
+  doc = doc.gsub(/xmlns(:\S+)?=['"][^'"]*['"]/, '').gsub(/\s+/, ' ').gsub(/\s+>/, '>').gsub(/>\s*</, ">\n<")
+
+
+  r.should == doc
 end

data/features/step_definitions/xml_steps.rb

@@ -1,9 +1,10 @@
 Given /the statemachine/ do |doc_xml|
   @context ||= Fabulator::Expr::Context.new
+  @compiler ||= Fabulator::Compiler.new
 
   if @sm.nil?
-    @sm = Fabulator::Core::StateMachine.new
-    @sm.compile_xml(doc_xml)
+    @sm = @compiler.compile(doc_xml)
+    #@sm.compile_xml(doc_xml)
   else
     @sm.compile_xml(doc_xml)
   end

data/features/templates.feature

@@ -6,12 +6,12 @@ Feature: Templates
      And the prefix f as "http://dh.tamu.edu/ns/fabulator/1.0#"
      And the template
        """
-<foo></foo>
+<foo xmlns="http://dh.tamu.edu/ns/fabulator/1.0#"></foo>
        """
    When I render the template
    Then the rendered text should equal
        """
-<foo/>
+<foo xmlns="http://dh.tamu.edu/ns/fabulator/1.0#"/>
        """
 
   Scenario: Rendering a choice in a template
@@ -19,7 +19,7 @@ Feature: Templates
      And the prefix f as "http://dh.tamu.edu/ns/fabulator/1.0#"
      And the template
        """
-<foo>
+<foo xmlns="http://dh.tamu.edu/ns/fabulator/1.0#">
   <r:choose>
     <r:when test="f:true()">
       true
@@ -33,7 +33,7 @@ Feature: Templates
    When I render the template
    Then the rendered text should equal
        """
-<foo>
+<foo xmlns="http://dh.tamu.edu/ns/fabulator/1.0#">
 
 
       true
@@ -48,7 +48,7 @@ Feature: Templates
      And the prefix f as "http://dh.tamu.edu/ns/fabulator/1.0#"
      And the template
        """
-<foo>
+<foo xmlns="http://dh.tamu.edu/ns/fabulator/1.0#">
   <r:choose>
     <r:when test="f:false()">
       true
@@ -62,7 +62,7 @@ Feature: Templates
    When I render the template
    Then the rendered text should equal
        """
-<foo>
+<foo xmlns="http://dh.tamu.edu/ns/fabulator/1.0#">
 
 
 
@@ -77,10 +77,10 @@ Feature: Templates
      And the prefix f as "http://dh.tamu.edu/ns/fabulator/1.0#"
      And the template
        """
-<view>
+<view xmlns="http://dh.tamu.edu/ns/fabulator/1.0#">
   <form>
-    <textline id='foo'><caption>Foo</caption></textline>
-    <submit id='submit'/>
+    <text id='foo'><caption>Foo</caption></text>
+    <submission id='submit'/>
   </form>
 </view>
        """
@@ -91,10 +91,10 @@ Feature: Templates
       | submit | SubmitCaption |
    Then the rendered text should equal
        """
-<view>
+<view xmlns="http://dh.tamu.edu/ns/fabulator/1.0#">
   <form>
-    <textline id="foo"><caption>FooCaption</caption></textline>
-    <submit id="submit"><caption>SubmitCaption</caption></submit>
+    <text id="foo"><caption>FooCaption</caption></text>
+    <submission id="submit"><caption>SubmitCaption</caption></submission>
   </form>
 </view>
        """
@@ -105,9 +105,9 @@ Feature: Templates
      And the prefix f as "http://dh.tamu.edu/ns/fabulator/1.0#"
      And the template
        """
-<view>
+<view xmlns="http://dh.tamu.edu/ns/fabulator/1.0#">
   <form>
-    <textline id='foo'><caption>Foo</caption></textline>
+    <text id='foo'><caption>Foo</caption></text>
   </form>
 </view>
        """
@@ -117,9 +117,9 @@ Feature: Templates
       | foo    | FooDefault    |
    Then the rendered text should equal
        """
-<view>
+<view xmlns="http://dh.tamu.edu/ns/fabulator/1.0#">
   <form>
-    <textline id="foo"><caption>Foo</caption><default>FooDefault</default></textline>
+    <text id="foo"><caption>Foo</caption><default>FooDefault</default></text>
   </form>
 </view>
        """
@@ -130,10 +130,10 @@ Feature: Templates
      And the prefix f as "http://dh.tamu.edu/ns/fabulator/1.0#"
      And the template
        """
-<view>
+<view xmlns="http://dh.tamu.edu/ns/fabulator/1.0#">
   <form id='foo'>
-    <textline id='bar'><caption>Foo</caption></textline>
-    <textline id='baz'><caption>Boo</caption></textline>
+    <text id='bar'><caption>Foo</caption></text>
+    <text id='baz'><caption>Boo</caption></text>
   </form>
 </view>
        """
@@ -144,10 +144,37 @@ Feature: Templates
       | foo/baz | this & that   |
    Then the rendered text should equal
        """
-<view>
+<view xmlns="http://dh.tamu.edu/ns/fabulator/1.0#">
   <form id="foo">
-    <textline id="bar"><caption>Foo</caption><default>FooDefault</default></textline>
-    <textline id="baz"><caption>Boo</caption><default>this &amp; that</default></textline>
+    <text id="bar"><caption>Foo</caption><default>FooDefault</default></text>
+    <text id="baz"><caption>Boo</caption><default>this &amp; that</default></text>
   </form>
 </view>
        """
+
+  @nst
+  Scenario: Rendering markup with namespaces
+   Given a context
+     And the prefix f as "http://dh.tamu.edu/ns/fabulator/1.0#"
+     And the template
+       """
+<form xmlns="http://dh.tamu.edu/ns/fabulator/1.0#">
+  <text id="foo"><caption>Foo</caption></text>
+</form>
+       """
+   When I render the template
+   Then the rendered html should equal
+       """
+<form type="application/x-multipart" method="POST" class="fabulator-form">
+  <table class="form-content" border="0" cellspacing="0" cellpadding="0">
+    <tr>
+      <td class="form-caption" valign="top">
+        <span class="caption">Foo</span>
+      </td>
+      <td class="form-element" valign="top">
+        <input type="text" name="foo" size="12" value="">
+      </td>
+    </tr>
+    </table>
+</form>
+       """

data/features/types.feature

@@ -40,25 +40,25 @@ Feature: Type unification
       And the prefix f as "http://dh.tamu.edu/ns/fabulator/1.0#"
     When I run the expression (f:true()/@type)
     Then I should get 1 item
-      And item 0 should be [f:uri-prefix('f') + 'boolean']
+      And item 0 should be [f:uri('f:boolean')]
 
   Scenario: Get the type of a string value
     Given a context
       And the prefix f as "http://dh.tamu.edu/ns/fabulator/1.0#"
     When I run the expression ("foo"/@type)
     Then I should get 1 item
-      And item 0 should be [f:uri-prefix('f') + 'string']
+      And item 0 should be [f:uri('f:string')]
 
   Scenario: Get the type of a numeric value
     Given a context
       And the prefix f as "http://dh.tamu.edu/ns/fabulator/1.0#"
     When I run the expression (3/@type)
     Then I should get 1 item
-      And item 0 should be [f:uri-prefix('f') + 'numeric']
+      And item 0 should be [f:uri('f:numeric')]
 
   Scenario: Get the type of a uri value
     Given a context
       And the prefix f as "http://dh.tamu.edu/ns/fabulator/1.0#"
     When I run the expression (3/@type/@type)
     Then I should get 1 item
-      And item 0 should be [f:uri-prefix('f') + 'uri']
+      And item 0 should be [f:uri('f:uri')]

data/lib/fabulator.rb

@@ -5,9 +5,13 @@ module Fabulator
   FAB_LIB_NS='http://dh.tamu.edu/ns/fabulator/library/1.0#'
 
   require 'fabulator/expr'
+  require 'fabulator/tag_lib/transformations'
+  require 'fabulator/tag_lib/presentations'
+  require 'fabulator/tag_lib/type'
   require 'fabulator/tag_lib'
   require 'fabulator/action'
   require 'fabulator/structural'
   require 'fabulator/core'
+  require 'fabulator/compiler'
   require 'fabulator/version'
 end

data/lib/fabulator/compiler.rb

@@ -0,0 +1,27 @@
+require 'xml/libxml'
+
+module Fabulator
+  class Compiler
+    def initialize
+      @context = Fabulator::Expr::Context.new
+    end
+
+    # Calls the right compiler object based on the root element
+    def compile(xml)
+      XML.default_line_numbers = true
+
+      doc = nil
+
+      if xml.is_a?(String)
+        doc = LibXML::XML::Document.string xml
+        doc = doc.root
+      elsif xml.is_a?(LibXML::XML::Document)
+        doc = xml.root
+      else
+        doc = xml
+      end
+
+      @context.compile_structural(doc)
+    end
+  end
+end

data/lib/fabulator/core.rb

@@ -1,8 +1,3 @@
-require 'fabulator/core/state_machine'
-require 'fabulator/core/constraint'
-require 'fabulator/core/filter'
-require 'fabulator/core/group'
-require 'fabulator/core/parameter'
-require 'fabulator/core/state'
-require 'fabulator/core/transition'
-require 'fabulator/core/actions'
+require 'fabulator/core/structurals'
+#require 'fabulator/core/actions'
+require 'fabulator/core/lib'

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

@@ -125,24 +125,6 @@ module Fabulator
     end
   end
 
-  class Super < Fabulator::Action
-    namespace Fabulator::FAB_NS
-    has_select
-    has_actions :super
-
-    def run(context, autovivify = false)
-      return [] if @actions.nil?
-
-      @context.with(context) do |ctx|
-        new_context = @select.run(ctx,autovivify)
-
-        new_context = [ new_context ] unless new_context.is_a?(Array)
-
-        return new_context.collect { |c| @actions.run(ctx.with_root(c), autovivify) }.flatten
-      end
-    end
-  end
-
   end
   end
 end

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

@@ -42,54 +42,6 @@ module Fabulator
     end
   end
 
-  class Considering < Fabulator::Action
-    namespace Fabulator::FAB_NS
-    attribute :as, :static => true
-    has_select
-    has_actions
-
-    def run(context, autovivify = false)
-      return [] if @select.nil?
-      res = [ ]
-      @context.with(context) do |ctx|
-        c = self.select(ctx)
-        root = nil
-        if self.as.nil?
-          if c.size == 1
-            root = c.first
-          else
-            root = Fabulator::Expr::Node.new('data', context.root.roots, nil, c)
-          end
-          res = self.run_actions(ctx.with_root(root))
-        else
-          ctx.in_context do |ctx2|
-            ctx2.set_var(self.as, c)
-            res = self.run_actions(ctx2)
-          end
-        end
-      end
-      res
-    end
-  end
-
-  class While < Fabulator::Action
-    namespace Fabulator::FAB_NS
-    attribute :test, :eval => true, :static => false
-    attribute :limit, :default => 1000
-    has_actions
-
-    def run(context, autovivify = false)
-      res = [ ]
-      counter = 0
-      @context.with(context) do |ctx|
-        lim = self.limit(ctx) #@limit.nil? ? 1000 : @limit.run(ctx).first.value
-        while counter < lim && (!!self.test(ctx).first.value rescue false)
-          res = res + self.run_actions(ctx)
-        end
-      end
-      res
-    end
-  end
   end
   end
 end