meteor 0.9.25 → 0.9.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 972f9396e2d45e6310cbfa0fda64ae798d10e150b7241db77cc07c954aa0a8ce
-  data.tar.gz: 07e9dc8c2e6f4018c3c00c6ed0d68fc2c2393c1daf43977e87fc50d9d063f40e
+  metadata.gz: a6776307290552674dcb55922ddc18ed004c4b79c1176c80ddd9f60ad87b0b1d
+  data.tar.gz: ec1e5797f5e09c537603b7ac67866cd51ab0cbbd80f6dd30074d9e43642b0fb4
 SHA512:
-  metadata.gz: e90da0e028c4cd8c41a81012fa74121c6f68d7ace825b540eea77ae9b7b8e857b99341c5eeba3c1ac0991bff7b743dad90fb406d9d95baa147c94f92cd33b214
-  data.tar.gz: d55c86399dcdaaf6bc11fec20bf25d4ef033e5e731014cb57e80f40b647b25d0ce6dcca84e8f1ac7c222c12142cc09362bd0782cc917c219e04a97ac0cb0df3a
+  metadata.gz: f9b7bdd39d61dc47cf3929eda3a4b9a08399d3b72223b6ac9a392ebce76566b11872bb6a186e73f793fa58e2b897ead3fd2e4aeb3cac08c8a08f3eae5731c9d6
+  data.tar.gz: 940e99265e10e13149cc4fc0bd50732d8ee9b1f3c7a66dfcc2ecf012fc8e7602b016041ae6453b444085dfcdfe97be6fb6f7fc4818050015c06df5872925c5f0

data/ChangeLog

@@ -1,3 +1,7 @@
+== 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.26)
 
 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/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

@@ -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("/")

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.26
 #
 
 module Meteor
-  VERSION = "0.9.25"
+  VERSION = "0.9.26"
 
   # 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.26
 platform: ruby
 authors:
 - Yasumasa Ashida