fabulator 0.0.7 → 0.0.8

data/lib/fabulator/lib.rb

@@ -47,6 +47,7 @@ require 'fabulator/lib/lib'
 require 'fabulator/lib/structural'
 require 'fabulator/lib/action'
 require 'fabulator/lib/attribute'
+require 'fabulator/lib/function'
 
 module Fabulator
   module Lib
@@ -57,10 +58,10 @@ module Fabulator
     structural :structural, Structural
     structural :action, Action
     structural :attribute, Attribute
-    #structural :function, Function
-    #structural :mapping, Mapping
-    #structural :reduction, Reduction
-    #structural :consolidation, Consolidation
+    structural :function, Function
+    structural :mapping, Mapping
+    structural :reduction, Reduction
+    structural :consolidation, Consolidation
     #structural :type, Type
     #structural :filter, Filter
     #structural :constraint, Constraint

data/lib/fabulator/lib/action.rb

@@ -1,13 +1,58 @@
+#
+# Provides functional support -- not quite closures (yet)
+#
 module Fabulator
   module Lib
     class Action < Fabulator::Structural
+      attr_accessor :attributes
+
       namespace FAB_LIB_NS
 
       attribute :name, :static => true
+      attribute 'has-actions', :static => true, :as => :has_actions, :type => :boolean
 
       contains :attribute
 
       has_actions
+
+      def compile_action(e, context)
+        ret = nil
+        context.with(e) do |ctx|
+          ret = ActionRef.new(self, ctx, ctx.compile_actions(e))
+        end
+        ret
+      end
+    end
+
+    class ActionRef
+      def initialize(defining_action, context, actions = nil)
+        @context = context
+        @action = defining_action
+        @actions = actions
+        @static_attributes = { }
+        @action.attributes.collect{ |a| a.is_static? }.each do |a|
+          @static_attributes[a.path] = a.value(@context)
+        end
+      end
+
+      def run(context, autovivify = false)
+        ret = [ ]
+        @context.with(context) do |ctx|
+          @static_attributes.each_pair do |p,v|
+            ctx.set_value(p, v)
+          end
+# These can be passed to f:eval to get their value
+          @action.attributes.collect{ |a| !a.is_static? }.each do |attr|
+            ctx.set_value(attr.path, attr.value(ctx))
+          end
+          # we can f:eval($actions) in whatever current context we have
+          if @action.has_actions?
+            ctx.set_var('actions', ctx.root.anon_node(@actions, [ FAB_NS, 'expression' ]))
+          end
+          ret = @action.run(ctx)
+        end
+        ret
+      end
     end
   end
 end

data/lib/fabulator/lib/attribute.rb

@@ -4,6 +4,17 @@ module Fabulator
       namespace FAB_LIB_NS
 
       attribute :name, :static => true
+      attribute :ns, :static => true, :inherited => true
+      attribute :static, :static => true, :type => :boolean
+      attribute :eval, :static => true, :type => :boolean
+
+      def is_static?
+        @static
+      end
+
+      def value(context)
+        context.attribute(@ns, @name, { :static => @static, :eval => @eval })
+      end
     end
   end
 end

data/lib/fabulator/lib/function.rb

@@ -0,0 +1,36 @@
+module Fabulator
+  module Lib
+    class Function < Fabulator::Structural
+      namespace FAB_LIB_NS
+
+      attribute :name, :static => true
+
+      has_actions
+    end
+
+    class Mapping < Fabulator::Structural
+      namespace FAB_LIB_NS
+
+      attribute :name, :static => true
+
+      has_actions
+    end
+
+    class Reduction < Fabulator::Structural
+      namespace FAB_LIB_NS
+
+      attribute :name, :static => true
+
+      has_actions
+    end
+
+    class Consolidation < Fabulator::Structural
+      namespace FAB_LIB_NS
+
+      attribute :name, :static => true
+
+      has_actions
+    end
+  end
+end
+

data/lib/fabulator/lib/lib.rb

@@ -3,6 +3,8 @@ module Fabulator
   class Lib < Fabulator::Structural
 
     namespace FAB_LIB_NS
+
+    element :library
     
     attribute :ns, :static => true
 
@@ -17,16 +19,75 @@ module Fabulator
     contains :constraint, :storage => :hash, :key => :name
 
     def register_library
-      Fabulator::TagLib.namespaces[@ns] = self
-      @attributes.each do |attr|
-        Fabulator::TagLib.attributes << [ @ns, attr[:name], attr[:options] ]
-      end
+      Fabulator::TagLib.namespaces[self.ns] = self
     end
 
-    def compile_action(e, c_attrs)
+    def compile_action(e, context)
+      name = e.name
+      return nil unless @actions.has_key?(name)
+      @actions[name].compile_action(e, context)
     end
 
     def run_function(context, nom, args)
+      # look for a function/mapping/consolidation
+      # then pass along to any objects in @contained
+
+      fctn = nil
+      fctn_type = nil
+
+      if nom =~ /^(.*)\*$/
+        cnom = $1
+        if !@consolidations[cnom].nil?
+          fctn = @consolidations[cnom]
+          fctn_type = :reduction
+        end
+      else
+        if @consolidations.has_key?(nom)
+          fctn = @reductions[nom]
+          fctn_type = :reduction
+        end
+        if fctn.nil?
+          fctn = @mappings[nom]
+          fctn_type = :mapping
+        end
+        if fctn.nil?
+          fctn = @functions[nom]
+          fctn_type = :function
+        end
+        if fctn.nil?
+          fctn = @reductions[nom]
+          fctn_type = :reduction
+        end
+      end
+
+      if !fctn.nil?
+        res = [ ]
+        context.in_context do |ctx|
+          args = args.flatten
+          case fctn_type
+            when :function:
+              args.size.times do |i|
+                ctx.set_var((i+1).to_s, args[i])
+              end
+              ctx.set_var('0', args)
+              res = fctn.run(ctx)
+            when :mapping:
+              res = args.collect{ |a| fctn.run(ctx.with_root(a)) }.flatten
+            when :reduction:
+              ctx.set_var('0', args.flatten)
+              res = fctn.run(ctx)
+          end
+        end
+        return res
+      end
+
+      return [] if @contained.nil?
+
+      @contained.each do |c|
+        ret = c.run_function(context, nom, args)
+        return ret unless ret.nil? || ret.empty?
+      end
+      []
     end   
 
     def function_return_type(name)
@@ -38,9 +99,21 @@ module Fabulator
     end
 
     def run_filter(context, nom)
+      return if @contained.nil?
+      @contained.each do |c|
+        ret = c.run_filter(context, nom)
+        return ret unless ret.nil?
+      end
+      nil
     end
  
     def run_constraint(context, nom)
+      return if @contained.nil?
+      @contained.each do |c|
+        ret = c.run_constraint(context, nom)
+        return ret unless ret.nil?
+      end
+      false
     end
   end
   end

data/lib/fabulator/structural.rb

@@ -1,7 +1,11 @@
 module Fabulator
   class Structural < Action
 
-    def compile_xml(xml, context)
+    def initialize
+      @context = Fabulator::Expr::Context.new
+    end
+
+    def compile_xml(xml, context = nil)
       XML.default_line_numbers = true
       if xml.is_a?(String)
         xml = LibXML::XML::Document.string xml
@@ -17,12 +21,12 @@ module Fabulator
       end
 
       self.setup(xml)
-
-      self
     end
 
-    def self.element(nom)
-      @@elements[self.name] = nom
+    def self.element(nom = nil)
+      @@elements ||= { }
+      @@elements[self.name] = nom unless nom.nil?
+      @@elements[self.name]
     end
 
     def self.contains(nom, opts = { })
@@ -33,16 +37,40 @@ module Fabulator
       @@structurals[self.name][ns][nom.to_sym] = opts
     end
 
+    def self.contained_in(ns, nom, h = {})
+      @@contained_in ||= { }
+
+      @@contained_in[ns] ||= { }
+      @@contained_in[ns][nom.to_sym] ||= { }
+      @@contained_in[ns][nom.to_sym][self.namespace] ||= { }
+      @@contained_in[ns][nom.to_sym][self.namespace][self.element.to_sym] = h.update({ :as => :contained})
+    end
+
     def self.structurals
-      return @@structurals[self.name]
+      ret = @@structurals[self.name]
+      els = self.element
+      els = [ els ] unless els.is_a?(Array)
+
+      return ret if self.element.nil?
+
+      @@contained_in ||= { }
+
+      return ret if @@contained_in[self.namespace].nil?
+
+      pot = @@contained_in[self.namespace][self.element.to_sym]
+      return ret if pot.nil? || pot.empty?
+
+      pot.each_pair do |ns, noms|
+        ret[ns] ||= { }
+        ret[ns] = ret[ns].update(noms)
+      end
+      ret
     end
 
     def self.accepts_structural?(ns, nom)
-      return false if @@structurals.nil?
-      return false if @@structurals[self.name].nil?
-      return false if @@structurals[self.name][ns].nil?
-      return false if @@structurals[self.name][ns][nom.to_sym].nil?
-      return true
+      s = self.structurals
+      in_s = (s[ns][nom.to_sym] rescue nil)
+      return !in_s.nil?
     end
 
     def accepts_structural?(ns, nom)

data/lib/fabulator/tag_lib.rb

@@ -74,7 +74,7 @@ module Fabulator
     end
 
       def structural_class(nom)
-        Fabulator::TagLib.structural_classes[self.class.name][nom]
+        Fabulator::TagLib.structural_classes[self.class.name][nom.to_sym]
       end
 
     def self.inherited(base)
@@ -418,14 +418,10 @@ module Fabulator
             r
           }
           Fabulator::TagLib.structural_classes[self.name] ||= {}
-          Fabulator::TagLib.structural_classes[self.name][name] = klass
+          Fabulator::TagLib.structural_classes[self.name][name.to_sym] = klass
         end
       end
 
-      def structural_class(nom)
-        (Fabulator::TagLib.structural_classes[self.class.name][nom] rescue nil)
-      end
-
       def function(name, returns = nil, takes = nil, &block)
         self.function_descriptions[name] = { :returns => returns, :takes => takes }
         self.function_descriptions[name][:description] = Fabulator::TagLib.last_description if Fabulator::TagLib.last_description

data/xsm_expression_parser.racc

@@ -1,9 +1,11 @@
 class Fabulator::Expr::Parser
+  #--
   # based on XSM expression grammer from 
   #    http://cpansearch.perl.org/src/JSMITH/Gestinanna-0.02/parser.PL
-
+  #
   # instead of compiling ruby code, we'll instantiate objects to handle the
   # run-time performance
+  #++
 
   start statements
 
@@ -184,15 +186,38 @@ rule
 end
 
 ---- inner 
+  # == Fabulator Expression Parser
+  #
+  # <tt>Fabulator::Expr::Parser</tt> provides a parser for Fabulator
+  # expressions operating on a DOM-like data model provided by
+  # Fabulator::Expr::Context and Fabulator::Expr::Node.
+  #
+  # The expression language is based on XQuery and XPath.
+  #
+
   require 'fabulator/expr'
   require 'rational'
   require 'bigdecimal'
   require 'bigdecimal/util'
 
-  def parse(t, ctx)
-    @source = t
+  # Within the context of a Fabulator::Expr::Context object, this will
+  # parse the given string and return an object that can be run to return
+  # an array if Fabulator::Expr::Node objects.
+  #
+  # Example:
+  #
+  #   parser  = Fabulator::Expr::Parser.new
+  #   context = Fabulator::Expr::Context.new
+  #   expr    = parser.parse('//foo', context)
+  #   foos    = expr.run(context)
+  #
+  # Results in 'foos' being an array of all of the nodes in the
+  # context that are named 'foo' regardless of their depth in the
+  # node tree.
+  def parse(text, context)
+    @source = text
     @curpos = 0
-    @context = ctx
+    @context = context
     @line = 0
     @col = 0
 
@@ -203,6 +228,8 @@ end
     do_parse
   end
 
+  # Used internally by the parser to raise a Fabulator::Expr::ParserError
+  # when the parse fails.
   def on_error(*args)
     raise Fabulator::Expr::ParserError.new("unable to parse '#{args[1]}' near line #{@line + 1}, column #{@col}")
   end
@@ -396,8 +423,8 @@ end
           if res[1] == 'if'
             @token = [ :IF, 'if' ]
           else
-            if @source[@curpos+res[1].length .. @curpos+res[1].length] == '*'
-              @token = [ :FUNCTION_NAME, res[1]+'*' ]
+            if @source[@curpos+res[1].length .. @curpos+res[1].length + 1] =~ /^(\??\*?)/
+              @token = [ :FUNCTION_NAME, res[1]+$1 ]
             else
               @token = [ :FUNCTION_NAME, res[1] ]
             end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fabulator
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - James Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-07 00:00:00 +00:00
+date: 2010-09-11 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,6 +106,7 @@ extensions: []
 
 extra_rdoc_files: 
 - README.rdoc
+- TODO
 files: 
 - History.txt
 - Manifest.txt
@@ -165,6 +166,7 @@ files:
 - lib/fabulator/lib.rb
 - lib/fabulator/lib/action.rb
 - lib/fabulator/lib/attribute.rb
+- lib/fabulator/lib/function.rb
 - lib/fabulator/lib/lib.rb
 - lib/fabulator/lib/structural.rb
 - lib/fabulator/structural.rb
@@ -180,6 +182,7 @@ files:
 - test/test_helper.rb
 - xslt/form.xsl
 - xsm_expression_parser.racc
+- TODO
 - test/cucumber.rb
 has_rdoc: true
 homepage: http://github.com/jgsmith/ruby-fabulator