meteor 0.9.44 → 0.9.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebd554983ecc3081fd55707f6282c3a639609c5cd6e100b7e75d0e7c46b457bb
-  data.tar.gz: 3c6734e06ac743d78871fc71efda67a3a1bbd9d6bac519563d02c45a4b90daee
+  metadata.gz: da1a40f7b01242df1d91e5a5c9fbe36a606393ebc787874ea9e87ebf4a50fc80
+  data.tar.gz: 38a522602a2634d109714bad2a27fbe60c1e9173f0c9730f27ab7dcc9eb7aa78
 SHA512:
-  metadata.gz: da148763b7573f7700eac92e3873c45be1c3cc474e10aaf823c1725c178d54500553d7940d65d00ef62b183fd7b003ad5a101583ca2b847ec35466f754d110f1
-  data.tar.gz: 1e1ab49831f262ea795e14d3e0a786cdfce3f63799888fda983fdb14d90e778bdd8d86d0c44b158c45e4fbea154d17938a605ff6b741190d41a3abd26f437f23
+  metadata.gz: 6be1372ef96ba157c1ef6e9803fcf4cefa916915034e3448945dcc353ce56c1e78f1c6535264e60baf515f0c1eb11550483881cbf15c5489acf31024e84d2495
+  data.tar.gz: f50a8ddde335d672a00c6313f189d6b9d7398f00a509ed249afcb8c8d3da40574fbd43fe0c670c565eb211107ba42c1114dba7d27e9e9f21df7a5f3a011a38f2

data/ChangeLog

@@ -1,3 +1,12 @@
+== 0.9.46 / 2026-08-06 Yasumasa Ashida <ys.ashida@gmail.com>
+
+* Refactor Meteor::Ml::(Html4|Xhtml4)::ParserImpl
+
+== 0.9.45 / 2026-08-05 Yasumasa Ashida <ys.ashida@gmail.com>
+
+* Refactor Meteor::Ml::Html4::ParserImpl
+* Fix Meteor::Element#document
+
 == 0.9.44 / 2026-07-26 Yasumasa Ashida <ys.ashida@gmail.com>
 
 * Refactor Meteor::Core::Kernel

data/Gemfile.lock

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

data/lib/meteor/core/kernel.rb

@@ -453,7 +453,7 @@ module Meteor
       private :element_pattern_three
 
       def element_normal_three_one(name) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-        # puts  @res.captures.length
+        # puts @res.captures.length
         case @res.captures.length
         when FOUR
           # element (要素)

data/lib/meteor/element.rb

@@ -216,10 +216,14 @@ module Meteor
     # get document (ドキュメントを取得する)
     # @return [String] document (ドキュメント)
     #
-    def document # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
+    def document # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity,Metrics/AbcSize
       if @document_sync
         @document_sync = false
-        @_mixed_content = @mixed_content ? Regexp.quote(@mixed_content) : ''
+        @_mixed_content = if @mixed_content
+                            childless ? Regexp.quote(@mixed_content) : @mixed_content
+                          else
+                            ''
+                          end
         case @parser.doc_type
         when Parser::HTML, Parser::HTML4
           @document = if @cx

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

@@ -160,39 +160,14 @@ module Meteor
         # @param [String] name tag name (タグ名)
         # @return [Meteor::Element] element (要素)
         #
-        def element_one(name) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/PerceivedComplexity
+        def element_one(name)
           quote_name(name)
 
           # case of void element (空要素の場合(<->内容あり要素の場合))
           if match?(MATCH_TAG, name)
-            # void element search pattern (空要素検索用パターン)
-            @pattern_cc = String.new('') << '<' << @_name << '(|\\s[^<>]*)>'
-            # @pattern_cc = "<#{@_name}(|\\s[^<>]*)>"
-            @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc)
-            @res = @pattern.match(@root.document)
-            if @res
-              element_void_one(name)
-            else
-              puts(Meteor::Exception::NoSuchElementException.new(name).message) if @error_check
-
-              @elm_ = nil
-            end
+            element_one_void(name)
           else
-            # normal element search pattern (内容あり要素検索用パターン()
-            @pattern_cc = "<#{@_name}(|\\s[^<>]*)>(((?!(#{@_name}[^<>]*>)).)*)<\\/#{@_name}>"
-
-            @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc)
-            # search of normal element (内容あり要素検索)
-            @res = @pattern.match(@root.document)
-            # case of normal element (内容あり要素の場合)
-            if @res
-              @on_search = true
-              element_normal_one(name)
-            else
-              puts(Meteor::Exception::NoSuchElementException.new(name).message) if @error_check
-
-              @elm_ = nil
-            end
+            element_one_normal(name)
           end
 
           @elm_
@@ -200,6 +175,41 @@ module Meteor
 
         private :element_one
 
+        def element_one_void(name)
+          # void element search pattern (空要素検索用パターン)
+          @pattern_cc = String.new('') << '<' << @_name << '(|\\s[^<>]*)>'
+          # @pattern_cc = "<#{@_name}(|\\s[^<>]*)>"
+          @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc)
+          @res = @pattern.match(@root.document)
+          if @res
+            element_void_one(name)
+          else
+            puts(Meteor::Exception::NoSuchElementException.new(name).message) if @error_check
+
+            @elm_ = nil
+          end
+        end
+
+        private :element_one_void
+
+        def element_one_normal(name)
+          # normal element search pattern (内容あり要素検索用パターン()
+          @pattern_cc = "<#{@_name}(|\\s[^<>]*)>(((?!(#{@_name}[^<>]*>)).)*)<\\/#{@_name}>"
+
+          @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc)
+          # search of normal element (内容あり要素検索)
+          @res = @pattern.match(@root.document)
+          # case of normal element (内容あり要素の場合)
+          if @res
+            @on_search = true
+            element_normal_one(name)
+          else
+            puts(Meteor::Exception::NoSuchElementException.new(name).message) if @error_check
+
+            @elm_ = nil
+          end
+        end
+
         def element_void_one(name)
           @elm_ = Meteor::Element.new(name)
           # attribute (属性)
@@ -222,48 +232,39 @@ module Meteor
         # @param [true,false] quote quote flag (クオート・フラグ)
         # @return [Meteor::Element] element (要素)
         #
-        def element_three(name, attr_name, attr_value, quote = true) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity,Style/OptionalBooleanParameter
+        def element_three(name, attr_name, attr_value, quote = true) # rubocop:disable Style/OptionalBooleanParameter
           quote_name(name)
           quote_attribute(attr_name, attr_value) if quote
 
           # case of void element (空要素の場合(<->内容あり要素の場合))
           if match?(MATCH_TAG, name)
-            # void element search pattern (空要素検索パターン)
-            @pattern_cc = "<#{@_name}(\\s[^<>]*#{@_attr_name}=\"#{@_attr_value}\"[^<>]*)>"
-
-            @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc)
-            # void element search (空要素検索)
-            @res = @pattern.match(@root.document)
-            if @res
-              element_void_three(name)
-            else
-              puts(Meteor::Exception::NoSuchElementException.new(name, attr_name, attr_value).message) if @error_check
-
-              @elm_ = nil
-            end
+            element_three_void(name, attr_name, attr_value)
           else
-            # normal element search pattern (内容あり要素検索パターン)
-            @pattern_cc = "<#{@_name}(\\s[^<>]*#{@_attr_name}=\"#{@_attr_value}\"[^<>]*)>(((?!(#{@_name}[^<>]*>)).)*)<\\/#{@_name}>" # rubocop:disable Layout/LineLength
+            element_three_normal(name, attr_name, attr_value)
+          end
 
-            @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc)
-            # search of normal element (内容あり要素検索)
-            @res = @pattern.match(@root.document)
+          @elm_
+        end
 
-            @res = element_normal_three_two if !@res && !match?(MATCH_TAG_NNE, name)
+        private :element_three
 
-            if @res
-              element_normal_three_one(name)
-            else
-              puts(Meteor::Exception::NoSuchElementException.new(name, attr_name, attr_value).message) if @error_check
+        def element_three_void(name, attr_name, attr_value)
+          # void element search pattern (空要素検索パターン)
+          @pattern_cc = "<#{@_name}(\\s[^<>]*#{@_attr_name}=\"#{@_attr_value}\"[^<>]*)>"
 
-              @elm_ = nil
-            end
-          end
+          @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc)
+          # void element search (空要素検索)
+          @res = @pattern.match(@root.document)
+          if @res
+            element_void_three(name)
+          else
+            puts(Meteor::Exception::NoSuchElementException.new(name, attr_name, attr_value).message) if @error_check
 
-          @elm_
+            @elm_ = nil
+          end
         end
 
-        private :element_three
+        private :element_three_void
 
         def element_void_three(name)
           element_void_three_one(name, '"[^<>]*)>')
@@ -271,6 +272,27 @@ module Meteor
 
         private :element_void_three
 
+        def element_three_normal(name, attr_name, attr_value)
+          # normal element search pattern (内容あり要素検索パターン)
+          @pattern_cc = "<#{@_name}(\\s[^<>]*#{@_attr_name}=\"#{@_attr_value}\"[^<>]*)>(((?!(#{@_name}[^<>]*>)).)*)<\\/#{@_name}>" # rubocop:disable Layout/LineLength
+
+          @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc)
+          # search of normal element (内容あり要素検索)
+          @res = @pattern.match(@root.document)
+
+          @res = element_normal_three_two if !@res && !match?(MATCH_TAG_NNE, name)
+
+          if @res
+            element_normal_three_one(name)
+          else
+            puts(Meteor::Exception::NoSuchElementException.new(name, attr_name, attr_value).message) if @error_check
+
+            @elm_ = nil
+          end
+        end
+
+        private :element_three_normal
+
         #
         # get element using attribute(name="value") (属性(属性名="属性値")で検索し、要素を取得する)
         # @param [String] attr_name attribute name (属性名)
@@ -307,55 +329,15 @@ module Meteor
         # @param [String] attr_value2 attribute value2 (属性値2)
         # @return [Meteor::Element] element (要素)
         #
-        def element_five(name, attr_name1, attr_value1, attr_name2, attr_value2) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
+        def element_five(name, attr_name1, attr_value1, attr_name2, attr_value2)
           quote_name(name)
           quote_attribute_one_two(attr_name1, attr_value1, attr_name2, attr_value2)
 
           # case of void element (空要素の場合(<->内容あり要素の場合))
           if match?(MATCH_TAG, name)
-            # void element search pattern (空要素検索パターン)
-            @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)
-            # void element search (空要素検索)
-            @res = @pattern.match(@root.document)
-
-            if @res
-              element_void_five(name)
-            else
-              if @error_check
-                puts(
-                  Meteor::Exception::NoSuchElementException
-                    .new(name, attr_name1, attr_value1, attr_name2, attr_value2)
-                    .message
-                )
-              end
-
-              @elm_ = nil
-            end
+            element_five_void(name, attr_name1, attr_value1, attr_name2, attr_value2)
           else
-            # normal element search pattern (内容あり要素検索パターン)
-            @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)
-            # search of normal element (内容あり要素検索)
-            @res = @pattern.match(@root.document)
-
-            @res = element_normal_five_two if !@res && !match?(MATCH_TAG_NNE, name)
-
-            if @res
-              element_normal_five_one(name)
-            else
-              if @error_check
-                puts(
-                  Meteor::Exception::NoSuchElementException
-                    .new(name, attr_name1, attr_value1, attr_name2, attr_value2)
-                    .message
-                )
-              end
-
-              @elm_ = nil
-            end
+            element_five_normal(name, attr_name1, attr_value1, attr_name2, attr_value2)
           end
 
           @elm_
@@ -363,12 +345,64 @@ module Meteor
 
         private :element_five
 
+        def element_five_void(name, attr_name1, attr_value1, attr_name2, attr_value2) # rubocop:disable Metrics/MethodLength
+          # void element search pattern (空要素検索パターン)
+          @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)
+          # void element search (空要素検索)
+          @res = @pattern.match(@root.document)
+
+          if @res
+            element_void_five(name)
+          else
+            if @error_check
+              puts(
+                Meteor::Exception::NoSuchElementException
+                  .new(name, attr_name1, attr_value1, attr_name2, attr_value2)
+                  .message
+              )
+            end
+
+            @elm_ = nil
+          end
+        end
+
+        private :element_five_void
+
         def element_void_five(name)
           element_void_five_one(name, '")[^<>]*)>')
         end
 
         private :element_void_five
 
+        def element_five_normal(name, attr_name1, attr_value1, attr_name2, attr_value2) # rubocop:disable Metrics/MethodLength
+          # normal element search pattern (内容あり要素検索パターン)
+          @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)
+          # search of normal element (内容あり要素検索)
+          @res = @pattern.match(@root.document)
+
+          @res = element_normal_five_two if !@res && !match?(MATCH_TAG_NNE, name)
+
+          if @res
+            element_normal_five_one(name)
+          else
+            if @error_check
+              puts(
+                Meteor::Exception::NoSuchElementException
+                  .new(name, attr_name1, attr_value1, attr_name2, attr_value2)
+                  .message
+              )
+            end
+
+            @elm_ = nil
+          end
+        end
+
+        private :element_five_normal
+
         #
         # get element using attribute1,2(name="value") (属性1・属性2(属性名="属性値")で検索し、要素を取得する)
         #

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

@@ -133,8 +133,6 @@ module Meteor
 
           element_three('meta', 'http-equiv', 'Content-Type')
 
-          element_three('meta', 'http-equiv', 'Content-Type') unless @elm_
-
           @error_check = true
 
           if @elm_

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.44
+# @version 0.9.46
 #
 
 module Meteor
-  VERSION = '0.9.44'
+  VERSION = '0.9.46'
 
   # require 'fileutils'
 

metadata

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