meteor 0.9.42 → 0.9.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06e3af4f688641740f8ca20eccb680649355e66a6d370c5a9f09dc63ef2a5fea
-  data.tar.gz: d9a404cf2d03bc439a6b88f7aa60d39add1a7d49ed57fa46a9348339fefa75d4
+  metadata.gz: ebd554983ecc3081fd55707f6282c3a639609c5cd6e100b7e75d0e7c46b457bb
+  data.tar.gz: 3c6734e06ac743d78871fc71efda67a3a1bbd9d6bac519563d02c45a4b90daee
 SHA512:
-  metadata.gz: cce916500df8f9e7e3648d7144d3a9b68e0c4df21cd8ca70a0f5b667b8746897d5daca0fe8f741b757ec6ec052e4d768ef0646beb9d2990e9936370c646766b7
-  data.tar.gz: 6d2d1e9f403946998c2ec58123853021e8fc30adcd6602f425cbfb4a6f221c49c5ad6f55b014b9d4ccf2ce0eebf41e6670fb69721497a852605f12ed530347f0
+  metadata.gz: da148763b7573f7700eac92e3873c45be1c3cc474e10aaf823c1725c178d54500553d7940d65d00ef62b183fd7b003ad5a101583ca2b847ec35466f754d110f1
+  data.tar.gz: 1e1ab49831f262ea795e14d3e0a786cdfce3f63799888fda983fdb14d90e778bdd8d86d0c44b158c45e4fbea154d17938a605ff6b741190d41a3abd26f437f23

data/ChangeLog

@@ -1,3 +1,13 @@
+== 0.9.44 / 2026-07-26 Yasumasa Ashida <ys.ashida@gmail.com>
+
+* Refactor Meteor::Core::Kernel
+
+== 0.9.43 / 2026-07-22 Yasumasa Ashida <ys.ashida@gmail.com>
+
+* Refactor Meteor::Core::Kernel
+* Fix Meteor::Element#document
+* Refactor Meteor::Element#element
+
 == 0.9.42 / 2026-07-21 Yasumasa Ashida <ys.ashida@gmail.com>
 
 * Refactor Meteor::Element

data/Gemfile.lock

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

data/demo/xml.rb

@@ -32,7 +32,7 @@ elm7 = root.element('kobe')
 # elm8 = root.element(manbo: "mango")
 # elm8 = root.element(momo: "momo")
 
-# elm9 = root.element("hamachi",id: "aa",id2: 'bb')
+elm9 = root.element('hamachi', id: 'aa', id2: 'bb')
 # elm_c1 = root.cxtag("cs")
 
 # puts elm8.name
@@ -43,7 +43,7 @@ elm7 = root.element('kobe')
 # elm1["id2"] = "cc"
 
 # elm8['mango'] = "mangoo"  # elm8.attr(manbo: "mangoo")
-# elm9.content = "\\1"      # elm9.content("\\1")
+elm9.content = '\\1' # elm9.content("\\1")
 
 # elm2.attr(id3: 'cc')
 

data/lib/meteor/core/kernel.rb

@@ -50,6 +50,9 @@ module Meteor
       RE_CLEAN_ONE = Regexp.new('<!--\\s@[^<>]*\\s[^<>]*(\\s)*-->')
       RE_CLEAN_TWO = Regexp.new('<!--\\s\\/@[^<>]*(\\s)*-->')
 
+      # NEWLINE = "\r?\n|\r"
+      NEWLINE = ["\r\n", "\n", "\r"].freeze
+
       BR = '<br>'
       BR_RE = BR
 
@@ -170,10 +173,32 @@ module Meteor
       # parse document (ドキュメントを解析する)
       # @param [String] document document (ドキュメント)
       #
-      def parse; end
+      def parse
+        analyze_ml
+      end
 
       protected :parse
 
+      #
+      # analyze document (ドキュメントをパースする)
+      #
+      def analyze_ml
+        analyze_newline
+      end
+
+      protected :analyze_ml
+
+      #
+      # analyze document , set newline (ドキュメントをパースし、改行コードをセットする)
+      #
+      def analyze_newline
+        NEWLINE.each do |a|
+          @root.newline = a if @root.document.include?(a)
+        end
+      end
+
+      private :analyze_newline
+
       #
       # get element (要素を取得する)
       # @overload element(name)
@@ -368,11 +393,8 @@ module Meteor
       # @param [true,false] 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
-        if quote
-          quote_element_three(name, attr_name, attr_value)
-        else
-          quote_name(name)
-        end
+        quote_name(name)
+        quote_attribute(attr_name, attr_value) if quote
 
         @pattern_cc_one = element_pattern_three
 
@@ -430,13 +452,6 @@ module Meteor
 
       private :element_pattern_three
 
-      def quote_element_three(name, attr_name, attr_value)
-        quote_name(name)
-        quote_attribute(attr_name, attr_value)
-      end
-
-      private :quote_element_three
-
       def element_normal_three_one(name) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
         # puts  @res.captures.length
         case @res.captures.length
@@ -669,7 +684,7 @@ module Meteor
       #         case @res.captures.length
       #           when FOUR
       #             @_name = @res[1]
-      #             # eleement (要素)
+      #             # element (要素)
       #             @elm_ = Element.new(@_name)
       #             # attribute (属性)
       #             @elm_.attributes = @res[2]
@@ -791,7 +806,8 @@ module Meteor
       # @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
-        quote_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)
 
         @pattern_cc_one = "<#{@_name}(\\s[^<>]*(?:#{@_attr_name1}=\"#{@_attr_value1}\"[^<>]*#{@_attr_name2}=\"#{@_attr_value2}\"|#{@_attr_name2}=\"#{@_attr_value2}\"[^<>]*#{@_attr_name1}=\"#{@_attr_value1}\")[^<>]*)\\/>|<#{@_name}(\\s[^<>]*(?:#{@_attr_name1}=\"#{@_attr_value1}\"[^<>]*#{@_attr_name2}=\"#{@_attr_value2}\"|#{@_attr_name2}=\"#{@_attr_value2}\"[^<>]*#{@_attr_name1}=\"#{@_attr_value1}\")[^<>]*)>(((?!(#{@_name}[^<>]*>)).)*)<\\/#{@_name}>" # rubocop:disable Layout/LineLength
 
@@ -843,21 +859,36 @@ module Meteor
 
       private :element_five
 
-      def quote_element_five(name, attr_name1, attr_value1, attr_name2, attr_value2)
-        quote_name(name)
+      def quote_attribute_one_two(attr_name1, attr_value1, attr_name2, attr_value2)
+        quote_attribute_one(attr_name1, attr_value1)
+        quote_attribute_two(attr_name2, attr_value2)
+      end
+
+      private :quote_attribute_one_two
+
+      def quote_attribute_one(attr_name1, attr_value1)
         @_attr_name1 = Regexp.quote(attr_name1)
-        @_attr_name2 = Regexp.quote(attr_name2)
         @_attr_value1 = Regexp.quote(attr_value1)
+      end
+
+      private :quote_attribute_one
+
+      def quote_attribute_two(attr_name2, attr_value2)
         @_attr_value2 = Regexp.quote(attr_value2)
+        @_attr_name2 = Regexp.quote(attr_name2)
       end
 
-      private :quote_element_five
+      private :quote_attribute_two
 
       def element_normal_five_one(name) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+        # @res.to_a.each_with_index do |capture, i|
+        #   puts i
+        #   puts capture
+        # end
         # puts @res.captures.length
         case @res.captures.length
         when FOUR
-          # eleemnt (要素)
+          # element (要素)
           @elm_ = Meteor::Element.new(name)
           # attribute (属性)
           @elm_.attributes = @res[1]
@@ -966,7 +997,7 @@ module Meteor
         # document (全体)
         @elm_.document = @res[0]
         # pattern (空要素検索用パターン)
-        @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
+        @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
 
@@ -984,7 +1015,7 @@ module Meteor
       # @return [Meteor::Element] element (要素)
       #
       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)
+        quote_attribute_one_two(attr_name1, attr_value1, attr_name2, attr_value2)
 
         element_pattern_four
 
@@ -1009,17 +1040,8 @@ module Meteor
 
       private :element_four
 
-      def quote_element_four(attr_name1, attr_value1, attr_name2, attr_value2)
-        @_attr_name1 = Regexp.quote(attr_name1)
-        @_attr_name2 = Regexp.quote(attr_name2)
-        @_attr_value1 = Regexp.quote(attr_value1)
-        @_attr_value2 = Regexp.quote(attr_value2)
-      end
-
-      private :quote_element_four
-
       def element_pattern_four
-        @pattern_cc = "<([^<>\"]*)\\s[^<>]*(#{@_attr_name1}=\"#{@_attr_value1}\"[^<>]*#{@_attr_name2}=\"#{@_attr_value2}\"|#{@_attr_name2}=\"#{@_attr_value2}\"[^<>]*#{@_attr_name1}=\"#{@_attr_value1}\")" # rubocop:disable Layout/LineLength
+        @pattern_cc = "<([^<>\"]*)\\s[^<>]*(?:#{@_attr_name1}=\"#{@_attr_value1}\"[^<>]*#{@_attr_name2}=\"#{@_attr_value2}\"|#{@_attr_name2}=\"#{@_attr_value2}\"[^<>]*#{@_attr_name1}=\"#{@_attr_value1}\")" # rubocop:disable Layout/LineLength
       end
 
       private :element_pattern_four
@@ -1283,7 +1305,6 @@ module Meteor
             else
               element_void_one(@elm_.name)
             end
-
           when TWO, THREE
             if @elm_.normal
               element_normal_three_one(@elm_.name)

data/lib/meteor/element.rb

@@ -219,21 +219,22 @@ module Meteor
     def document # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
       if @document_sync
         @document_sync = false
+        @_mixed_content = @mixed_content ? Regexp.quote(@mixed_content) : ''
         case @parser.doc_type
         when Parser::HTML, Parser::HTML4
           @document = if @cx
-                        "<!-- @#{@name} #{@attributes} -->#{@mixed_content}<!-- /@#{@name} -->"
+                        "<!-- @#{@name} #{@attributes} -->#{@_mixed_content}<!-- /@#{@name} -->"
                       elsif @normal
-                        "<#{@name}#{@attributes}>#{@mixed_content}</#{@name}>"
+                        "<#{@name}#{@attributes}>#{@_mixed_content}</#{@name}>"
                       else
                         String.new('') << '<' << @name << @attributes << '>'
                         # @document = "<#{@name}#{@attributes}>"
                       end
         when Parser::XHTML, Parser::XHTML4, Parser::XML
           @document = if @cx
-                        "<!-- @#{@name} #{@attributes} -->#{@mixed_content}<!-- /@#{@name} -->"
+                        "<!-- @#{@name} #{@attributes} -->#{@_mixed_content}<!-- /@#{@name} -->"
                       elsif @normal
-                        "<#{@name}#{@attributes}>#{@mixed_content}</#{@name}>"
+                        "<#{@name}#{@attributes}>#{@_mixed_content}</#{@name}>"
                       else
                         String.new('') << '<' << @name << @attributes << '/>'
                         # "<#{@name}#{@attributes}/>"

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

@@ -8,9 +8,6 @@ module Meteor
       # HTML4 parser (HTMLパーサ)
       #
       class ParserImpl < Meteor::Core::Kernel # rubocop:disable Metrics/ClassLength
-        # NEWLINE = "\r?\n|\r"
-        # NEWLINE = "\r\n|\n|\r"
-        NEWLINE = ["\r\n", "\n", "\r"].freeze
         BR = '<br>'
         BR_RE = BR
 
@@ -117,22 +114,12 @@ module Meteor
 
         private :initialize_one
 
-        #
-        # parse document (ドキュメントを解析する)
-        #
-        def parse
-          analyze_ml
-        end
-
-        protected :parse
-
         #
         # analyze document (ドキュメントをパースする)
         #
         def analyze_ml
+          super
           analyze_content_type
-          analyze_newline
-
           @res = nil
         end
 
@@ -168,17 +155,6 @@ module Meteor
 
         protected :analyze_content_type
 
-        #
-        # analuze document , set newline (ドキュメントをパースし、改行コードをセットする)
-        #
-        def analyze_newline
-          NEWLINE.each do |a|
-            @root.newline = a if @root.document.include?(a)
-          end
-        end
-
-        protected :analyze_newline
-
         #
         # get element using tag name (要素のタグ名で検索し、要素を取得する)
         # @param [String] name tag name (タグ名)
@@ -247,11 +223,8 @@ module Meteor
         # @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
-          if quote
-            quote_element_three(name, attr_name, attr_value)
-          else
-            quote_name(name)
-          end
+          quote_name(name)
+          quote_attribute(attr_name, attr_value) if quote
 
           # case of void element (空要素の場合(<->内容あり要素の場合))
           if match?(MATCH_TAG, name)
@@ -335,7 +308,8 @@ module Meteor
         # @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
-          quote_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)
@@ -405,9 +379,9 @@ module Meteor
         # @return [Meteor::Element] element (要素)
         #
         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)
+          quote_attribute_one_two(attr_name1, attr_value1, attr_name2, attr_value2)
 
-          @pattern_cc = "<([^<>\"]*)\\s([^<>]*(#{@_attr_name1}=\"#{@_attr_value1}\"[^<>]*#{@_attr_name2}=\"#{@_attr_value2}\"|#{@_attr_name2}=\"#{@_attr_value2}\"[^<>]*#{@_attr_name1}=\"#{@_attr_value1}\")[^<>]*)>" # rubocop:disable Layout/LineLength
+          @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/ml/xhtml4/parser_impl.rb

@@ -8,8 +8,6 @@ module Meteor
       # XHTML4 parser (XHTML4パーサ)
       #
       class ParserImpl < Meteor::Core::Kernel # rubocop:disable Metrics/ClassLength
-        # NEWLINE = "\r?\n|\r"
-        NEWLINE = ["\r\n", "\n", "\r"].freeze
         BR = '<br/>'
         BR_RE = '<br\\/>'
 
@@ -108,21 +106,12 @@ module Meteor
 
         private :initialize_one
 
-        #
-        # parse document (ドキュメントを解析する)
-        #
-        def parse
-          analyze_ml
-        end
-
-        protected :parse
-
         #
         # analyze document (ドキュメントをパースする)
         #
         def analyze_ml
+          super
           analyze_content_type
-          analyze_newline
           @res = nil
         end
 
@@ -160,17 +149,6 @@ module Meteor
 
         private :analyze_content_type
 
-        #
-        # analyze document , set newline (ドキュメントをパースし、改行コードをセットする)
-        #
-        def analyze_newline
-          NEWLINE.each do |a|
-            @root.newline = a if @root.document.include?(a)
-          end
-        end
-
-        private :analyze_newline
-
         def edit_attrs_(elm, attr_name, attr_value) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
           if match?('selected', attr_name) && match?('option', elm.name)
             edit_attrs_five(elm, attr_value, RE_SELECTED_M, RE_SELECTED_R, SELECTED_U)

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

@@ -8,9 +8,6 @@ module Meteor
       # XML parser (XMLパーサ)
       #
       class ParserImpl < Meteor::Core::Kernel
-        # NEWLINE = "\r?\n|\r"
-        NEWLINE = ["\r\n", "\n", "\r"].freeze
-
         TABLE_FOR_ESCAPE_ = {
           '&' => '&amp;',
           '"' => '&quot;',
@@ -66,22 +63,12 @@ module Meteor
 
         private :initialize_one
 
-        #
-        # parse document (ドキュメントを解析する)
-        #
-        def parse
-          analyze_ml
-        end
-
-        protected :parse
-
         #
         # analyze document (ドキュメントをパースする)
         #
         def analyze_ml
-          analyze_newline
+          super
           analyze_content_type
-
           @res = nil
         end
 
@@ -95,17 +82,6 @@ module Meteor
           @root.content_type
         end
 
-        #
-        # analuze document , set newline (ドキュメントをパースし、改行コードをセットする)
-        #
-        def analyze_newline
-          NEWLINE.each do |a|
-            @root.newline = a if @root.document.include?(a)
-          end
-        end
-
-        private :analyze_newline
-
         #
         # analyze document , set content type (ドキュメントをパースし、コンテントタイプをセットする)
         #

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

metadata

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