cheri 0.0.5 → 0.0.6

data/lib/cheri/builder/swing/main.rb

@@ -87,7 +87,7 @@ end #self
   # Duplicating this here rather than including Cheri::AWT. (See note re: performance)
   #++
   def awt(*r,&k)
-    if (ctx = __cheri_ctx)
+    if ctx = __cheri_ctx
       if k
         AWTFrame.new(ctx,*r,&k).run
       else
@@ -101,7 +101,7 @@ end #self
   #   swing([*args] [, &block]) -> SwingProxy if no block given, else result of block
   #   
   def swing(*r,&k)
-    if (ctx = __cheri_ctx)
+    if ctx = __cheri_ctx
       if k
         if ctx.empty? && (c = ctx.client).kind_of?(RPC) || c.kind_of?(JComp)
           ctx.fsend(CheriYieldFactory,:cheri_yield,c,&k)

data/lib/cheri/builder/xml/connecter.rb

@@ -36,6 +36,17 @@ XmlConnecter = Cheri::Builder::TypeConnecter.new do
     connect XmlElement
   end
 
+  type TextElem do
+    connect XmlElement
+    connect Cheri::Builder::Content
+    connect Object  
+  end
+  
+  type Namespace do
+    connect XmlElement do |namespace,elem|
+      elem.ns ||= namespace.__prefix__
+    end  
+  end
 end #XmlConnecter
 
 end #Xml

data/lib/cheri/builder/xml/element.rb

@@ -32,18 +32,18 @@ end #XmlElement
 
 # Included by all Cheri::Xml builders
 module XmlBuilder
-  CE = ' />'.freeze #:nodoc:
+  TCE = ' />'.freeze #:nodoc:
 
   def empty_s(str='')
-    str << CE
+    str << TCE
   end
 
   def empty_io(ios)
-    ios << CE
+    ios << TCE
   end
 
   def esc(inp,out=nil)
-    if @ctx[:xml_esc] && (cs = Charsets.charset(inp))
+    if @opt[:esc] && (cs = Charsets.charset(inp))
       cs.xlat(inp,(out ||= ''))
       out
     elsif out
@@ -58,10 +58,26 @@ class Elem
   include Cheri::Builder::MarkupBuilder
   include XmlBuilder
   include XmlElement
+  
+  def initialize(ctx,*r,&k)
+    opt = @opt = ctx[:xml_opts] || {}
+    @fmt = true if opt[:format]
+    @amap = opt[:attr] if opt[:attr]
+    super
+  end
 
   def mod
     Cheri::Xml  
   end
+
+  def margin
+    @mrg || @opt[:margin] || @ctx[:margin] || 0
+  end
+
+  def indent
+    @idt || @opt[:indent] || @ctx[:indent] || 0
+  end
+  
 end
 
 class EmptyElem
@@ -69,40 +85,53 @@ class EmptyElem
   include XmlBuilder
   include XmlElement
 
+  def initialize(ctx,*r,&k)
+    opt = @opt = ctx[:xml_opts] || {}
+    @fmt = true if opt[:format]
+    @amap = opt[:attr] if opt[:attr]
+    super
+  end
+  
   def mod
     Cheri::Xml  
   end
 
-  def content?(value)
+  def add?(value)
     raise XmlException,"content not allowed for empty element #{@sym}: #{value}"  
   end
-end
 
+  def margin
+    @mrg || @opt[:margin] || @ctx[:margin] || 0
+  end
+
+  def indent
+    @idt || @opt[:indent] || @ctx[:indent] || 0
+  end
+  
+end
 
 class TextElem
-  include Cheri::Builder::Builder
-  include Cheri::Builder::Content
-  include Cheri::Builder::ContentArgs
+  include Cheri::Builder::MarkupLikeBuilder
   include XmlBuilder
   
-  def mod
-    Cheri::Xml  
+  def initialize(ctx,*r,&k)
+    @opt = ctx[:xml_opts] || {}
+    super
   end
 
-  def object
-    self
+  def set?(n,v)
+    raise XmlException,"attribute not allowed for text element #{@sym}: #{n}=#{v}"  
   end
+  private :set?
   
-  def run
-    value = @ctx.call(self,&@blk) if @blk
-    add(value) if String === value
-    #add(value) if value && !(Appendable === value || BaseProxy === value)
-    self
+  def mod
+    Cheri::Xml  
   end
 
   # Appends content to +str+, or to an empty string if +str+ is omitted.
   # Returns the result.
   def to_s(str='')
+    return to_io(str) unless String === str
     @cont.each do |c|
       if String === c
         esc(c,str)
@@ -127,6 +156,7 @@ class TextElem
 
 end
 
+# Like TextElem, but always escapes values, regardless of :esc setting
 class EscElem < TextElem
 
   def esc(inp,out=nil)
@@ -142,14 +172,54 @@ class EscElem < TextElem
 
 end
 
+class CommentElem
+  include Cheri::Builder::CommentBuilder
+  include XmlBuilder
+  include XmlElement
+  # :stopdoc:
+  CO = '<!-- '.freeze
+  CC = ' -->'.freeze
+  CCLF = " -->\n".freeze
+  # :startdoc:
+  def initialize(ctx,*r,&k)
+    opt = @opt = ctx[:xml_opts] || {}
+    @fmt = true if opt[:format]
+    super
+  end
+
+  def set?(n,v)
+    raise XmlException,"attribute not allowed for comment #{@sym}: #{n}=#{v}"  
+  end
+  private :set?
+  
+  def mod
+    Cheri::Xml  
+  end
+
+  def margin
+    @mrg || @opt[:margin] || @ctx[:margin] || 0
+  end
+
+  def indent
+    @idt || @opt[:indent] || @ctx[:indent] || 0
+  end
+
+end #CommentElem
+
 # TODO: special handling for these:
 
 class XmlRoot
-  XML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n".freeze #:nodoc:
-  include Cheri::Builder::Builder
-  include Cheri::Builder::Content
-  include Cheri::Builder::ContentArgs
+  # :stopdoc:
+  XML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>".freeze
+  # :startdoc:
+  include Cheri::Builder::MarkupBuilder
   include XmlBuilder
+
+  def initialize(ctx,*r,&k)
+    opt = @opt = ctx[:xml_opts] || {}
+    @fmt = true if opt[:format]
+    super
+  end
   
   def mod
     Cheri::Xml  
@@ -167,17 +237,29 @@ class XmlRoot
   # Appends content to +str+ (or new String if +str+ is omitted). Returns the result.
   def to_s(str='')
     return to_io(str) unless String === str
+    str << ' ' * @opt[:margin] if @fmt && @opt[:margin]
     str << XML
+    str << 10 if @fmt
     cont_s(str)
     str
   end
 
   # Appends content to +ios+. Returns the result.
   def to_io(ios)
+    ios << ' ' * @opt[:margin] if @fmt && @opt[:margin]
     ios << XML
+    ios << LF if @fmt
     cont_io(ios)
     ios
   end
+  
+  def format!
+    @fmt = true  
+  end
+  
+  def depth
+    -1  
+  end
 
 end
 
@@ -185,5 +267,42 @@ end
 class ProcElem < Elem
 end
 
+class Namespace
+  alias_method :__methods__,:methods
+  keep = /^(__|<|>|=)|^(class|inspect|to_s)$|(\?|!|=)$/
+  instance_methods.each do |m|
+    undef_method m unless m =~ keep  
+  end
+
+  def initialize(ctx,prefix,uri=nil)
+    @ctx = ctx
+    @pfx = prefix.to_sym
+    @uri = uri if uri
+  end
+  
+  def __prefix__
+    @pfx  
+  end
+  
+  def __uri__
+    @uri  
+  end
+  
+  def mod
+    Cheri::Xml
+  end
+  private :mod
+
+  def method_missing(sym,*r,&k)
+    @ctx.nsend(mod,@pfx,sym,*r,&k)
+  end
+  private :method_missing
+
+  def inspect
+    "#<#{self.class}:instance>"  
+  end
+
+end #Namespace
+
 end #Xml
 end #Cheri

data/lib/cheri/builder/xml/main.rb

@@ -41,7 +41,7 @@ class << self
 
   def connecter
     XmlConnecter  
-  end  
+  end
 
 end #self
 
@@ -51,33 +51,170 @@ end #self
   #   xml([*args] [, &block]) -> XmlProxy if no block given, else result of block
   #   
   def xml(*r,&k)
-    if (ctx = __cheri_ctx)
+    if ctx = __cheri_ctx
+      unless copts = ctx[:xml_opts]
+        iopts = ctx.ictx[:xml_opts] ||= XmlOptions.new
+        copts = ctx[:xml_opts] = XmlOptions.new(iopts)
+      end
       if k      
         if ctx.tos(XmlBuilder)
           XmlFrame.new(ctx,*r,&k).run
         else
-          ctx.msend(Cheri::Xml,:xml,*r,&k)
+          copts.ingest_args(*r) unless r.empty?
+          ctx.msend(Cheri::Xml,:xml,&k)
         end
       else
+        copts.ingest_args(*r) unless r.empty?
         ctx[:xml_proxy] ||= XmlProxy.new(ctx,*r)
       end
     end
   end
   private :xml
-
-
+  
 module XmlFactory
   def self.builder(ctx,sym,*r,&k)
+    opts = ctx[:xml_opts] || {}
+    if ((als = opts[:alias]) && (asym = als[sym])) || (asym = Aliases[sym])
+      sym = asym
+    end
     if (clazz = Types[sym])
       clazz.new(ctx,sym,*r,&k)
-    elsif ctx[:xml_any] || ((acc = ctx[:xml_accept]) && acc[sym])
+    elsif :no_ns == sym || ((hns = opts[:ns]) && hns[sym])
+      ns = (ctx[:xml_ns] ||= {})[sym] ||= Namespace.new(ctx,sym)
+      NamespaceBuilder.new(ns,ctx,sym,*r,&k)
+    elsif opts[:any] || ((acc = opts[:accept]) && acc[sym])
       Elem.new(ctx,sym,*r,&k)
     else
-      nil    
+      nil
     end
   end
 end #XmlFactory
 
+class XmlOptions < Cheri::Builder::BaseOptions
+  def validate(key,value)
+    raise Cheri.type_error(key,Symbol) unless Symbol === key
+    case key
+      when :any : validate_boolean_nil(value) || nil
+      when :esc : validate_boolean_nil(value) || nil
+      when :format : validate_boolean_nil(value) || nil
+      when :indent
+        unless Fixnum === value
+          if true == value
+            value = 2
+          elsif false == value || nil == value
+            value = nil
+          else
+            raise Cheri.type_error(value,Fixnum,TrueClass,FalseClass,NilClass)
+          end
+        end
+        store(:format,true) if value
+        value
+      when :margin
+        unless Fixnum === value
+          if false == value || nil == value
+            value = nil
+          else
+            raise Cheri.type_error(value,Fixnum,FalseClass,NilClass)
+          end
+        end
+        store(:format,true) if value
+        value
+      when :ns
+        value = value.to_sym if String === value
+        if Symbol === value
+          hns = self[:ns] || {}
+          hns[value] = true
+          hns
+        elsif Array === value
+          hns = self[:ns] || {}
+          value.each do |ns|
+            if String === ns
+              ns = ns.to_sym
+            else
+              validate_symbol(ns)
+            end
+            hns[ns] = true
+          end
+          warn "warning: empty array specified in xml :ns" if value.empty?
+          hns
+        elsif Hash === value
+          value.each_pair do |k,v|
+            validate_symbol(k)
+            validate_boolean_nil(v)
+          end
+          value
+        else
+          raise Cheri.type_error(value,Symbol,Array,Hash)
+        end
+      when :accept
+        value = value.to_sym if String === value
+        if Symbol === value
+          acc = self[:accept] || {}
+          acc[value] = true
+          acc
+        elsif Array === value
+          acc = self[:accept] || {}
+          value.each do |a|
+            if String === a
+              a = a.to_sym
+            else
+              validate_symbol(a)
+            end
+            acc[a] = true
+          end
+          warn "warning: empty array specified in xml :accept" if value.empty?
+          store(:any,false)
+          acc
+        elsif Hash === value
+          value.each_pair do |k,v|
+            validate_symbol(k)
+            validate_boolean_nil(v)
+          end
+          value
+        else
+          raise Cheri.type_error(value,Symbol,Array,Hash)
+        end
+      when :alias
+        if Array === value
+          raise ArgumentError,"odd number of values for :alias" if ((len = value.length) & 1) == 1
+          als = self[:alias] || {}
+          (len>>1).times do |i|
+            als[value[i*2].to_sym] = value[i*2+1].to_sym
+          end
+          als
+        elsif Hash === value
+          value.each_pair do |k,v|
+            validate_symbol(k)
+            validate_symbol(v)
+          end
+          value
+        else
+          raise Cheri.type_error(value,Array,Hash)
+        end
+      when :attr
+        if Array === value
+          raise ArgumentError,"odd number of values for :attr" if ((len = value.length) & 1) == 1
+          als = self[:attr] || {}
+          (len>>1).times do |i|
+            als[value[i*2].to_sym] = value[i*2+1].to_sym
+          end
+          als
+        elsif Hash === value
+          value.each_pair do |k,v|
+            validate_symbol(k)
+            validate_symbol(v)
+          end
+          value
+        else
+          raise Cheri.type_error(value,Array,Hash)
+        end
+    else
+      raise ArgumentError,"invalid xml option: #{key}"
+    end
+  end
+end #XmlOptions
+
+
 class XmlProxy < Cheri::Builder::BaseProxy
 
   impl(Types.keys)
@@ -87,43 +224,62 @@ class XmlProxy < Cheri::Builder::BaseProxy
   end
   private :mod
   
-  def [](opts)
-    if Symbol === opts
-      case opts
-        when :any : @ctx[:xml_any] = true
-        when :esc : @ctx[:xml_esc] = true
-        else raise ArgumentError,"invalid simple xml option: :#{opts}"
-      end
-    elsif Hash === opts
-      @ctx[:xml_any] = opts[:any] != false if opts[:any] != nil
-      @ctx[:xml_esc] = opts[:esc] != false if opts[:esc] != nil
-      if (accept = opts[:accept])
-        raise Cheri.type_error(accept,Array) unless Array === accept
-        acc = {}
-        accept.each do |a|
-          raise Cheri.type_error(a,Symbol) unless Symbol === a
-          acc[a] = true
-        end
-        @ctx[:xml_accept] = acc
-        @ctx[:xml_any] = nil
-      end
-    else
-      raise Cheri.type_error(opts,Hash,Symbol)
-    end
+  def [](*args)
+    ictx = (ctx = @ctx).ictx
+    iopts = ictx[:xml_opts] ||= XmlOptions.new
+    iopts.ingest_args(*args)
+    copts = ctx[:xml_opts] ||= XmlOptions.new
+    copts.ingest_args(*args)
     nil
   end
 
 end #XmlProxy
 
+class NamespaceBuilder
+  include Cheri::Builder::Builder
+  def initialize(ns,*r,&k)
+    super(*r,&k)
+    @obj = ns
+  end
+  def child?
+    false
+  end
+  def parent?
+    false  
+  end
+  def any?
+    true
+  end
+  def mod
+    Cheri::Xml  
+  end
+end #NamespaceBuilder
+
 class XmlFrame
   include Cheri::Builder::Frame
   def initialize(ctx,*r,&k)
-    super
-    @obj = ctx[:xml_proxy] ||= XmlProxy.new(ctx,*r)  
+    super(ctx,&k)
+    @obj = ctx[:xml_proxy] ||= XmlProxy.new(ctx,*r)
+    @args = r unless r.empty?
   end
   def mod
     Cheri::Xml  
   end
+  def run
+    if blk = @blk
+      if args = @args
+        opts = (ctx = @ctx)[:xml_opts]
+        temp = XmlOptions.new(opts)
+        temp.ingest_args(*args)
+        ctx[:xml_opts] = temp
+        result = ctx.call(self,&blk)
+        ctx[:xml_opts] = opts
+        result
+      else
+        @ctx.call(self,&blk)
+      end
+    end
+  end
 end #XmlFrame
 
 end #Xml