meteor 0.9.16 → 0.9.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7d47ad0742865e6db6e46f77760be2e297d06801994d8946d5d214b62eabb2c
-  data.tar.gz: 9589c40343c33e537a172f2f7473eacb0c2e76cd68bc2718b8795c9400b7e1fa
+  metadata.gz: 5a115fb12155d38898790a30ed917abe7e22fdac5ce8d4bc76e732e0eb2c4b64
+  data.tar.gz: f673cc5f72f4a3c9c8253d8fee3cb44365894911f9ad4863eb29693d10fe36b2
 SHA512:
-  metadata.gz: 3499c0efa7aa62b76a5ad077855b1c8da0c715396ee0979a9c6103a3a8f7b85606558794be63b64c012864c53b915556ae165da6d282af616b6912342689fd0f
-  data.tar.gz: a4d2d9d1d8ec23285c94840934967c37ac7921813c951b8ec0c1e52ed3cb968cd678f080f646c0aa67676596b5abff91e24337820ef67ff10973364223042c4a
+  metadata.gz: 2fe5a34dc71d3f5f889300653179b98d9c81b87652c1658e95c091b89079f97eeb4e1e8489a4cc037eda6dc935dc6f4d0a8fa56e2b0c04cb26e3dd6780bfda0c
+  data.tar.gz: 2b578499df7e05f249f493ee6646f026655f3eeb6b819e01b0822a8f83256cc6d39410907f0ecb28f62f0a4dedca2bcf9da6b46b9b121cdf496d2232cc4aac70

data/ChangeLog

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    meteor (0.9.16)
+    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

@@ -351,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
@@ -386,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)
 
           # 空要素の場合(<->内容あり要素の場合)
@@ -579,7 +577,6 @@ module Meteor
         private :get_type
 
         def get_attr_value_r(elm, match_p)
-
           @res = match_p.match(elm.attributes)
 
           if @res

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

@@ -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
@@ -137,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 (相対パス)
@@ -209,15 +210,15 @@ module Meteor
     # @param [String] enc character encoding (文字エンコーディング)
     # @return [Meteor::Parser] parser(パーサ)
     #
-    def link_3(type, relative_path, enc)
-      relative_url = path_to_url(relative_path)
-
+    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)
       @cache[relative_url] = ps
     end
 
-    private :link_3
+    private :add_3
 
     #
     # generate parser (パーサを作成する)
@@ -225,15 +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)
-
-      ps = new_parser(type)
-      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 (パーサを作成する)
@@ -241,30 +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)
-
-      ps = new_parser(@type)
-      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)
-
-      ps = new_parser(@type)
-      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)
@@ -289,7 +278,7 @@ module Meteor
       when 1
         parser_1(args[0])
       when 2, 3
-        link(args)
+        add(args)
       end
       # parser_1(key)
     end
@@ -327,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
@@ -357,15 +346,15 @@ module Meteor
     # @param [String] doc document (ドキュメント)
     # @return [Meteor::Parser] parser (パーサ)
     #
-    def link_str_3(type, relative_url, doc)
-      ps = new_parser(@type)
-
-      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 (パーサを作成する)
@@ -373,17 +362,14 @@ module Meteor
     # @param [String] doc document (ドキュメント)
     # @return [Meteor::Parser] parser (パーサ)
     #
-    def link_str_2(relative_url, doc)
-      ps = new_parser(@type)
-
-      ps.document = doc
-      ps.parse
-      @cache[relative_url] = ps
+    def add_str_2(relative_url, doc)
+      add_str_3(@type, relative_url, doc)
     end
 
-    private :link_str_2
+    private :add_str_2
 
-    alias :paraser_str :link_str
+    alias_method :link_str, :add_str
+    alias_method :parser_str, :add_str
 
     def new_parser(type)
       case type
@@ -422,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.16
+# @version 0.9.17
 #
 
 module Meteor
-  VERSION = "0.9.16"
+  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.16
+  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