fabulator 0.0.8 → 0.0.9

data/lib/fabulator/core/{actions.rb → lib.rb}

@@ -5,118 +5,147 @@ require 'fabulator/core/actions/variables'
 
 module Fabulator
   module Core
-  module Actions
   class Lib < TagLib
     namespace FAB_NS
 
-    structural 'application', Fabulator::Core::StateMachine
-    structural 'view', Fabulator::Core::State
-    structural 'goes-to', Fabulator::Core::Transition
-    #structural 'before', 
-    #structural 'after', 
-    structural 'params', Fabulator::Core::Group
-    structural 'group', Fabulator::Core::Group
-    structural 'param', Fabulator::Core::Parameter
-    structural 'value', Fabulator::Core::Constraint
-    structural 'constraint', Fabulator::Core::Constraint
-    structural 'filter', Fabulator::Core::Filter
-    structural 'sort', Sort
-    structural 'when', When
-    structural 'otherwise', When
-
-
-    action 'choose', Choose
-    action 'for-each', ForEach
-    action 'value-of', ValueOf
-    action 'value', Value
-    action 'while', While
-    action 'considering', Considering
-    action 'variable', Variable
-    action 'if', If
-    action 'go-to', Goto
-    action 'raise', Raise
-    action 'div', Block
-    action 'catch', Catch
-    action 'super', Super
+    structural :application, Structurals::StateMachine
+    structural :view, Structurals::State
+    structural 'goes-to', Structurals::Transition
+    structural :params, Structurals::Group
+    structural :group, Structurals::Group
+    structural :param, Structurals::Parameter
+    structural :value, Structurals::Constraint
+    structural :constraint, Structurals::Constraint
+    structural :filter, Structurals::Filter
+
+    structural :sort, Actions::Sort
+    structural :when, Actions::When
+    structural :otherwise, Actions::When
+
+    action :choose, Actions::Choose
+    action 'for-each', Actions::ForEach
+    action 'value-of', Actions::ValueOf
+    action :value, Actions::Value
+    action :variable, Actions::Variable
+    action :if, Actions::If
+    action 'go-to', Actions::Goto
+    action :raise, Actions::Raise
+    action :div, Actions::Block
+    action :catch, Actions::Catch
+
+    presentations do
+      transformations_into.html do
+        xslt_from_file File.join(File.dirname(__FILE__), "..", "..", "..", "xslt", "form.xsl")
+      end
+
+      interactive :text
+      interactive :asset
+      interactive :selection
+      interactive :password
+      interactive :submission
+
+      structural :form
+      structural :container
+      structural :group
+      structural :option
+    end
 
     ###
     ### core types
     ###
 
-    register_type 'boolean', {
-      :ops => {
-      },
-      :to => [
-        { :type => [ FAB_NS, 'string' ],
-          :weight => 1.0,
-          :convert => lambda { |i| i.value ? 'true' : '' }
-        },
-        { :type => [ FAB_NS, 'numeric' ],
-          :weight => 1.0,
-          :convert => lambda{ |i| Rational.new(i.value ? 1 : 0, 1) }
-        },
-      ]
-    }
-
-    register_type 'string', {
-      :ops => {
-        #:plus => {
-        #},
-        :minus => { 
-          :proc => lambda { |a,b| a.split(b).join('')} 
-        },
-        :mpy => {
-          :args => [ [ FAB_NS, 'string' ], [ FAB_NS, 'integer' ] ],
-          :proc => lambda { |a,b| a * b }
-        },
-        :lt => { },
-        :eq => { },
-      },
-      :to => [
-        { :type => [ FAB_NS, 'boolean' ],
-          :weight => 0.0001,
-          :convert => lambda { |s| !(s.value.nil? || s.value == '' || s.value =~ /\s*/) }
-        },
-        { :type => [ FAB_NS, 'html' ],
-          :weight => 1.0,
-          :convert => lambda { |s| s.value.gsub(/&/, '&amp;').gsub(/</, '&lt;') }
-        },
-      ],
-    }
-
-    register_type 'uri', {
-      :to => [
-        { :type => [ FAB_NS, 'string' ],
-          :weight => 1.0,
-          :convert => lambda { |u| u.get_attribute('namespace').value + u.get_attribute('name').value }
-        }
-      ]
-    }
-
-    register_type 'numeric', {
-      :ops => {
-        #:plus => { },
-        #:minus => { },
-        #:mpy => { },
-        #:div => { },
-        #:mod => { },
-        #:lt => { },
-        #:eq => { },
-      },
-      :to => [
-        { :type => [ FAB_NS, 'string' ],
-          :weight => 1.0,
-          :convert => lambda { |n| (n.value % 1 == 0 ? n.value.to_i : n.value.to_d).to_s }
-        },
-        { :type => [ FAB_NS, 'boolean' ],
-          :weight => 0.0001,
-          :convert => lambda { |n| n.value != 0 }
-        },
-      ],
-    }
-
-    register_type 'expression', {
-    }
+    has_type :boolean do
+      going_to [ FAB_NS, 'string' ] do
+        weight 1.0
+        converting do |i|
+          i.root.value ? 'true' : ''
+        end
+      end
+
+      going_to [ FAB_NS, 'numeric' ] do
+        weight 1.0
+        converting do |i|
+          Rational.new(i.root.value ? 1 : 0, 1)
+        end
+      end
+    end
+
+    has_type :string do
+      going_to [ FAB_NS, 'boolean' ] do
+        weight 0.0001
+        converting do |s|
+          !(s.root.value.nil? || s.root.value == '' || s.root.value =~ /^\s*$/)
+        end
+      end
+
+      going_to [ FAB_NS, 'html' ] do
+        weight 1.0
+        converting do |s|
+          s.root.value.gsub(/&/, '&amp;').gsub(/</, '&lt;').gsub(/>/, '&gt;')
+        end
+      end
+    end
+
+    has_type :html do
+    end
+
+    has_type :uri do
+      going_to [ FAB_NS, 'string' ] do
+        weight 1.0
+        converting do |u|
+          u.root.get_attribute('namespace').value + u.root.get_attribute('name').value
+        end
+      end
+
+      coming_from [ FAB_NS, 'string'] do
+        weight 1.0
+        converting do |u|
+          p = u.root.value
+          ns = nil
+          name = nil
+          if p =~ /^([a-zA-Z_][-a-zA-Z0-9_.]*):([a-zA-Z_][-a-zA-Z0-9_.]*)$/
+            ns_prefix = $1
+            name = $2
+            ns = u.get_ns(ns_prefix)
+          else
+            p =~ /^(.*?)([a-zA-Z_][-a-zA-Z0-9_.]*)$/
+            ns = $1
+            name = $2
+          end
+          r = u.root.anon_node(nil)
+          r.set_attribute('namespace', ns)
+          r.set_attribute('name', name)
+          r
+        end
+      end
+    end
+
+    has_type :numeric do
+      going_to [ FAB_NS, 'string' ] do
+        weight 1.0
+        converting do |n|
+          (n.root.value % 1 == 0 ? n.root.value.to_i : n.root.value.to_d).to_s
+        end
+      end
+
+      going_to [ FAB_NS, 'boolean' ] do
+        weight 0.0001
+        converting do |n|
+          n.root.value != 0
+        end
+      end
+    end
+
+    has_type :expression do
+      coming_from [ FAB_NS, 'string' ] do
+        weight 1.0
+        converting do |e|
+          p = Fabulator::Expr::Parser.new
+          c = e.root.value
+          c.nil? ? nil : p.parse(c,e)
+        end
+      end
+    end
 
     ###
     ### Numeric functions
@@ -268,9 +297,9 @@ module Fabulator
       first = args[1].first.value
       if args.size == 3
         last = args[2].first.value
-        return [ args[0].collect{ |src| src.value.to_s.substr(first, last) } ]
+        return [ args[0].collect{ |src| src.value.to_s.substr(first-1, last-1) } ]
       else
-        return [ args[0].collect{ |src| src.value.to_s.substr(first) } ]
+        return [ args[0].collect{ |src| src.value.to_s.substr(first-1) } ]
       end
     end
 
@@ -298,18 +327,18 @@ module Fabulator
       args[0].collect{ |a| a.to_s.split(div) }
     end
 
-    function 'contains' do |ctx, args|
+    function 'contains?' do |ctx, args|
       tgt = (args[1].first.to_s rescue '')
       return args[0].collect{ |a| (a.to_s.include?(tgt) rescue false) }
     end
 
-    function 'starts-with' do |ctx, args|
+    function 'starts-with?' do |ctx, args|
       tgt = (args[1].first.to_s rescue '')
       tgt_len = tgt.size - 1
       return args[0].collect{ |a| (a.to_s[0,tgt_len] == tgt rescue false) }
     end
 
-    function 'ends-with' do |ctx, args|
+    function 'ends-with?' do |ctx, args|
       tgt = (args[1].first.to_s rescue '').reverse
       tgt_len = tgt.size
       return args[0].collect{ |a| (a.to_s[-tgt_len,-1] == tgt rescue false) }
@@ -416,11 +445,11 @@ module Fabulator
     ### Sequences
     ###
 
-    mapping 'empty' do |ctx, arg|
+    reduction 'empty?' do |ctx, arg|
       arg.nil? || !arg.is_a?(Array) || arg.empty?
     end
 
-    mapping 'exists' do |ctx, arg|
+    reduction 'exists?' do |ctx, arg|
       !(arg.nil? || !arg.is_a?(Array) || arg.empty?)
     end
 
@@ -428,15 +457,15 @@ module Fabulator
       args.flatten.reverse
     end
 
-    mapping 'zero-or-one' do |ctx, arg|
+    reduction 'zero-or-one?' do |ctx, arg|
       arg.is_a?(Array) && arg.size <= 1
     end
 
-    mapping 'one-or-more' do |ctx, arg|
+    reduction 'one-or-more?' do |ctx, arg|
       arg.is_a?(Array) && arg.size >= 1
     end
 
-    mapping 'zero-or-one' do |ctx, arg|
+    reduction 'only-one?' do |ctx, arg|
       arg.is_a?(Array) && arg.size == 1
     end
 
@@ -444,6 +473,50 @@ module Fabulator
       args.size
     end
 
+    function 'first' do |ctx, args|
+      if args.size == 1 && args.vtype.join('') == FAB_NS + 'tuple'
+        args.value.first
+      else
+        args.first
+      end
+    end
+
+    function 'last' do |ctx, args|
+      if args.size == 1 && args.vtype.join('') == FAB_NS + 'tuple'
+        args.value.last
+      else
+        args.last
+      end
+    end
+
+    function 'all-but-first' do |ctx, args|
+      if args.size == 1 && args.vtype.join('') == FAB_NS + 'tuple'
+        if args.value.size > 1
+          args.value[1 .. args.value.size-1]
+        else
+          []
+        end
+      elsif args.size > 1
+        args[1 .. args.size-1]
+      else
+        []
+      end
+    end
+
+    function 'all-but-last' do |ctx, args|
+      if args.size == 1 && args.vtype.join('') == FAB_NS + 'tuple'
+        if args.value.size > 1
+          args.value[0 .. args.value.size-2]
+        else
+          []
+        end
+      elsif args.size > 1
+        args[0 .. args.size-2]
+      else
+        []
+      end
+    end
+
     ###
     ### Context
     ###
@@ -452,11 +525,11 @@ module Fabulator
       ctx.position
     end
 
-    function 'last', BOOLEAN do |ctx, args|
+    function 'last?', BOOLEAN do |ctx, args|
       ctx.last?
     end
 
-    function 'first', BOOLEAN do |ctx, args|
+    function 'first?', BOOLEAN do |ctx, args|
       ctx.position == 1
     end
 
@@ -529,5 +602,4 @@ module Fabulator
 
   end
   end
-  end
 end

data/lib/fabulator/core/structurals.rb

@@ -0,0 +1,7 @@
+require 'fabulator/core/structurals/state_machine'
+require 'fabulator/core/structurals/constraint'
+require 'fabulator/core/structurals/filter'
+require 'fabulator/core/structurals/group'
+require 'fabulator/core/structurals/parameter'
+require 'fabulator/core/structurals/state'
+require 'fabulator/core/structurals/transition'

data/lib/fabulator/core/{constraint.rb → structurals/constraint.rb}

@@ -1,5 +1,6 @@
 module Fabulator
   module Core
+  module Structurals
   class Constraint < Fabulator::Action
 
     namespace Fabulator::FAB_NS
@@ -134,3 +135,4 @@ module Fabulator
   end
   end
 end
+end

data/lib/fabulator/core/{filter.rb → structurals/filter.rb}

@@ -1,5 +1,6 @@
 module Fabulator
   module Core
+  module Structurals
   class Filter < Fabulator::Action
     namespace Fabulator::FAB_NS
     attribute :name, :static => true
@@ -26,3 +27,4 @@ module Fabulator
   end
   end
 end
+end

data/lib/fabulator/core/{group.rb → structurals/group.rb}

@@ -1,5 +1,6 @@
 module Fabulator
   module Core
+  module Structurals
   class Group < Fabulator::Structural
     attr_accessor :name, :params, :tags, :required_params
 
@@ -90,3 +91,4 @@ module Fabulator
   end
   end
 end
+end

data/lib/fabulator/core/{parameter.rb → structurals/parameter.rb}

@@ -1,5 +1,6 @@
 module Fabulator
   module Core
+  module Structurals
   class Parameter < Fabulator::Structural
     attr_accessor :name
 
@@ -96,3 +97,4 @@ module Fabulator
   end
   end
 end
+end

data/lib/fabulator/core/{state.rb → structurals/state.rb}

@@ -1,5 +1,6 @@
 module Fabulator
   module Core
+  module Structurals
   class State < Fabulator::Structural
     attr_accessor :name, :transitions
 
@@ -49,3 +50,4 @@ module Fabulator
   end
   end
 end
+end