fabulator 0.0.6 → 0.0.7

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

@@ -20,7 +20,7 @@ module Fabulator
 
     def run(context, autovivify = false)
       @context.with(context) do |ctx|
-        ctx.set_value(@path, @select.nil? ? @actions : @select )
+        ctx.set_value(self.path, @select.nil? ? @actions : @select )
       end
     end
   end
@@ -32,18 +32,16 @@ module Fabulator
     has_actions
 
     def run(context, autovivify = false)
-      return [] if @name.nil?
+      return [] if self.name.nil?
       res = [ ]
       @context.with(context) do |ctx|
         if @select
-          res = @select.run(ctx, autovivify)
-        elsif !@actions.empty?
-          @actions.each do |a|
-            res = a.run(ctx, autovivify)
-          end
+          res = self.select(ctx)
+        else
+          res = self.run_actions(ctx)
         end
       end
-      context.set_var(@name, res)
+      context.set_var(self.name, res)
       res
     end
   end

data/lib/fabulator/core/constraint.rb

@@ -9,6 +9,7 @@ module Fabulator
 
     def compile_xml(xml, ctx)
       super
+
       @constraints = [ ]
       @values = [ ]
       @params = [ ]
@@ -28,7 +29,7 @@ module Fabulator
           e_ctx = @context.merge(e)
           case e.name
             when 'param':
-              pname = e_ctx.attribute(FAB_NS, 'name') # (e.get_attribute_ns(FAB_NS, 'name').value rescue nil)
+              pname = e_ctx.attribute(FAB_NS, 'name')
               if !pname.nil?
                 v = e_ctx.attribute(FAB_NS, 'value', { :default => e_ctx.get_select })
                 @params[pname] = v unless v.nil?
@@ -44,7 +45,6 @@ module Fabulator
           end
         end
       end
-      self
     end
 
     def error_message(context)

data/lib/fabulator/core/filter.rb

@@ -4,19 +4,6 @@ module Fabulator
     namespace Fabulator::FAB_NS
     attribute :name, :static => true
     
-#    def compile_xml(xml, context)
-#      @context = context.merge(xml)
-#      filter_type = @context.attribute(FAB_NS, 'name', {:static => true}).split(/:/, 2)
-#      if filter_type.size == 2
-#        @ns = @context.get_ns(filter_type[0])
-#        @name = filter_type[1]
-#      else
-#        @ns = FAB_NS
-#        @name = filter_type[0]
-#      end
-#      self
-#    end
-
     def run(context)
       filtered = [ ]
       @context.with(context) do |ctx|

data/lib/fabulator/core/group.rb

@@ -1,41 +1,37 @@
 module Fabulator
   module Core
-  class Group < Fabulator::Action
+  class Group < Fabulator::Structural
     attr_accessor :name, :params, :tags, :required_params
 
     namespace Fabulator::FAB_NS
 
+    contains 'group', :as => :groups
+    contains 'param', :as => :params
+    contains 'constraint', :as => :constraints
+    contains 'filter', :as => :filters
+
     has_select
 
-    def initialize
-      @params = [ ]
-      @constraints = [ ]
-      @filters = [ ]
-      @required_params = [ ]
-      @tags = [ ]
-    end
+    attribute :select, :as => :name, :static => true
 
     def compile_xml(xml, context)
       super
-      xml.each_element do |e|
-        next unless e.namespaces.namespace.href == FAB_NS
 
-        case e.name
-          when 'param':
-            v = Parameter.new.compile_xml(e,@context)
-            @params << v
-            @required_params = @required_params + v.names if v.required?
-          when 'group':
-            v = Group.new.compile_xml(e,@context)
-            @params << v
-            @required_params = @required_params + v.required_params.collect{ |n| (@name + '/' + n).gsub(/\/+/, '/') }
-          when 'constraint':
-            @constraints << Constraint.new.compile_xml(e,@context)
-          when 'filter':
-            @filters << Filter.new.compile_xml(e,@context)
-        end
+      @required_params = [ ]
+
+      @params.each do |p|
+        @required_params += p.names if p.required?
       end
-      self
+
+      @name = '' if @name.nil?
+      @name.gsub!(/^\//, '')
+
+      @groups.each do |g|
+        @required_params += g.required_params.collect{ |n| (@name + '/' + n).gsub(/\/+/, '/') }
+      end
+
+      @params += @groups
+      @groups = nil
     end
 
     def apply_filters(context)

data/lib/fabulator/core/parameter.rb

@@ -1,6 +1,6 @@
 module Fabulator
   module Core
-  class Parameter < Fabulator::Action
+  class Parameter < Fabulator::Structural
     attr_accessor :name
 
     namespace Fabulator::FAB_NS
@@ -8,6 +8,10 @@ module Fabulator
     attribute :name, :eval => false, :static => true
     attribute :required, :static => true, :default => 'false'
 
+    contains :constraint
+    contains :filter
+    contains :value, :as => :constraints
+
     def required?
       @required
     end
@@ -23,9 +27,6 @@ module Fabulator
     def compile_xml(xml, context)
       super
 
-      @constraints = [ ]
-      @filters = [ ]
-
       case @required.downcase
         when 'yes':
           @required = true
@@ -36,19 +37,6 @@ module Fabulator
         when 'false':
           @required = false
       end
-
-      xml.each_element do |e|
-        next unless e.namespaces.namespace.href == FAB_NS
-        case e.name
-          when 'constraint':
-            @constraints << Constraint.new.compile_xml(e, @context)
-          when 'filter':
-            @filters << Filter.new.compile_xml(e, @context)
-          when 'value':
-            @constraints << Constraint.new.compile_xml(e, @context)
-        end
-      end
-      self
     end
 
     def get_context(context)

data/lib/fabulator/core/state.rb

@@ -1,54 +1,13 @@
 module Fabulator
   module Core
-  class State < Fabulator::Action
+  class State < Fabulator::Structural
     attr_accessor :name, :transitions
 
-    def initialize
-      @transitions = []
-      @pre_actions = nil
-      @post_actions = nil
-    end
-
     namespace Fabulator::FAB_NS
-    attribute :name, :static => true
-    
 
-    def compile_xml(xml, ctx)
-      super
+    attribute :name, :static => true
 
-      inheriting = !@transitions.empty?
-      xml.each_element do |e|
-        next unless e.namespaces.namespace.href == FAB_NS
-        case e.name
-          when 'goes-to':
-            if inheriting
-              target = e.attributes.get_attribute_ns(FAB_NS, 'view').value
-              tags = (e.attributes.get_attribute_ns(FAB_NS, 'tag').value rescue '').split(/\s+/)
-              old = @transitions.collect{ |t| t.state == target && (tags.empty? || !(tags & t.tags).empty?)}
-              if old.empty?
-                @transitions << Transition.new.compile_xml(e,@context)
-              else
-                old.each do |t|
-                  t.compile_xml(e,@context)
-                end
-              end
-            else 
-              @transitions << Transition.new.compile_xml(e, @context)
-            end
-          when 'before':
-            ActionLib.with_super(@pre_actions) do
-              t = @context.compile_actions(e)
-              @pre_actions = t if @pre_actions.nil? || !t.is_noop?
-            end
-          when 'after':
-            ActionLib.with_super(@post_actions) do
-              t = @context.compile_actions(e)
-              @post_actions = t if @post_actions.nil? || !t.is_noop?
-            end
-        end
-      end
-      self
-    end
+    contains 'goes-to', :as => :transitions
 
     def states
       @transitions.map { |t| t.state }.uniq
@@ -56,6 +15,7 @@ module Fabulator
 
     def select_transition(context,params)
       # we need hypthetical variables here :-/
+      return nil if @context.nil?
       best_match = nil
       @context.with(context) do |ctx|
         best_match = nil

data/lib/fabulator/core/state_machine.rb

@@ -2,63 +2,35 @@ require 'yaml'
 require 'xml/libxml'
 
 module Fabulator
-  FAB_NS='http://dh.tamu.edu/ns/fabulator/1.0#'
-  RDFS_NS = 'http://www.w3.org/2000/01/rdf-schema#'
-  RDF_NS = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'
-  RDFA_NS = 'http://dh.tamu.edu/ns/fabulator/rdf/1.0#'
-
   class StateChangeException < Exception
   end
 
   module Core
 
-  class StateMachine
+  class StateMachine < Structural
     attr_accessor :states, :missing_params, :errors, :namespaces, :updated_at
     attr_accessor :state
 
+    namespace FAB_NS
+
+    contains :view, :as => :states, :storage => :hash
+
+    has_actions
+
     def initialize
       @states = { }
       @context = Fabulator::Expr::Context.new
       @state = 'start'
     end
 
-    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
-
-      if context.nil?
-        @context = @context.merge(xml.root)
-      else
-        @context = context.merge(xml.root)
-      end
-
-      ActionLib.with_super(@actions) do
-        p_actions = @context.compile_actions(xml.root)
-        @actions = p_actions if @actions.nil? || !p_actions.is_noop?
-      end
-
-      xml.root.each_element do |child|
-        next unless child.namespaces.namespace.href == FAB_NS
-        case child.name
-          when 'view':
-            nom = (child.attributes.get_attribute_ns(FAB_NS, 'name').value rescue nil)
-            if !@states[nom].nil?
-              @states[nom].compile_xml(child, @context)
-            else
-              @states[nom] = State.new.compile_xml(child, @context)
-            end
-        end
-      end
+    def compile_xml(xml, context = nil)
+      super
 
       if @states.empty?
         s = State.new
         s.name = 'start'
-        @states['start'] = s
+        @states = { 'start' => s }
       end
-      self
     end
 
     def clone

data/lib/fabulator/core/transition.rb

@@ -1,49 +1,16 @@
 module Fabulator
   module Core
-  class Transition < Fabulator::Action
+  class Transition < Fabulator::Structural
     attr_accessor :state, :validations, :tags
 
-    namespace Fabulator::FAB_NS
-    attribute :view, :as => :lstate, :static => true
-    attribute :tag,  :as => :ltags,  :static => true, :default => ''
+    namespace FAB_NS
 
-    def initialize
-      @state = nil
-      @tags = nil
-      @groups = { }
-      @params = [ ]
-      @actions = nil
-    end
-
-    def compile_xml(xml, ctx)
-      super
+    attribute :view, :as => :state, :static => true
+    #attribute :tag,  :as => :ltags,  :static => true, :default => ''
 
-      inheriting = !@state.nil?
-
-      if !inheriting
-        @state = @lstate
-        @tags = @ltags
-      end
+    contains :params, :as => :params
 
-        # TODO: figure out some way to reference inherited actions
-        #   figure out 'super' vs. 'inner' -- only supporting 'super'
-        #   for now
-      ActionLib.with_super(@actions) do
-        t = @context.compile_actions(xml)
-        @actions = t if @actions.nil? || !t.is_noop?
-      end
-      parser = Fabulator::Expr::Parser.new
-
-      xml.each_element do |e|
-        next unless e.namespaces.namespace.href == FAB_NS
-        case e.name
-# TODO: handle parameters when inheriting
-          when 'params':
-            @params << Group.new.compile_xml(e, @context)
-        end
-      end
-      self
-    end
+    has_actions
 
     def param_names
       (@params.collect{|w| w.param_names}.flatten).uniq

data/lib/fabulator/expr/axis.rb

@@ -23,8 +23,8 @@ module Fabulator
         if @root.nil? || @root == ''
           return @axis.run(context, autovivify)
         else
-          if context.root.roots[@root].nil? && !Fabulator::ActionLib.axes[@root].nil?
-            context.root.roots[@root] = Fabulator::ActionLib.axes[@root].call(context)
+          if context.root.roots[@root].nil? && !Fabulator::TagLib.axes[@root].nil?
+            context.root.roots[@root] = Fabulator::TagLib.axes[@root].call(context)
           end
           return context.root.roots[@root].nil? ? [ ] : 
                                 @axis.nil? ? [ context.root.roots[@root] ] : 

data/lib/fabulator/expr/bin_expr.rb

@@ -9,7 +9,7 @@ module Fabulator
       def expr_type(context)
         lt = @left.expr_type(context)
         rt = @right.expr_type(context)
-        Fabulator::ActionLib.unify_types([ lt, rt ])
+        Fabulator::TagLib.unify_types([ lt, rt ])
       end
 
       def run(context, autovivify = false)
@@ -23,8 +23,8 @@ module Fabulator
 
         l.each do |i|
           r.each do |j|
-            ut = Fabulator::ActionLib.unify_types([ i.vtype, j.vtype ])
-            op = ActionLib.find_op(ut, self.op)
+            ut = Fabulator::TagLib.unify_types([ i.vtype, j.vtype ])
+            op = TagLib.find_op(ut, self.op)
             if(op && op[:proc])
               calc = op[:proc].call(i.to(ut), j.to(ut))
             else

data/lib/fabulator/expr/context.rb

@@ -318,8 +318,13 @@ module Fabulator
         end
       end
       d.each do |i|
-        c = root_context.create_child(node_name)
-        self.with_root(c).merge_data(i)
+        next if i.nil?
+        if i.is_a?(Array) || i.is_a?(Hash)
+          c = root_context.create_child(node_name)
+          self.with_root(c).merge_data(i)
+        else
+          root_context.create_child(node_name, i)
+        end
       end
     elsif d.is_a?(Hash)
       d.each_pair do |k,v|
@@ -338,10 +343,12 @@ module Fabulator
 
   def compile_actions(xml)
     actions = Fabulator::Expr::StatementList.new
+    return actions if xml.nil?
+
     local_ctx = self.merge(xml)
     xml.each_element do |e|
       ns = e.namespaces.namespace.href
-      next unless Fabulator::ActionLib.namespaces.include?(ns)
+      next unless Fabulator::TagLib.namespaces.include?(ns)
       if ns == FAB_NS && e.name == 'ensure'
         actions.add_ensure(local_ctx.compile_actions(e))
       elsif ns == FAB_NS && e.name == 'catch'
@@ -355,8 +362,32 @@ module Fabulator
 
   def compile_action(e)
     ns = e.namespaces.namespace.href
-    return unless Fabulator::ActionLib.namespaces.include?(ns)
-    Fabulator::ActionLib.namespaces[ns].compile_action(e, self)
+    return unless Fabulator::TagLib.namespaces.include?(ns)
+    Fabulator::TagLib.namespaces[ns].compile_action(e, self)
+  end
+
+  def compile_structurals(xml)
+    #local_ctx = self.merge(xml)
+    structs = { }
+    our_ns = xml.namespaces.namespace.href
+    our_nom = xml.name
+    xml.each_element do |e|
+      ns = e.namespaces.namespace.href
+      nom = e.name.to_sym
+      allowed = (Fabulator::TagLib.namespaces[our_ns].structural_class(our_nom).accepts_structural?(ns, nom) rescue false)
+      next unless allowed
+      structs[ns] ||= { }
+      structs[ns][nom] ||= [ ]
+      structs[ns][nom] << self.compile_structural(e)
+      structs[ns][nom] -= [ nil ]
+    end
+    return structs
+  end
+
+  def compile_structural(e)
+    ns = e.namespaces.namespace.href
+    return unless Fabulator::TagLib.namespaces.include?(ns)
+    Fabulator::TagLib.namespaces[ns].compile_structural(e, self)
   end
 
   def in_context(&block)
@@ -381,7 +412,7 @@ module Fabulator
   end
 
   def run_filter(ns, name)
-    handler = Fabulator::ActionLib.namespaces[ns]
+    handler = Fabulator::TagLib.namespaces[ns]
     return [] if handler.nil?
     handler.run_filter(self, name)
   end