meteor 0.9.15 → 0.9.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6586cbfb631f019d21e7c7b9e900452d2611b9afefcf0ac38bd9e7f004224f6
-  data.tar.gz: 6a8872a716c23859f82070db908b1097cd8d0424b9ad5d8ce989896680eaf5e9
+  metadata.gz: 5a115fb12155d38898790a30ed917abe7e22fdac5ce8d4bc76e732e0eb2c4b64
+  data.tar.gz: f673cc5f72f4a3c9c8253d8fee3cb44365894911f9ad4863eb29693d10fe36b2
 SHA512:
-  metadata.gz: 660d690f2e3e458da8f945ce9fbe35e23f095c3144be4364a4cbcaae41f67e8a6e37f7ee81c2b9429349f945fc15d4b968d53c83f9418ea9518d17db8974a30b
-  data.tar.gz: a39d22634dae13029428b91b10ff66016f3945b3ba37d3d484d11897bf43ad86c3c2e7fc4f0993c258a747a0b8475e170aadcabf655d98b482e3692825deb8c5
+  metadata.gz: 2fe5a34dc71d3f5f889300653179b98d9c81b87652c1658e95c091b89079f97eeb4e1e8489a4cc037eda6dc935dc6f4d0a8fa56e2b0c04cb26e3dd6780bfda0c
+  data.tar.gz: 2b578499df7e05f249f493ee6646f026655f3eeb6b819e01b0822a8f83256cc6d39410907f0ecb28f62f0a4dedca2bcf9da6b46b9b121cdf496d2232cc4aac70

data/ChangeLog

@@ -1,3 +1,11 @@
+== 0.9.17 / 2026-06-19 Yasumasa Ashida <ys.ashida@gmail.com>
+
+* Refactoring
+
+== 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.17)
 
 GEM
   remote: https://rubygems.org/

data/demo/html.rb

@@ -5,8 +5,8 @@
 # require 'rubygems'
 require "meteor"
 
-Meteor::ElementFactory.link(:html, "ml/sample_html.html", "UTF-8")
-root = Meteor::ElementFactory.element("/ml/sample_html")
+Meteor::Elements.add(:html, "ml/sample_html.html", "UTF-8")
+root = Meteor::Elements.get("/ml/sample_html")
 
 start_time = Time.new.to_f
 

data/demo/html4.rb

@@ -5,11 +5,11 @@
 # require 'rubygems'
 require "meteor"
 
-# Meteor::ElementFactory.link(:html4,'ml/sample_4.html', 'UTF-8')
-Meteor::ElementFactory.options = {type: :html4}
-Meteor::ElementFactory.link("ml/sample_html4.html")
+# Meteor::Elements.add(:html4,'ml/sample_4.html', 'UTF-8')
+Meteor::Elements.options = {type: :html4}
+Meteor::Elements.add("ml/sample_html4.html")
 
-root = Meteor::ElementFactory.element("/ml/sample_html4")
+root = Meteor::Elements.get("/ml/sample_html4")
 
 start_time = Time.new.to_f
 

data/demo/xhtml.rb

@@ -5,8 +5,8 @@
 # require 'rubygems'
 require "meteor"
 
-Meteor::ElementFactory.link(:xhtml, "ml/sample_xhtml.html", "UTF-8")
-root = Meteor::ElementFactory.element("/ml/sample_xhtml")
+Meteor::Elements.add(:xhtml, "ml/sample_xhtml.html", "UTF-8")
+root = Meteor::Elements.get("/ml/sample_xhtml")
 
 startTime = Time.new.to_f
 

data/demo/xhtml4.rb

@@ -5,8 +5,8 @@
 # require 'rubygems'
 require "meteor"
 
-Meteor::ElementFactory.link(:xhtml4, "ml/sample_xhtml4.html", "UTF-8")
-root = Meteor::ElementFactory.element("/ml/sample_xhtml4")
+Meteor::Elements.add(:xhtml4, "ml/sample_xhtml4.html", "UTF-8")
+root = Meteor::Elements.get("/ml/sample_xhtml4")
 
 startTime = Time.new.to_f
 

data/demo/xml.rb

@@ -5,8 +5,8 @@
 # require 'rubygems'
 require "meteor"
 
-Meteor::ElementFactory.link(Meteor::XML, "ml/sample.xml", "UTF-8")
-root = Meteor::ElementFactory.element("/ml/sample")
+Meteor::Elements.add(Meteor::XML, "ml/sample.xml", "UTF-8")
+root = Meteor::Elements.get("/ml/sample")
 
 start_time = Time.new.to_f
 

data/lib/meteor/core/kernel.rb

@@ -463,7 +463,6 @@ module Meteor
           @elm_.empty = true
 
           @elm_.parser = self
-
         when FIVE
           # element (要素)
           @elm_ = Meteor::Element.new(name)
@@ -596,7 +595,6 @@ module Meteor
       # @return [Meteor::Element] element (要素)
       #
       def element_2(attr_name, attr_value)
-
         quote_attribute(attr_name, attr_value)
 
         element_pattern_2
@@ -613,7 +611,6 @@ module Meteor
 
           @elm_ = nil
         end
-        #=end
 
 =begin
         @pattern_cc_1 = "<([^<>\"]*)(\\s[^<>]*#{@_attr_name}=\"#{@_attr_value}\"[^<>]*)\\/>|<([^<>\"]*)(\\s[^<>]*#{@_attr_name}=\"#{@_attr_value}\"[^<>]*)>(((?!(\\3[^<>]*>)).)*)<\\/\\3>"
@@ -1056,7 +1053,6 @@ module Meteor
       # @return [Meteor::Element] element (要素)
       #
       def element_4(attr_name1, attr_value1, attr_name2, attr_value2)
-
         quote_element_4(attr_name1, attr_value1, attr_name2, attr_value2)
 
         element_pattern_4
@@ -1792,7 +1788,6 @@ module Meteor
       # @return [Meteor::Element] element (要素)
       #
       def set_content_3(elm, content, entity_ref = true)
-
         if entity_ref || !elm.raw_content
           escape_content(content, elm)
         end

data/lib/meteor/{element_factory.rb → elements.rb}

@@ -3,10 +3,10 @@
 
 module Meteor
   #
-  # Element Factory Class (要素ファクトリ クラス)
+  # Elements Class (要素ファクトリ クラス)
   #
-  class ElementFactory
-    @@pf = Meteor::ParserFactory.new
+  class Elements
+    @@pf = Meteor::Parsers.new
 
     #
     # set options (オプションをセットする)
@@ -23,37 +23,42 @@ module Meteor
     end
 
     #
-    #@overload link(type,relative_path,enc)
+    #@overload add(type,relative_path,enc)
     # generate parser (パーサを作成する)
     # @param [Fixnum] type type of parser (パーサ・タイプ)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @param [String] enc character encoding (エンコーディング)
     # @return [Meteor::Parser] parser (パーサ)
-    #@overload link(type,relative_path)
+    #@overload add(type,relative_path)
     # generate parser (パーサを作成する)
     # @param [Fixnum] type type of parser (パーサ・タイプ)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @return [Meteor::Parser] parser (パーサ)
     #
-    def self.link(*args)
-      @@pf.link(*args)
+    def self.add(*args)
+      @@pf.add(*args)
     end
 
     #
-    # @overload link_str(type, relative_url, doc)
+    # @overload add_str(type, relative_url, doc)
     #  generate parser (パーサを作成する)
     #  @param [Fixnum] type type of parser (パーサ・タイプ)
     #  @param [String] relative_url relative URL (相対URL)
     #  @param [String] doc document (ドキュメント)
     #  @return [Meteor::Parser] parser (パーサ)
-    # @overload link_str(relative_url, doc)
+    # @overload add_str(relative_url, doc)
     #  generate parser (パーサを作成する)
     #  @param [String] relative_url relative URL (相対URL)
     #  @param [String] doc document (ドキュメント)
     #  @return [Meteor::Parser] parser (パーサ)
     #
-    def self.link_str(*args)
-      @@pf.link_str(args)
+    def self.add_str(*args)
+      @@pf.add_str(args)
+    end
+
+    class << self
+      alias_method :link, :add
+      alias_method :link_str, :add_str
     end
 
     #
@@ -61,8 +66,17 @@ module Meteor
     # @param [String,Symbol] key identifier (キー)
     # @return [Meteor::RootElement] root element (ルート要素)
     #
-    def self.element(key)
+    def self.get(key)
       @@pf.element(key)
     end
+
+    class << self
+      alias_method :element, :get
+    end
   end
+
+  #
+  # Elements Class (要素ファクトリ クラス)
+  #
+  Elements = Elements
 end

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)
 
         #
@@ -350,7 +351,6 @@ module Meteor
         # @return [Meteor::Element] element (要素)
         #
         def element_2(attr_name, attr_value)
-
           quote_attribute(attr_name, attr_value)
 
           # @pattern_cc = String.new('') << '<([^<>"]*)\\s[^<>]*' << @_attr_name << '="' << @_attr_value
@@ -385,7 +385,6 @@ module Meteor
         # @return [Meteor::Element] element (要素)
         #
         def element_5(name, attr_name1, attr_value1, attr_name2, attr_value2)
-
           quote_element_5(name, attr_name1, attr_value1, attr_name2, attr_value2)
 
           # 空要素の場合(<->内容あり要素の場合)
@@ -578,7 +577,6 @@ module Meteor
         private :get_type
 
         def get_attr_value_r(elm, match_p)
-
           @res = match_p.match(elm.attributes)
 
           if @res
@@ -650,14 +648,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
@@ -51,8 +51,6 @@ module Meteor
         # end
         #
         # private :initialize_0
-        #
-        # private :initialize_0
 
         #
         # initializer (イニシャライザ)

data/lib/meteor/{parser_factory.rb → parsers.rb}

@@ -12,7 +12,7 @@ module Meteor
   # @!attribute [rw] enc
   #  @return [String] default character encoding (デフォルトエンコーディング)
   #
-  class ParserFactory
+  class Parsers
     attr_accessor :type
     attr_accessor :root
     attr_accessor :enc
@@ -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
@@ -141,47 +137,48 @@ module Meteor
     end
 
     #
-    #@overload link(relative_path,enc)
+    #@overload add(relative_path,enc)
     # generate parser (パーサを作成する)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @param [String] enc character encoding (文字エンコーディング)
     # @return [Meteor::Parser] parser (パーサ)
-    #@overload link(relative_path)
+    #@overload add(relative_path)
     # generate parser (パーサを作成する)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @return [Meteor::Parser] parser (パーサ)
-    #@overload link(type,relative_path,enc)
+    #@overload add(type,relative_path,enc)
     # generate parser (パーサを作成する)
     # @param [Fixnum,Symbol] type type of parser (パーサ・タイプ)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @param [String] enc character encoding (文字エンコーディング)
     # @return [Meteor::Parser] parser (パーサ)
-    #@overload link(type,relative_path)
+    #@overload add(type,relative_path)
     # generate parser (パーサを作成する)
     # @param [Fixnum,Symbol] type type of parser (パーサ・タイプ)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @return [Meteor::Parser] parser (パーサ)
     #
-    def link(*args)
+    def add(*args)
       case args.length
       when 1
-        link_1(args[0])
+        add_1(args[0])
       when 2
         if args[0].kind_of?(Fixnum) || args[0].kind_of?(Symbol)
-          link_2_n(args[0], args[1])
+          add_2_n(args[0], args[1])
         elsif args[0].kind_of?(String)
-          link_2_s(args[0], args[1])
+          add_2_s(args[0], args[1])
         else
           raise ArgumentError
         end
-
       when 3
-        link_3(args[0], args[1], args[2])
+        add_3(args[0], args[1], args[2])
       else
         raise ArgumentError
       end
     end
 
+    alias_method :link, :add
+
     #
     # change relative path to relative url (相対パスを相対URLにする)
     # @param [String] path relative path (相対パス)
@@ -213,35 +210,15 @@ module Meteor
     # @param [String] enc character encoding (文字エンコーディング)
     # @return [Meteor::Parser] parser(パーサ)
     #
-    def link_3(type, relative_path, enc)
+    def add_3(type, relative_path, enc = "UTF-8")
+      ps = new_parser(type)
+      ps.read(File.expand_path(relative_path, @root), 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
+      @cache[relative_url] = ps
     end
 
-    private :link_3
+    private :add_3
 
     #
     # generate parser (パーサを作成する)
@@ -249,28 +226,11 @@ module Meteor
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @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.read(File.expand_path(relative_path, @root), @enc)
-      @cache[relative_url] = ps
+    def add_2_n(type, relative_path)
+      add_3(type, relative_path, @enc)
     end
 
-    private :link_2_n
+    private :add_2_n
 
     #
     # generate parser (パーサを作成する)
@@ -278,58 +238,22 @@ module Meteor
     # @param [String] enc character encoding (文字エンコーディング)
     # @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.read(File.expand_path(relative_path, @root), enc)
-      @cache[relative_url] = ps
+    def add_2_s(relative_path, enc)
+      add_3(@type, relative_path, enc)
     end
 
-    private :link_2_s
+    private :add_2_s
 
     #
     # generate parser (パーサを作成する)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @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.read(File.expand_path(relative_path, @root), @enc)
-      @cache[relative_url] = ps
+    def add_1(relative_path)
+      add_3(@type, relative_path, @enc)
     end
 
-    private :link_1
+    private :add_1
 
     #
     #@overload parser(key)
@@ -354,7 +278,7 @@ module Meteor
       when 1
         parser_1(args[0])
       when 2, 3
-        link(args)
+        add(args)
       end
       # parser_1(key)
     end
@@ -392,24 +316,24 @@ module Meteor
     end
 
     #
-    # @overload link_str(type, relative_url, doc)
+    # @overload add_str(type, relative_url, doc)
     #  generate parser (パーサを作成する)
     #  @param [Fixnum] type type of parser (パーサ・タイプ)
     #  @param [String] relative_url relative URL (相対URL)
     #  @param [String] doc document (ドキュメント)
     #  @return [Meteor::Parser] parser (パーサ)
-    # @overload link_str(relative_url, doc)
+    # @overload add_str(relative_url, doc)
     #  generate parser (パーサを作成する)
     #  @param [String] relative_url relative URL (相対URL)
     #  @param [String] doc document (ドキュメント)
     #  @return [Meteor::Parser] parser (パーサ)
     #
-    def link_str(*args)
+    def add_str(*args)
       case args.length
       when 2
-        link_str_2(args[0], args[1])
+        add_str_2(args[0], args[1])
       when 3
-        link_str_3(args[0], args[1], args[2])
+        add_str_3(args[0], args[1], args[2])
       else
         raise ArgumentError
       end
@@ -422,26 +346,15 @@ module Meteor
     # @param [String] doc document (ドキュメント)
     # @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.dcument = doc
+    def add_str_3(type, relative_url, doc)
+      ps = new_parser(type)
+      ps.document = doc
       ps.parse
+
       @cache[relative_url] = ps
     end
 
-    private :link_str_3
+    private :add_str_3
 
     #
     # generate parser (パーサを作成する)
@@ -449,28 +362,33 @@ module Meteor
     # @param [String] doc document (ドキュメント)
     # @return [Meteor::Parser] parser (パーサ)
     #
-    def link_str_2(relative_url, doc)
-      case @type
+    def add_str_2(relative_url, doc)
+      add_str_3(@type, relative_url, doc)
+    end
+
+    private :add_str_2
+
+    alias_method :link_str, :add_str
+    alias_method :parser_str, :add_str
+
+    def new_parser(type)
+      case type
       when Parser::HTML, :html
-        ps = Meteor::Ml::Html::ParserImpl.new
+        Meteor::Ml::Html::ParserImpl.new
       when Parser::XML, :xml
-        ps = Meteor::Ml::Xml::ParserImpl.new
+        Meteor::Ml::Xml::ParserImpl.new
       when Parser::XHTML, :xhtml
-        ps = Meteor::Ml::Xhtml::ParserImpl.new
+        Meteor::Ml::Xhtml::ParserImpl.new
       when Parser::HTML4, :html4
-        ps = Meteor::Ml::Html4::ParserImpl.new
+        Meteor::Ml::Html4::ParserImpl.new
       when Parser::XHTML4, :xhtml4
-        ps = Meteor::Ml::Xhtml4::ParserImpl.new
+        Meteor::Ml::Xhtml4::ParserImpl.new
+      else
+        raise ArgumentError
       end
-
-      ps.document = doc
-      ps.parse
-      @cache[relative_url] = ps
     end
 
-    private :link_str_2
-
-    alias :paraser_str :link_str
+    private :new_parser
 
     #
     # set parser (パーサをセットする)
@@ -490,4 +408,9 @@ module Meteor
       self.parser(key)
     end
   end
+
+  #
+  # Parser Factory Class (パーサ・ファクトリ クラス)
+  #
+  ParserFactory = Parsers
 end

data/lib/meteor.rb

@@ -6,8 +6,8 @@ require "meteor/root_element"
 require "meteor/attribute"
 require "meteor/attribute_map"
 require "meteor/parser"
-require "meteor/parser_factory"
-require "meteor/element_factory"
+require "meteor/parsers"
+require "meteor/elements"
 require "meteor/exception/no_such_element_exception"
 require "meteor/core/kernel"
 require "meteor/core/util/pattern_cache"
@@ -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.17
 #
 
 module Meteor
-  VERSION = "0.9.15"
+  VERSION = "0.9.17"
 
   # 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.17
 platform: ruby
 authors:
 - Yasumasa Ashida
@@ -51,7 +51,7 @@ files:
 - lib/meteor/core/kernel.rb
 - lib/meteor/core/util/pattern_cache.rb
 - lib/meteor/element.rb
-- lib/meteor/element_factory.rb
+- lib/meteor/elements.rb
 - lib/meteor/exception/no_such_element_exception.rb
 - lib/meteor/ml/html/parser_impl.rb
 - lib/meteor/ml/html4/parser_impl.rb
@@ -59,7 +59,7 @@ files:
 - lib/meteor/ml/xhtml4/parser_impl.rb
 - lib/meteor/ml/xml/parser_impl.rb
 - lib/meteor/parser.rb
-- lib/meteor/parser_factory.rb
+- lib/meteor/parsers.rb
 - lib/meteor/root_element.rb
 - meteor.gemspec
 - test/meteor_test.rb