meteor 0.9.24 → 0.9.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80d59c6205221bcf3bcc849a8c70a7689eea1a91341531255341d60d58891a02
-  data.tar.gz: eda5a84623011d29c4c842836123f0f39f81682a9dbfa40b2f1fe84bb4c8f91d
+  metadata.gz: 972f9396e2d45e6310cbfa0fda64ae798d10e150b7241db77cc07c954aa0a8ce
+  data.tar.gz: 07e9dc8c2e6f4018c3c00c6ed0d68fc2c2393c1daf43977e87fc50d9d063f40e
 SHA512:
-  metadata.gz: d3a61991ed0eac2ce67ab6832ecfaca5ba6149996cf901ae474387e3143eb89c64163a439fb599470a68ef0f4ded6558fb2c02cce0270d37a235e344f757e2e3
-  data.tar.gz: b3051e52c18ea7a590e149e20d49437aacfc149de2b427698d004819264031006870fe23239b35bb606d53db4b8d21fa99d9f2fadb2568024a460ea6ba182cc8
+  metadata.gz: e90da0e028c4cd8c41a81012fa74121c6f68d7ace825b540eea77ae9b7b8e857b99341c5eeba3c1ac0991bff7b743dad90fb406d9d95baa147c94f92cd33b214
+  data.tar.gz: d55c86399dcdaaf6bc11fec20bf25d4ef033e5e731014cb57e80f40b647b25d0ce6dcca84e8f1ac7c222c12142cc09362bd0782cc917c219e04a97ac0cb0df3a

data/ChangeLog

@@ -1,3 +1,7 @@
+== 0.9.25 / 2026-06-25 Yasumasa Ashida <ys.ashida@gmail.com>
+
+* Refactoring
+
 == 0.9.24 / 2026-06-22 Yasumasa Ashida <ys.ashida@gmail.com>
 
 * Refactoring

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    meteor (0.9.24)
+    meteor (0.9.25)
 
 GEM
   remote: https://rubygems.org/

data/demo/html.rb

@@ -43,7 +43,7 @@ elm_text1["required"] = true
 # elm_select1['multiple'] = true  # elm_select1.attr(multiple: true)
 # puts elm_select1['multiple']    # puts elm_select1.attr('multiple')
 
-# elm_select1.unsafe_content = "<option id=\"option12\">オプション12</option>"
+# elm_select1.unsafe_content = "<option id=\"option1-2\">オプション1-2</option>"
 
 # elm_option1 = root.element('option', id: 'option1')
 # elm_option1['selected'] = true  # elm_option1.attr(selected: true)

data/lib/meteor/core/kernel.rb

@@ -317,15 +317,15 @@ module Meteor
         @pattern_cc = "<#{@_name}(|\\s[^<>]*)\\/>|<#{@_name}((?:|\\s[^<>]*))>(((?!(#{@_name}[^<>]*>)).)*)<\\/#{@_name}>"
 
         @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc)
-        # search of content-rich element (内容あり要素検索)
+        # search of normal element (内容あり要素検索)
         @res = @pattern.match(@root.document)
 
         if @res
           if @res[1]
-            element_without_1(name)
+            element_void_1(name)
           else
-            # puts '---element_with_1'
-            element_with_1(name)
+            # puts '---element_normal_1'
+            element_normal_1(name)
           end
           # else
         end
@@ -335,7 +335,7 @@ module Meteor
 
       private :element_1
 
-      def element_with_1(name)
+      def element_normal_1(name)
         @elm_ = Meteor::Element.new(name)
 
         unless @on_search
@@ -356,21 +356,21 @@ module Meteor
           # document (全体)
           @elm_.document = @res[0]
         end
-        # content-rich element search pattern (内容あり要素検索用パターン)
+        # normal element search pattern (内容あり要素検索用パターン)
         # @pattern_cc = String.new('') << "<" << @_name << '(?:|\\s[^<>]*)>((?!(' << @_name
         # @pattern_cc << '[^<>]*>)).)*<\\/' << @_name << '>'
         @pattern_cc = "<#{@_name}(|\\s[^<>]*)>(((?!(#{@_name}[^<>]*>)).)*)<\\/#{@_name}>"
 
         @elm_.pattern = @pattern_cc
-        @elm_.empty = true
+        @elm_.normal = true
         @elm_.parser = self
 
         @elm_
       end
 
-      private :element_with_1
+      private :element_normal_1
 
-      def element_without_1(name)
+      def element_void_1(name)
         # element (要素)
         @elm_ = Meteor::Element.new(name)
         # attribute (属性)
@@ -382,14 +382,14 @@ module Meteor
         # @pattern_cc = "<#{@_name}(|\\s[^<>]*)\\/>"
         @elm_.pattern = @pattern_cc
 
-        @elm_.empty = false
+        @elm_.normal = false
 
         @elm_.parser = self
 
         @elm_
       end
 
-      private :element_without_1
+      private :element_void_1
 
       #
       # get element using tag name and attribute(name="value") (要素のタグ名と属性(属性名="属性値")で検索し、要素を取得する)
@@ -411,7 +411,7 @@ module Meteor
         @res1 = @pattern.match(@root.document)
 
         if @res1 && @res1[1] || !@res1
-          @res2 = element_with_3_2
+          @res2 = element_normal_3_2
           @pattern_cc_2 = @pattern_cc
 
           # puts @res2.captures.length
@@ -423,27 +423,27 @@ module Meteor
             @res = @res1
             # @pattern_cc = @pattern_cc_1
             if @res[1]
-              element_without_3(name)
+              element_void_3(name)
             else
-              element_with_3_1(name)
+              element_normal_3_1(name)
             end
           elsif @res1.begin(0) > @res2.begin(0)
             @res = @res2
             # @pattern_cc = @pattern_cc_2
-            element_with_3_1(name)
+            element_normal_3_1(name)
           end
         elsif @res1 && !@res2
           @res = @res1
           # @pattern_cc = @pattern_cc_1
           if @res[1]
-            element_without_3(name)
+            element_void_3(name)
           else
-            element_with_3_1(name)
+            element_normal_3_1(name)
           end
         elsif @res2 && !@res1
           @res = @res2
           # @pattern_cc = @pattern_cc_2
-          element_with_3_1(name)
+          element_normal_3_1(name)
         else
           if @error_check
             puts(Meteor::Exception::NoSuchElementException.new(name, attr_name, attr_value).message)
@@ -470,7 +470,7 @@ module Meteor
 
       private :quote_element_3
 
-      def element_with_3_1(name)
+      def element_normal_3_1(name)
         # puts  @res.captures.length
         case @res.captures.length
         when FOUR
@@ -482,7 +482,7 @@ module Meteor
           @elm_.mixed_content = @res[2]
           # document (全体)
           @elm_.document = @res[0]
-          # content-rich element search pattern (内容あり要素検索用パターン)
+          # normal element search pattern (内容あり要素検索用パターン)
           # @pattern_cc = String.new('')<< "<" << @_name << '\\s[^<>]*' << @_attr_name << '="'
           # @pattern_cc << @_attr_value << '"[^<>]*>((?!(' << @_name
           # @pattern_cc << '[^<>]*>)).)*<\\/' << @_name << '>'
@@ -490,7 +490,7 @@ module Meteor
 
           @elm_.pattern = @pattern_cc
 
-          @elm_.empty = true
+          @elm_.normal = true
 
           @elm_.parser = self
         when FIVE
@@ -502,7 +502,7 @@ module Meteor
           @elm_.mixed_content = @res[3]
           # document (全体)
           @elm_.document = @res[0]
-          # content-rich element search pattern (内容あり要素検索用パターン)
+          # normal element search pattern (内容あり要素検索用パターン)
           # @pattern_cc = String.new('')<< "<" << @_name << '\\s[^<>]*' << @_attr_name << '="'
           # @pattern_cc << @_attr_value << '"[^<>]*>((?!(' << @_name
           # @pattern_cc << '[^<>]*>)).)*<\\/' << @_name << '>'
@@ -510,7 +510,7 @@ module Meteor
 
           @elm_.pattern = @pattern_cc
 
-          @elm_.empty = true
+          @elm_.normal = true
 
           @elm_.parser = self
 
@@ -530,10 +530,10 @@ module Meteor
           end
           # document (全体)
           @elm_.document = @res[0]
-          #  content-rich element search pattern (内容あり要素検索用パターン)
+          #  normal element search pattern (内容あり要素検索用パターン)
           @elm_.pattern = @pattern_cc
 
-          @elm_.empty = true
+          @elm_.normal = true
 
           @elm_.parser = self
         end
@@ -541,10 +541,10 @@ module Meteor
         @elm_
       end
 
-      private :element_with_3_1
+      private :element_normal_3_1
 
-      def element_with_3_2
-        element_pattern_with_3_2
+      def element_normal_3_2
+        element_pattern_normal_3_2
 
         if @sbuf.length == ZERO || @cnt != ZERO
           return nil
@@ -556,9 +556,9 @@ module Meteor
         @res
       end
 
-      private :element_with_3_2
+      private :element_normal_3_2
 
-      def element_pattern_with_3_2
+      def element_pattern_normal_3_2
         # @pattern_cc_1 = String.new('') << "<" << @_name << '(\\s[^<>]*' << @_attr_name << '="'
         # @pattern_cc_1 << @_attr_value << '(?:[^<>\\/]*>|(?:(?!([^<>]*\\/>))[^<>]*>)))'
         @pattern_cc_1 = "<#{@_name}(\\s[^<>]*#{@_attr_name}=\"#{@_attr_value}(?:[^<>\\/]*>|(?:(?!([^<>]*\\/>))[^<>]*>)))"
@@ -577,7 +577,7 @@ module Meteor
         @pattern_cc_2_2 = String.new("") << ".*?)<\\/" << @_name << ">"
         # @pattern_cc_2_2 = ".*?)<\\/#{@_name}>"
 
-        # search of content-rich element (内容あり要素検索)
+        # search of normal element (内容あり要素検索)
         @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc_1)
 
         @sbuf = String.new("")
@@ -592,15 +592,15 @@ module Meteor
         @pattern_cc = @sbuf
       end
 
-      private :element_pattern_with_3_2
+      private :element_pattern_normal_3_2
 
-      def element_without_3(name)
-        element_without_3_1(name, "\"[^<>]*)\\/>")
+      def element_void_3(name)
+        element_void_3_1(name, "\"[^<>]*)\\/>")
       end
 
-      private :element_without_3
+      private :element_void_3
 
-      def element_without_3_1(name, closer)
+      def element_void_3_1(name, closer)
         # element (要素)
         @elm_ = Meteor::Element.new(name)
         # attribute (属性)
@@ -616,7 +616,7 @@ module Meteor
         @elm_
       end
 
-      private :element_without_3_1
+      private :element_void_3_1
 
       #
       # get element using attribute(name="value") (属性(属性名="属性値")で検索し、要素を取得する)
@@ -649,7 +649,7 @@ module Meteor
         @res1 = @pattern.match(@root.document)
 
         if @res1 && @res1[1] || !@res1
-          @res2 = element_with_2_2
+          @res2 = element_normal_2_2
           @pattern_cc_2 = @pattern_cc
 
           # puts @res2.captures.length
@@ -661,27 +661,27 @@ module Meteor
             @res = @res1
             # @pattern_cc = @pattern_cc_1
             if @res[1]
-              element_without_2
+              element_void_2
             else
-              element_with_2_1
+              element_normal_2_1
             end
           elsif @res1.begin(0) > @res2.begin(0)
             @res = @res2
             # @pattern_cc = @pattern_cc_2
-            element_with_2_1
+            element_normal_2_1
           end
         elsif @res1 && !@res2
           @res = @res1
           # @pattern_cc = @pattern_cc_1
           if @res[1]
-            element_without_2
+            element_void_2
           else
-            element_with_2_1
+            element_normal_2_1
           end
         elsif @res2 && !@res1
           @res = @res2
           # @pattern_cc = @pattern_cc_2
-          element_with_2_1
+          element_normal_2_1
         else
           if @error_check
             puts Meteor::Exception::NoSuchElementException.new(attr_name, attr_value).message
@@ -717,7 +717,7 @@ module Meteor
       private :element_pattern_2
 
 =begin
-      def element_with_2_1
+      def element_normal_2_1
         # puts @res.captures.length
         case @res.captures.length
           when FOUR
@@ -737,7 +737,7 @@ module Meteor
             @ pattern_cc = "<#{@_name}\\s[^<>]*#{@_attr_name}=\"#{@_attr_value}\"[^<>]*>((?!(#{@_name}[^<>]*>)).)*<\\/#{@_name}>"
 
             @elm_.pattern = @pattern_cc
-            @elm_.empty = true
+            @elm_.normal = true
             @elm_.parser = self
           when FIVE,SEVEN
             @_name = @res[3]
@@ -756,7 +756,7 @@ module Meteor
             @pattern_cc = "<#{@_name}\\s[^<>]*#{@_attr_name}=\"#{@_attr_value}\"[^<>]*>((?!(#{@_name}[^<>]*>)).)*<\\/#{@_name}>"
 
             @elm_.pattern = @pattern_cc
-            @elm_.empty = true
+            @elm_.normal = true
             @elm_.parser = self
           when THREE,SIX
             # puts @res[1]
@@ -773,20 +773,20 @@ module Meteor
             # pattern (内容あり要素検索用パターン)
             @elm_.pattern = @pattern_cc
 
-            @elm_.empty = true
+            @elm_.normal = true
             @elm_.parser = self
         end
         @elm_
       end
 
-      private :element_with_2_1
+      private :element_normal_2_1
 
-      def element_with_2_2
+      def element_normal_2_2
         # @pattern_cc_1 = String.new('') << "<" << @_name << '(\\s[^<>]*' << @_attr_name << '="'
         # @pattern_cc_1 << @_attr_value << '(?:[^<>\\/]*>|(?:(?!([^<>]*\\/>))[^<>]*>)))'
         @pattern_cc_1 = "<([^<>\"]*)(\\s[^<>]*#{@_attr_name}=\"#{@_attr_value}(?:[^<>\\/]*>|(?:(?!([^<>]*\\/>))[^<>]*>)))"
 
-        # search of content-rich element (内容あり要素検索)
+        # search of normal element (内容あり要素検索)
         @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc_1)
         @sbuf = String.new('')
 
@@ -804,7 +804,7 @@ module Meteor
         @res = @pattern.match(@root.document)
       end
 
-      private :element_with_2_2
+      private :element_normal_2_2
 
       def create_pattern_2(args_cnt)
         @pattern_cc_1b = String.new('') << "<" << @_name << '(\\s[^<>\\/]*>|((?!([^<>]*\\/>))[^<>]*>))'
@@ -821,13 +821,13 @@ module Meteor
         @pattern_1b = Meteor::Core::Util::PatternCache.get(@pattern_cc_1b)
       end
 
-      def element_without_2
-        element_without_2_1('"[^<>]*\\/>')
+      def element_void_2
+        element_void_2_1('"[^<>]*\\/>')
       end
 
-      private :element_without_2
+      private :element_void_2
 
-      def element_without_2_1(closer)
+      def element_void_2_1(closer)
         # element (要素)
         @elm_ = Element.new(@res[1])
         # attribute (属性)
@@ -842,7 +842,7 @@ module Meteor
         @elm_
       end
 
-      private :element_without_2_1
+      private :element_void_2_1
 =end
 
       #
@@ -863,7 +863,7 @@ module Meteor
         @res1 = @pattern.match(@root.document)
 
         if @res1 && @res1[1] || !@res1
-          @res2 = element_with_5_2
+          @res2 = element_normal_5_2
           @pattern_cc_2 = @pattern_cc
 
           # puts @res2.captures.length
@@ -875,27 +875,27 @@ module Meteor
             @res = @res1
             # @pattern_cc = @pattern_cc_1
             if @res[1]
-              element_without_5(name)
+              element_void_5(name)
             else
-              element_with_5_1(name)
+              element_normal_5_1(name)
             end
           elsif @res1.begin(0) > @res2.begin(0)
             @res = @res2
             # @pattern_cc = @pattern_cc_2
-            element_with_5_1(name)
+            element_normal_5_1(name)
           end
         elsif @res1 && !@res2
           @res = @res1
           # @pattern_cc = @pattern_cc_1
           if @res[1]
-            element_without_5(name)
+            element_void_5(name)
           else
-            element_with_5_1(name)
+            element_normal_5_1(name)
           end
         elsif @res2 && !@res1
           @res = @res2
           # @pattern_cc = @pattern_cc_2
-          element_with_5_1(name)
+          element_normal_5_1(name)
         else
           if @error_check
             puts(Meteor::Exception::NoSuchElementException.new(name, attr_name, attr_value).message)
@@ -919,7 +919,7 @@ module Meteor
 
       private :quote_element_5
 
-      def element_with_5_1(name)
+      def element_normal_5_1(name)
 
         # puts @res.captures.length
         case @res.captures.length
@@ -942,7 +942,7 @@ module Meteor
           @pattern_cc = "<#{@_name}(\\s[^<>]*(?:#{@_attr_name1}=\"#{@_attr_value1}\"[^<>]*#{@_attr_name2}=\"#{@_attr_value2}\"|#{@_attr_name2}=\"#{@_attr_value2}\"[^<>]*#{@_attr_name1}=\"#{@_attr_value1}\")[^<>]*)>(((?!(#{@_name}[^<>]*>)).)*)<\\/#{@_name}>"
 
           @elm_.pattern = @pattern_cc
-          @elm_.empty = true
+          @elm_.normal = true
           @elm_.parser = self
         when FIVE
           # element (要素)
@@ -963,7 +963,7 @@ module Meteor
           @pattern_cc = "<#{@_name}(\\s[^<>]*(?:#{@_attr_name1}=\"#{@_attr_value1}\"[^<>]*#{@_attr_name2}=\"#{@_attr_value2}\"|#{@_attr_name2}=\"#{@_attr_value2}\"[^<>]*#{@_attr_name1}=\"#{@_attr_value1}\")[^<>]*)>(((?!(#{@_name}[^<>]*>)).)*)<\\/#{@_name}>"
 
           @elm_.pattern = @pattern_cc
-          @elm_.empty = true
+          @elm_.normal = true
           @elm_.parser = self
 
         when THREE, SIX
@@ -975,20 +975,20 @@ module Meteor
           @elm_.mixed_content = @res[3]
           # document (全体)
           @elm_.document = @res[0]
-          # content-rich element search pattern (要素ありタグ検索用パターン)
+          # normal element search pattern (要素ありタグ検索用パターン)
           @elm_.pattern = @pattern_cc
 
-          @elm_.empty = true
+          @elm_.normal = true
           @elm_.parser = self
         end
 
         @elm_
       end
 
-      private :element_with_5_1
+      private :element_normal_5_1
 
-      def element_with_5_2
-        element_pattern_with_5_2
+      def element_normal_5_2
+        element_pattern_normal_5_2
 
         if @sbuf.length == ZERO || @cnt != ZERO
           return nil
@@ -1000,9 +1000,9 @@ module Meteor
         @res
       end
 
-      private :element_with_5_2
+      private :element_normal_5_2
 
-      def element_pattern_with_5_2
+      def element_pattern_normal_5_2
 
         # @pattern_cc_1 = String.new('') << "<" << @_name << '(\\s[^<>]*(?:' << @_attr_name1 << '="'
         # @pattern_cc_1 << @_attr_value1 << '"[^<>]*' << @_attr_name2 << '="'
@@ -1029,7 +1029,7 @@ module Meteor
         # @pattern_cc_2_1 = ".*?<\\/#{@_name}>"
         # @pattern_cc_2_2 = ".*?)<\\/#{@_name}>"
 
-        # search of content-rich element (内容あり要素検索)
+        # search of normal element (内容あり要素検索)
         @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc_1)
 
         @sbuf = String.new("")
@@ -1042,15 +1042,15 @@ module Meteor
         @pattern_cc = @sbuf
       end
 
-      private :element_pattern_with_5_2
+      private :element_pattern_normal_5_2
 
-      def element_without_5(name)
-        element_without_5_1(name, "\")[^<>]*)\\/>")
+      def element_void_5(name)
+        element_void_5_1(name, "\")[^<>]*)\\/>")
       end
 
-      private :element_without_5
+      private :element_void_5
 
-      def element_without_5_1(name, closer)
+      def element_void_5_1(name, closer)
         # element (要素)
         @elm_ = Meteor::Element.new(name)
         # attribute (属性)
@@ -1070,7 +1070,7 @@ module Meteor
         @elm_
       end
 
-      private :element_without_5_1
+      private :element_void_5_1
 
       #
       # get element using attribute1,2(name="value") (属性1・属性2(属性名="属性値")で検索し、要素を取得する)
@@ -1388,24 +1388,24 @@ module Meteor
           # if @res
           case args.size
           when ONE
-            if @elm_.empty
-              element_with_1(@elm_.name)
+            if @elm_.normal
+              element_normal_1(@elm_.name)
             else
-              element_without_1(@elm_.name)
+              element_void_1(@elm_.name)
             end
 
           when TWO, THREE
-            if @elm_.empty
-              element_with_3_1(@elm_.name)
+            if @elm_.normal
+              element_normal_3_1(@elm_.name)
             else
-              element_without_3(@elm_.name)
+              element_void_3(@elm_.name)
             end
 
           when FOUR, FIVE
-            if @elm_.empty
-              element_with_5_1(@elm_.name)
+            if @elm_.normal
+              element_normal_5_1(@elm_.name)
             else
-              element_without_5(@elm_.name)
+              element_void_5(@elm_.name)
             end
           end
 
@@ -1846,7 +1846,7 @@ module Meteor
       #
       def get_content_1(elm)
         if !elm.cx
-          if elm.empty
+          if elm.normal
             unescape_content(elm.mixed_content, elm)
           else
             nil
@@ -1955,7 +1955,7 @@ module Meteor
           # pattren (要素検索パターン)
           @elm_.pattern = @pattern_cc
 
-          @elm_.empty = true
+          @elm_.normal = true
 
           @elm_.parser = self
         else
@@ -2073,7 +2073,7 @@ module Meteor
               # self.document_hook << @root.kaigyo_code << "<#{self.element_hook.name}#{self.element_hook.attributes}>#{self.element_hook.mixed_content}</#{self.element_hook.name}>"
             end
 
-            self.element_hook = Element.new!(self.element_hook.origin, self)
+            self.element_hook = self.element_hook.origin.clone(self)
           else
             reflect
             @_attributes = self.element_hook.attributes
@@ -2097,7 +2097,7 @@ module Meteor
               # self.document_hook << @root.kaigyo_code << "<#{self.element_hook.name}#{@_attributes}>#{@root.document}</#{self.element_hook.name}>"
             end
 
-            self.element_hook = Element.new!(self.element_hook.origin, self)
+            self.element_hook = self.element_hook.origin.clone(self)
           end
         else
           reflect
@@ -2125,13 +2125,13 @@ module Meteor
       # @return [Meteor::Element] element (要素)
       #
       def shadow(elm)
-        if elm.empty
-          # case of content-rich element (内容あり要素の場合)
+        if elm.normal
+          # case of normal element (内容あり要素の場合)
           set_mono_info(elm)
 
-          pif2 = create(self)
+          pif2 = self.class.new(self)
 
-          @elm_ = Element.new!(elm, pif2)
+          @elm_ = elm.clone(pif2)
 
           if !elm.mono
             pif2.root_element.document = String.new(elm.mixed_content)
@@ -2209,25 +2209,6 @@ module Meteor
 
       private :is_match_s
 
-      def create(pif)
-        case pif.doc_type
-        when Parser::HTML
-          Meteor::Ml::Html::ParserImpl.new
-        when Parser::XML
-          Meteor::Ml::Xml::ParserImpl.new
-        when Parser::XHTML
-          Meteor::Ml::Xhtml::ParserImpl.new
-        when Parser::HTML4
-          Meteor::Ml::Html4::ParserImpl.new
-        when Parser::XHTML4
-          Meteor::Ml::Xhtml4::ParserImpl.new
-        else
-          nil
-        end
-      end
-
-      private :create
-
       def escape(content)
         # replace special character (特殊文字の置換)
         content = content.gsub(@@pattern_escape, TABLE_FOR_ESCAPE_)

data/lib/meteor/element.rb

@@ -17,8 +17,8 @@ module Meteor
   #  @return [String] pattern (パターン)
   # @!attribute [rw] document_sync
   #  @return [true,false] document update flag (ドキュメント更新フラグ)
-  # @!attribute [rw] empty
-  #  @return [true,false] content empty flag (内容存在フラグ)
+  # @!attribute [rw] normal
+  #  @return [true,false] content normal flag (内容存在フラグ)
   # @!attribute [rw] cx
   #  @return [true,false] comment extension tag flag (コメント拡張タグフラグ)
   # @!attribute [rw] mono
@@ -43,7 +43,7 @@ module Meteor
     attr_accessor :raw_content
     attr_accessor :pattern
     attr_accessor :document_sync
-    attr_accessor :empty
+    attr_accessor :normal
     attr_accessor :cx
     attr_accessor :mono
     attr_accessor :parser
@@ -56,6 +56,9 @@ module Meteor
     alias_method :tag, :name
     alias_method :tag=, :name=
 
+    alias_method :empty, :normal
+    alias_method :empty=, :normal=
+
     #
     # initializer (イニシャライザ)
     # @overload initialize(name)
@@ -77,19 +80,7 @@ module Meteor
           raise ArgumentError
         end
       when Meteor::TWO
-        @name = args[0].name
-        @attributes = String.new(args[0].attributes)
-        @mixed_content = String.new(args[0].mixed_content)
-        # @pattern = String.new(args[0].pattern)
-        @pattern = args[0].pattern
-        @document = String.new(args[0].document)
-        @empty = args[0].empty
-        @cx = args[0].cx
-        @mono = args[0].mono
-        @parser = args[1]
-        # @usable = false
-        @origin = args[0]
-        args[0].copy = self
+        initialize_2(args[0], args[1])
       when Meteor::ZERO
       else
         raise ArgumentError
@@ -107,7 +98,7 @@ module Meteor
       # @pattern = nil
       # @document = nil
       # @parser=nil
-      # @empty = false
+      # @normal = false
       # @cx = false
       # @mono = false
       # @parent = false
@@ -121,45 +112,57 @@ module Meteor
     # @param [Meteor::Element] elm element (要素)
     #
     def initialize_e(elm)
+      if self.normal
+        self.parser.element(elm)
+      else
+        @name = elm.name
+        @attributes = String.new(elm.attributes)
+        # @pattern = String.new(elm.pattern)
+        @pattern = elm.pattern
+        @document = String.new(elm.document)
+        @normal = elm.normal
+        @cx = elm.cx
+        @mono = elm.mono
+        @origin = elm
+        @parser = elm.parser
+        @usable = true
+      end
+    end
+
+    private :initialize_e
+
+    def initialize_2(elm, ps)
       @name = elm.name
       @attributes = String.new(elm.attributes)
+      @mixed_content = String.new(elm.mixed_content)
       # @pattern = String.new(elm.pattern)
       @pattern = elm.pattern
       @document = String.new(elm.document)
-      @empty = elm.empty
+      @normal = elm.normal
       @cx = elm.cx
       @mono = elm.mono
+      @parser = ps
+      # @usable = false
       @origin = elm
-      @parser = elm.parser
-      @usable = true
+      elm.copy = self
     end
 
-    private :initialize_e
+    private :initialize_2
 
     #
-    # make copy (コピーを作成する)
-    # @overload new!(elm,ps)
-    #  @param [Meteor::Element] elm element (要素)
+    # clone (複製する)
+    # @overload clone()
+    #  @return [Meteor::Element] element (要素)
+    # @overload clone(ps)
     #  @param [Meteor::Parser] ps parser (パーサ)
     #  @return [Meteor::Element] element (要素)
     #
-    def self.new!(*args)
+    def clone(*args)
       case args.length
-      when Meteor::TWO
-        @obj = args[1].element_hook
-        if @obj
-          @obj.attributes = String.new(args[0].attributes)
-          @obj.mixed_content = String.new(args[0].mixed_content)
-          # @obj.pattern = String.new(args[0].pattern)
-          @obj.document = String.new(args[0].document)
-          @obj
-        else
-          @obj = self.new(args[0], args[1])
-          args[1].element_hook = @obj
-          @obj
-        end
-      else
-        raise ArgumentError
+      when Meteor::ZERO
+        clone_0
+      when Meteor::ONE
+        clone_1(args[0])
       end
     end
 
@@ -167,7 +170,7 @@ module Meteor
     # clone (複製する)
     # @return [Meteor::Element] element (要素)
     #
-    def clone
+    def clone_0
       obj = self.parser.element_cache[self.object_id]
       if obj
         obj.attributes = String.new(self.attributes)
@@ -177,12 +180,36 @@ module Meteor
         obj.usable = true
         obj
       else
-        obj = self.new(self)
+        obj = self.class.new(self)
         self.parser.element_cache[self.object_id] = obj
         obj
       end
     end
 
+    private :clone_0
+
+    #
+    # clone (複製する)
+    # @param [Meteor::Parser] ps parser (パーサ)
+    # @return [Meteor::Element] element (要素)
+    #
+    def clone_1(ps)
+      obj = ps.element_hook
+      if obj
+        obj.attributes = String.new(self.attributes)
+        obj.mixed_content = String.new(self.mixed_content)
+        # obj.pattern = String.new(self.pattern)
+        obj.document = String.new(self.document)
+        obj
+      else
+        obj = self.class.new(self, ps)
+        ps.element_hook = obj
+        obj
+      end
+    end
+
+    private :clone_1
+
     #
     # set document (ドキュメントをセットする)
     # @param [String] doc document (ドキュメント)
@@ -205,7 +232,7 @@ module Meteor
             # @pattern_cc = String.new('') << '<!-- @' << elm.name << ' ' << elm.attributes << '-->' << elm.mixed_content << '<!-- /@' << elm.name << ' -->'
             @document = "<!-- @#{@name} #{@attributes} -->#{@mixed_content}<!-- /@#{@name} -->"
           else
-            if @empty
+            if @normal
               # @pattern_cc = String.new('') << "<" << elm.name << elm.attributes << '>' << elm.mixed_content << '</' << elm.name << '>'
               @document = "<#{@name}#{@attributes}>#{@mixed_content}</#{@name}>"
             else
@@ -218,7 +245,7 @@ module Meteor
             # @pattern_cc = String.new('') << '<!-- @' << elm.name << ' ' << elm.attributes << '-->' << elm.mixed_content << '<!-- /@' << elm.name << ' -->'
             @document = "<!-- @#{@name} #{@attributes} -->#{@mixed_content}<!-- /@#{@name} -->"
           else
-            if @empty
+            if @normal
               # @pattern_cc = String.new('') << "<" << elm.name << elm.attributes << '>' << elm.mixed_content << '</' << elm.name << '>'
               @document = "<#{@name}#{@attributes}>#{@mixed_content}</#{@name}>"
             else

data/lib/meteor/ml/html4/parser_impl.rb

@@ -195,7 +195,7 @@ module Meteor
             @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc)
             @res = @pattern.match(@root.document)
             if @res
-              element_without_1(name)
+              element_void_1(name)
             else
               if @error_check
                 puts(Meteor::Exception::NoSuchElementException.new(name).message)
@@ -204,18 +204,18 @@ module Meteor
               @elm_ = nil
             end
           else
-            # content-rich element search pattern (内容あり要素検索用パターン()
+            # normal element search pattern (内容あり要素検索用パターン()
             # @pattern_cc = String.new('') << "<" << @_name << '(|\\s[^<>]*)>(((?!(' << @_name
             # @pattern_cc << '[^<>]*>)).)*)<\\/' << @_name << '>'
             @pattern_cc = "<#{@_name}(|\\s[^<>]*)>(((?!(#{@_name}[^<>]*>)).)*)<\\/#{@_name}>"
 
             @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc)
-            # search of content-rich element (内容あり要素検索)
+            # search of normal element (内容あり要素検索)
             @res = @pattern.match(@root.document)
-            # case of content-rich element (内容あり要素の場合)
+            # case of normal element (内容あり要素の場合)
             if @res
               @on_search = true
-              element_with_1(name)
+              element_normal_1(name)
             else
               if @error_check
                 puts(Meteor::Exception::NoSuchElementException.new(name).message)
@@ -230,7 +230,7 @@ module Meteor
 
         private :element_1
 
-        def element_without_1(name)
+        def element_void_1(name)
           @elm_ = Meteor::Element.new(name)
           # attribute (属性)
           @elm_.attributes = @res[1]
@@ -242,7 +242,7 @@ module Meteor
           @elm_.parser = self
         end
 
-        private :element_without_1
+        private :element_void_1
 
         #
         # get element using tag name and attribute(name="value") (要素のタグ名、属性(属性名="属性値")で検索し、要素を取得する)
@@ -270,7 +270,7 @@ module Meteor
             # void element search (空要素検索)
             @res = @pattern.match(@root.document)
             if @res
-              element_without_3(name)
+              element_void_3(name)
             else
               if @error_check
                 puts(Meteor::Exception::NoSuchElementException.new(name, attr_name, attr_value).message)
@@ -279,22 +279,22 @@ module Meteor
               @elm_ = nil
             end
           else
-            # content-rich element search pattern (内容あり要素検索パターン)
+            # normal element search pattern (内容あり要素検索パターン)
             # @pattern_cc = String.new('') << "<" << @_name << '(\\s[^<>]*' << @_attr_name << '="'
             # @pattern_cc << @_attr_value << '"[^<>]*)>(((?!(' << @_name
             # @pattern_cc << '[^<>]*>)).)*)<\\/' << @_name << '>'
             @pattern_cc = "<#{@_name}(\\s[^<>]*#{@_attr_name}=\"#{@_attr_value}\"[^<>]*)>(((?!(#{@_name}[^<>]*>)).)*)<\\/#{@_name}>"
 
             @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc)
-            # search of content-rich element (内容あり要素検索)
+            # search of normal element (内容あり要素検索)
             @res = @pattern.match(@root.document)
 
             if !@res && !is_match(@@match_tag_nne, name)
-              @res = element_with_3_2
+              @res = element_normal_3_2
             end
 
             if @res
-              element_with_3_1(name)
+              element_normal_3_1(name)
             else
               if @error_check
                 puts(Meteor::Exception::NoSuchElementException.new(name, attr_name, attr_value).message)
@@ -309,11 +309,11 @@ module Meteor
 
         private :element_3
 
-        def element_without_3(name)
-          element_without_3_1(name, "\"[^<>]*)>")
+        def element_void_3(name)
+          element_void_3_1(name, "\"[^<>]*)>")
         end
 
-        private :element_without_3
+        private :element_void_3
 
         #
         # get element using attribute(name="value") (属性(属性名="属性値")で検索し、要素を取得する)
@@ -373,7 +373,7 @@ module Meteor
             @res = @pattern.match(@root.document)
 
             if @res
-              element_without_5(name)
+              element_void_5(name)
             else
               if @error_check
                 puts(
@@ -386,7 +386,7 @@ module Meteor
               @elm_ = nil
             end
           else
-            # content-rich element search pattern (内容あり要素検索パターン)
+            # normal element search pattern (内容あり要素検索パターン)
             # @pattern_cc = String.new('') << "<" << @_name << '(\\s[^<>]*(?:' << @_attr_name1 << '="'
             # @pattern_cc << @_attr_value1 << '"[^<>]*' << @_attr_name2 << '="'
             # @pattern_cc << @_attr_value2 << '"|' << @_attr_name2 << '="'
@@ -396,15 +396,15 @@ module Meteor
             @pattern_cc = "<#{@_name}(\\s[^<>]*(?:#{@_attr_name1}=\"#{@_attr_value1}\"[^<>]*#{@_attr_name2}=\"#{@_attr_value2}\"|#{@_attr_name2}=\"#{@_attr_value2}\"[^<>]*#{@_attr_name1}=\"#{@_attr_value1}\")[^<>]*)>(((?!(#{@_name}[^<>]*>)).)*)<\\/#{@_name}>"
 
             @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc)
-            # search of content-rich element (内容あり要素検索)
+            # search of normal element (内容あり要素検索)
             @res = @pattern.match(@root.document)
 
             if !@res && !is_match(@@match_tag_nne, tag)
-              @res = element_with_5_2
+              @res = element_normal_5_2
             end
 
             if @res
-              element_with_5_1(name)
+              element_normal_5_1(name)
             else
               if @error_check
                 puts(
@@ -423,11 +423,11 @@ module Meteor
 
         private :element_5
 
-        def element_without_5(name)
-          element_without_5_1(name, "\")[^<>]*)>")
+        def element_void_5(name)
+          element_void_5_1(name, "\")[^<>]*)>")
         end
 
-        private :element_without_5
+        private :element_void_5
 
         #
         # get element using attribute1,2(name="value") (属性1・属性2(属性名="属性値")で検索し、要素を取得する)

data/lib/meteor.rb

@@ -36,11 +36,11 @@ require "meteor/ml/xml/parser_impl"
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 # @author Yasumasa Ashida
-# @version 0.9.24
+# @version 0.9.25
 #
 
 module Meteor
-  VERSION = "0.9.24"
+  VERSION = "0.9.25"
 
   # require 'fileutils'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meteor
 version: !ruby/object:Gem::Version
-  version: 0.9.24
+  version: 0.9.25
 platform: ruby
 authors:
 - Yasumasa Ashida