meteor 0.9.25 → 0.9.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 972f9396e2d45e6310cbfa0fda64ae798d10e150b7241db77cc07c954aa0a8ce
-  data.tar.gz: 07e9dc8c2e6f4018c3c00c6ed0d68fc2c2393c1daf43977e87fc50d9d063f40e
+  metadata.gz: 767fbc8cbdae6e5e7b833b4618639e278d8ed48d9983a629a4d766e8a2b83bc9
+  data.tar.gz: a99c9054bf591fbd5853ac3a4e0fc5d172841fc239941b9dba0425a39b9c922c
 SHA512:
-  metadata.gz: e90da0e028c4cd8c41a81012fa74121c6f68d7ace825b540eea77ae9b7b8e857b99341c5eeba3c1ac0991bff7b743dad90fb406d9d95baa147c94f92cd33b214
-  data.tar.gz: d55c86399dcdaaf6bc11fec20bf25d4ef033e5e731014cb57e80f40b647b25d0ce6dcca84e8f1ac7c222c12142cc09362bd0782cc917c219e04a97ac0cb0df3a
+  metadata.gz: fb1c32cfdc1445b8e2be9270f5e0621806dd5941da921969506adda5eaeb1093e9c4b8f861ab387928ba284e1ae790c2b812089b3fa56fb3ff2f53658104a689
+  data.tar.gz: 1c137770bb6bcb351154798916c251097b2a862e78e7b5d236bbc47fa2aec9fb7f9eaacf2a34a25b7bd8c2fe8fef3d2e9e638bb00aa5f9b3f45a17a595596127

data/ChangeLog

@@ -1,3 +1,11 @@
+== 0.9.27 / 2026-06-30 Yasumasa Ashida <ys.ashida@gmail.com>
+
+* Refactoring
+
+== 0.9.26 / 2026-06-30 Yasumasa Ashida <ys.ashida@gmail.com>
+
+* Refactoring
+
 == 0.9.25 / 2026-06-25 Yasumasa Ashida <ys.ashida@gmail.com>
 
 * Refactoring

data/Gemfile.lock

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

data/lib/meteor/core/kernel.rb

@@ -111,18 +111,22 @@ module Meteor
       # set character encoding (文字エンコーディングをセットする)
       # @param [String] enc character encoding (文字エンコーディング)
       #
-      def character_encoding=(enc)
-        @root.character_encoding = enc
+      def enc=(enc)
+        @root.enc = enc
       end
 
+      alias_method :character_encoding=, :enc=
+
       #
       # get character encoding (文字エンコーディングを取得する)
       # @return [String] character encoding (文字エンコーディング)
       #
-      def character_encoding
-        @root.character_encoding
+      def enc
+        @root.enc
       end
 
+      alias_method :character_encoding, :enc
+
       #
       # get root element (ルート要素を取得する)
       # @return [Meteor::RootElement] root element (ルート要素)
@@ -158,23 +162,25 @@ module Meteor
       #
       def read(file_path, enc)
         # try {
-        @character_encoding = enc
-        # open file (ファイルのオープン)
-        if "UTF-8".eql?(enc)
-          # io = File.open(file_path,"r:" << enc)
-          io = File.open(file_path, "r:UTF-8")
+        self.enc = enc
+        mode = if enc == "UTF-8"
+          # String.new("") << "r:" << enc
+          "r:UTF-8"
         else
-          io = File.open(file_path, String.new("") << "r:" << enc << ":utf-8")
+          String.new("") << "r:" << enc << ":utf-8"
         end
 
+        # open file (ファイルのオープン)
+        io = File.open(file_path, mode)
+
         # load and save (読込及び格納)
         @root.document = io.read
 
-        parse
-
         # close file (ファイルのクローズ)
         io.close
 
+        parse
+
         return @root.document
       end
 
@@ -2148,7 +2154,6 @@ module Meteor
       # private :shadow
 
       def set_mono_info(elm)
-
         @res = @@pattern_set_mono1.match(elm.mixed_content)
 
         if @res
@@ -2164,7 +2169,7 @@ module Meteor
         elsif regex.kind_of?(Array)
           is_match_a(regex, str)
         elsif regex.kind_of?(String)
-          if regex.eql?(str.downcase)
+          if regex == str.downcase
             true
           else
             false
@@ -2189,9 +2194,7 @@ module Meteor
       def is_match_a(regex, str)
         str = str.downcase
         regex.each do |item|
-          if item.eql?(str)
-            return true
-          end
+          return true if item == str
         end
 
         false

data/lib/meteor/element.rb

@@ -112,11 +112,20 @@ module Meteor
     # @param [Meteor::Element] elm element (要素)
     #
     def initialize_e(elm)
+      initialize_2(elm, elm.parser)
+      @usable = true
+    end
+
+    private :initialize_e
+
+    def initialize_2(elm, ps)
+      @parser = ps
       if self.normal
-        self.parser.element(elm)
+        ps.element(elm)
       else
         @name = elm.name
         @attributes = String.new(elm.attributes)
+        @mixed_content = String.new(elm.mixed_content)
         # @pattern = String.new(elm.pattern)
         @pattern = elm.pattern
         @document = String.new(elm.document)
@@ -124,29 +133,11 @@ module Meteor
         @cx = elm.cx
         @mono = elm.mono
         @origin = elm
-        @parser = elm.parser
-        @usable = true
+        # @usable = false
+        elm.copy = self
       end
     end
 
-    private :initialize_e
-
-    def initialize_2(elm, ps)
-      @name = elm.name
-      @attributes = String.new(elm.attributes)
-      @mixed_content = String.new(elm.mixed_content)
-      # @pattern = String.new(elm.pattern)
-      @pattern = elm.pattern
-      @document = String.new(elm.document)
-      @normal = elm.normal
-      @cx = elm.cx
-      @mono = elm.mono
-      @parser = ps
-      # @usable = false
-      @origin = elm
-      elm.copy = self
-    end
-
     private :initialize_2
 
     #

data/lib/meteor/elements.rb

@@ -40,25 +40,26 @@ module Meteor
     end
 
     #
-    # @overload add_str(type, relative_url, doc)
+    # @overload add_template(type, relative_url, doc)
     #  add parser (パーサを追加する)
     #  @param [Integer] type type of parser (パーサ・タイプ)
     #  @param [String] relative_url relative URL (相対URL)
     #  @param [String] doc document (ドキュメント)
     #  @return [Meteor::Parser] parser (パーサ)
-    # @overload add_str(relative_url, doc)
+    # @overload add_template(relative_url, doc)
     #  add parser (パーサを追加する)
     #  @param [String] relative_url relative URL (相対URL)
     #  @param [String] doc document (ドキュメント)
     #  @return [Meteor::Parser] parser (パーサ)
     #
-    def self.add_str(*args)
-      @@pf.add_str(args)
+    def self.add_template(*args)
+      @@pf.add_template(args)
     end
 
     class << self
       alias_method :link, :add
-      alias_method :link_str, :add_str
+      alias_method :add_str, :add_template
+      alias_method :link_str, :add_template
     end
 
     #

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

@@ -493,7 +493,7 @@ module Meteor
             @res = match_p.match(elm.attributes)
 
             if !@res
-              if !"".eql?(elm.attributes) && !"".eql?(elm.attributes.strip)
+              if elm.attributes != "" && elm.attributes.strip != ""
                 elm.attributes = String.new("") << " " << elm.attributes.strip
               else
                 elm.attributes = String.new("")

data/lib/meteor/parsers.rb

@@ -161,17 +161,17 @@ module Meteor
     def add(*args)
       case args.length
       when 1
-        add_1(args[0])
+        add_file_1(args[0])
       when 2
         if args[0].kind_of?(Integer) || args[0].kind_of?(Symbol)
-          add_2_n(args[0], args[1])
+          add_file_2_n(args[0], args[1])
         elsif args[0].kind_of?(String)
-          add_2_s(args[0], args[1])
+          add_file_2_s(args[0], args[1])
         else
           raise ArgumentError
         end
       when 3
-        add_3(args[0], args[1], args[2])
+        add_file_3(args[0], args[1], args[2])
       else
         raise ArgumentError
       end
@@ -190,7 +190,7 @@ module Meteor
       if paths.length == 1
         return File.basename(paths[0], ".*")
       else
-        if ".".eql?(paths[0])
+        if paths[0] == "."
           paths.delete_at(0)
           paths[paths.length - 1] = File.basename(paths[paths.length - 1], ".*")
           return String.new("") << "/" << paths.join("/")
@@ -210,7 +210,7 @@ module Meteor
     # @param [String] enc character encoding (文字エンコーディング)
     # @return [Meteor::Parser] parser(パーサ)
     #
-    def add_3(type, relative_path, enc = "UTF-8")
+    def add_file_3(type, relative_path, enc = "UTF-8")
       ps = new_parser(type)
       ps.read(File.expand_path(relative_path, @root), enc)
 
@@ -218,7 +218,7 @@ module Meteor
       @cache[relative_url] = ps
     end
 
-    private :add_3
+    private :add_file_3
 
     #
     # add parser (パーサを追加する)
@@ -226,11 +226,11 @@ module Meteor
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @return [Meteor::Parser] parser (パーサ)
     #
-    def add_2_n(type, relative_path)
-      add_3(type, relative_path, @enc)
+    def add_file_2_n(type, relative_path)
+      add_file_3(type, relative_path, @enc)
     end
 
-    private :add_2_n
+    private :add_file_2_n
 
     #
     # add parser (パーサを追加する)
@@ -238,22 +238,79 @@ module Meteor
     # @param [String] enc character encoding (文字エンコーディング)
     # @return [Meteor::Parser] parser (パーサ)
     #
-    def add_2_s(relative_path, enc)
-      add_3(@type, relative_path, enc)
+    def add_file_2_s(relative_path, enc)
+      add_file_3(@type, relative_path, enc)
     end
 
-    private :add_2_s
+    private :add_file_2_s
 
     #
     # add parser (パーサを追加する)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @return [Meteor::Parser] parser (パーサ)
     #
-    def add_1(relative_path)
-      add_3(@type, relative_path, @enc)
+    def add_file_1(relative_path)
+      add_file_3(@type, relative_path, @enc)
     end
 
-    private :add_1
+    private :add_file_1
+
+    #
+    # @overload add_template(type, relative_url, doc)
+    #  add parser (パーサを追加する)
+    #  @param [Integer,Symbol] type type of parser (パーサ・タイプ)
+    #  @param [String] relative_url relative URL (相対URL)
+    #  @param [String] doc document (ドキュメント)
+    #  @return [Meteor::Parser] parser (パーサ)
+    # @overload add_template(relative_url, doc)
+    #  add parser (パーサを追加する)
+    #  @param [String] relative_url relative URL (相対URL)
+    #  @param [String] doc document (ドキュメント)
+    #  @return [Meteor::Parser] parser (パーサ)
+    #
+    def add_template(*args)
+      case args.length
+      when 2
+        add_template_2(args[0], args[1])
+      when 3
+        add_template_3(args[0], args[1], args[2])
+      else
+        raise ArgumentError
+      end
+    end
+
+    #
+    # add parser (パーサを追加する)
+    # @param [Integer,Symbol] type type of parser (パーサ・タイプ)
+    # @param [String] relative_url relative URL (相対URL)
+    # @param [String] doc document (ドキュメント)
+    # @return [Meteor::Parser] parser (パーサ)
+    #
+    def add_template_3(type, relative_url, doc)
+      ps = new_parser(type)
+      ps.document = doc
+      ps.parse
+
+      @cache[relative_url] = ps
+    end
+
+    private :add_template_3
+
+    #
+    # add parser (パーサを追加する)
+    # @param [String] relative_url relative URL (相対URL)
+    # @param [String] doc document (ドキュメント)
+    # @return [Meteor::Parser] parser (パーサ)
+    #
+    def add_template_2(relative_url, doc)
+      add_template_3(@type, relative_url, doc)
+    end
+
+    private :add_template_2
+
+    alias_method :link_str, :add_template
+    alias_method :add_str, :add_template
+    alias_method :parser_str, :add_template
 
     #
     #@overload parser(key)
@@ -315,62 +372,6 @@ module Meteor
       parser_1(key).root_element
     end
 
-    #
-    # @overload add_str(type, relative_url, doc)
-    #  add parser (パーサを追加する)
-    #  @param [Integer] type type of parser (パーサ・タイプ)
-    #  @param [String] relative_url relative URL (相対URL)
-    #  @param [String] doc document (ドキュメント)
-    #  @return [Meteor::Parser] parser (パーサ)
-    # @overload add_str(relative_url, doc)
-    #  add parser (パーサを追加する)
-    #  @param [String] relative_url relative URL (相対URL)
-    #  @param [String] doc document (ドキュメント)
-    #  @return [Meteor::Parser] parser (パーサ)
-    #
-    def add_str(*args)
-      case args.length
-      when 2
-        add_str_2(args[0], args[1])
-      when 3
-        add_str_3(args[0], args[1], args[2])
-      else
-        raise ArgumentError
-      end
-    end
-
-    #
-    # add parser (パーサを追加する)
-    # @param [Integer,Symbol] type type of parser (パーサ・タイプ)
-    # @param [String] relative_url relative URL (相対URL)
-    # @param [String] doc document (ドキュメント)
-    # @return [Meteor::Parser] parser (パーサ)
-    #
-    def add_str_3(type, relative_url, doc)
-      ps = new_parser(type)
-      ps.document = doc
-      ps.parse
-
-      @cache[relative_url] = ps
-    end
-
-    private :add_str_3
-
-    #
-    # add parser (パーサを追加する)
-    # @param [String] relative_url relative URL (相対URL)
-    # @param [String] doc document (ドキュメント)
-    # @return [Meteor::Parser] parser (パーサ)
-    #
-    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

data/lib/meteor/root_element.rb

@@ -11,14 +11,17 @@ module Meteor
   #  @return [String] newline (改行コード)
   # @!attribute [rw] charset
   #  @return [String] charset (文字コード)
-  # @!attribute [rw] character_encoding
+  # @!attribute [rw] enc
   #  @return [String] character encoding (文字エンコーディング)
   #
   class RootElement < Element
     attr_accessor :content_type
     attr_accessor :kaigyo_code
     attr_accessor :charset
-    attr_accessor :character_encoding
+    attr_accessor :enc
     # attr_accessor :document #[String] document (ドキュメント)
+
+    alias_method :character_encoding, :enc
+    alias_method :character_encoding=, :enc=
   end
 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.25
+# @version 0.9.27
 #
 
 module Meteor
-  VERSION = "0.9.25"
+  VERSION = "0.9.27"
 
   # require 'fileutils'
 

metadata

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