meteor 0.9.15 → 0.9.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6586cbfb631f019d21e7c7b9e900452d2611b9afefcf0ac38bd9e7f004224f6
-  data.tar.gz: 6a8872a716c23859f82070db908b1097cd8d0424b9ad5d8ce989896680eaf5e9
+  metadata.gz: f7d47ad0742865e6db6e46f77760be2e297d06801994d8946d5d214b62eabb2c
+  data.tar.gz: 9589c40343c33e537a172f2f7473eacb0c2e76cd68bc2718b8795c9400b7e1fa
 SHA512:
-  metadata.gz: 660d690f2e3e458da8f945ce9fbe35e23f095c3144be4364a4cbcaae41f67e8a6e37f7ee81c2b9429349f945fc15d4b968d53c83f9418ea9518d17db8974a30b
-  data.tar.gz: a39d22634dae13029428b91b10ff66016f3945b3ba37d3d484d11897bf43ad86c3c2e7fc4f0993c258a747a0b8475e170aadcabf655d98b482e3692825deb8c5
+  metadata.gz: 3499c0efa7aa62b76a5ad077855b1c8da0c715396ee0979a9c6103a3a8f7b85606558794be63b64c012864c53b915556ae165da6d282af616b6912342689fd0f
+  data.tar.gz: a4d2d9d1d8ec23285c94840934967c37ac7921813c951b8ec0c1e52ed3cb968cd678f080f646c0aa67676596b5abff91e24337820ef67ff10973364223042c4a

data/ChangeLog

@@ -1,3 +1,7 @@
+== 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

data/Gemfile.lock

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

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)
 
         #
@@ -650,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

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.15
+# @version 0.9.16
 #
 
 module Meteor
-  VERSION = "0.9.15"
+  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.15
+  version: 0.9.16
 platform: ruby
 authors:
 - Yasumasa Ashida