xx 0.1.0 → 2.0.0

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

@@ -1,11 +1,11 @@
 unless defined? $__xx_rb__
-
 require "rexml/document"
 
-
 module XX
 #--{{{
-  VERSION = "0.1.0"
+  VERSION = "2.0.0"
+
+  def self.version() VERSION end
 
   %w(
     CRAZY_LIKE_A_HELL
@@ -19,11 +19,13 @@ module XX
     attr "doc"
     attr "stack"
     attr "size"
+    attr_accessor "xmldecl"
 
     def initialize *a, &b
 #--{{{
       @doc = ::REXML::Document::new *a, &b
       @stack = [@doc]
+      @xmldecl = nil
       @size = 0
 #--}}}
     end
@@ -51,17 +53,23 @@ module XX
     end
     def to_str port = ""
 #--{{{
-      @doc.write port, indent=-1, transitive=false, ie_hack=true
-      port
+      xmldecl ? ugly(port) : pretty(port)
 #--}}}
     end
     alias_method "to_s", "to_str"
-    def pretty port = '' 
+    def pretty port = ""
 #--{{{
       @doc.write port, indent=2, transitive=false, ie_hack=true
       port
 #--}}}
     end
+    def ugly port = '' 
+#--{{{
+      @doc.write port, indent=-1, transitive=false, ie_hack=true
+      port
+#--}}}
+    end
+    alias_method "compact", "ugly"
     def create element
 #--{{{
       push element
@@ -173,66 +181,33 @@ module XX
 
     module InstanceMethods
 #--{{{
-      def method_missing m, *a, &b
+      def _ tag_name, *a, &b
 #--{{{
-        m = m.to_s
+        hashes, nothashes = a.partition{|x| Hash === x}
 
-        tag_method, tag_name = xx_class::xx_tag_method_name m
-
-        c_method_missing = xx_class::xx_config_for "method_missing", xx_which
-        c_tags = xx_class::xx_config_for "tags", xx_which
-
-        pat =
-          case c_method_missing
-            when ::XX::CRAZY_LIKE_A_HELL
-              %r/.*/
-            when ::XX::PERMISSIVE
-              %r/_$/o
-            when ::XX::STRICT
-              %r/_$/o
-            else
-              super
-          end
-
-        super unless m =~ pat
-
-        if c_method_missing == ::XX::STRICT
-          super unless c_tags.include? tag_name
-        end
-
-        ret, defined = nil
+        doc = xx_doc
+        element = ::REXML::Element::new "#{ tag_name }"
 
-        begin
-          xx_class::xx_define_tmp_method tag_method
-          xx_class::xx_define_tag_method tag_method, tag_name
-          ret = send tag_method, *a, &b
-          defined = true
-        ensure
-          xx_class::xx_remove_tag_method tag_method unless defined
-        end
+        hashes.each{|h| h.each{|k,v| element.add_attribute k.to_s, v}}
+        nothashes.each{|nh| element << ::REXML::Text::new(nh.to_s)}
 
-        ret
+        doc.create element, &b
 #--}}}
       end
-      def xx_tag_ tag_name, *a, &b
+      alias_method "xx_tag" , "_"
+      alias_method "__"      , "_"
+      alias_method "g__"      , "_"
+      def method_missing m, *a, &b
 #--{{{
-        tag_method, tag_name = xx_class::xx_tag_method_name tag_name 
+        m = m.to_s
 
-        ret, defined = nil
+        tag_name = m.sub! %r/_+$/, ''
 
-        begin
-          xx_class::xx_define_tmp_method tag_method
-          xx_class::xx_define_tag_method tag_method, tag_name
-          ret = send tag_method, *a, &b
-          defined = true
-        ensure
-          xx_class::xx_remove_tag_method tag_method unless defined
-        end
+        super unless tag_name 
 
-        ret
+        __ tag_name, *a, &b
 #--}}}
       end
-      alias_method "g_", "xx_tag_"
       def xx_which *argv 
 #--{{{
         @xx_which = nil unless defined? @xx_which
@@ -256,7 +231,6 @@ module XX
         ddoc = doc.doc
         begin
           @xx_docs.push doc
-          b.call doc if b
 
           doctype = xx_config_for "doctype", xx_which
           if doctype
@@ -273,9 +247,12 @@ module XX
               xmldecl = ::REXML::XMLDecl::new xmldecl unless
                 ::REXML::XMLDecl === xmldecl
               ddoc << xmldecl
+              doc.xmldecl = ::REXML::XMLDecl
             end
           end
 
+          b.call doc if b
+
           return doc
         ensure
           @xx_docs.pop
@@ -303,8 +280,7 @@ module XX
         doc.create text, &b
 #--}}}
       end
-      alias_method "text_", "xx_text_"
-      alias_method "t_", "xx_text_"
+      alias_method "t__", "xx_text_"
       def xx_markup_ *objects, &b
 #--{{{
         doc = xx_doc
@@ -322,7 +298,7 @@ module XX
         ret
 #--}}}
       end
-      alias_method "x_", "xx_markup_"
+      alias_method "x__", "xx_markup_"
       def xx_any_ *objects, &b
 #--{{{
         doc = xx_doc
@@ -340,8 +316,8 @@ module XX
         doc.create text, &b
 #--}}}
       end
-      alias_method "h_", "xx_any_"
-      alias_method "x_", "xx_any_" # supplant for now
+      alias_method "h__", "xx_any_"
+      alias_method "x__", "xx_any_" # supplant for now
       def xx_cdata_ *objects, &b
 #--{{{
         doc = xx_doc
@@ -355,7 +331,7 @@ module XX
         doc.create cdata, &b
 #--}}}
       end
-      alias_method "c_", "xx_cdata_"
+      alias_method "c__", "xx_cdata_"
       def xx_parse_attributes string
 #--{{{
         string = string.to_s
@@ -364,7 +340,7 @@ module XX
         xx_parse_yaml_attributes(tokens.join(','))
 #--}}}
       end
-      alias_method "att_", "xx_parse_attributes"
+      alias_method "a__", "xx_parse_attributes"
       def xx_parse_yaml_attributes string
 #--{{{
         require "yaml"
@@ -376,8 +352,7 @@ module XX
         obj
 #--}}}
       end
-      alias_method "at_", "xx_parse_yaml_attributes"
-      alias_method "yat_", "xx_parse_yaml_attributes"
+      alias_method "y__", "xx_parse_yaml_attributes"
       def xx_class
 #--{{{
         @xx_class ||= self.class
@@ -444,7 +419,7 @@ module XX
       def xx_define_tag_method tag_method, tag_name = nil
 #--{{{
         tag_method = tag_method.to_s
-        tag_name ||= tag_method.gsub %r/_+$/, ""
+        tag_name ||= tag_method.sub(%r/_$/, '')
 
         module_eval <<-code
           def #{ tag_method } *a, &b
@@ -557,6 +532,7 @@ module XX
       end
 #--}}}
     end
+    alias_method "xhtml__", "xhtml_"
 
     module Strict
 #--{{{
@@ -578,6 +554,7 @@ module XX
         super(which, *a, &b)
 #--}}}
       end
+      alias_method "xhtml__", "xhtml_"
 #--}}}
     end
 
@@ -590,6 +567,7 @@ module XX
         super(which, *a, &b)
 #--}}}
       end
+      alias_method "xhtml__", "xhtml_"
 #--}}}
     end
 #--}}}
@@ -605,6 +583,7 @@ module XX
       xx_which(which){ xx_with_doc_in_effect *a, &b }
 #--}}}
     end
+    alias_method "html4__", "html4_"
 
     module Strict
 #--{{{
@@ -625,6 +604,7 @@ module XX
         super(which, *a, &b)
 #--}}}
       end
+      alias_method "html4__", "html4_"
 #--}}}
     end
 
@@ -637,6 +617,7 @@ module XX
         super(which, *a, &b)
 #--}}}
       end
+      alias_method "html4__", "html4_"
 #--}}}
     end
 #--}}}
@@ -653,6 +634,7 @@ module XX
       xx_which(XML){ xx_with_doc_in_effect *a, &b }
 #--}}}
     end
+    alias_method "xml__", "xml_"
 #--}}}
   end
 #--}}}

data/lib/xx.rb

@@ -1,11 +1,11 @@
 unless defined? $__xx_rb__
-
 require "rexml/document"
 
-
 module XX
 #--{{{
-  VERSION = "0.1.0"
+  VERSION = "2.0.0"
+
+  def self.version() VERSION end
 
   %w(
     CRAZY_LIKE_A_HELL
@@ -19,11 +19,13 @@ module XX
     attr "doc"
     attr "stack"
     attr "size"
+    attr_accessor "xmldecl"
 
     def initialize *a, &b
 #--{{{
       @doc = ::REXML::Document::new *a, &b
       @stack = [@doc]
+      @xmldecl = nil
       @size = 0
 #--}}}
     end
@@ -51,17 +53,23 @@ module XX
     end
     def to_str port = ""
 #--{{{
-      @doc.write port, indent=-1, transitive=false, ie_hack=true
-      port
+      xmldecl ? ugly(port) : pretty(port)
 #--}}}
     end
     alias_method "to_s", "to_str"
-    def pretty port = '' 
+    def pretty port = ""
 #--{{{
       @doc.write port, indent=2, transitive=false, ie_hack=true
       port
 #--}}}
     end
+    def ugly port = '' 
+#--{{{
+      @doc.write port, indent=-1, transitive=false, ie_hack=true
+      port
+#--}}}
+    end
+    alias_method "compact", "ugly"
     def create element
 #--{{{
       push element
@@ -173,66 +181,33 @@ module XX
 
     module InstanceMethods
 #--{{{
-      def method_missing m, *a, &b
+      def _ tag_name, *a, &b
 #--{{{
-        m = m.to_s
+        hashes, nothashes = a.partition{|x| Hash === x}
 
-        tag_method, tag_name = xx_class::xx_tag_method_name m
-
-        c_method_missing = xx_class::xx_config_for "method_missing", xx_which
-        c_tags = xx_class::xx_config_for "tags", xx_which
-
-        pat =
-          case c_method_missing
-            when ::XX::CRAZY_LIKE_A_HELL
-              %r/.*/
-            when ::XX::PERMISSIVE
-              %r/_$/o
-            when ::XX::STRICT
-              %r/_$/o
-            else
-              super
-          end
-
-        super unless m =~ pat
-
-        if c_method_missing == ::XX::STRICT
-          super unless c_tags.include? tag_name
-        end
-
-        ret, defined = nil
+        doc = xx_doc
+        element = ::REXML::Element::new "#{ tag_name }"
 
-        begin
-          xx_class::xx_define_tmp_method tag_method
-          xx_class::xx_define_tag_method tag_method, tag_name
-          ret = send tag_method, *a, &b
-          defined = true
-        ensure
-          xx_class::xx_remove_tag_method tag_method unless defined
-        end
+        hashes.each{|h| h.each{|k,v| element.add_attribute k.to_s, v}}
+        nothashes.each{|nh| element << ::REXML::Text::new(nh.to_s)}
 
-        ret
+        doc.create element, &b
 #--}}}
       end
-      def xx_tag_ tag_name, *a, &b
+      alias_method "xx_tag" , "_"
+      alias_method "__"      , "_"
+      alias_method "g__"      , "_"
+      def method_missing m, *a, &b
 #--{{{
-        tag_method, tag_name = xx_class::xx_tag_method_name tag_name 
+        m = m.to_s
 
-        ret, defined = nil
+        tag_name = m.sub! %r/_+$/, ''
 
-        begin
-          xx_class::xx_define_tmp_method tag_method
-          xx_class::xx_define_tag_method tag_method, tag_name
-          ret = send tag_method, *a, &b
-          defined = true
-        ensure
-          xx_class::xx_remove_tag_method tag_method unless defined
-        end
+        super unless tag_name 
 
-        ret
+        __ tag_name, *a, &b
 #--}}}
       end
-      alias_method "g_", "xx_tag_"
       def xx_which *argv 
 #--{{{
         @xx_which = nil unless defined? @xx_which
@@ -256,7 +231,6 @@ module XX
         ddoc = doc.doc
         begin
           @xx_docs.push doc
-          b.call doc if b
 
           doctype = xx_config_for "doctype", xx_which
           if doctype
@@ -273,9 +247,12 @@ module XX
               xmldecl = ::REXML::XMLDecl::new xmldecl unless
                 ::REXML::XMLDecl === xmldecl
               ddoc << xmldecl
+              doc.xmldecl = ::REXML::XMLDecl
             end
           end
 
+          b.call doc if b
+
           return doc
         ensure
           @xx_docs.pop
@@ -303,8 +280,7 @@ module XX
         doc.create text, &b
 #--}}}
       end
-      alias_method "text_", "xx_text_"
-      alias_method "t_", "xx_text_"
+      alias_method "t__", "xx_text_"
       def xx_markup_ *objects, &b
 #--{{{
         doc = xx_doc
@@ -322,7 +298,7 @@ module XX
         ret
 #--}}}
       end
-      alias_method "x_", "xx_markup_"
+      alias_method "x__", "xx_markup_"
       def xx_any_ *objects, &b
 #--{{{
         doc = xx_doc
@@ -340,8 +316,8 @@ module XX
         doc.create text, &b
 #--}}}
       end
-      alias_method "h_", "xx_any_"
-      alias_method "x_", "xx_any_" # supplant for now
+      alias_method "h__", "xx_any_"
+      alias_method "x__", "xx_any_" # supplant for now
       def xx_cdata_ *objects, &b
 #--{{{
         doc = xx_doc
@@ -355,7 +331,7 @@ module XX
         doc.create cdata, &b
 #--}}}
       end
-      alias_method "c_", "xx_cdata_"
+      alias_method "c__", "xx_cdata_"
       def xx_parse_attributes string
 #--{{{
         string = string.to_s
@@ -364,7 +340,7 @@ module XX
         xx_parse_yaml_attributes(tokens.join(','))
 #--}}}
       end
-      alias_method "att_", "xx_parse_attributes"
+      alias_method "a__", "xx_parse_attributes"
       def xx_parse_yaml_attributes string
 #--{{{
         require "yaml"
@@ -376,8 +352,7 @@ module XX
         obj
 #--}}}
       end
-      alias_method "at_", "xx_parse_yaml_attributes"
-      alias_method "yat_", "xx_parse_yaml_attributes"
+      alias_method "y__", "xx_parse_yaml_attributes"
       def xx_class
 #--{{{
         @xx_class ||= self.class
@@ -444,7 +419,7 @@ module XX
       def xx_define_tag_method tag_method, tag_name = nil
 #--{{{
         tag_method = tag_method.to_s
-        tag_name ||= tag_method.gsub %r/_+$/, ""
+        tag_name ||= tag_method.sub(%r/_$/, '')
 
         module_eval <<-code
           def #{ tag_method } *a, &b
@@ -557,6 +532,7 @@ module XX
       end
 #--}}}
     end
+    alias_method "xhtml__", "xhtml_"
 
     module Strict
 #--{{{
@@ -578,6 +554,7 @@ module XX
         super(which, *a, &b)
 #--}}}
       end
+      alias_method "xhtml__", "xhtml_"
 #--}}}
     end
 
@@ -590,6 +567,7 @@ module XX
         super(which, *a, &b)
 #--}}}
       end
+      alias_method "xhtml__", "xhtml_"
 #--}}}
     end
 #--}}}
@@ -605,6 +583,7 @@ module XX
       xx_which(which){ xx_with_doc_in_effect *a, &b }
 #--}}}
     end
+    alias_method "html4__", "html4_"
 
     module Strict
 #--{{{
@@ -625,6 +604,7 @@ module XX
         super(which, *a, &b)
 #--}}}
       end
+      alias_method "html4__", "html4_"
 #--}}}
     end
 
@@ -637,6 +617,7 @@ module XX
         super(which, *a, &b)
 #--}}}
       end
+      alias_method "html4__", "html4_"
 #--}}}
     end
 #--}}}
@@ -653,6 +634,7 @@ module XX
       xx_which(XML){ xx_with_doc_in_effect *a, &b }
 #--}}}
     end
+    alias_method "xml__", "xml_"
 #--}}}
   end
 #--}}}

data/test/xx.rb

@@ -14,9 +14,9 @@ require 'test/unit'
   glob = File::join libdir, "*{.rb,.so}"
   Dir[glob].each{|f| require(File::expand_path(f))}
 #
-# find sample and expected dirs
+# find samples and expected dirs
 #
-  sampledir = File::expand_path(File::join(dirname, File::join("..", "sample")))
+  sampledir = File::expand_path(File::join(dirname, File::join("..", "samples")))
   expecteddir = File::join sampledir, "expected" 
 #
 # this tests everything in samples/* and compares against samples/expected/*

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: xx
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2006-01-24 00:00:00 -07:00
+  version: 2.0.0
+date: 2007-02-16 00:00:00 -07:00
 summary: xx
 require_paths: 
 - lib
@@ -25,10 +25,11 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Ara T. Howard
 files: 
-- lib/xx-0.1.0.rb
+- lib/xx-2.0.0.rb
 - lib/xx.rb
 test_files: 
 - test/xx.rb