meteor 0.9.12 → 0.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3102e1f48f286368f2a764f81d5d32c0d7599891e46d6404a15ec615f84df774
-  data.tar.gz: 9511b466cef335dbfaba6522c466c6196283f00483a3877a188f322ecefdbce5
+  metadata.gz: 88fad5c6e441dad9f62db837cb68812b78ad2b92ddebf69a07027e2c497fa880
+  data.tar.gz: 3eb96c0e72a512a3b41f9acf9014d46c80f1f206183d5ca785440fe520468126
 SHA512:
-  metadata.gz: 57dc690b280ec1b278663e95452b537f1aea884f53c754bbeba667456a0075a3c8652f437f49392ea7e4b6ac16ed46ac06dc2f9b77c7510e86f7dbf20dd33841
-  data.tar.gz: cc326eb562f22d73882351d8769f7015ff37994a1bcc98c2273e86f38de2d07ff29fe28027b74f4f0459c092e9ce655f1fe26218f27c3d15c0983804e2015871
+  metadata.gz: 3b368f523ca876c85b3f2e90d89af9f31fe3a828e15cbdcf4ba1c714454ac9e3075f03ae06c0b3240a10b9aa2a92597adb608c878da27b9859b1f7d74981a8e5
+  data.tar.gz: b1526787c25b9645d3e51ce914837b4919f0ccc1a116feb0a25fbac6e6eff88bbbba3c189aa38aae433511309b299ea1f1ffe21f413293dba98512c8ce2704c4

data/ChangeLog

@@ -1,6 +1,10 @@
+== 0.9.13 / 2026-05-31 Yasumasa Ashida <ys.ashida@gmail.com>
+
+* Refactoring
+
 == 0.9.12 / 2026-01-20 Yasumasa Ashida <ys.ashida@gmail.com>
 
-* enable frozen_string_literal
+* Enable frozen_string_literal
 
 == 0.9.8 / 2014-01-07 Yasumasa Ashida <ys.ashida@gmail.com>
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    meteor (0.9.9.0)
+    meteor (0.9.12)
 
 GEM
   remote: https://rubygems.org/
@@ -15,4 +15,4 @@ DEPENDENCIES
   meteor!
 
 BUNDLED WITH
-   2.2.3
+   4.0.11

data/README.md

@@ -2,7 +2,7 @@
 # Meteor
 
 ==================
- A lightweight HTML & XML Parser
+ A lightweight (X)HTML & XML Parser
 
 ```shell
   gem install meteor #gem installation
@@ -58,7 +58,9 @@ https://github.com/asip/meteor/tree/master/demo
 Licensed under the LGPL V2.1.
 
 ## Author
- Yasumasa Ashida (ys.ashida@gmail.com)
+
+ Yasumasa Ashida (<ys.ashida@gmail.com>)
 
 ## Copyright
-(c) 2008-2023 Yasumasa Ashida
+
+(c) 2008-present, Yasumasa Ashida

data/demo/html.rb

@@ -2,7 +2,7 @@
 # -* coding: UTF-8 -*-
 # frozen_string_literal: true
 
-#require 'rubygems'
+# require 'rubygems'
 require 'meteor'
 
 Meteor::ElementFactory.link(:html,"ml/sample_html.html", 'UTF-8')
@@ -11,53 +11,53 @@ root = Meteor::ElementFactory.element('/ml/sample_html')
 start_time = Time.new.to_f
 
 elm_hello = root.element(id: 'hello')
-elm_hello['class'] = 'red'  #elm_hello.attr(class: 'red')
-#elm_hello['class'] = nil   #elm_hello.remove_attr('class')
+elm_hello['class'] = 'red'  # elm_hello.attr(class: 'red')
+# elm_hello['class'] = nil   # elm_hello.remove_attr('class')
 
 elm_hello2 = root.element(id: 'hello2')
-elm_hello2.content = 'Hello,Tester'  #elm_hello2.content('Hello,Tester')
+elm_hello2.content = 'Hello,Tester'  # elm_hello2.content('Hello,Tester')
 
 elm_text1 = root.element(id: 'text1')
-elm_text1['value'] = 'めも'    #elm_text1.attr(value: めも')
-elm_text1['disabled'] = true  #elm_text1.attr(disabled: true)
-elm_text1['required'] = true  #elm_text1.attr(required: true)
-
-#elm_text1['disabled'] = nil  #elm_text1.remove_attr('disabled')
-#map = elm_text1.attr_map
-#map.names.each { |item| 
-#  puts item
-#  puts map.fetch(item)
-#}
-
-#elm_radio1 = root.element('input', id: 'radio1', type: 'radio')
-#elm_radio1['checked'] = true  #elm_radio1.attr(checked: true)
-#puts elm_radio1.document
-
-#elm_select1 = root.element('select', id: 'select1')
-#elm_select1 = root.element('select')
-#elm_select1['multiple'] = true  #elm_select1.attr(multiple: true)
-#puts elm_select1['multiple']    #puts elm_select1.attr('multiple')
-
-#elm_option1 = root.element('option', id: 'option1')
-#elm_option1['selected'] = true  #elm_option1.attr(selected: true)
-#elm_option1['selected'] = nil   #elm_option1.remove_attr('selected')
-#puts elm_option1['selected']    #puts elm_option1.attr('selected')
-#puts elm_text1['readonly']      #puts elm_text1.attr('readonly')
+elm_text1['value'] = 'めも'    # elm_text1.attr(value: めも')
+elm_text1['disabled'] = true  # elm_text1.attr(disabled: true)
+elm_text1['required'] = true  # elm_text1.attr(required: true)
+
+# elm_text1['disabled'] = nil  # elm_text1.remove_attr('disabled')
+# map = elm_text1.attr_map
+# map.names.each { |item|
+#   puts item
+#   puts map.fetch(item)
+# }
+
+# elm_radio1 = root.element('input', id: 'radio1', type: 'radio')
+# elm_radio1['checked'] = true  # elm_radio1.attr(checked: true)
+# puts elm_radio1.document
+
+# elm_select1 = root.element('select', id: 'select1')
+# elm_select1 = root.element('select')
+# elm_select1['multiple'] = true  # elm_select1.attr(multiple: true)
+# puts elm_select1['multiple']    # puts elm_select1.attr('multiple')
+
+# elm_option1 = root.element('option', id: 'option1')
+# elm_option1['selected'] = true  # elm_option1.attr(selected: true)
+# elm_option1['selected'] = nil   # elm_option1.remove_attr('selected')
+# puts elm_option1['selected']    # puts elm_option1.attr('selected')
+# puts elm_text1['readonly']      # puts elm_text1.attr('readonly')
 
 elm_select2 = root.element('select',id: 'select2')
 elm_select2['multiple'] = true
 elm_option2 = elm_select2.element('option',id: 'option2')
 co_elm = elm_option2.element()
 10.times { |i|
-  co_elm['value'] = i  #co_elm.attr(value: i)
-  #'<' +
+  co_elm['value'] = i  # co_elm.attr(value: i)
+  # '<' +
   if i == 1 then
-    co_elm['selected'] = true   #co_elm.attr(selected: true)
+    co_elm['selected'] = true   # co_elm.attr(selected: true)
   else
-    co_elm['selected'] = false  #co_elm.attr(selected: false)
+    co_elm['selected'] = false  # co_elm.attr(selected: false)
   end
-  co_elm.content = i  #co_elm.content(i)
-  co_elm['id'] = nil  #co_elm.remove_attr('id')
+  co_elm.content = i  # co_elm.content(i)
+  co_elm['id'] = nil  # co_elm.remove_attr('id')
   co_elm.flash
 }
 
@@ -74,7 +74,7 @@ elm_dt3_ = elm_.element(id: 'cc')
   elm_dt1.content = i
   elm_dt2.content = i
   elm_dt3.content = i
-  #"< \n" +
+  # "< \n" +
   elm_.flash
 end
 
@@ -85,8 +85,8 @@ end_time = Time.new.to_f
 puts root.document
 
 elms = root.elements('tr', id: 'loop')
-#elms = root.elements('input', id: 'radio1', type: 'radio')
-#elms = root.css('input[id=radio1][type=radio]')
+# elms = root.elements('input', id: 'radio1', type: 'radio')
+# elms = root.css('input[id=radio1][type=radio]')
 elms.each{|elm|
   puts '-------'
   puts 'doc----'
@@ -97,4 +97,7 @@ elms.each{|elm|
   puts elm.mixed_content
 }
 
+puts "charset:#{root.charset}"
+puts "content-type:#{root.content_type}"
+
 puts '' + (end_time - start_time).to_s + ' sec'

data/demo/html4.rb

@@ -2,10 +2,10 @@
 # -* coding: UTF-8 -*-
 # frozen_string_literal: true
 
-#require 'rubygems'
+# require 'rubygems'
 require 'meteor'
 
-#Meteor::ElementFactory.link(:html4,'ml/sample_4.html', 'UTF-8')
+# Meteor::ElementFactory.link(:html4,'ml/sample_4.html', 'UTF-8')
 Meteor::ElementFactory.options= {type: :html4}
 Meteor::ElementFactory.link('ml/sample_html4.html')
 
@@ -14,51 +14,51 @@ root = Meteor::ElementFactory.element('/ml/sample_html4')
 start_time = Time.new.to_f
 
 elm_hello = root.element(id: 'hello')
-elm_hello['class'] = 'red'  #elm_hello.attr(class: 'red')
-#elm_hello['class'] = nil  #elm_hello.remove_attr('class')
+elm_hello['class'] = 'red'  # elm_hello.attr(class: 'red')
+# elm_hello['class'] = nil  # elm_hello.remove_attr('class')
 
 elm_hello2 = root.element(id: 'hello2')
-elm_hello2.content = 'Hello,Tester'  #elm_hello2.content('Hello,Tester')
+elm_hello2.content = 'Hello,Tester'  # elm_hello2.content('Hello,Tester')
 
-#elm_hello3 = root.cxtag('hello3')
-#elm_hello3.content = "Hello,Hello\ntt"  #elm_hello3.content = "Hello,Hello"
-#puts elm_hello3.pattern
-#puts elm_hello3.mixed_content
-#puts elm_hello3.document
-#puts elm_hello3.content
-#puts elm_hello3.mixed_content
+# elm_hello3 = root.cxtag('hello3')
+# elm_hello3.content = "Hello,Hello\ntt"  # elm_hello3.content = "Hello,Hello"
+# puts elm_hello3.pattern
+# puts elm_hello3.mixed_content
+# puts elm_hello3.document
+# puts elm_hello3.content
+# puts elm_hello3.mixed_content
 
 elm_text1 = root.element('input', id: 'text1')
-#elm_text1['value'] = 'めも'       #elm_text1.attr(value: 'めも')
-#elm_text1.attr = {value: 'メモ'}
-#elm_text1['disabled'] = true     #elm_text1.attr(disabled: true)
+# elm_text1['value'] = 'めも'       # elm_text1.attr(value: 'めも')
+# elm_text1.attr = {value: 'メモ'}
+# elm_text1['disabled'] = true     # elm_text1.attr(disabled: true)
 elm_text1.attrs = {value: 'メモ', disabled: true, readonly: true}
-#puts elm_text1.attrs
-#elm_text1['disabled'] = nil      #elm_text1.remove_attr('disabled')
-#map = elm_text1.attr_map
-#map.names.each { |item|
-#  puts item
-#  puts map.fetch(item)
-#}
-
-#elm_radio1 = root.element('input', id: 'radio1', type: 'radio')
-##elm_radio1 = root.css('input[id=radio1][type=radio]')
-##elm_radio1 = root.css('#radio1')  #elm_radio1 = root.css('input#radio1')
-##elm_radio1 = root.css('.test')    #elm_radio1 = root.css('input.test')
-##elm_radio1 = root.css('[id=radio1][type=radio]')
-#elm_radio1['checked'] = true       #elm_radio1.attr(checked: true)
-#puts elm_radio1.document
-
-#elm_select1 = root.element('select', id: 'select1')
-#elm_select1 = root.element('select')
-#elm_select1['multiple'] = true  #elm_select1.attr('multiple',true)
-#puts elm_select1['multiple']    #puts elm_select1.attr('multiple')
-
-#elm_option1 = root.element('option', id: 'option1')
-#elm_option1['selected'] = true  #elm_option1.attr(selected: true)
-#elm_option1['selected'] = nil   #elm_option1.remove_attr('selected')
-#puts elm_option1['selected']    #puts elm_option1.attr('selected')
-#puts elm_text1['readonly']      #puts elm_text1.attr('readonly')
+# puts elm_text1.attrs
+# elm_text1['disabled'] = nil      # elm_text1.remove_attr('disabled')
+# map = elm_text1.attr_map
+# map.names.each { |item|
+#   puts item
+#   puts map.fetch(item)
+# }
+
+# elm_radio1 = root.element('input', id: 'radio1', type: 'radio')
+## elm_radio1 = root.css('input[id=radio1][type=radio]')
+## elm_radio1 = root.css('# radio1')  # elm_radio1 = root.css('input# radio1')
+## elm_radio1 = root.css('.test')    # elm_radio1 = root.css('input.test')
+## elm_radio1 = root.css('[id=radio1][type=radio]')
+# elm_radio1['checked'] = true       # elm_radio1.attr(checked: true)
+# puts elm_radio1.document
+
+# elm_select1 = root.element('select', id: 'select1')
+# elm_select1 = root.element('select')
+# elm_select1['multiple'] = true  # elm_select1.attr('multiple',true)
+# puts elm_select1['multiple']    # puts elm_select1.attr('multiple')
+
+# elm_option1 = root.element('option', id: 'option1')
+# elm_option1['selected'] = true  # elm_option1.attr(selected: true)
+# elm_option1['selected'] = nil   # elm_option1.remove_attr('selected')
+# puts elm_option1['selected']    # puts elm_option1.attr('selected')
+# puts elm_text1['readonly']      # puts elm_text1.attr('readonly')
 
 
 elm_select2 = root.element('select', id: 'select2')
@@ -66,19 +66,19 @@ elm_select2['multiple'] = true
 elm_option2 = elm_select2.element('option',id: 'option2')
 co_elm = elm_option2.element()
 10.times { |i|
-  co_elm['value'] = i  #co_elm.attr(value: i)
-  #'<' +
+  co_elm['value'] = i  # co_elm.attr(value: i)
+  # '<' +
   if i == 1 then
-    co_elm['selected'] = true   #co_elm.attr(selected: 'true')
+    co_elm['selected'] = true   # co_elm.attr(selected: 'true')
   else
-    co_elm['selected'] = false  #co_elm.attr(selected: 'false')
+    co_elm['selected'] = false  # co_elm.attr(selected: 'false')
   end
-  co_elm.content = i  #co_elm.content(i)
-  co_elm['id'] = nil  #co_elm.remove_attr('id')
+  co_elm.content = i  # co_elm.content(i)
+  co_elm['id'] = nil  # co_elm.remove_attr('id')
   co_elm.flash
 }
 
-elm_tr1 = root.element('tr',id: 'loop')  #elm_tr1 = root.css('tr[id=loop]')
+elm_tr1 = root.element('tr',id: 'loop')  # elm_tr1 = root.css('tr[id=loop]')
 elm_ = root.element(elm_tr1)
 elm_dt1_ = elm_.element(id: 'aa')
 elm_dt2_ = elm_.element(id: 'bb')
@@ -91,12 +91,12 @@ elm_dt3_ = elm_.element(id: 'cc')
   elm_dt1.content = i
   elm_dt2.content = i
   elm_dt3.content = i
-  #"< \n" +
+  # "< \n" +
   elm_.flash
 end
 
 elms = root.elements(id: 'sample')
-#elms = root.css('div')  #elms = root.css('div[class=test]')
+# elms = root.css('div')  # elms = root.css('div[class=test]')
 
 elms.each_with_index{ |elm_,i|
   elm_['style'] = i.to_s
@@ -108,4 +108,7 @@ end_time = Time.new.to_f
 
 puts root.document
 
+puts "charset:#{root.charset}"
+puts "content-type:#{root.content_type}"
+
 puts '' + (end_time - start_time).to_s + ' sec'

data/demo/ml/sample_html.html

@@ -1,7 +1,8 @@
+<!DOCTYPE html>
 <html lang="ja">
   <head>
     <title>HTMLテスト</title>
-    <meta http-equiv="Content-Type" charset="utf-8" content="text/html; charset=UTF-8">
+    <meta charset="UTF-8"/>
   </head>
 
   <body>
@@ -11,13 +12,13 @@
     <form>
       <input id="text1" name="text1" type="text">
 
-      <input id="radio1" type="radio">
+      <input id="radio1" name="radio1" type="radio">
 
-      <select name="select1">
+      <select id="select1" name="select1">
         <option id="option1">オプション</option>
       </select>
 
-      <select id="select2">
+      <select id="select2" name="select2">
         <option id="option2">オプション</option>
       </select>
     </form>

data/demo/ml/sample_html4.html

@@ -9,15 +9,15 @@
     <div id="hello2">Hello,World</div>
     <!-- @quark id="hello3" -->Hello,World<!-- /@quark -->
     <form>
-      <input id="text1" type="text" >
+      <input id="text1" name="text1" type="text" >
 
-      <input id="radio1" type="radio" class="test">
+      <input id="radio1" name="radio1" type="radio" class="test">
 
-      <select id="select1">
+      <select id="select1" name="select1">
         <option id="option1">オプション</option>
       </select>
 
-      <select id="select2">
+      <select id="select2" name="select2">
         <option id="option2">オプション</option>
       </select>
     </form>

data/demo/ml/sample_xhtml.html

@@ -1,8 +1,9 @@
+<!DOCTYPE html>
 <?xml version="1.0" encoding="UTF-8"?>
 <html lang="ja">
   <head>
     <title>HTMLテスト</title>
-    <meta http-equiv="Content-Type" charset="utf-8" content="text/html; charset=UTF-8"/>
+    <meta charset="UTF-8"/>
   </head>
 
   <body>
@@ -10,15 +11,15 @@
     <div id="hello2">Hello,World</div>
     <!-- @quark id="hello3" -->Hello,World<!-- /@quark -->
     <form>
-      <input id="text1" type="text" />
+      <input id="text1" name="text1" type="text" />
 
-      <input id="radio1" type="radio" />
+      <input id="radio1" name="radio1" type="radio" />
 
-      <select>
+      <select id="select1" name="select1">
         <option id="option1">オプション</option>
       </select>
 
-      <select id="select2">
+      <select id="select2" name="select2">
         <option id="option2">オプション</option>
       </select>
     </form>

data/demo/ml/sample_xhtml4.html

@@ -10,15 +10,15 @@
     <div id="hello2">Hello,World</div>
     <!-- @quark id="hello3" -->Hello,World<!-- /@quark -->
     <form>
-      <input id="text1" type="text" />
+      <input id="text1" name="text1" type="text" />
 
-      <input id="radio1" type="radio" />
+      <input id="radio1" name="radio1" type="radio" />
 
       <select>
         <option id="option1">オプション</option>
       </select>
 
-      <select id="select2">
+      <select id="select2" name="select2">
         <option id="option2">オプション</option>
       </select>
     </form>

data/demo/xhtml.rb

@@ -2,7 +2,7 @@
 # -* coding: UTF-8 -*-
 # frozen_string_literal: true
 
-#require 'rubygems'
+# require 'rubygems'
 require 'meteor'
 
 Meteor::ElementFactory.link(:xhtml,'ml/sample_xhtml.html', 'UTF-8')
@@ -11,40 +11,40 @@ root = Meteor::ElementFactory.element('/ml/sample_xhtml')
 startTime = Time.new.to_f
 
 elm_hello = root.element(id: 'hello')
-elm_hello['class'] = 'red'  #elm_hello.attr(class: "red")
-#elm_hello['class'] = nil   #elm_hello.remove_attr('class')
-#elm_hello.attr(class: nil)
+elm_hello['class'] = 'red'  # elm_hello.attr(class: "red")
+# elm_hello['class'] = nil   # elm_hello.remove_attr('class')
+# elm_hello.attr(class: nil)
 
 elm_hello2 = root.element(id: 'hello2')
-elm_hello2.content = "Hello,Tester"  #elm_hello2.content("Hello,Tester")
-#elm_hello2.remove
+elm_hello2.content = "Hello,Tester"  # elm_hello2.content("Hello,Tester")
+# elm_hello2.remove
 
-#elm_hello3 = root.cxtag("hello3")
-#elm_hello3.content = "Hello,Hello\ntt"  #elm_hello3.content("Hello,Hello\ntt")
-#puts elm_hello3.content
-#puts elm_hello3.mixed_content
+# elm_hello3 = root.cxtag("hello3")
+# elm_hello3.content = "Hello,Hello\ntt"  # elm_hello3.content("Hello,Hello\ntt")
+# puts elm_hello3.content
+# puts elm_hello3.mixed_content
 
 elm_text1 = root.element(id: 'text1')
-elm_text1['value'] = 'めも'    #elm_text1.attr(value: 'めも')
-elm_text1['disabled'] = true  #elm_text1.attr(disabled: true)
-elm_text1['required'] = true  #elm_text1.attr(required: true)
-#map = elm_text1.attr_map
-#map.names.each { |item| 
-#  puts item
-#  puts map.fetch(item)
-#}
-
-#elm_radio1 = root.element("input",id: "radio1", type: "radio")
-#elm_radio1['checked'] = true  #elm_radio1.attr(checked: true)
-
-#elm_select1 = root.element("select",id: "select1")
-#elm_select1 = root.element("select")
-#elm_select1['multiple'] = true  #elm_select1.attr(multiple: true)
-#puts elm_select1['multiple']    #puts elm_select1.attr("multiple")
-#elm_option1 = root.element("option",id: "option1")
-#elm_option1['selected'] = true  #elm_option1.attr(selected: true)
-#puts elm_option1['selected']    #puts elm_option1.attr("selected")
-#puts elm_text1['readonly']      #puts elm_text1.attr("readonly")
+elm_text1['value'] = 'めも'    # elm_text1.attr(value: 'めも')
+elm_text1['disabled'] = true  # elm_text1.attr(disabled: true)
+elm_text1['required'] = true  # elm_text1.attr(required: true)
+# map = elm_text1.attr_map
+# map.names.each { |item|
+#   puts item
+#   puts map.fetch(item)
+# }
+
+# elm_radio1 = root.element("input",id: "radio1", type: "radio")
+# elm_radio1['checked'] = true  # elm_radio1.attr(checked: true)
+
+# elm_select1 = root.element("select",id: "select1")
+# elm_select1 = root.element("select")
+# elm_select1['multiple'] = true  # elm_select1.attr(multiple: true)
+# puts elm_select1['multiple']    # puts elm_select1.attr("multiple")
+# elm_option1 = root.element("option",id: "option1")
+# elm_option1['selected'] = true  # elm_option1.attr(selected: true)
+# puts elm_option1['selected']    # puts elm_option1.attr("selected")
+# puts elm_text1['readonly']      # puts elm_text1.attr("readonly")
 
 elm_select2 = root.element("select",id: "select2")
 elm_select2["multiple"] = true
@@ -52,13 +52,13 @@ elm_option2 = elm_select2.element("option",id: "option2")
 co_elm = elm_option2.element()
 10.times { |i|
   if i == 1 then
-    co_elm['selected'] = true    #co_elm.attr(selected: true)
+    co_elm['selected'] = true    # co_elm.attr(selected: true)
   else
-    co_elm['selected'] = false   #co_elm.attr(selected: false)
+    co_elm['selected'] = false   # co_elm.attr(selected: false)
   end
-  co_elm['value'] = i  #co_elm.attr(value: i)
-  co_elm['id'] = nil   #co_elm.remove_attr("id")
-  co_elm.content = i   #co_elm.content(i)
+  co_elm['value'] = i  # co_elm.attr(value: i)
+  co_elm['id'] = nil   # co_elm.remove_attr("id")
+  co_elm.content = i   # co_elm.content(i)
   co_elm.flash
 }
 
@@ -72,7 +72,7 @@ elm_dt3_ = elm_.element(id: 'cc')
   elm_dt1 = elm_dt1_.clone
   elm_dt2 = elm_dt2_.clone
   elm_dt3 = elm_dt3_.clone
-  elm_dt1.content = i  #elm_dt1.content("<>\"' \n" << i.to_s)
+  elm_dt1.content = i  # elm_dt1.content("<>\"' \n" << i.to_s)
   elm_dt2.content = i
   elm_dt3.content = i
   elm_.flash
@@ -84,4 +84,7 @@ endTime = Time.new.to_f
 
 puts root.document
 
+puts "charset:#{root.charset}"
+puts "content-type:#{root.content_type}"
+
 puts '' + (endTime - startTime).to_s + ' sec'