xx 2.0.0 → 2.1.0

data/lib/xx.rb

@@ -1,12 +1,17 @@
-unless defined? $__xx_rb__
+unless(defined?($__xx_rb__) or defined?(XX))
+
 require "rexml/document"
 
 module XX
 #--{{{
-  VERSION = "2.0.0"
-
+  VERSION = "2.1.0"
   def self.version() VERSION end
 
+  LIBDIR = File.dirname(File.expand_path(__FILE__)) << File::SEPARATOR
+  def self.libdir() LIBDIR end
+
+  require libdir + "binding_of_caller"
+
   %w(
     CRAZY_LIKE_A_HELL
     PERMISSIVE
@@ -59,7 +64,7 @@ module XX
     alias_method "to_s", "to_str"
     def pretty port = ""
 #--{{{
-      @doc.write port, indent=2, transitive=false, ie_hack=true
+      @doc.write port, indent=0, transitive=false, ie_hack=true
       port
 #--}}}
     end
@@ -281,6 +286,7 @@ module XX
 #--}}}
       end
       alias_method "t__", "xx_text_"
+      alias_method "text__", "xx_text_"
       def xx_markup_ *objects, &b
 #--{{{
         doc = xx_doc
@@ -299,6 +305,7 @@ module XX
 #--}}}
       end
       alias_method "x__", "xx_markup_"
+      alias_method "markup__", "xx_markup_"
       def xx_any_ *objects, &b
 #--{{{
         doc = xx_doc
@@ -316,6 +323,7 @@ module XX
         doc.create text, &b
 #--}}}
       end
+      alias_method "any__", "xx_any_"
       alias_method "h__", "xx_any_"
       alias_method "x__", "xx_any_" # supplant for now
       def xx_cdata_ *objects, &b
@@ -331,6 +339,7 @@ module XX
         doc.create cdata, &b
 #--}}}
       end
+      alias_method "cdata__", "xx_cdata_"
       alias_method "c__", "xx_cdata_"
       def xx_parse_attributes string
 #--{{{
@@ -637,6 +646,212 @@ module XX
     alias_method "xml__", "xml_"
 #--}}}
   end
+
+  module Template
+#--{{{
+    class Basic
+#--{{{
+      %w( path inline type object template port pretty ).each{|a| attr_accessor a}
+      def initialize opts = {}, &b
+#--{{{
+        @path = opts['path'] || opts[:path]
+        @inline = opts['inline'] || opts[:inline]
+        @type = opts['type'] || opts[:type]
+        @object = opts['object'] || opts[:object]
+        @pretty = opts['pretty'] || opts[:pretty]
+        @port = opts['port'] || opts[:port] || STDOUT
+
+        bool = lambda{|value| value ? true : false}
+        raise ArgumentError unless(bool[@path] ^ bool[@inline])
+
+        path_init(&b) if @path
+        inline_init(&b) if @inline
+
+        @type =
+          case @type.to_s.downcase.strip
+            when /^xhtml$/
+              XHTML
+            when /^xml$/
+              XML
+            when /^html4$/
+              HTML4
+            else
+              XHTML
+          end
+#--}}}
+      end
+      def path_init &b
+#--{{{
+        @template = IO.read @path
+        @type = @path[%r/\.[^\.]+$/o] || XHTML unless @type
+#--}}}
+      end
+      def inline_init &b
+#--{{{
+        @template = (@inline || b.call).to_s 
+        @type ||= XHTML
+#--}}}
+      end
+      def expand binding, opts = {}
+#--{{{
+        port = opts['port'] || opts[:port] || STDOUT
+        pretty = opts['pretty'] || opts[:pretty]
+
+        object = eval 'self', binding
+
+        unless type === object 
+          __m = type
+          klass = object.class
+          klass.module_eval{ include __m } 
+        end
+
+        doc = eval @template, binding 
+
+        display = pretty ? 'pretty' : 'to_str'
+
+        doc.send display, port
+#--}}}
+      end
+      alias_method "result", "expand"
+#--}}}
+    end
+
+    class File < Basic
+#--{{{
+      def initialize *argv, &b
+#--{{{
+        opts, argv = argv.partition{|arg| Hash === arg}
+        opts = opts.inject{|a,b| a.update b}
+        path = argv.shift
+        raise ArgumentError, "no path" unless path
+        raise ArgumentError, "bad opts" unless Hash === opts or opts.nil? 
+        opts ||= {}
+        opts['path'] = opts[:path] = path.to_s
+        super opts, &b
+#--}}}
+      end
+#--}}}
+    end
+
+    class Inline < Basic
+#--{{{
+      def initialize *argv, &b
+#--{{{
+        opts, argv = argv.partition{|arg| Hash === arg}
+        opts = opts.inject{|a,b| a.update b}
+        inline = argv.shift || b.call
+        raise ArgumentError, "no inline" unless inline
+        raise ArgumentError, "bad opts" unless Hash === opts or opts.nil? 
+        opts ||= {}
+        opts['inline'] = opts[:inline] = inline.to_s
+        super opts, &b
+#--}}}
+      end
+#--}}}
+    end
+#--}}}
+  end
+
+  module Expandable
+#--{{{
+    module InstanceMethods
+#--{{{
+      def xx_template_file *a, &b
+#--{{{
+        template = XX::Template::File.new *a, &b
+        template.object ||= self
+        template
+#--}}}
+      end
+      def xx_template_inline *a, &b
+#--{{{
+        template = XX::Template::Inline.new *a, &b
+        template.object ||= self
+        template
+#--}}}
+      end
+      def xx_expand template, opts = {}
+#--{{{
+        port = opts['port'] || opts[:port] || STDOUT
+        pretty = opts['pretty'] || opts[:pretty]
+        binding = opts['binding'] || opts[:binding]
+
+        type = template.type
+
+        unless type === self 
+          klass = self.class
+          klass.module_eval{ include type } 
+        end
+
+        display = pretty ? 'pretty' : 'to_str'
+
+        Binding.of_caller do |scope|
+          binding ||= eval('binding', scope)
+          doc = eval template.template, binding 
+          doc.send display, port
+        end
+#--}}}
+      end
+      def xx_expand_file *a, &b 
+#--{{{
+        template = xx_template_file *a, &b 
+
+        type = template.type
+        pretty = template.pretty
+        port = template.port
+
+        unless type === self 
+          klass = self.class
+          klass.module_eval{ include type } 
+        end
+
+        display = pretty ? 'pretty' : 'to_str'
+
+        Binding.of_caller do |scope|
+          binding ||= eval('binding', scope)
+          doc = eval template.template, binding 
+          doc.send display, port
+        end
+#--}}}
+      end
+      alias_method "xx_expand_path", "xx_expand_file"
+      alias_method "xx_expand_template", "xx_expand_file"
+      def xx_expand_inline *a, &b 
+#--{{{
+        template = xx_template_inline *a, &b 
+
+        type = template.type
+        pretty = template.pretty
+        port = template.port
+
+        unless type === self 
+          klass = self.class
+          klass.module_eval{ include type } 
+        end
+
+        display = pretty ? 'pretty' : 'to_str'
+
+        Binding.of_caller do |scope|
+          binding ||= eval('binding', scope)
+          doc = eval template.template, binding 
+          doc.send display, port
+        end
+#--}}}
+      end
+      alias_method "xx_expand_string", "xx_expand_inline"
+#--}}}
+    end
+    module ClassMethods
+    end
+    def self.included other
+#--{{{
+      other.instance_eval{ include InstanceMethods }
+      other.extend ClassMethods 
+#--}}}
+    end
+#--}}}
+  end
+
 #--}}}
 end
 

data/lib/{xx-2.0.0.rb → xx.rb.bak}

@@ -1,10 +1,10 @@
-unless defined? $__xx_rb__
+unless(defined?($__xx_rb__) or defined?(XX))
+
 require "rexml/document"
 
 module XX
 #--{{{
-  VERSION = "2.0.0"
-
+  VERSION = "2.1.0"
   def self.version() VERSION end
 
   %w(
@@ -637,6 +637,126 @@ module XX
     alias_method "xml__", "xml_"
 #--}}}
   end
+
+  module Template
+
+    module InstanceMethods
+      def xx_template_file *a, &b
+        XX::Template::File.new *a, &b
+      end
+      def xx_template_inline *a, &b
+        XX::Template::Inline.new *a, &b
+      end
+    end
+    module ClassMethods
+    end
+
+    def self.included other
+      other.instance_eval{ include InstanceMethods }
+      other.extend ClassMethods 
+    end
+
+    class Basic
+#--{{{
+      %w(
+        path
+        inline
+        type
+      ).each{|a| attr_accessor a}
+
+      def initialize opts = {}, &b
+#--{{{
+        @path = opts['path'] || opts[:path]
+        @inline = opts['inline'] || opts[:inline]
+        @type = opts['type'] || opts[:type]
+
+        bool = lambda{|value| value ? true : false}
+        raise ArgumentError unless(bool[@path] ^ bool[@inline])
+
+        path_init(&b) if @path
+        inline_init(&b) if @inline
+
+        @type =
+          case @type.to_s.downcase.strip
+            when /^xhtml$/
+              XHTML
+            when /^xml$/
+              XML
+            when /^html4$/
+              HTML4
+            else
+              XHTML
+          end
+#--}}}
+      end
+
+      def path_init &b
+#--{{{
+        @template = IO.read @path
+        @type = @path[%r/\.[^\.]+$/o] || XHTML unless @type
+#--}}}
+      end
+
+      def inline_init &b
+#--{{{
+        @template = (@inline || b.call).to_s 
+        @type ||= XHTML
+#--}}}
+      end
+
+require 'binding_of_caller'
+      def expand opts = {}
+#--{{{
+        port = opts['port'] || opts[:port] || STDOUT
+        pretty = opts['pretty'] || opts[:pretty]
+
+        Binding.of_caller do |binding_of_caller|
+          this = eval 'self', binding_of_caller
+          unless @type === this 
+            klass = this.class
+            m = @type 
+            klass.module_eval{ m } 
+          end
+
+          doc = eval @template, binding_of_caller 
+          msg = pretty ? 'pretty' : 'to_str'
+          doc.send msg, port
+        end
+#--}}}
+      end
+
+#--}}}
+    end
+
+    class File < Basic
+
+      def initialize *a, &b
+        path, opts, ignored = *a
+        raise ArgumentError unless path
+        raise ArgumentError unless Hash === opts or opts.nil? 
+        opts ||= {}
+        opts['path'] = opts[:path] = path
+        super opts, &b
+
+      end
+
+    end
+
+    class Inline < Basic
+
+      def initialize *a, &b
+
+        inline, opts, ignored = *a
+        raise ArgumentError unless inline or b
+        raise ArgumentError unless Hash === opts or opts.nil? 
+        opts ||= {}
+        opts['inline'] = opts[:inline] = inline
+        super opts, &b
+
+      end
+
+    end
+  end
 #--}}}
 end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: xx
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
-date: 2007-02-16 00:00:00 -07:00
+  version: 2.1.0
+date: 2007-02-24 00:00:00 -07:00
 summary: xx
 require_paths: 
 - lib
@@ -29,7 +29,9 @@ post_install_message:
 authors: 
 - Ara T. Howard
 files: 
-- lib/xx-2.0.0.rb
+- lib/xx.rb.bak
+- lib/xx-2.1.0.rb
+- lib/binding_of_caller.rb
 - lib/xx.rb
 test_files: 
 - test/xx.rb