meteor 0.9.42 → 0.9.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06e3af4f688641740f8ca20eccb680649355e66a6d370c5a9f09dc63ef2a5fea
-  data.tar.gz: d9a404cf2d03bc439a6b88f7aa60d39add1a7d49ed57fa46a9348339fefa75d4
+  metadata.gz: 825640494e7fedc75191acae932e5a48c480a8dfe487bbd5d1f5784e8a5695b5
+  data.tar.gz: b7a2cdbd87bcb11466f644e5f31e9f36b9ccaefec561c15bf69d0c8a25b61f69
 SHA512:
-  metadata.gz: cce916500df8f9e7e3648d7144d3a9b68e0c4df21cd8ca70a0f5b667b8746897d5daca0fe8f741b757ec6ec052e4d768ef0646beb9d2990e9936370c646766b7
-  data.tar.gz: 6d2d1e9f403946998c2ec58123853021e8fc30adcd6602f425cbfb4a6f221c49c5ad6f55b014b9d4ccf2ce0eebf41e6670fb69721497a852605f12ed530347f0
+  metadata.gz: cb63be5f0155775ad90edf407d09aa637fa0557d62a41d3a386acfb337500e7dc1a4dde101c193941c205f070ff17f95a04d2f1cf95579e948f25d6315e115ba
+  data.tar.gz: '068c2caec3f5b93a71a773b9eb674f809d31709dd638dce51d01b8a1e96743f2a743d8d300fd7a111c585e71654eb1328964ad458b124d49816fb5a5de053557'

data/ChangeLog

@@ -1,3 +1,9 @@
+== 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.43)
 
 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)
@@ -669,7 +694,7 @@ module Meteor
       #         case @res.captures.length
       #           when FOUR
       #             @_name = @res[1]
-      #             # eleement (要素)
+      #             # element (要素)
       #             @elm_ = Element.new(@_name)
       #             # attribute (属性)
       #             @elm_.attributes = @res[2]
@@ -854,10 +879,14 @@ module Meteor
       private :quote_element_five
 
       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 +995,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
 
@@ -1019,7 +1048,7 @@ module Meteor
       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 +1312,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 (タグ名)
@@ -407,7 +383,7 @@ 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 = "<([^<>\"]*)\\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.43
 #
 
 module Meteor
-  VERSION = '0.9.42'
+  VERSION = '0.9.43'
 
   # 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.43
 platform: ruby
 authors:
 - Yasumasa Ashida