meteor 0.9.14 → 0.9.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5edd4d31b61edd52eee6adb3f61784e54140d28216ada36e7ce2b0f66e02b0c1
-  data.tar.gz: a5e1729d16467baf211cd96d6876f8d307c03bc27e56dfc462fd7356a6a17484
+  metadata.gz: f7d47ad0742865e6db6e46f77760be2e297d06801994d8946d5d214b62eabb2c
+  data.tar.gz: 9589c40343c33e537a172f2f7473eacb0c2e76cd68bc2718b8795c9400b7e1fa
 SHA512:
-  metadata.gz: 0424f42f10572ead20fe1f1ffd368f1a001b9bac5e607af725508a2c51262bf9ca1f8be35e28ee62b70381f6422284aa504fe145c8cb913c9771ce52931ee277
-  data.tar.gz: 74fb101b38d37e03a30919724bd348e71c8a10c481f609bcb35055f17bccd1fe47b73cbf6acc7044b30ae7a84972075c49c1668c657bbf502e666eb33c666d0a
+  metadata.gz: 3499c0efa7aa62b76a5ad077855b1c8da0c715396ee0979a9c6103a3a8f7b85606558794be63b64c012864c53b915556ae165da6d282af616b6912342689fd0f
+  data.tar.gz: a4d2d9d1d8ec23285c94840934967c37ac7921813c951b8ec0c1e52ed3cb968cd678f080f646c0aa67676596b5abff91e24337820ef67ff10973364223042c4a

data/ChangeLog

@@ -1,3 +1,11 @@
+== 0.9.16 / 2026-06-18 Yasumasa Ashida <ys.ashida@gmail.com>
+
+* Refactoring
+
+== 0.9.15 / 2026-06-18 Yasumasa Ashida <ys.ashida@gmail.com>
+
+* Fix ParserImpl#element
+
 == 0.9.14 / 2026-06-17 Yasumasa Ashida <ys.ashida@gmail.com>
 
 * Fix the content-type handling in the parsers

data/Gemfile.lock

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

data/lib/meteor/core/kernel.rb

@@ -369,7 +369,11 @@ module Meteor
       # @param [true,false] quote flag (クオート・フラグ)
       # @return [Meteor::Element] element (要素)
       def element_3(name, attr_name, attr_value, quote = true)
-        element_quote_3(name, attr_name, attr_value)
+        if quote
+          quote_element_3(name, attr_name, attr_value)
+        else
+          quote_name(name)
+        end
 
         @pattern_cc_1 = element_pattern_3
 
@@ -429,13 +433,12 @@ module Meteor
 
       private :element_pattern_3
 
-      def element_quote_3(name, attr_name, attr_value)
-        @_name = Regexp.quote(name)
-        @_attr_name = Regexp.quote(attr_name)
-        @_attr_value = Regexp.quote(attr_value)
+      def quote_element_3(name, attr_name, attr_value)
+        quote_name(name)
+        quote_attribute(attr_name, attr_value)
       end
 
-      private :element_quote_3
+      private :quote_element_3
 
       def element_with_3_1(name)
         # puts  @res.captures.length
@@ -594,7 +597,7 @@ module Meteor
       #
       def element_2(attr_name, attr_value)
 
-        element_quote_2(attr_name, attr_value)
+        quote_attribute(attr_name, attr_value)
 
         element_pattern_2
 
@@ -665,12 +668,18 @@ module Meteor
 
       private :element_2
 
-      def element_quote_2(attr_name, attr_value)
+      def quote_name(name)
+        @_name = Regexp.quote(name)
+      end
+
+      private :quote_name
+
+      def quote_attribute(attr_name, attr_value)
         @_attr_name = Regexp.quote(attr_name)
         @_attr_value = Regexp.quote(attr_value)
       end
 
-      private :element_quote_2
+      private :quote_attribute
 
       def element_pattern_2
         # # @pattern_cc = String.new('') << '<([^<>"]*)\\s[^<>]*' << @_attr_name << '="' << @_attr_value << '(?:[^<>\\/]*>|((?!([^<>]*\\/>))[^<>]*>))'
@@ -681,7 +690,7 @@ module Meteor
       private :element_pattern_2
 
 =begin
-     def element_with_2_1
+      def element_with_2_1
         # puts @res.captures.length
         case @res.captures.length
           when FOUR
@@ -820,7 +829,7 @@ module Meteor
       #
       def element_5(name, attr_name1, attr_value1, attr_name2, attr_value2)
 
-        element_quote_5(name, attr_name1, attr_value1, attr_name2, attr_value2)
+        quote_element_5(name, attr_name1, attr_value1, attr_name2, attr_value2)
 
         @pattern_cc_1 = "<#{@_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}>"
 
@@ -874,7 +883,7 @@ module Meteor
 
       private :element_5
 
-      def element_quote_5(name, attr_name1, attr_value1, attr_name2, attr_value2)
+      def quote_element_5(name, attr_name1, attr_value1, attr_name2, attr_value2)
         @_name = Regexp.quote(name)
         @_attr_name1 = Regexp.quote(attr_name1)
         @_attr_name2 = Regexp.quote(attr_name2)
@@ -882,7 +891,7 @@ module Meteor
         @_attr_value2 = Regexp.quote(attr_value2)
       end
 
-      private :element_quote_5
+      private :quote_element_5
 
       def element_with_5_1(name)
 
@@ -1048,7 +1057,7 @@ module Meteor
       #
       def element_4(attr_name1, attr_value1, attr_name2, attr_value2)
 
-        element_quote_4(attr_name1, attr_value1, attr_name2, attr_value2)
+        quote_element_4(attr_name1, attr_value1, attr_name2, attr_value2)
 
         element_pattern_4
 
@@ -1073,14 +1082,14 @@ module Meteor
 
       private :element_4
 
-      def element_quote_4(attr_name1, attr_value1, attr_name2, attr_value2)
+      def quote_element_4(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 :element_quote_4
+      private :quote_element_4
 
       def element_pattern_4
 

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

@@ -12,7 +12,7 @@ module Meteor
         MATCH_TAG = ["br", "hr", "img", "input", "meta", "base", "embed", "command", "keygen"]
 
         #[Array] non-nestable elements (入れ子にできない要素)
-        MATCH_TAG_SNG = [
+        MATCH_TAG_NNE = [
           "texarea",
           "select",
           "option",
@@ -57,7 +57,7 @@ module Meteor
         def initialize(*args)
           super()
           @@match_tag = MATCH_TAG
-          @@match_tag_sng = MATCH_TAG_SNG
+          @@MATCH_TAG_NNE = MATCH_TAG_NNE
           @@attr_logic = ATTR_LOGIC
           @doc_type = Parser::HTML
           case args.length

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

@@ -52,7 +52,7 @@ module Meteor
         # @@pattern_true = Regexp.new("true")
         # @@pattern_false = Regexp.new("false")
 
-        PATTERN_UNESCAPE = "&(amp|quot|apos|gt|lt|nbsp);"
+        
         GET_ATTRS_MAP2 = "\\s(disabled|readonly|checked|selected|multiple)"
 
         @@pattern_selected_m = Regexp.new(SELECTED_M)
@@ -66,7 +66,6 @@ module Meteor
         @@pattern_multiple_m = Regexp.new(MULTIPLE_M)
         @@pattern_multiple_r = Regexp.new(MULTIPLE_R)
 
-        @@pattern_unescape = Regexp.new(PATTERN_UNESCAPE)
         @@pattern_get_attrs_map2 = Regexp.new(GET_ATTRS_MAP2)
 
         # @@pattern_match_tag = Regexp.new(@@match_tag)
@@ -95,9 +94,11 @@ module Meteor
 
         PATTERN_ESCAPE = "[&\"'<> ]"
         PATTERN_ESCAPE_CONTENT = "[&\"'<> \\n]"
-
         @@pattern_escape = Regexp.new(PATTERN_ESCAPE)
         @@pattern_escape_content = Regexp.new(PATTERN_ESCAPE_CONTENT)
+
+        PATTERN_UNESCAPE = "&(amp|quot|apos|gt|lt|nbsp);"
+        @@pattern_unescape = Regexp.new(PATTERN_UNESCAPE)
         @@pattern_br_2 = Regexp.new(BR)
 
         #
@@ -214,7 +215,7 @@ module Meteor
         # @return [Meteor::Element] element (要素)
         #
         def element_1(name)
-          @_name = Regexp.quote(name)
+          quote_name(name)
 
           # case of void element (空要素の場合(<->内容あり要素の場合))
           if is_match(@@match_tag, name)
@@ -281,8 +282,11 @@ module Meteor
         # @return [Meteor::Element] element (要素)
         #
         def element_3(name, attr_name, attr_value, quote = true)
-
-          element_quote_3(name, attr_name, attr_value) if quote
+          if quote
+            quote_element_3(name, attr_name, attr_value)
+          else
+            quote_name(name)
+          end
 
           # case of void element (空要素の場合(<->内容あり要素の場合))
           if is_match(@@match_tag, name)
@@ -348,7 +352,7 @@ module Meteor
         #
         def element_2(attr_name, attr_value)
 
-          element_quote_2(attr_name, attr_value)
+          quote_attribute(attr_name, attr_value)
 
           # @pattern_cc = String.new('') << '<([^<>"]*)\\s[^<>]*' << @_attr_name << '="' << @_attr_value
           # @pattern_cc << '"[^<>]*>'
@@ -383,7 +387,7 @@ module Meteor
         #
         def element_5(name, attr_name1, attr_value1, attr_name2, attr_value2)
 
-          element_quote_5(name, attr_name1, attr_value1, attr_name2, attr_value2)
+          quote_element_5(name, attr_name1, attr_value1, attr_name2, attr_value2)
 
           # 空要素の場合(<->内容あり要素の場合)
           if is_match(@@match_tag, name)
@@ -466,7 +470,7 @@ module Meteor
         # @return [Meteor::Element] element (要素)
         #
         def element_4(attr_name1, attr_value1, attr_name2, attr_value2)
-          element_quote_4(attr_name1, attr_value1, attr_name2, attr_value2)
+          quote_element_4(attr_name1, attr_value1, attr_name2, attr_value2)
 
           # @pattern_cc = String.new('') << '<([^<>"]*)\\s([^<>]*(' << @_attr_name1 << '="' << @_attr_value1
           # @pattern_cc << '"[^<>]*' << @_attr_name2 << '="' << @_attr_value2
@@ -647,14 +651,14 @@ module Meteor
         private :remove_attrs_
 
         def escape(content)
-          # 特殊文字の置換
+          # replace special character (特殊文字の置換)
           content = content.gsub(@@pattern_escape, TABLE_FOR_ESCAPE_)
 
           content
         end
 
         def escape_content(content, elm)
-          # 特殊文字の置換
+          # replace special character (特殊文字の置換)
           content = content.gsub(@@pattern_escape_content, TABLE_FOR_ESCAPE_CONTENT_)
 
           content

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

@@ -48,8 +48,6 @@ module Meteor
         MULTIPLE_R = "multiple=\"[^\"]*\""
         MULTIPLE_U = "multiple=\"multiple\""
 
-        PATTERN_UNESCAPE = "&(amp|quot|apos|gt|lt|nbsp);"
-
         @@pattern_selected_m = Regexp.new(SELECTED_M)
         @@pattern_selected_m1 = Regexp.new(SELECTED_M1)
         @@pattern_selected_r = Regexp.new(SELECTED_R)
@@ -66,10 +64,6 @@ module Meteor
         @@pattern_multiple_m1 = Regexp.new(MULTIPLE_M1)
         @@pattern_multiple_r = Regexp.new(MULTIPLE_R)
 
-        @@pattern_unescape = Regexp.new(PATTERN_UNESCAPE)
-
-        @@pattern_br_2 = Regexp.new("<br\\/>")
-
         # @@pattern_match_tag = Regexp.new(@@match_tag)
         # @@pattern_match_tag2 = Regexp.new(@@match_tag_2)
 
@@ -99,6 +93,10 @@ module Meteor
         @@pattern_escape = Regexp.new(PATTERN_ESCAPE)
         @@pattern_escape_content = Regexp.new(PATTERN_ESCAPE_CONTENT)
 
+        PATTERN_UNESCAPE = "&(amp|quot|apos|gt|lt|nbsp);"
+        @@pattern_unescape = Regexp.new(PATTERN_UNESCAPE)
+        @@pattern_br_2 = Regexp.new("<br\\/>")
+
         #
         # initializer (イニシャライザ)
         # @overload initialize

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

@@ -11,10 +11,6 @@ module Meteor
         # KAIGYO_CODE = "\r?\n|\r"
         KAIGYO_CODE = ["\r\n", "\n", "\r"]
 
-        PATTERN_UNESCAPE = "&(amp|quot|apos|gt|lt);"
-
-        @@pattern_unescape = Regexp.new(PATTERN_UNESCAPE)
-
         TABLE_FOR_ESCAPE_ = {
           "&" => "&",
           "\"" => """,
@@ -22,9 +18,13 @@ module Meteor
           "<" => "&lt;",
           ">" => "&gt;"
         }
+
         PATTERN_ESCAPE = "[&\\\"'<>]"
         @@pattern_escape = Regexp.new(PATTERN_ESCAPE)
 
+        PATTERN_UNESCAPE = "&(amp|quot|apos|gt|lt);"
+        @@pattern_unescape = Regexp.new(PATTERN_UNESCAPE)
+
         #
         # initializer (イニシャライザ)
         # @overload initialize
@@ -108,7 +108,7 @@ module Meteor
 
         private :analyze_kaigyo_code
 
-         #
+        #
         # analyze document , set content type (ドキュメントをパースし、コンテントタイプをセットする)
         #
         def analyze_content_type

data/lib/meteor/parser_factory.rb

@@ -59,9 +59,7 @@ module Meteor
     # initializer (イニシャライザ)
     #
     def initialize_0
-      @cache = Hash.new
-      @root = "."
-      @enc = "UTF-8"
+      initialize_2
     end
 
     private :initialize_0
@@ -71,9 +69,7 @@ module Meteor
     # @param [String] root root directory (基準ディレクトリ)
     #
     def initialize_1(root)
-      @cache = Hash.new
-      @root = root
-      @enc = "UTF-8"
+      initialize_2(root)
     end
 
     private :initialize_1
@@ -83,7 +79,7 @@ module Meteor
     # @param [String] root root directory (基準ディレクトリ)
     # @param [String] enc default character encoding (デフォルト文字エンコーディング)
     #
-    def initialize_2(root, enc)
+    def initialize_2(root = ".", enc = "UTF-8")
       @cache = Hash.new
       @root = root
       @enc = enc
@@ -97,7 +93,7 @@ module Meteor
     # @param [String] root root directory (基準ディレクトリ)
     # @param [String] enc default character encoding (デフォルト文字エンコーディング)
     #
-    def initialize_3(type, root, enc)
+    def initialize_3(type, root=".", enc = "UTF-8")
       @cache = Hash.new
       @type = type
       @root = root
@@ -214,31 +210,11 @@ module Meteor
     # @return [Meteor::Parser] parser(パーサ)
     #
     def link_3(type, relative_path, enc)
-
       relative_url = path_to_url(relative_path)
 
-      case type
-      when Parser::HTML, :html, :html5
-        html = Meteor::Ml::Html::ParserImpl.new
-        html.read(File.expand_path(relative_path, @root), enc)
-        @cache[relative_url] = html
-      when Parser::XML, :xml
-        xml = Meteor::Ml::Xml::ParserImpl.new
-        xml.read(File.expand_path(relative_path, @root), enc)
-        @cache[relative_url] = xml
-      when Parser::XHTML, :xhtml, :xhtml5
-        xhtml = Meteor::Ml::Xhtml::ParserImpl.new
-        xhtml.read(File.expand_path(relative_path, @root), enc)
-        @cache[relative_url] = xhtml
-      when Parser::HTML4, :html4
-        html4 = Meteor::Ml::Html4::ParserImpl.new
-        html.read(File.expand_path(relative_path, @root), enc)
-        @cache[relative_url] = html4
-      when Parser::XHTML4, :xhtml4
-        xhtml4 = Meteor::Ml::Xhtml4::ParserImpl.new
-        xhtml4.read(File.expand_path(relative_path, @root), enc)
-        @cache[relative_url] = xhtml4
-      end
+      ps = new_parser(type)
+      ps.read(File.expand_path(relative_path, @root), enc)
+      @cache[relative_url] = ps
     end
 
     private :link_3
@@ -250,22 +226,9 @@ module Meteor
     # @return [Meteor::Parser] parser (パーサ)
     #
     def link_2_n(type, relative_path)
-
       relative_url = path_to_url(relative_path)
 
-      case type
-      when Parser::HTML, :html, :html5
-        ps = Meteor::Ml::Html::ParserImpl.new
-      when Parser::XML, :xml
-        ps = Meteor::Ml::Xml::ParserImpl.new
-      when Parser::XHTML, :xhtml, :xhtml5
-        ps = Meteor::Ml::Xhtml::ParserImpl.new
-      when Parser::HTML4, :html4
-        ps = Meteor::Ml::Html4::ParserImpl.new
-      when Parser::XHTML4, :xhtml4
-        ps = Meteor::Ml::Xhtml4::ParserImpl.new
-      end
-
+      ps = new_parser(type)
       ps.read(File.expand_path(relative_path, @root), @enc)
       @cache[relative_url] = ps
     end
@@ -279,22 +242,9 @@ module Meteor
     # @return [Meteor::Parser] parser (パーサ)
     #
     def link_2_s(relative_path, enc)
-
       relative_url = path_to_url(relative_path)
 
-      case @type
-      when Parser::HTML, :html
-        ps = Meteor::Ml::Html::ParserImpl.new
-      when Parser::XML, :xml
-        ps = Meteor::Ml::Xml::ParserImpl.new
-      when Parser::XHTML, :xhtml
-        ps = Meteor::Ml::Xhtml::ParserImpl.new
-      when Parser::HTML4, :html4
-        ps = Meteor::Ml::Html4::ParserImpl.new
-      when Parser::XHTML4, :xhtml4
-        ps = Meteor::Ml::Xhtml4::ParserImpl.new
-      end
-
+      ps = new_parser(@type)
       ps.read(File.expand_path(relative_path, @root), enc)
       @cache[relative_url] = ps
     end
@@ -307,24 +257,9 @@ module Meteor
     # @return [Meteor::Parser] parser (パーサ)
     #
     def link_1(relative_path)
-
       relative_url = path_to_url(relative_path)
 
-      case @type
-      when Parser::HTML, :html
-        ps = Meteor::Ml::Html::ParserImpl.new
-      when Parser::XML, :xml
-        ps = Meteor::Ml::Xml::ParserImpl.new
-      when Parser::XHTML, :xhtml
-        ps = Meteor::Ml::Xhtml::ParserImpl.new
-      when Parser::HTML4, :html4
-        ps = Meteor::Ml::Html4::ParserImpl.new
-      when Parser::XHTML4, :xhtml4
-        ps = Meteor::Ml::Xhtml4::ParserImpl.new
-      else
-        raise ArgumentError
-      end
-
+      ps = new_parser(@type)
       ps.read(File.expand_path(relative_path, @root), @enc)
       @cache[relative_url] = ps
     end
@@ -423,18 +358,7 @@ module Meteor
     # @return [Meteor::Parser] parser (パーサ)
     #
     def link_str_3(type, relative_url, doc)
-      case type
-      when Parser::HTML, :html
-        ps = Meteor::Ml::Html::ParserImpl.new
-      when Parser::XML, :xml
-        ps = Meteor::Ml::Xml::ParserImpl.new
-      when Parser::XHTML, :xhtml
-        ps = Meteor::Ml::Xhtml::ParserImpl.new
-      when Parser::HTML4, :html4
-        ps = Meteor::Ml::Html4::ParserImpl.new
-      when Parser::XHTML4, :xhtml4
-        ps = Meteor::Ml::Xhtml4::ParserImpl.new
-      end
+      ps = new_parser(@type)
 
       ps.dcument = doc
       ps.parse
@@ -450,18 +374,7 @@ module Meteor
     # @return [Meteor::Parser] parser (パーサ)
     #
     def link_str_2(relative_url, doc)
-      case @type
-      when Parser::HTML, :html
-        ps = Meteor::Ml::Html::ParserImpl.new
-      when Parser::XML, :xml
-        ps = Meteor::Ml::Xml::ParserImpl.new
-      when Parser::XHTML, :xhtml
-        ps = Meteor::Ml::Xhtml::ParserImpl.new
-      when Parser::HTML4, :html4
-        ps = Meteor::Ml::Html4::ParserImpl.new
-      when Parser::XHTML4, :xhtml4
-        ps = Meteor::Ml::Xhtml4::ParserImpl.new
-      end
+      ps = new_parser(@type)
 
       ps.document = doc
       ps.parse
@@ -472,6 +385,25 @@ module Meteor
 
     alias :paraser_str :link_str
 
+    def new_parser(type)
+      case type
+      when Parser::HTML, :html
+        Meteor::Ml::Html::ParserImpl.new
+      when Parser::XML, :xml
+        Meteor::Ml::Xml::ParserImpl.new
+      when Parser::XHTML, :xhtml
+        Meteor::Ml::Xhtml::ParserImpl.new
+      when Parser::HTML4, :html4
+        Meteor::Ml::Html4::ParserImpl.new
+      when Parser::XHTML4, :xhtml4
+        Meteor::Ml::Xhtml4::ParserImpl.new
+      else
+        raise ArgumentError
+      end
+    end
+
+    private :new_parser
+
     #
     # set parser (パーサをセットする)
     # @param [String,Symbol] key identifier (キー)

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.14
+# @version 0.9.16
 #
 
 module Meteor
-  VERSION = "0.9.14"
+  VERSION = "0.9.16"
 
   # require 'fileutils'
 

metadata

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