meteor 0.9.28 → 0.9.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8abad2437009e72eb2f0571fbe405d78fb5493741b3d6a5c5f4bbfc42f249545
-  data.tar.gz: ae69dac0b5737134cc268b0a33ac5a18f2fb5d9d9e4f71bef2450746a19e01d0
+  metadata.gz: 50c95ae971722d36e7d3e198d73f043fd44e65be5f7fc0ccd437d813d6a172e0
+  data.tar.gz: 6797ee8ac69369f4dd2b5b369bddded751bc6feb9d039c03a0346903bc417543
 SHA512:
-  metadata.gz: b4089dca4e619355fd4de6d084cc74b442ab5d4f1febe7f8bae22614288e127bfaed101e9f7b1fd069b8bd7dc268caa9ed958bf78b0c502ad703d835a185d47d
-  data.tar.gz: b6819a02186ed3d48d1ae903a64ec1497253eeb45248d735f37705b9e7c7859702f3874f602f55d17de9118f0d96e47f61b9499ccf05a109c29020a4b254b623
+  metadata.gz: 9015aa8aa74e4dc6684196694c1af631bda8f2cf809f8c4012d92609d5d33aa3e8b9945cd8374fe6ffe1825a01925f148ed85c7af783b7888ef5dff851a3dc65
+  data.tar.gz: 2ce12093acf7b2dff79106714bc912318a287dc31b196f9a79e6bddaebebda2bc31ce7851e10e9a976c565dffdcbddde38bcbc1aae3b284a4fc8e2b9c7438ef2

data/ChangeLog

@@ -1,3 +1,11 @@
+== 0.9.30 / 2026-07-02 Yasumasa Ashida <ys.ashida@gmail.com>
+
+* Refactor Meteor::Core::Util::PatternCache
+
+== 0.9.29 / 2026-07-02 Yasumasa Ashida <ys.ashida@gmail.com>
+
+* Refactor Meteor::RootElement
+
 == 0.9.28 / 2026-07-01 Yasumasa Ashida <ys.ashida@gmail.com>
 
 * Fix Meteor::Elements

data/Gemfile.lock

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

data/lib/meteor/core/kernel.rb

@@ -1581,7 +1581,7 @@ module Meteor
         # attribute search (属性検索)
         # @res = @pattern.match(elm.attributes)
 
-        #  (検索対象属性の存在判定)
+        # Attribute existence check (属性の存在判定)
         if elm.attributes.include?(String.new(" ") << attr_name << "=\"")
           @_attr_value = attr_value
 
@@ -2068,7 +2068,7 @@ module Meteor
               self.document_hook <<
                 "<!-- @#{self.element_hook.name} #{self.element_hook.attributes}-->#{self.element_hook.mixed_content}<!-- /@#{self.element_hook.name} -->"
 
-              # self.document_hook << @root.kaigyo_code << "<!-- @#{self.element_hook.name} #{self.element_hook.attributes}-->#{self.element_hook.mixed_content}<!-- /@#{self.element_hook.name} -->"
+              # self.document_hook << @root.newline << "<!-- @#{self.element_hook.name} #{self.element_hook.attributes}-->#{self.element_hook.mixed_content}<!-- /@#{self.element_hook.name} -->"
             else
               # @root.hookDocument << "<" << @root.element.name
               # @root.hookDocument << @root.element.attributes << '>' << @root.element.mixed_content
@@ -2076,7 +2076,7 @@ module Meteor
               self.document_hook <<
                 "<#{self.element_hook.name}#{self.element_hook.attributes}>#{self.element_hook.mixed_content}</#{self.element_hook.name}>"
 
-              # self.document_hook << @root.kaigyo_code << "<#{self.element_hook.name}#{self.element_hook.attributes}>#{self.element_hook.mixed_content}</#{self.element_hook.name}>"
+              # self.document_hook << @root.newline << "<#{self.element_hook.name}#{self.element_hook.attributes}>#{self.element_hook.mixed_content}</#{self.element_hook.name}>"
             end
 
             self.element_hook = self.element_hook.origin.clone(self)
@@ -2092,7 +2092,7 @@ module Meteor
               self.document_hook <<
                 "<!-- @#{self.element_hook.name} #{@_attributes}-->#{@root.document}<!-- /@#{self.element_hook.name} -->"
 
-              # self.document_hook << @root.kaigyo_code << "<!-- @#{self.element_hook.name} #{@_attributes}-->#{@root.document}<!-- /@#{self.element_hook.name} -->"
+              # self.document_hook << @root.newline << "<!-- @#{self.element_hook.name} #{@_attributes}-->#{@root.document}<!-- /@#{self.element_hook.name} -->"
             else
               # @root.hookDocument << "<" << @root.element.name
               # @root.hookDocument << @_attributes << '>' << @root.document
@@ -2100,7 +2100,7 @@ module Meteor
               self.document_hook <<
                 "<#{self.element_hook.name}#{@_attributes}>#{@root.document}</#{self.element_hook.name}>"
 
-              # self.document_hook << @root.kaigyo_code << "<#{self.element_hook.name}#{@_attributes}>#{@root.document}</#{self.element_hook.name}>"
+              # self.document_hook << @root.newline << "<#{self.element_hook.name}#{@_attributes}>#{@root.document}</#{self.element_hook.name}>"
             end
 
             self.element_hook = self.element_hook.origin.clone(self)
@@ -2145,7 +2145,7 @@ module Meteor
             pif2.root_element.document = String.new(elm.document)
           end
 
-          pif2.root_element.kaigyo_code = elm.parser.root_element.kaigyo_code
+          pif2.root_element.newline = elm.parser.root_element.newline
 
           @elm_
         end
@@ -2261,7 +2261,7 @@ module Meteor
       def br_to_newline(content)
         if (elm.cx || !is_match(@@match_tag_2, elm.name)) && content.include?(BR)
           # 「<br>」->「¥r?¥n」
-          content.gsub!(@@pattern_br_2, @root.kaigyo_code)
+          content.gsub!(@@pattern_br_2, @root.newline)
         end
       end
 

data/lib/meteor/core/util/pattern_cache.rb

@@ -29,79 +29,45 @@ module Meteor
         def self.get(*args)
           case args.length
           when ONE
-            # get_1(args[0])
-            if @@regex_cache[args[0].to_sym]
-              @@regex_cache[args[0].to_sym]
-            else
-              @@regex_cache[args[0].to_sym] = Regexp.new(args[0], Regexp::MULTILINE)
-            end
-
+            get_1(args[0])
           when TWO
-            # get_2(args[0], args[1])
-            if @@regex_cache[args[0].to_sym]
-              @@regex_cache[args[0].to_sym]
-            else
-              @@regex_cache[args[0].to_sym] = Regexp.new(args[0], args[1])
-            end
+            get_2(args[0], args[1])
           else
             raise ArgumentError
           end
         end
 
-        ##
-        ## get pattern (パターンを取得する)
-        ## @param [String] regex regular expression (正規表現)
-        ## @return [Regexp] pattern (パターン)
-        ##
-        # def self.get_1(regex)
-        #  ## pattern = @@regex_cache[regex]
-        #  ##
-        #  ## if pattern == nil
-        #  # if regex.kind_of?(String)
-        #  if !@@regex_cache[regex.to_sym]
-        #    # pattern = Regexp.new(regex)
-        #    # @@regex_cache[regex] = pattern
-        #    @@regex_cache[regex.to_sym] = Regexp.new(regex, Regexp::MULTILINE)
-        #  end
         #
-        #  # return pattern
-        #  @@regex_cache[regex.to_sym]
-        #  ## elsif regex.kind_of?(Symbol)
-        #  ##  if !@@regex_cache[regex]
-        #  ##    @@regex_cache[regex.object_id] = Regexp.new(regex.to_s, Regexp::MULTILINE)
-        #  ##  end
-        #  ##
-        #  ##  @@regex_cache[regex]
-        #  # end
-        # end
+        # get pattern (パターンを取得する)
+        # @param [String] regex regular expression (正規表現)
+        # @return [Regexp] pattern (パターン)
+        #
+        def self.get_1(regex)
+          if @@regex_cache[regex.to_sym]
+            @@regex_cache[regex.to_sym]
+          else
+            @@regex_cache[regex.to_sym] = Regexp.new(regex, Regexp::MULTILINE)
+          end
+        end
 
-        ##
-        ## get pattern (パターンを取得する)
-        ## @param [String] regex (正規表現)
-        ## @param [Integer] option (オプション)
-        ## @return [Regexp] psttern (パターン)
-        ##
-        # def self.get_2(regex, option)
-        #  ## pattern = @@regex_cache[regex]
-        #  ##
-        #  ## if pattern == nil
-        #  # if regex.kind_of?(String)
-        #  if !@@regex_cache[regex.to_sym]
-        #    # pattern = Regexp.new(regex)
-        #    # @@regex_cache[regex] = pattern
-        #    @@regex_cache[regex.to_sym] = Regexp.new(regex, option,"UTF-8")
-        #  end
         #
-        #  # return pattern
-        #  @@regex_cache[regex.to_sym]
-        #  ## elsif regex.kind_of?(Symbol)
-        #  ##  if !@@regex_cache[regex]
-        #  ##    @@regex_cache[regex] = Regexp.new(regex.to_s, option,"UTF-8")
-        #  ##  end
-        #  ##
-        #  ##  @@regex_cache[regex]
-        #  # end
-        # end
+        # get pattern (パターンを取得する)
+        # @param [String] regex (正規表現)
+        # @param [Integer] option (オプション)
+        # @return [Regexp] psttern (パターン)
+        #
+        def self.get_2(regex, option)
+          if @@regex_cache[regex.to_sym]
+            @@regex_cache[regex.to_sym]
+          else
+            @@regex_cache[regex.to_sym] = Regexp.new(regex, option)
+          end
+        end
+
+        class << self
+          private :get_1
+          private :get_2
+        end
       end
     end
   end

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

@@ -87,7 +87,7 @@ module Meteor
           self.document_hook = String.new(ps.document_hook)
           @root.content_type = String.new(ps.root_element.content_type)
           @root.charset = ps.root_element.charset
-          @root.kaigyo_code = ps.root_element.kaigyo_code
+          @root.newline = ps.root_element.newline
         end
 
         private :initialize_1

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

@@ -107,7 +107,7 @@ module Meteor
           self.document_hook = String.new(ps.document_hook)
           @root.content_type = String.new(ps.root_element.content_type)
           @root.charset = ps.root_element.charset
-          @root.kaigyo_code = ps.root_element.kaigyo_code
+          @root.newline = ps.root_element.newline
         end
 
         private :initialize_1
@@ -171,8 +171,8 @@ module Meteor
         def analyze_newline
           for a in KAIGYO_CODE
             if @root.document.include?(a)
-              @root.kaigyo_code = a
-              # puts "kaigyo:" << @root.kaigyo_code
+              @root.newline = a
+              # puts "kaigyo:" << @root.newline
             end
           end
         end

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

@@ -63,7 +63,7 @@ module Meteor
           self.document_hook = String.new(ps.document_hook)
           @root.content_type = String.new(ps.root_element.content_type)
           @root.charset = ps.root_element.charset
-          @root.kaigyo_code = ps.root_element.kaigyo_code
+          @root.newline = ps.root_element.newline
         end
 
         private :initialize_1

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

@@ -103,7 +103,7 @@ module Meteor
           self.document_hook = String.new(ps.document_hook)
           @root.content_type = String.new(ps.root_element.content_type)
           @root.charset = ps.root_element.charset
-          @root.kaigyo_code = ps.root_element.kaigyo_code
+          @root.newline = ps.root_element.newline
         end
 
         private :initialize_1
@@ -166,7 +166,7 @@ module Meteor
         def analyze_newline
           for a in KAIGYO_CODE
             if @root.document.include?(a)
-              @root.kaigyo_code = a
+              @root.newline = a
             end
           end
         end

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

@@ -60,7 +60,7 @@ module Meteor
           @root.document = String.new(ps.document)
           ps.document_hook = String.new(ps.document_hook)
           @root.content_type = String.new(ps.root_element.content_type)
-          @root.kaigyo_code = ps.root_element.kaigyo_code
+          @root.newline = ps.root_element.newline
         end
 
         private :initialize_1
@@ -98,8 +98,8 @@ module Meteor
         def analyze_newline
           for a in KAIGYO_CODE
             if @root.document.include?(a)
-              @root.kaigyo_code = a
-              # puts "kaigyo:" << @root.kaigyo_code
+              @root.newline = a
+              # puts "kaigyo:" << @root.newline
             end
           end
         end

data/lib/meteor/root_element.rb

@@ -7,7 +7,7 @@ module Meteor
   #
   # @!attribute [rw] content_type
   #  @return [String] content type (コンテントタイプ)
-  # @!attribute [rw] kaigyo_code
+  # @!attribute [rw] newline
   #  @return [String] newline (改行コード)
   # @!attribute [rw] charset
   #  @return [String] charset (文字コード)
@@ -16,12 +16,15 @@ module Meteor
   #
   class RootElement < Element
     attr_accessor :content_type
-    attr_accessor :kaigyo_code
+    attr_accessor :newline
     attr_accessor :charset
     attr_accessor :enc
     # attr_accessor :document #[String] document (ドキュメント)
 
     alias_method :character_encoding, :enc
     alias_method :character_encoding=, :enc=
+
+    alias_method :kaigyo_code, :newline
+    alias_method :kaigyo_code=, :newline=
   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.28
+# @version 0.9.30
 #
 
 module Meteor
-  VERSION = "0.9.28"
+  VERSION = "0.9.30"
 
   # require 'fileutils'
 

metadata

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