meteor 0.9.40 → 0.9.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8a5ce47fc5de4ccdb94ed15e152a80efe36dc1765ca73e5b864d03bdc6feac7
-  data.tar.gz: 820d8b7df1c57df54a31099a3191a2d54798e729748aa98516f4d36158b2887f
+  metadata.gz: 06e3af4f688641740f8ca20eccb680649355e66a6d370c5a9f09dc63ef2a5fea
+  data.tar.gz: d9a404cf2d03bc439a6b88f7aa60d39add1a7d49ed57fa46a9348339fefa75d4
 SHA512:
-  metadata.gz: f3698775f588bfc8b5ceeca48cf5ffef533cc028822e986a7a98283547740f75c6f22a3035565defcbc7ccc990b0d30a375a2416bd10f8022d3b7348084840b5
-  data.tar.gz: 28b21ad8f65b972f5dd3dfdcdb7f60e6407e575d7c6e1d5e8f8c586776f68230005242a3d3251659b9b978a4e5bcfd6456b21e161169bb734b4afd31696e90b0
+  metadata.gz: cce916500df8f9e7e3648d7144d3a9b68e0c4df21cd8ca70a0f5b667b8746897d5daca0fe8f741b757ec6ec052e4d768ef0646beb9d2990e9936370c646766b7
+  data.tar.gz: 6d2d1e9f403946998c2ec58123853021e8fc30adcd6602f425cbfb4a6f221c49c5ad6f55b014b9d4ccf2ce0eebf41e6670fb69721497a852605f12ed530347f0

data/ChangeLog

@@ -1,3 +1,11 @@
+== 0.9.42 / 2026-07-21 Yasumasa Ashida <ys.ashida@gmail.com>
+
+* Refactor Meteor::Element
+
+== 0.9.41 / 2026-07-14 Yasumasa Ashida <ys.ashida@gmail.com>
+
+* Remove unnecessary comments
+
 == 0.9.40 / 2026-07-13 Yasumasa Ashida <ys.ashida@gmail.com>
 
 * Fix comments

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    meteor (0.9.40)
+    meteor (0.9.42)
 
 GEM
   remote: https://rubygems.org/
@@ -41,9 +41,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 4.0.15)
+  bundler (~> 4.0.16)
   meteor!
   rubocop (~> 1.88.2)
 
 BUNDLED WITH
-  4.0.15
+  4.0.16

data/lib/meteor/core/kernel.rb

@@ -45,8 +45,6 @@ module Meteor
       RE_FIND_FOUR = Regexp.new(PATTERN_FIND_FOUR)
       RE_FIND_FIVE = Regexp.new(PATTERN_FIND_FIVE)
 
-      RE_CHILDLESS = Regexp.new('\\A[^<>]*\\Z')
-
       RE_GET_ATTRS_MAP = Regexp.new('([^\\s]*)="([^\"]*)"')
 
       RE_CLEAN_ONE = Regexp.new('<!--\\s@[^<>]*\\s[^<>]*(\\s)*-->')
@@ -330,8 +328,6 @@ module Meteor
         end
         @elm_.document = @res[0]
         # normal element search pattern (内容あり要素検索用パターン)
-        # @pattern_cc = String.new('') << "<" << @_name << '(?:|\\s[^<>]*)>((?!(' << @_name
-        # @pattern_cc << '[^<>]*>)).)*<\\/' << @_name << '>'
         @pattern_cc = "<#{@_name}(|\\s[^<>]*)>(((?!(#{@_name}[^<>]*>)).)*)<\\/#{@_name}>"
 
         @elm_.pattern = @pattern_cc
@@ -454,9 +450,6 @@ module Meteor
           # document (全体)
           @elm_.document = @res[0]
           # 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}>" # rubocop:disable Layout/LineLength
 
           @elm_.pattern = @pattern_cc
@@ -474,9 +467,6 @@ module Meteor
           # document (全体)
           @elm_.document = @res[0]
           # 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}>" # rubocop:disable Layout/LineLength
 
           @elm_.pattern = @pattern_cc
@@ -526,13 +516,9 @@ module Meteor
       private :element_normal_three_two
 
       def element_pattern_normal_three_two # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-        # @pattern_cc_one = String.new('') << "<" << @_name << '(\\s[^<>]*' << @_attr_name << '="'
-        # @pattern_cc_one << @_attr_value << '(?:[^<>\\/]*>|(?:(?!([^<>]*\\/>))[^<>]*>)))'
         @pattern_cc_one = "<#{@_name}(\\s[^<>]*#{@_attr_name}=\"#{@_attr_value}(?:[^<>\\/]*>|(?:(?!([^<>]*\\/>))[^<>]*>)))" # rubocop:disable Layout/LineLength
         @pattern_cc_oneb = String.new('') << '<' << @_name << '(\\s[^<>\\/]*>|((?!([^<>]*\\/>))[^<>]*>))'
         # @pattern_cc_oneb = "<#{@_name}(\\s[^<>\\/]*>|((?!([^<>]*\\/>))[^<>]*>))"
-        # @pattern_cc_one_one = String.new('') << "<" << @_name << '(\\s[^<>]*' << @_attr_name << '="'
-        # @pattern_cc_one_one << @_attr_value << '"(?:[^<>\\/]*>|(?!([^<>]*\\/>))[^<>]*>))('
         @pattern_cc_one_one = "<#{@_name}(\\s[^<>]*#{@_attr_name}=\"#{@_attr_value}\"(?:[^<>\\/]*>|(?!([^<>]*\\/>))[^<>]*>))(" # rubocop:disable Layout/LineLength
         @pattern_cc_one_two = String.new('') << '.*?<' << @_name << '(\\s[^<>\\/]*>|((?!([^<>]*\\/>))[^<>]*>))'
         # @pattern_cc_one_two = ".*?<#{@_name}(\\s[^<>\\/]*>|((?!([^<>]*\\/>))[^<>]*>))"
@@ -575,8 +561,6 @@ module Meteor
         # document (全体)
         @elm_.document = @res[0]
         # pattern (空要素検索用パターン)
-        # @pattern_cc = String.new("") << "<" << @_name << "(\\s[^<>]*"
-        #  << @_attr_name << "=\"" << @_attr_value << closer
         @pattern_cc = "<#{@_name}(\\s[^<>]*#{@_attr_name}=\"#{@_attr_value}#{closer}"
         @elm_.pattern = @pattern_cc
         @elm_.parser = self
@@ -673,10 +657,8 @@ module Meteor
       private :quote_attribute
 
       def element_pattern_two
-        # # @pattern_cc = String.new('') << '<([^<>"]*)\\s[^<>]*'
-        #  << @_attr_name << '="' << @_attr_value << '(?:[^<>\\/]*>|((?!([^<>]*\\/>))[^<>]*>))'
-        # @pattern_cc = String.new('') << '<([^<>"]*)\\s[^<>]*'
-        #  << @_attr_name << '="' << @_attr_value << '"'
+        ## @pattern_cc = String.new('') << '<([^<>"]*)\\s[^<>]*'
+        ##  << @_attr_name << '="' << @_attr_value << '(?:[^<>\\/]*>|((?!([^<>]*\\/>))[^<>]*>))'
         @pattern_cc = "<([^<>\"]*)\\s[^<>]*#{@_attr_name}=\"#{@_attr_value}\""
       end
 
@@ -696,9 +678,6 @@ module Meteor
       #             # document (全体)
       #             @elm_.document = @res[0]
       #             # 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}>" # rubocop:disable Layout/LineLength
       #
       #             @elm_.pattern = @pattern_cc
@@ -715,9 +694,6 @@ module Meteor
       #             # document (全体)
       #             @elm_.document = @res[0]
       #             # 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}>" # rubocop:disable Layout/LineLength
       #
       #             @elm_.pattern = @pattern_cc
@@ -747,8 +723,6 @@ module Meteor
       #       private :element_normal_two_one
       #
       #       def element_normal_two_two
-      #         # @pattern_cc_one = String.new('') << "<" << @_name << '(\\s[^<>]*' << @_attr_name << '="'
-      #         # @pattern_cc_one << @_attr_value << '(?:[^<>\\/]*>|(?:(?!([^<>]*\\/>))[^<>]*>)))'
       #         @pattern_cc_one = "<([^<>\"]*)(\\s[^<>]*#{@_attr_name}=\"#{@_attr_value}(?:[^<>\\/]*>|(?:(?!([^<>]*\\/>))[^<>]*>)))" # rubocop:disable Layout/LineLength
       #
       #         # search of normal element (内容あり要素検索)
@@ -774,8 +748,6 @@ module Meteor
       #       def create_pattern_two(args_cnt)
       #         @pattern_cc_oneb = String.new('') << "<" << @_name << '(\\s[^<>\\/]*>|((?!([^<>]*\\/>))[^<>]*>))'
       #
-      #         # @pattern_cc_one_one = String.new('') << "<" << @_name << '(\\s[^<>]*' << @_attr_name << '="'
-      #         # @pattern_cc_one_one << @_attr_value << '"(?:[^<>\\/]*>|(?!([^<>]*\\/>))[^<>]*>))('
       #         @pattern_cc_one_one = "<#{@_name}(\\s[^<>]*#{@_attr_name}=\"#{@_attr_value}\"(?:[^<>\\/]*>|(?!([^<>]*\\/>))[^<>]*>))(" # rubocop:disable Layout/LineLength
       #         @pattern_cc_one_two = String.new('') << '.*?<' << @_name << '(\\s[^<>\\/]*>|((?!([^<>]*\\/>))[^<>]*>))'
       #         @pattern_cc_two = String.new('') << '<\\/' << @_name << '>'
@@ -894,12 +866,6 @@ module Meteor
           # document (全体)
           @elm_.document = @res[0]
           # pattern (内容あり要素検索用パターン)
-          # @pattern_cc = String.new('') << "<" << @_name << '\\s[^<>]*(?:' << @_attr_name1 << '="'
-          # @pattern_cc << @_attr_value1 << '"[^<>]*' << @_attr_name2 << '="'
-          # @pattern_cc << @_attr_value2 << '"|' << @_attr_name2 << '="'
-          # @pattern_cc << @_attr_value2 << '"[^<>]*' << @_attr_name1 << '="'
-          # @pattern_cc << @_attr_value1 << '")[^<>]*>((?!(' << @_name
-          # @pattern_cc << '[^<>]*>)).)*<\\/' << @_name << '>'
           @pattern_cc = "<#{@_name}(\\s[^<>]*(?:#{@_attr_name1}=\"#{@_attr_value1}\"[^<>]*#{@_attr_name2}=\"#{@_attr_value2}\"|#{@_attr_name2}=\"#{@_attr_value2}\"[^<>]*#{@_attr_name1}=\"#{@_attr_value1}\")[^<>]*)>(((?!(#{@_name}[^<>]*>)).)*)<\\/#{@_name}>" # rubocop:disable Layout/LineLength
 
           @elm_.pattern = @pattern_cc
@@ -915,12 +881,6 @@ module Meteor
           # documement (全体)
           @elm_.document = @res[0]
           # pattern (内容あり要素検索用パターン)
-          # @pattern_cc = String.new('') << "<" << @_name << '\\s[^<>]*(?:' << @_attr_name1 << '="'
-          # @pattern_cc << @_attr_value1 << '"[^<>]*' << @_attr_name2 << '="'
-          # @pattern_cc << @_attr_value2 << '"|' << @_attr_name2 << '="'
-          # @pattern_cc << @_attr_value2 << '"[^<>]*' << @_attr_name1 << '="'
-          # @pattern_cc << @_attr_value1 << '")[^<>]*>((?!(' << @_name
-          # @pattern_cc << '[^<>]*>)).)*<\\/' << @_name << '>'
           @pattern_cc = "<#{@_name}(\\s[^<>]*(?:#{@_attr_name1}=\"#{@_attr_value1}\"[^<>]*#{@_attr_name2}=\"#{@_attr_value2}\"|#{@_attr_name2}=\"#{@_attr_value2}\"[^<>]*#{@_attr_name1}=\"#{@_attr_value1}\")[^<>]*)>(((?!(#{@_name}[^<>]*>)).)*)<\\/#{@_name}>" # rubocop:disable Layout/LineLength
 
           @elm_.pattern = @pattern_cc
@@ -962,20 +922,10 @@ module Meteor
       private :element_normal_five_two
 
       def element_pattern_normal_five_two # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-        # @pattern_cc_one = String.new('') << "<" << @_name << '(\\s[^<>]*(?:' << @_attr_name1 << '="'
-        # @pattern_cc_one << @_attr_value1 << '"[^<>]*' << @_attr_name2 << '="'
-        # @pattern_cc_one << @_attr_value2 << '"|' << @_attr_name2 << '="'
-        # @pattern_cc_one << @_attr_value2 << '"[^<>]*' << @_attr_name1 << '="'
-        # @pattern_cc_one << @_attr_value1 << '")([^<>\\/]*>|((?!([^<>]*\\/>))[^<>]*>)))'
         @pattern_cc_one = "<#{@_name}(\\s[^<>]*(?:#{@_attr_name1}=\"#{@_attr_value1}\"[^<>]*#{@_attr_name2}=\"#{@_attr_value2}\"|#{@_attr_name2}=\"#{@_attr_value2}\"[^<>]*#{@_attr_name1}=\"#{@_attr_value1}\")([^<>\\/]*>|((?!([^<>]*\\/>))[^<>]*>)))" # rubocop:disable Layout/LineLength
         @pattern_cc_oneb = String.new('') << '<' << @_name << '(\\s[^<>\\/]*>|((?!([^<>]*\\/>))[^<>]*>))'
         # @pattern_cc_oneb = "<#{@_name}(\\s[^<>\\/]*>|((?!([^<>]*\\/>))[^<>]*>))"
 
-        # @pattern_cc_one_one = String.new('') << "<" << @_name << '(\\s[^<>]*(?:' << @_attr_name1 << '="'
-        # @pattern_cc_one_one << @_attr_value1 << '"[^<>]*' << @_attr_name2 << '="'
-        # @pattern_cc_one_one << @_attr_value2 << '"|' << @_attr_name2 << '="'
-        # @pattern_cc_one_one << @_attr_value2 << '"[^<>]*' << @_attr_name1 << '="'
-        # @pattern_cc_one_one << @_attr_value1 << '")(?:[^<>\\/]*>|(?!([^<>]*\\/>))[^<>]*>))('
         @pattern_cc_one_one = "<#{@_name}(\\s[^<>]*(?:#{@_attr_name1}=\"#{@_attr_value1}\"[^<>]*#{@_attr_name2}=\"#{@_attr_value2}\"|#{@_attr_name2}=\"#{@_attr_value2}\"[^<>]*#{@_attr_name1}=\"#{@_attr_value1}\")(?:[^<>\\/]*>|(?!([^<>]*\\/>))[^<>]*>))(" # rubocop:disable Layout/LineLength
         @pattern_cc_one_two = String.new('') << '.*?<' << @_name << '(\\s[^<>\\/]*>|((?!([^<>]*\\/>))[^<>]*>))'
         @pattern_cc_two = String.new('') << '<\\/' << @_name << '>'
@@ -1016,11 +966,6 @@ module Meteor
         # document (全体)
         @elm_.document = @res[0]
         # pattern (空要素検索用パターン)
-        # @pattern_cc = String.new('') << "<" << @_name << '\\s[^<>]*(?:' << @_attr_name1 << '="'
-        # @pattern_cc << @_attr_value1 << '"[^<>]*' << @_attr_name2 << '="'
-        # @pattern_cc << @_attr_value2 << '"|' << @_attr_name2 << '="'
-        # @pattern_cc << @_attr_value2 << '"[^<>]*' << @_attr_name1 << '="'
-        # @pattern_cc << @_attr_value1 << closer
         @pattern_cc = "<#{@_name}(\\s[^<>]*(#{@_attr_name1}=\"#{@_attr_value1}\"[^<>]*#{@_attr_name2}=\"#{@_attr_value2}\"|#{@_attr_name2}=\"#{@_attr_value2}\"[^<>]*#{@_attr_name1}=\"#{@_attr_value1}#{closer}" # rubocop:disable Layout/LineLength
         @elm_.pattern = @pattern_cc
         @elm_.parser = self
@@ -1074,11 +1019,6 @@ module Meteor
       private :quote_element_four
 
       def element_pattern_four
-        # @pattern_cc = String.new('') << '<([^<>"]*)\\s([^<>]*(' << @_attr_name1 << '="'
-        # @pattern_cc << @_attr_value1 << '"[^<>]*' << @_attr_name2 << '="'
-        # @pattern_cc << @_attr_value2 << '"|' << @_attr_name2 << '="'
-        # @pattern_cc << @_attr_value2 << '"[^<>]*' << @_attr_name1 << '="'
-        # @pattern_cc << @_attr_value1 << '"'
         @pattern_cc = "<([^<>\"]*)\\s[^<>]*(#{@_attr_name1}=\"#{@_attr_value1}\"[^<>]*#{@_attr_name2}=\"#{@_attr_value2}\"|#{@_attr_name2}=\"#{@_attr_value2}\"[^<>]*#{@_attr_name1}=\"#{@_attr_value1}\")" # rubocop:disable Layout/LineLength
       end
 
@@ -1495,8 +1435,8 @@ module Meteor
           @pattern = Meteor::Core::Util::PatternCache.get(String.new('') << attr_name << '="[^"]*"')
           # @pattern = Meteor::Core::Util::PatternCache.get("#{attr_name}=\"[^\"]*\"")
 
+          # elm.attributes.sub!(@pattern, "#{attr_name}=\"#{@_attr_value}\"")
           elm.attributes.sub!(@pattern, String.new('') << attr_name << '="' << @_attr_value << '"')
-        # elm.attributes.sub!(@pattern, "#{attr_name}=\"#{@_attr_value}\"")
         else
           # add an attribute to attrubutes (属性文字列の最後に新規の属性を追加する)
 
@@ -1828,8 +1768,6 @@ module Meteor
         @_id = Regexp.quote(id)
 
         # CX tag search pattern (CXタグ検索用パターン)
-        # @pattern_cc = String.new('') << "<!--\\s@" << @_name << '\\s([^<>]*id="'
-        # @pattern_cc << id << '"[^<>]*)-->(((?!(<!--\\s/@' << @_name << ")).)*)<!--\\s/@" << @_name << "\\s-->"
         # @pattern_cc = "<!--\\s@#{@_name}\\s([^<>]*id=\"#{@_id}\"[^<>]*)-->(((?!(<!--\\s\\/@#{@_name})).)*)<!--\\s\\/@#{@_name}\\s-->" # rubocop:disable Layout/LineLength
         @pattern_cc = "<!--\\s@#{@_name}\\s([^<>]*id=\"#{@_id}\"[^<>]*)-->(((?!(<!--\\s/@#{@_name})).)*)<!--\\s/@#{@_name}\\s-->" # rubocop:disable Layout/LineLength
 
@@ -1951,19 +1889,12 @@ module Meteor
         if element_hook
           if element_hook.origin.childless
             if element_hook.origin.cx
-              # @root.hookDocument << '<!-- @' << @root.element.name << ' '
-              # @root.hookDocument << @root.element.attributes << '-->'
-              # @root.hookDocument << @root.element.mixed_content << '<!-- /@'
-              # @root.hookDocument << @root.element.name << ' -->'
               document_hook <<
                 "<!-- @#{element_hook.name} #{element_hook.attributes}-->#{element_hook.mixed_content}<!-- /@#{element_hook.name} -->" # rubocop:disable Layout/LineLength
 
               # self.document_hook << @root.newline <<
               # "<!-- @#{self.element_hook.name} #{self.element_hook.attributes}-->#{self.element_hook.mixed_content}<!-- /@#{self.element_hook.name} -->" # rubocop:disable Layout/LineLength
             else
-              # @root.hookDocument << "<" << @root.element.name
-              # @root.hookDocument << @root.element.attributes << '>' << @root.element.mixed_content
-              # @root.hookDocument << '</' << @root.element.name << '>'
               document_hook <<
                 "<#{element_hook.name}#{element_hook.attributes}>#{element_hook.mixed_content}</#{element_hook.name}>"
 
@@ -1976,22 +1907,15 @@ module Meteor
             @_attributes = element_hook.attributes
 
             if element_hook.origin.cx
-              # @root.hookDocument << '<!-- @' << @root.element.name << ' '
-              # @root.hookDocument << @_attributes << '-->'
-              # @root.hookDocument << @root.document << '<!-- /@'
-              # @root.hookDocument << @root.element.name << ' -->'
               document_hook <<
                 "<!-- @#{element_hook.name} #{@_attributes}-->#{@root.document}<!-- /@#{element_hook.name} -->"
 
-              # self.document_hook << @root.newline << "<!-- @#{self.element_hook.name} #{@_attributes}-->#{@root.document}<!-- /@#{self.element_hook.name} -->" # rubocop:disable Layout/LineLength
+              # self.document_hook << @root.newline << "<!-- @#{element_hook.name} #{@_attributes}-->#{@root.document}<!-- /@#{element_hook.name} -->" # rubocop:disable Layout/LineLength
             else
-              # @root.hookDocument << "<" << @root.element.name
-              # @root.hookDocument << @_attributes << '>' << @root.document
-              # @root.hookDocument << '</' << @root.element.name << '>'
               document_hook <<
                 "<#{element_hook.name}#{@_attributes}>#{@root.document}</#{element_hook.name}>"
 
-              # self.document_hook << @root.newline << "<#{self.element_hook.name}#{@_attributes}>#{@root.document}</#{self.element_hook.name}>" # rubocop:disable Layout/LineLength
+              # document_hook << @root.newline << "<#{element_hook.name}#{@_attributes}>#{@root.document}</#{element_hook.name}>" # rubocop:disable Layout/LineLength
             end
 
           end
@@ -2021,12 +1945,9 @@ module Meteor
       # @param [Meteor::Element] elm element (要素)
       # @return [Meteor::Element] element (要素)
       #
-      def shadow(elm) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+      def shadow(elm) # rubocop:disable Metrics/AbcSize
         return unless elm.normal
 
-        # case of normal element (内容あり要素の場合)
-        self.childless = elm
-
         pif2 = self.class.new(self)
 
         @elm_ = elm.clone(pif2)
@@ -2044,14 +1965,6 @@ module Meteor
 
       # private :shadow
 
-      def childless=(elm)
-        @res = RE_CHILDLESS.match(elm.mixed_content)
-
-        elm.childless = true if @res
-      end
-
-      private :childless=
-
       def match?(regex, str)
         case regex
         when Regexp

data/lib/meteor/element.rb

@@ -21,8 +21,6 @@ module Meteor
   #  @return [true,false] content normal flag (内容存在フラグ)
   # @!attribute [rw] cx
   #  @return [true,false] comment extension tag flag (コメント拡張タグフラグ)
-  # @!attribute [rw] childless
-  #  @return [true,false] child childless flag (子要素なしフラグ)
   # @!attribute [rw] parser
   #  @return [Meteor::Parser] parser(パーサ)
   # @!attribute [rw] type_value
@@ -37,7 +35,7 @@ module Meteor
   #  @return [true,false] deletion flag (削除フラグ)
   #
   class Element # rubocop:disable Metrics/ClassLength
-    attr_accessor :name, :attributes, :mixed_content, :raw_content, :pattern, :document_sync, :normal, :cx, :childless,
+    attr_accessor :name, :attributes, :mixed_content, :raw_content, :pattern, :document_sync, :normal, :cx,
                   :parser, :type_value, :usable, :origin, :copy, :removed
 
     alias tag name
@@ -46,8 +44,7 @@ module Meteor
     alias empty normal
     alias empty= normal=
 
-    alias mono childless
-    alias mono= childless=
+    RE_CHILDLESS = Regexp.new('\\A[^<>]*\\Z')
 
     #
     # initializer (イニシャライザ)
@@ -90,7 +87,6 @@ module Meteor
       # @parser=nil
       # @normal = false
       # @cx = false
-      # @childless = false
       # @parent = false
       @usable = true
     end
@@ -108,7 +104,7 @@ module Meteor
 
     private :initialize_e
 
-    def initialize_two(elm, ps) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Naming/MethodParameterName
+    def initialize_two(elm, ps) # rubocop:disable Metrics/MethodLength,Naming/MethodParameterName
       @parser = ps
       if normal
         ps.element(elm)
@@ -121,7 +117,6 @@ module Meteor
         @document = String.new(elm.document)
         @normal = elm.normal
         @cx = elm.cx
-        @childless = elm.childless
         @origin = elm
         # @usable = false
         elm.copy = self
@@ -189,6 +184,25 @@ module Meteor
 
     private :clone_one
 
+    #
+    # get childless flag (子要素なしフラグを取得する)
+    # @return [true,false] childless flag (子要素なしフラグ)
+    #
+    def childless
+      if @childless.nil?
+        @res = RE_CHILDLESS.match(mixed_content)
+
+        @childless = if @res
+                       true
+                     else
+                       false
+                     end
+      end
+      @childless
+    end
+
+    alias mono childless
+
     #
     # set document (ドキュメントをセットする)
     # @param [String] doc document (ドキュメント)
@@ -208,12 +222,8 @@ module Meteor
         case @parser.doc_type
         when Parser::HTML, Parser::HTML4
           @document = if @cx
-                        # @pattern_cc = String.new('') << '<!-- @' << elm.name << ' ' << elm.attributes << '-->'
-                        #  << elm.mixed_content << '<!-- /@' << elm.name << ' -->'
                         "<!-- @#{@name} #{@attributes} -->#{@mixed_content}<!-- /@#{@name} -->"
                       elsif @normal
-                        # @pattern_cc = String.new('') << "<" << elm.name << elm.attributes << '>'
-                        #  << elm.mixed_content << '</' << elm.name << '>'
                         "<#{@name}#{@attributes}>#{@mixed_content}</#{@name}>"
                       else
                         String.new('') << '<' << @name << @attributes << '>'
@@ -221,16 +231,12 @@ module Meteor
                       end
         when Parser::XHTML, Parser::XHTML4, Parser::XML
           @document = if @cx
-                        # @pattern_cc = String.new('') << '<!-- @' << elm.name << ' ' << elm.attributes << '-->'
-                        #  << elm.mixed_content << '<!-- /@' << elm.name << ' -->'
                         "<!-- @#{@name} #{@attributes} -->#{@mixed_content}<!-- /@#{@name} -->"
                       elsif @normal
-                        # @pattern_cc = String.new('') << "<" << elm.name << elm.attributes << '>' << elm.mixed_content
-                        #  << '</' << elm.name << '>'
                         "<#{@name}#{@attributes}>#{@mixed_content}</#{@name}>"
                       else
                         String.new('') << '<' << @name << @attributes << '/>'
-                        # @document = "<#{@name}#{@attributes}/>"
+                        # "<#{@name}#{@attributes}/>"
                       end
         end
       else

data/lib/meteor/elements.rb

@@ -77,7 +77,7 @@ module Meteor
   end
 
   #
-  # Elements Class (要素ファクトリ クラス)
+  # Elements Factory Class (要素ファクトリ クラス)
   #
   ElementFactory = Elements
 end

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

@@ -203,8 +203,6 @@ module Meteor
             end
           else
             # 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)
@@ -258,8 +256,6 @@ module Meteor
           # case of void element (空要素の場合(<->内容あり要素の場合))
           if match?(MATCH_TAG, name)
             # void element search pattern (空要素検索パターン)
-            # @pattern_cc = String.new('') << "<" << @_name << '(\\s[^<>]*' << @_attr_name << '="'
-            # @pattern_cc << @_attr_value << '"[^<>]*)>'
             @pattern_cc = "<#{@_name}(\\s[^<>]*#{@_attr_name}=\"#{@_attr_value}\"[^<>]*)>"
 
             @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc)
@@ -274,9 +270,6 @@ module Meteor
             end
           else
             # 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}>" # rubocop:disable Layout/LineLength
 
             @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc)
@@ -314,8 +307,6 @@ module Meteor
         def element_two(attr_name, attr_value) # rubocop:disable Metrics/MethodLength
           quote_attribute(attr_name, attr_value)
 
-          # @pattern_cc = String.new('') << '<([^<>"]*)\\s[^<>]*' << @_attr_name << '="' << @_attr_value
-          # @pattern_cc << '"[^<>]*>'
           @pattern_cc = "<([^<>\"]*)\\s[^<>]*#{@_attr_name}=\"#{@_attr_value}\"[^<>]*>"
 
           @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc)
@@ -349,11 +340,6 @@ module Meteor
           # case of void element (空要素の場合(<->内容あり要素の場合))
           if match?(MATCH_TAG, name)
             # void element search pattern (空要素検索パターン)
-            # @pattern_cc = String.new('') << "<" << @_name << '(\\s[^<>]*(?:' << @_attr_name1 << '="'
-            # @pattern_cc << @_attr_value1 << '"[^<>]*' << @_attr_name2 << '="'
-            # @pattern_cc << @_attr_value2 << '"|' << @_attr_name2 << '="'
-            # @pattern_cc << @_attr_value2 << '"[^<>]*' << @_attr_name1 << '="'
-            # @pattern_cc << @_attr_value1 << '")[^<>]*)>'
             @pattern_cc = "<#{@_name}(\\s[^<>]*(?:#{@_attr_name1}=\"#{@_attr_value1}\"[^<>]*#{@_attr_name2}=\"#{@_attr_value2}\"|#{@_attr_name2}=\"#{@_attr_value2}\"[^<>]*#{@_attr_name1}=\"#{@_attr_value1}\")[^<>]*)>" # rubocop:disable Layout/LineLength
 
             @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc)
@@ -375,12 +361,6 @@ module Meteor
             end
           else
             # normal element search pattern (内容あり要素検索パターン)
-            # @pattern_cc = String.new('') << "<" << @_name << '(\\s[^<>]*(?:' << @_attr_name1 << '="'
-            # @pattern_cc << @_attr_value1 << '"[^<>]*' << @_attr_name2 << '="'
-            # @pattern_cc << @_attr_value2 << '"|' << @_attr_name2 << '="'
-            # @pattern_cc << @_attr_value2 << '"[^<>]*' << @_attr_name1 << '="'
-            # @pattern_cc << @_attr_value1 << '")[^<>]*)>(((?!(' << @_name
-            # @pattern_cc << '[^<>]*>)).)*)<\\/' << @_name << '>'
             @pattern_cc = "<#{@_name}(\\s[^<>]*(?:#{@_attr_name1}=\"#{@_attr_value1}\"[^<>]*#{@_attr_name2}=\"#{@_attr_value2}\"|#{@_attr_name2}=\"#{@_attr_value2}\"[^<>]*#{@_attr_name1}=\"#{@_attr_value1}\")[^<>]*)>(((?!(#{@_name}[^<>]*>)).)*)<\\/#{@_name}>" # rubocop:disable Layout/LineLength
 
             @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc)
@@ -427,11 +407,6 @@ module Meteor
         def element_four(attr_name1, attr_value1, attr_name2, attr_value2) # rubocop:disable Metrics/MethodLength
           quote_element_four(attr_name1, attr_value1, attr_name2, attr_value2)
 
-          # @pattern_cc = String.new('') << '<([^<>"]*)\\s([^<>]*(' << @_attr_name1 << '="' << @_attr_value1
-          # @pattern_cc << '"[^<>]*' << @_attr_name2 << '="' << @_attr_value2
-          # @pattern_cc << '"|' << @_attr_name2 << '="' << @_attr_value2
-          # @pattern_cc << '"[^<>]*' << @_attr_name1 << '="' << @_attr_value1
-          # @pattern_cc << '")[^<>]*)>'
           @pattern_cc = "<([^<>\"]*)\\s([^<>]*(#{@_attr_name1}=\"#{@_attr_value1}\"[^<>]*#{@_attr_name2}=\"#{@_attr_value2}\"|#{@_attr_name2}=\"#{@_attr_value2}\"[^<>]*#{@_attr_name1}=\"#{@_attr_value1}\")[^<>]*)>" # rubocop:disable Layout/LineLength
 
           @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc)

data/lib/meteor.rb

@@ -37,11 +37,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.40
+# @version 0.9.42
 #
 
 module Meteor
-  VERSION = '0.9.40'
+  VERSION = '0.9.42'
 
   # require 'fileutils'
 

data/meteor.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features|demo)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 4.0.15'
+  spec.add_development_dependency 'bundler', '~> 4.0.16'
   # spec.add_development_dependency "rake"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meteor
 version: !ruby/object:Gem::Version
-  version: 0.9.40
+  version: 0.9.42
 platform: ruby
 authors:
 - Yasumasa Ashida
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.15
+        version: 4.0.16
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.15
+        version: 4.0.16
 description: A lightweight (X)HTML & XML parser
 email: ys.ashida@gmail.com
 executables: []
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.15
+rubygems_version: 4.0.16
 specification_version: 4
 summary: A lightweight (X)HTML & XML parser
 test_files: