meteor 0.9.12 → 0.9.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3102e1f48f286368f2a764f81d5d32c0d7599891e46d6404a15ec615f84df774
-  data.tar.gz: 9511b466cef335dbfaba6522c466c6196283f00483a3877a188f322ecefdbce5
+  metadata.gz: 5edd4d31b61edd52eee6adb3f61784e54140d28216ada36e7ce2b0f66e02b0c1
+  data.tar.gz: a5e1729d16467baf211cd96d6876f8d307c03bc27e56dfc462fd7356a6a17484
 SHA512:
-  metadata.gz: 57dc690b280ec1b278663e95452b537f1aea884f53c754bbeba667456a0075a3c8652f437f49392ea7e4b6ac16ed46ac06dc2f9b77c7510e86f7dbf20dd33841
-  data.tar.gz: cc326eb562f22d73882351d8769f7015ff37994a1bcc98c2273e86f38de2d07ff29fe28027b74f4f0459c092e9ce655f1fe26218f27c3d15c0983804e2015871
+  metadata.gz: 0424f42f10572ead20fe1f1ffd368f1a001b9bac5e607af725508a2c51262bf9ca1f8be35e28ee62b70381f6422284aa504fe145c8cb913c9771ce52931ee277
+  data.tar.gz: 74fb101b38d37e03a30919724bd348e71c8a10c481f609bcb35055f17bccd1fe47b73cbf6acc7044b30ae7a84972075c49c1668c657bbf502e666eb33c666d0a

data/ChangeLog

@@ -1,6 +1,14 @@
+== 0.9.14 / 2026-06-17 Yasumasa Ashida <ys.ashida@gmail.com>
+
+* Fix the content-type handling in the parsers
+
+== 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.13)
 
 GEM
   remote: https://rubygems.org/
@@ -11,8 +11,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.2)
+  bundler (~> 4.0.11)
   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,79 +2,89 @@
 # -* coding: UTF-8 -*-
 # frozen_string_literal: true
 
-#require 'rubygems'
-require 'meteor'
+# require 'rubygems'
+require "meteor"
 
-Meteor::ElementFactory.link(:html,"ml/sample_html.html", 'UTF-8')
-root = Meteor::ElementFactory.element('/ml/sample_html')
+Meteor::ElementFactory.link(:html, "ml/sample_html.html", "UTF-8")
+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_hello2 = root.element(id: 'hello2')
-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_select2 = root.element('select',id: 'select2')
-elm_select2['multiple'] = true
-elm_option2 = elm_select2.element('option',id: 'option2')
-co_elm = elm_option2.element()
+elm_hello = root.element(id: "hello")
+# elm_hello.attr(class: 'red')
+elm_hello["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_text1 = root.element(id: "text1")
+# elm_text1.attr(value: めも')
+elm_text1["value"] = "めも"
+# elm_text1.attr(disabled: true)
+elm_text1["disabled"] = true
+# elm_text1.attr(required: true)
+elm_text1["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)
-  #'<' +
-  if i == 1 then
-    co_elm['selected'] = true   #co_elm.attr(selected: true)
+  # co_elm.attr(value: i)
+  co_elm["value"] = i
+  # '<' +
+  if i == 1
+    # co_elm.attr(selected: true)
+    co_elm["selected"] = true
   else
-    co_elm['selected'] = false  #co_elm.attr(selected: false)
+    # co_elm.attr(selected: false)
+    co_elm["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.remove_attr('id')
+  co_elm["id"] = nil
   co_elm.flash
 }
 
-elm_tr1 = root.element('tr',id: 'loop')
+elm_tr1 = root.element("tr", id: "loop")
 elm_ = root.element(elm_tr1)
-elm_dt1_ = elm_.element(id: 'aa')
-elm_dt2_ = elm_.element(id: 'bb')
-elm_dt3_ = elm_.element(id: 'cc')
+elm_dt1_ = elm_.element(id: "aa")
+elm_dt2_ = elm_.element(id: "bb")
+elm_dt3_ = elm_.element(id: "cc")
 10.times do |i|
-  elm_['loop'] = i
+  elm_["loop"] = i
   elm_dt1 = elm_dt1_.clone
   elm_dt2 = elm_dt2_.clone
   elm_dt3 = elm_dt3_.clone
   elm_dt1.content = i
   elm_dt2.content = i
   elm_dt3.content = i
-  #"< \n" +
+  # "< \n" +
   elm_.flash
 end
 
@@ -82,19 +92,22 @@ root.flash
 
 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.each{|elm|
-  puts '-------'
-  puts 'doc----'
-  puts elm.document
-  puts 'attrs--'
-  puts elm.attributes
-  puts 'mixed--'
-  puts elm.mixed_content
+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.each { |elm|
+  puts("-------")
+  puts("doc----")
+  puts(elm.document)
+  puts("attrs--")
+  puts(elm.attributes)
+  puts("mixed--")
+  puts(elm.mixed_content)
 }
 
-puts '' + (end_time - start_time).to_s + ' sec'
+puts("charset:#{root.charset}")
+puts("content-type:#{root.content_type}")
+
+puts("" + (end_time - start_time).to_s + " sec")

data/demo/html4.rb

@@ -2,110 +2,120 @@
 # -* coding: UTF-8 -*-
 # frozen_string_literal: true
 
-#require 'rubygems'
-require 'meteor'
+# require 'rubygems'
+require "meteor"
 
-#Meteor::ElementFactory.link(:html4,'ml/sample_4.html', 'UTF-8')
-Meteor::ElementFactory.options= {type: :html4}
-Meteor::ElementFactory.link('ml/sample_html4.html')
+# Meteor::ElementFactory.link(:html4,'ml/sample_4.html', 'UTF-8')
+Meteor::ElementFactory.options = {type: :html4}
+Meteor::ElementFactory.link("ml/sample_html4.html")
 
-root = Meteor::ElementFactory.element('/ml/sample_html4')
+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_hello2 = root.element(id: 'hello2')
-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_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.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')
-
-
-elm_select2 = root.element('select', id: 'select2')
-elm_select2['multiple'] = true
-elm_option2 = elm_select2.element('option',id: 'option2')
-co_elm = elm_option2.element()
+elm_hello = root.element(id: "hello")
+# elm_hello.attr(class: 'red')
+elm_hello["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_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.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')
+
+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)
-  #'<' +
-  if i == 1 then
-    co_elm['selected'] = true   #co_elm.attr(selected: 'true')
+  # co_elm.attr(value: i)
+  co_elm["value"] = i
+  # '<' +
+  if i == 1
+    # co_elm.attr(selected: 'true')
+    co_elm["selected"] = true
   else
-    co_elm['selected'] = false  #co_elm.attr(selected: 'false')
+    # co_elm.attr(selected: 'false')
+    co_elm["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.remove_attr('id')
+  co_elm["id"] = nil
   co_elm.flash
 }
 
-elm_tr1 = root.element('tr',id: 'loop')  #elm_tr1 = root.css('tr[id=loop]')
+# elm_tr1 = root.css('tr[id=loop]')
+elm_tr1 = root.element("tr", id: "loop")
 elm_ = root.element(elm_tr1)
-elm_dt1_ = elm_.element(id: 'aa')
-elm_dt2_ = elm_.element(id: 'bb')
-elm_dt3_ = elm_.element(id: 'cc')
+elm_dt1_ = elm_.element(id: "aa")
+elm_dt2_ = elm_.element(id: "bb")
+elm_dt3_ = elm_.element(id: "cc")
 10.times do |i|
-  elm_['loop'] = i
+  elm_["loop"] = i
   elm_dt1 = elm_dt1_.clone
   elm_dt2 = elm_dt2_.clone
   elm_dt3 = elm_dt3_.clone
   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.elements(id: "sample")
+# elms = root.css('div')  # elms = root.css('div[class=test]')
 
-elms.each_with_index{ |elm_,i|
-  elm_['style'] = i.to_s
+elms.each_with_index { |elm_, i|
+  elm_["style"] = i.to_s
 }
 
 root.flash
 
 end_time = Time.new.to_f
 
-puts root.document
+puts(root.document)
 
-puts '' + (end_time - start_time).to_s + ' sec'
+puts("charset:#{root.charset}")
+puts("content-type:#{root.content_type}")
+
+puts("" + (end_time - start_time).to_s + " sec")

data/demo/ml/sample.xml

@@ -9,42 +9,40 @@
 -->
 
 <root>
-
-<test1 manbo="mango" />
-
-<test manbo="manbo">
-  <tech mono="mono">こまねち</tech>
-</test>
-<test manbo="mbo">
-  <tech mono="mono">komaneti</tech>
-</test>
-<test manbo="mbo">
-  <tech mono="mono2">komaneti</tech>
-</test>
-<!-- @quark id="mono" --><!-- /@quark -->
-<!-- @quark id="moti" --><!-- /@quark -->
-<momo>komaneti</momo>
-<kobe momo="mono">komaneti</kobe>
-<teo a="aa" b="bb"/>
-<mink>komaneti</mink>
-
-<potato id="aa" lc="/cc">
-  <potato id="/bb"></potato>
-</potato>
-
-<potato id="aa" id2="bb" lc="/cc">
-  <potato id="/bb"><test></test></potato>
-</potato>
-
-<potato2 id="aa" id2="bb" lc="/cc"/>
-
-<hamachi id="aa" id2="bb" lc="/cc">
-  test
-</hamachi>
-
-<hamachi id="aa" id2="bb" />
-
-<kobe momo="momo" value="komaneti" />
-<!-- @pp id="cs" -->テスト<!-- /@pp -->
-
+  <test1 manbo="mango" />
+
+  <test manbo="manbo">
+    <tech mono="mono">こまねち</tech>
+  </test>
+  <test manbo="mbo">
+    <tech mono="mono">komaneti</tech>
+  </test>
+  <test manbo="mbo">
+    <tech mono="mono2">komaneti</tech>
+  </test>
+  <!-- @quark id="mono" --><!-- /@quark -->
+  <!-- @quark id="moti" --><!-- /@quark -->
+  <momo>komaneti</momo>
+  <kobe momo="mono">komaneti</kobe>
+  <teo a="aa" b="bb"/>
+  <mink>komaneti</mink>
+
+  <potato id="aa" lc="/cc">
+    <potato id="/bb"></potato>
+  </potato>
+
+  <potato id="aa" id2="bb" lc="/cc">
+    <potato id="/bb"><test></test></potato>
+  </potato>
+
+  <potato2 id="aa" id2="bb" lc="/cc"/>
+
+  <hamachi id="aa" id2="bb" lc="/cc">
+    test
+  </hamachi>
+
+  <hamachi id="aa" id2="bb" />
+
+  <kobe momo="momo" value="komaneti" />
+  <!-- @pp id="cs" -->テスト<!-- /@pp -->
 </root>

data/demo/ml/sample_html.html

@@ -1,32 +1,38 @@
+<!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>
+    <h1>HTMLテスト</h1>
     <div id="hello" class="black">Hello,World</div>
     <div id="hello2">Hello,World</div>
     <!-- @quark id="hello3" -->Hello,World<!-- /@quark -->
     <form>
-      <input id="text1" name="text1" type="text">
+      <label for="text1">text1</label>
+      <input type="text" id="text1" name="text1" value="">
 
-      <input id="radio1" type="radio">
+      <label for="radio1">radio1</label>
+      <input id="radio1" name="radio1" type="radio">
 
-      <select name="select1">
+      <label for="select1">select1</label>
+      <select id="select1" name="select1">
         <option id="option1">オプション</option>
       </select>
 
-      <select id="select2">
+      <label for="select2">select2</label>
+      <select id="select2" name="select2">
         <option id="option2">オプション</option>
       </select>
     </form>
 
     <table>
+      <caption>table1</caption>
       <tr id="loop">
         <td id="aa"></td><td id="bb"></td><td id="cc"></td>
       </tr>
     </table>
-
   </body>
 </html>

data/demo/ml/sample_html4.html

@@ -1,28 +1,36 @@
+<!DOCTYPE html>
 <html lang="ja">
   <head>
-    <title>HTMLテスト</title>
+    <title>HTML4テスト</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta charset="UTF-8"/>
   </head>
 
   <body>
+    <h1>HTML4テスト</h1>
     <div id="hello" class="black">Hello,World</div>
     <div id="hello2">Hello,World</div>
     <!-- @quark id="hello3" -->Hello,World<!-- /@quark -->
     <form>
-      <input id="text1" type="text" >
+      <label for="text1">text1</label>
+      <input id="text1" name="text1" type="text" >
 
-      <input id="radio1" type="radio" class="test">
+      <label for="radio1">radio1</label>
+      <input id="radio1" name="radio1" type="radio" class="test">
 
-      <select id="select1">
+      <label for="select1">select1</label>
+      <select id="select1" name="select1">
         <option id="option1">オプション</option>
       </select>
 
-      <select id="select2">
+      <label for="select2">select2</label>
+      <select id="select2" name="select2">
         <option id="option2">オプション</option>
       </select>
     </form>
 
     <table>
+      <caption>table</caption>
       <tr id="loop">
         <td id="aa"></td><td id="bb"></td><td id="cc"></td>
       </tr>
@@ -35,6 +43,5 @@
     <div id="sample2" style="background-color: aliceblue;" class="test">
       <div>test</div>
     </div>
-
   </body>
 </html>