meteor 0.9.19 → 0.9.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5cd092814ce42dc2c43a909cdaba66fdade6e6c843478ac090aac5a2d4f487e
-  data.tar.gz: f48b7cb7e1e159bd6f94d77a7140219a7f5e323812bd072a8368261fc3459200
+  metadata.gz: 634ddb57832e251c0d8dfeb25a124c0c92046f296fb31c8cb4c375ecf841ee27
+  data.tar.gz: 7f553a1b7ac314cca77e92fd45d1f541636590aebead0a687058ee450efed8de
 SHA512:
-  metadata.gz: '0689acb2f048912e05a831f94977c45239c5b35cfca707c2eaf8313956452fdc397d897e93ff7005e4944815145c13e77747c90af029d5d16985de43890c9944'
-  data.tar.gz: 850cbdc875e5845b5cd1bd424b27759d2e2ee4fb3515c86019234940371ee147f2e40ff8a3982460f195b963e9ae0b1137e0ad595919c863461861c9a8bdc19d
+  metadata.gz: 44091d7eb8d9bf3abea743b3543b60cc0f705f470927a0386c4598779268ecad39cee285ff856d117cbf4cdff5f48e945609c0ee2afa6828c7e6be6026ea740f
+  data.tar.gz: ede1106a3c620bd3a6031637f3acfc8d5a3c7e86bae7b85e75324bf36ce539a0fff939135b9857ebdb7b8fb8cd422b0c0383d7f38b28aec55a3d085b8b81d8cd

data/ChangeLog

@@ -1,3 +1,7 @@
+== 0.9.20 / 2026-06-20 Yasumasa Ashida <ys.ashida@gmail.com>
+
+* Refactoring
+
 == 0.9.19 / 2026-06-20 Yasumasa Ashida <ys.ashida@gmail.com>
 
 * Refactoring

data/Gemfile.lock

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

data/lib/meteor/core/kernel.rb

@@ -284,7 +284,7 @@ module Meteor
         @pattern_cc = "<#{@_name}(|\\s[^<>]*)\\/>|<#{@_name}((?:|\\s[^<>]*))>(((?!(#{@_name}[^<>]*>)).)*)<\\/#{@_name}>"
 
         @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc)
-        # search of element with content (内容あり要素検索)
+        # search of content-rich element (内容あり要素検索)
         @res = @pattern.match(@root.document)
 
         if @res
@@ -323,7 +323,7 @@ module Meteor
           # document (全体)
           @elm_.document = @res[0]
         end
-        # search pattern of element with content (内容あり要素検索用パターン)
+        # search pattern of content-rich element (内容あり要素検索用パターン)
         # @pattern_cc = String.new('') << "<" << @_name << '(?:|\\s[^<>]*)>((?!(' << @_name
         # @pattern_cc << '[^<>]*>)).)*<\\/' << @_name << '>'
         @pattern_cc = "<#{@_name}(|\\s[^<>]*)>(((?!(#{@_name}[^<>]*>)).)*)<\\/#{@_name}>"
@@ -469,7 +469,7 @@ module Meteor
           @elm_.mixed_content = @res[3]
           # document (全体)
           @elm_.document = @res[0]
-          # search pattern of element with content (内容あり要素検索用パターン)
+          # search pattern of content-rich element (内容あり要素検索用パターン)
           # @pattern_cc = String.new('')<< "<" << @_name << '\\s[^<>]*' << @_attr_name << '="'
           # @pattern_cc << @_attr_value << '"[^<>]*>((?!(' << @_name
           # @pattern_cc << '[^<>]*>)).)*<\\/' << @_name << '>'
@@ -497,7 +497,7 @@ module Meteor
           end
           # document (全体)
           @elm_.document = @res[0]
-          # search pattern of element with content (内容あり要素検索用パターン)
+          # search pattern of content-rich element (内容あり要素検索用パターン)
           @elm_.pattern = @pattern_cc
 
           @elm_.empty = true
@@ -544,7 +544,7 @@ module Meteor
         @pattern_cc_2_2 = String.new("") << ".*?)<\\/" << @_name << ">"
         # @pattern_cc_2_2 = ".*?)<\\/#{@_name}>"
 
-        # search of element with content (内容あり要素検索)
+        # search of content-rich element (内容あり要素検索)
         @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc_1)
 
         @sbuf = String.new("")
@@ -753,7 +753,7 @@ module Meteor
         # @pattern_cc_1 << @_attr_value << '(?:[^<>\\/]*>|(?:(?!([^<>]*\\/>))[^<>]*>)))'
         @pattern_cc_1 = "<([^<>\"]*)(\\s[^<>]*#{@_attr_name}=\"#{@_attr_value}(?:[^<>\\/]*>|(?:(?!([^<>]*\\/>))[^<>]*>)))"
 
-        # search of element with content (内容あり要素検索)
+        # search of content-rich element (内容あり要素検索)
         @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc_1)
         @sbuf = String.new('')
 
@@ -942,7 +942,7 @@ module Meteor
           @elm_.mixed_content = @res[3]
           # document (全体)
           @elm_.document = @res[0]
-          # search pattern of element with content (要素ありタグ検索用パターン)
+          # search pattern of content-rich element (要素ありタグ検索用パターン)
           @elm_.pattern = @pattern_cc
 
           @elm_.empty = true
@@ -996,7 +996,7 @@ module Meteor
         # @pattern_cc_2_1 = ".*?<\\/#{@_name}>"
         # @pattern_cc_2_2 = ".*?)<\\/#{@_name}>"
 
-        # search of element with content (内容あり要素検索)
+        # search of content-rich element (内容あり要素検索)
         @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc_1)
 
         @sbuf = String.new("")
@@ -2094,7 +2094,7 @@ module Meteor
       #
       def shadow(elm)
         if elm.empty
-          # case of element with content (内容あり要素の場合)
+          # case of content-rich element (内容あり要素の場合)
           set_mono_info(elm)
 
           pif2 = create(self)

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

@@ -33,7 +33,7 @@ module Meteor
         ]
 
         #[Array] boolean attributes (論理値で指定する属性)
-        ATTR_LOGIC = ["disabled", "readonly", "checked", "selected", "multiple", "required"]
+        ATTR_BOOL = ["disabled", "readonly", "checked", "selected", "multiple", "required"]
 
         #[Array] elements with the disabled attribute (disabled属性のある要素)
         DISABLE_ELEMENT = ["input", "textarea", "select", "optgroup", "fieldset"]
@@ -58,7 +58,7 @@ module Meteor
           super()
           @@match_tag = MATCH_TAG
           @@MATCH_TAG_NNE = MATCH_TAG_NNE
-          @@attr_logic = ATTR_LOGIC
+          @@attr_bool = ATTR_BOOL
           @doc_type = Parser::HTML
           case args.length
           when ZERO

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

@@ -21,10 +21,10 @@ module Meteor
         @@match_tag_2 = ["textarea", "option", "pre"]
 
         #[Array] non-nestable elements (入れ子にできない要素)
-        @@match_tag_sng = ["texarea", "select", "option", "form", "fieldset"]
+        @@match_tag_nne = ["texarea", "select", "option", "form", "fieldset"]
 
         #[Array] boolean attributes (論理値で指定する属性)
-        @@attr_logic = ["disabled", "readonly", "checked", "selected", "multiple"]
+        @@attr_bool = ["disabled", "readonly", "checked", "selected", "multiple"]
 
         # DISABLE_ELEMENT = "input|textarea|select|optgroup"
         #[Array] elements with the disabled attribute (disabled属性のある要素)
@@ -234,15 +234,15 @@ module Meteor
               @elm_ = nil
             end
           else
-            # search pattern of element with content (内容あり要素検索用パターン()
+            # search pattern of content-rich element (内容あり要素検索用パターン()
             # @pattern_cc = String.new('') << "<" << @_name << '(|\\s[^<>]*)>(((?!(' << @_name
             # @pattern_cc << '[^<>]*>)).)*)<\\/' << @_name << '>'
             @pattern_cc = "<#{@_name}(|\\s[^<>]*)>(((?!(#{tag}[^<>]*>)).)*)<\\/#{@_name}>"
 
             @pattern = Meteor::Core::Util::PatternCache.get(@pattern_cc)
-            # search of element with content (内容あり要素検索)
+            # search of content-rich element (内容あり要素検索)
             @res = @pattern.match(@root.document)
-            # case of element with content (内容あり要素の場合)
+            # case of content-rich element (内容あり要素の場合)
             if @res
               element_with_1(name)
             else
@@ -308,17 +308,17 @@ module Meteor
               @elm_ = nil
             end
           else
-            # search pattern of element with content (内容あり要素検索パターン)
+            # search pattern of content-rich element (内容あり要素検索パターン)
             # @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 element with content (内容あり要素検索)
+            # search of content-rich element (内容あり要素検索)
             @res = @pattern.match(@root.document)
 
-            if !@res && !is_match(@@match_tag_sng, name)
+            if !@res && !is_match(@@match_tag_nne, name)
               @res = element_with_3_2
             end
 
@@ -415,7 +415,7 @@ module Meteor
               @elm_ = nil
             end
           else
-            # search pattern of element with content (内容あり要素検索パターン)
+            # search pattern of content-rich element (内容あり要素検索パターン)
             # @pattern_cc = String.new('') << "<" << @_name << '(\\s[^<>]*(?:' << @_attr_name1 << '="'
             # @pattern_cc << @_attr_value1 << '"[^<>]*' << @_attr_name2 << '="'
             # @pattern_cc << @_attr_value2 << '"|' << @_attr_name2 << '="'
@@ -425,10 +425,10 @@ 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 element with content (内容あり要素検索)
+            # search of content-rich element (内容あり要素検索)
             @res = @pattern.match(@root.document)
 
-            if !@res && !is_match(@@match_tag_sng, tag)
+            if !@res && !is_match(@@match_tag_nne, tag)
               @res = element_with_5_2
             end
 
@@ -633,7 +633,7 @@ module Meteor
         private :get_attr_map
 
         def remove_attrs_(elm, attr_name)
-          if !is_match(@@attr_logic, attr_name)
+          if !is_match(@@attr_bool, attr_name)
             # attribute search pattern (属性検索用パターン)
             @pattern = Meteor::Core::Util::PatternCache.get(String.new("") << attr_name << "=\"[^\"]*\"\\s?")
             # @pattern = Meteor::Core::Util::PatternCache.get("#{attr_name}=\"[^\"]*\"\\s?")
@@ -693,15 +693,19 @@ module Meteor
 
         private :unescape
 
+        def br_to_kaigyo(content)
+          if (elm.cx || !is_match(@@match_tag_2, elm.name)) && content.include?(BR)
+            # 「<br>」->「¥r?¥n」
+            content.gsub!(@@pattern_br_2, @root.kaigyo_code)
+          end
+        end
+
+        private :br_to_kaigyo
+
         def unescape_content(content, elm)
           content_ = unescape(content)
 
-          if elm.cx || !is_match(@@match_tag_2, elm.name)
-            if content.include?(BR)
-              # 「<br>」->「¥r?¥n」
-              content_.gsub!(@@pattern_br_2, @root.kaigyo_code)
-            end
-          end
+          br_to_kaigyo(content_)
 
           content_
         end

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

@@ -9,7 +9,7 @@ module Meteor
       #
       class ParserImpl < Meteor::Ml::Xhtml4::ParserImpl
         #[Array] boolean attributes (論理値で指定する属性)
-        ATTR_LOGIC = ["disabled", "readonly", "checked", "selected", "multiple", "required"]
+        ATTR_BOOL = ["disabled", "readonly", "checked", "selected", "multiple", "required"]
 
         #[Array] elements with the disabled attribute (disabled属性のある要素)
         DISABLE_ELEMENT = ["input", "textarea", "select", "optgroup", "fieldset"]
@@ -34,7 +34,7 @@ module Meteor
         #
         def initialize(*args)
           super()
-          @@attr_logic = ATTR_LOGIC
+          @@attr_bool = ATTR_BOOL
           @doc_type = Parser::XHTML
           case args.length
           when ZERO

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

@@ -18,7 +18,7 @@ module Meteor
         @@match_tag_2 = ["textarea", "option", "pre"]
 
         #[Array] boolean attributes (論理値で指定する属性)
-        @@attr_logic = ["disabled", "readonly", "checked", "selected", "multiple"]
+        @@attr_bool = ["disabled", "readonly", "checked", "selected", "multiple"]
 
         # DISABLE_ELEMENT = "input|textarea|select|optgroup"
         #[Array] element with disablled attribute (disabled属性のある要素)
@@ -326,7 +326,7 @@ module Meteor
           attrs = Meteor::AttributeMap.new
 
           elm.attributes.scan(@@pattern_get_attrs_map) do |a, b|
-            if is_match(@@attr_logic, a) && a == b
+            if is_match(@@attr_bool, a) && a == b
               attrs.store(a, "true")
             else
               attrs.store(a, unescape(b))
@@ -386,13 +386,17 @@ module Meteor
 
         private :unescape
 
-        def unescape_content(content, elm)
-          content_ = unescape(content)
-
+        def br_to_kaigyo(content)
           if (elm.cx || !is_match(@@match_tag_2, elm.name)) && content.include?(BR)
             # 「<br>」->「¥r?¥n」
-            content_.gsub!(@@pattern_br_2, @root.kaigyo_code)
+            content.gsub!(@@pattern_br_2, @root.kaigyo_code)
           end
+        end
+
+        def unescape_content(content, elm)
+          content_ = unescape(content)
+
+          br_to_kaigyo(content_)
 
           content_
         end

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.19
+# @version 0.9.20
 #
 
 module Meteor
-  VERSION = "0.9.19"
+  VERSION = "0.9.20"
 
   # require 'fileutils'
 

metadata

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