meteor 0.9.14 → 0.9.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5edd4d31b61edd52eee6adb3f61784e54140d28216ada36e7ce2b0f66e02b0c1
-  data.tar.gz: a5e1729d16467baf211cd96d6876f8d307c03bc27e56dfc462fd7356a6a17484
+  metadata.gz: d6586cbfb631f019d21e7c7b9e900452d2611b9afefcf0ac38bd9e7f004224f6
+  data.tar.gz: 6a8872a716c23859f82070db908b1097cd8d0424b9ad5d8ce989896680eaf5e9
 SHA512:
-  metadata.gz: 0424f42f10572ead20fe1f1ffd368f1a001b9bac5e607af725508a2c51262bf9ca1f8be35e28ee62b70381f6422284aa504fe145c8cb913c9771ce52931ee277
-  data.tar.gz: 74fb101b38d37e03a30919724bd348e71c8a10c481f609bcb35055f17bccd1fe47b73cbf6acc7044b30ae7a84972075c49c1668c657bbf502e666eb33c666d0a
+  metadata.gz: 660d690f2e3e458da8f945ce9fbe35e23f095c3144be4364a4cbcaae41f67e8a6e37f7ee81c2b9429349f945fc15d4b968d53c83f9418ea9518d17db8974a30b
+  data.tar.gz: a39d22634dae13029428b91b10ff66016f3945b3ba37d3d484d11897bf43ad86c3c2e7fc4f0993c258a747a0b8475e170aadcabf655d98b482e3692825deb8c5

data/ChangeLog

@@ -1,3 +1,7 @@
+== 0.9.15 / 2026-06-18 Yasumasa Ashida <ys.ashida@gmail.com>
+
+* Fix ParserImpl#element
+
 == 0.9.14 / 2026-06-17 Yasumasa Ashida <ys.ashida@gmail.com>
 
 * Fix the content-type handling in the parsers

data/Gemfile.lock

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

data/lib/meteor/core/kernel.rb

@@ -369,7 +369,11 @@ module Meteor
       # @param [true,false] quote flag (クオート・フラグ)
       # @return [Meteor::Element] element (要素)
       def element_3(name, attr_name, attr_value, quote = true)
-        element_quote_3(name, attr_name, attr_value)
+        if quote
+          quote_element_3(name, attr_name, attr_value)
+        else
+          quote_name(name)
+        end
 
         @pattern_cc_1 = element_pattern_3
 
@@ -429,13 +433,12 @@ module Meteor
 
       private :element_pattern_3
 
-      def element_quote_3(name, attr_name, attr_value)
-        @_name = Regexp.quote(name)
-        @_attr_name = Regexp.quote(attr_name)
-        @_attr_value = Regexp.quote(attr_value)
+      def quote_element_3(name, attr_name, attr_value)
+        quote_name(name)
+        quote_attribute(attr_name, attr_value)
       end
 
-      private :element_quote_3
+      private :quote_element_3
 
       def element_with_3_1(name)
         # puts  @res.captures.length
@@ -594,7 +597,7 @@ module Meteor
       #
       def element_2(attr_name, attr_value)
 
-        element_quote_2(attr_name, attr_value)
+        quote_attribute(attr_name, attr_value)
 
         element_pattern_2
 
@@ -665,12 +668,18 @@ module Meteor
 
       private :element_2
 
-      def element_quote_2(attr_name, attr_value)
+      def quote_name(name)
+        @_name = Regexp.quote(name)
+      end
+
+      private :quote_name
+
+      def quote_attribute(attr_name, attr_value)
         @_attr_name = Regexp.quote(attr_name)
         @_attr_value = Regexp.quote(attr_value)
       end
 
-      private :element_quote_2
+      private :quote_attribute
 
       def element_pattern_2
         # # @pattern_cc = String.new('') << '<([^<>"]*)\\s[^<>]*' << @_attr_name << '="' << @_attr_value << '(?:[^<>\\/]*>|((?!([^<>]*\\/>))[^<>]*>))'
@@ -681,7 +690,7 @@ module Meteor
       private :element_pattern_2
 
 =begin
-     def element_with_2_1
+      def element_with_2_1
         # puts @res.captures.length
         case @res.captures.length
           when FOUR
@@ -820,7 +829,7 @@ module Meteor
       #
       def element_5(name, attr_name1, attr_value1, attr_name2, attr_value2)
 
-        element_quote_5(name, attr_name1, attr_value1, attr_name2, attr_value2)
+        quote_element_5(name, attr_name1, attr_value1, attr_name2, attr_value2)
 
         @pattern_cc_1 = "<#{@_name}(\\s[^<>]*(?:#{@_attr_name1}=\"#{@_attr_value1}\"[^<>]*#{@_attr_name2}=\"#{@_attr_value2}\"|#{@_attr_name2}=\"#{@_attr_value2}\"[^<>]*#{@_attr_name1}=\"#{@_attr_value1}\")[^<>]*)\\/>|<#{@_name}(\\s[^<>]*(?:#{@_attr_name1}=\"#{@_attr_value1}\"[^<>]*#{@_attr_name2}=\"#{@_attr_value2}\"|#{@_attr_name2}=\"#{@_attr_value2}\"[^<>]*#{@_attr_name1}=\"#{@_attr_value1}\")[^<>]*)>(((?!(#{@_name}[^<>]*>)).)*)<\\/#{@_name}>"
 
@@ -874,7 +883,7 @@ module Meteor
 
       private :element_5
 
-      def element_quote_5(name, attr_name1, attr_value1, attr_name2, attr_value2)
+      def quote_element_5(name, attr_name1, attr_value1, attr_name2, attr_value2)
         @_name = Regexp.quote(name)
         @_attr_name1 = Regexp.quote(attr_name1)
         @_attr_name2 = Regexp.quote(attr_name2)
@@ -882,7 +891,7 @@ module Meteor
         @_attr_value2 = Regexp.quote(attr_value2)
       end
 
-      private :element_quote_5
+      private :quote_element_5
 
       def element_with_5_1(name)
 
@@ -1048,7 +1057,7 @@ module Meteor
       #
       def element_4(attr_name1, attr_value1, attr_name2, attr_value2)
 
-        element_quote_4(attr_name1, attr_value1, attr_name2, attr_value2)
+        quote_element_4(attr_name1, attr_value1, attr_name2, attr_value2)
 
         element_pattern_4
 
@@ -1073,14 +1082,14 @@ module Meteor
 
       private :element_4
 
-      def element_quote_4(attr_name1, attr_value1, attr_name2, attr_value2)
+      def quote_element_4(attr_name1, attr_value1, attr_name2, attr_value2)
         @_attr_name1 = Regexp.quote(attr_name1)
         @_attr_name2 = Regexp.quote(attr_name2)
         @_attr_value1 = Regexp.quote(attr_value1)
         @_attr_value2 = Regexp.quote(attr_value2)
       end
 
-      private :element_quote_4
+      private :quote_element_4
 
       def element_pattern_4
 

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

@@ -12,7 +12,7 @@ module Meteor
         MATCH_TAG = ["br", "hr", "img", "input", "meta", "base", "embed", "command", "keygen"]
 
         #[Array] non-nestable elements (入れ子にできない要素)
-        MATCH_TAG_SNG = [
+        MATCH_TAG_NNE = [
           "texarea",
           "select",
           "option",
@@ -57,7 +57,7 @@ module Meteor
         def initialize(*args)
           super()
           @@match_tag = MATCH_TAG
-          @@match_tag_sng = MATCH_TAG_SNG
+          @@MATCH_TAG_NNE = MATCH_TAG_NNE
           @@attr_logic = ATTR_LOGIC
           @doc_type = Parser::HTML
           case args.length

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

@@ -214,7 +214,7 @@ module Meteor
         # @return [Meteor::Element] element (要素)
         #
         def element_1(name)
-          @_name = Regexp.quote(name)
+          quote_name(name)
 
           # case of void element (空要素の場合(<->内容あり要素の場合))
           if is_match(@@match_tag, name)
@@ -281,8 +281,11 @@ module Meteor
         # @return [Meteor::Element] element (要素)
         #
         def element_3(name, attr_name, attr_value, quote = true)
-
-          element_quote_3(name, attr_name, attr_value) if quote
+          if quote
+            quote_element_3(name, attr_name, attr_value)
+          else
+            quote_name(name)
+          end
 
           # case of void element (空要素の場合(<->内容あり要素の場合))
           if is_match(@@match_tag, name)
@@ -348,7 +351,7 @@ module Meteor
         #
         def element_2(attr_name, attr_value)
 
-          element_quote_2(attr_name, attr_value)
+          quote_attribute(attr_name, attr_value)
 
           # @pattern_cc = String.new('') << '<([^<>"]*)\\s[^<>]*' << @_attr_name << '="' << @_attr_value
           # @pattern_cc << '"[^<>]*>'
@@ -383,7 +386,7 @@ module Meteor
         #
         def element_5(name, attr_name1, attr_value1, attr_name2, attr_value2)
 
-          element_quote_5(name, attr_name1, attr_value1, attr_name2, attr_value2)
+          quote_element_5(name, attr_name1, attr_value1, attr_name2, attr_value2)
 
           # 空要素の場合(<->内容あり要素の場合)
           if is_match(@@match_tag, name)
@@ -466,7 +469,7 @@ module Meteor
         # @return [Meteor::Element] element (要素)
         #
         def element_4(attr_name1, attr_value1, attr_name2, attr_value2)
-          element_quote_4(attr_name1, attr_value1, attr_name2, attr_value2)
+          quote_element_4(attr_name1, attr_value1, attr_name2, attr_value2)
 
           # @pattern_cc = String.new('') << '<([^<>"]*)\\s([^<>]*(' << @_attr_name1 << '="' << @_attr_value1
           # @pattern_cc << '"[^<>]*' << @_attr_name2 << '="' << @_attr_value2

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

@@ -108,7 +108,7 @@ module Meteor
 
         private :analyze_kaigyo_code
 
-         #
+        #
         # analyze document , set content type (ドキュメントをパースし、コンテントタイプをセットする)
         #
         def analyze_content_type

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.14
+# @version 0.9.15
 #
 
 module Meteor
-  VERSION = "0.9.14"
+  VERSION = "0.9.15"
 
   # require 'fileutils'
 

metadata

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