meteor 0.9.17 → 0.9.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a115fb12155d38898790a30ed917abe7e22fdac5ce8d4bc76e732e0eb2c4b64
-  data.tar.gz: f673cc5f72f4a3c9c8253d8fee3cb44365894911f9ad4863eb29693d10fe36b2
+  metadata.gz: ea632b32536a814320a44110909a51a869dc09a9546d55307c8ca6e22e1e12ec
+  data.tar.gz: 2e5be17d0c3654208400db5731f389cb67fe9b616c1004965f820757c8d9a03b
 SHA512:
-  metadata.gz: 2fe5a34dc71d3f5f889300653179b98d9c81b87652c1658e95c091b89079f97eeb4e1e8489a4cc037eda6dc935dc6f4d0a8fa56e2b0c04cb26e3dd6780bfda0c
-  data.tar.gz: 2b578499df7e05f249f493ee6646f026655f3eeb6b819e01b0822a8f83256cc6d39410907f0ecb28f62f0a4dedca2bcf9da6b46b9b121cdf496d2232cc4aac70
+  metadata.gz: 573c2429e3de96abd5551c92cbd14ebf15ebf5b87a9edf86559c3905d1701dc9a094ab86c2a72af52ab1ff17f367c57832560df2a53e9a4a5e15166113cebe13
+  data.tar.gz: 32874256cd55783e984614448088ecc8abd05fbc638cd718ca2e9a8114a453dec708f3f03dfd915f4157142a266f76ab88ff9a0f9c4bf37b8c2da021e8065965

data/ChangeLog

@@ -1,3 +1,8 @@
+0.9.18 / 2026-06-20 Yasumasa Ashida <ys.ashida@gmail.com>
+
+* Fixnum → Integer
+* Refactoring
+
 == 0.9.17 / 2026-06-19 Yasumasa Ashida <ys.ashida@gmail.com>
 
 * Refactoring

data/demo/html.rb

@@ -5,7 +5,7 @@
 # require 'rubygems'
 require "meteor"
 
-Meteor::Elements.add(:html, "ml/sample_html.html", "UTF-8")
+Meteor::Elements.add(:html, "ml/sample_html.html")
 root = Meteor::Elements.get("/ml/sample_html")
 
 start_time = Time.new.to_f
@@ -13,7 +13,7 @@ start_time = Time.new.to_f
 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_hello['class'] = nil  # elm_hello.remove_attr('class')
 
 elm_hello2 = root.element(id: "hello2")
 # elm_hello2.content('Hello,Tester')

data/demo/html4.rb

@@ -6,7 +6,7 @@
 require "meteor"
 
 # Meteor::Elements.add(:html4,'ml/sample_4.html', 'UTF-8')
-Meteor::Elements.options = {type: :html4}
+Meteor::Elements.options = { type: :html4 }
 Meteor::Elements.add("ml/sample_html4.html")
 
 root = Meteor::Elements.get("/ml/sample_html4")
@@ -31,12 +31,12 @@ elm_hello2.content = "Hello,Tester"
 # 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}
+# 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')
+# elm_text1['disabled'] = nil   # elm_text1.remove_attr('disabled')
 # map = elm_text1.attr_map
 # map.names.each { |item|
 #   puts item
@@ -46,9 +46,9 @@ elm_text1.attrs = {value: "メモ", disabled: true, readonly: true}
 # 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('.test')     # elm_radio1 = root.css('input.test')
 ## elm_radio1 = root.css('[id=radio1][type=radio]')
-# elm_radio1['checked'] = true       # elm_radio1.attr(checked: true)
+# elm_radio1['checked'] = true        # elm_radio1.attr(checked: true)
 # puts elm_radio1.document
 
 # elm_select1 = root.element('select', id: 'select1')

data/demo/xhtml.rb

@@ -5,7 +5,7 @@
 # require 'rubygems'
 require "meteor"
 
-Meteor::Elements.add(:xhtml, "ml/sample_xhtml.html", "UTF-8")
+Meteor::Elements.add(:xhtml, "ml/sample_xhtml.html")
 root = Meteor::Elements.get("/ml/sample_xhtml")
 
 startTime = Time.new.to_f
@@ -13,7 +13,7 @@ startTime = Time.new.to_f
 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_hello['class'] = nil  # elm_hello.remove_attr('class')
 # elm_hello.attr(class: nil)
 
 elm_hello2 = root.element(id: "hello2")
@@ -40,7 +40,7 @@ elm_text1["required"] = true
 # }
 
 # elm_radio1 = root.element("input",id: "radio1", type: "radio")
-# elm_radio1['checked'] = true  # elm_radio1.attr(checked: true)
+# elm_radio1['checked'] = true    # elm_radio1.attr(checked: true)
 
 # elm_select1 = root.element("select",id: "select1")
 # elm_select1 = root.element("select")

data/demo/xhtml4.rb

@@ -13,7 +13,7 @@ startTime = Time.new.to_f
 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_hello['class'] = nil  # elm_hello.remove_attr('class')
 
 elm_hello2 = root.element(id: "hello2")
 # elm_hello2.content("Hello,Tester")

data/demo/xml.rb

@@ -90,8 +90,8 @@ elm_ = root.element(elm7)
 #   co_elm.content = i  # co_elm.content(i)
 #   co_elm.flash
 # }
-
-# elm3['id3'] = 'dd'  # elm3.attr(id3: 'dd')
+#
+# elm3['id3'] = 'dd'    # elm3.attr(id3: 'dd')
 
 root.flash
 

data/lib/meteor/core/kernel.rb

@@ -8,7 +8,7 @@ module Meteor
     # @!attribute [rw] element_cache
     #  @return [Hash] element cache (要素キャッシュ)
     # @!attribute [rw] doc_type
-    #  @return [Fixnum] document type (ドキュメントタイプ)
+    #  @return [Integer] document type (ドキュメントタイプ)
     # @!attribute [rw] document_hook
     #  @return [String] hook document (フック・ドキュメント)
     # @!attribute [rw] element_hook
@@ -124,7 +124,6 @@ module Meteor
       # @param [String] enc character encoding of input file (入力ファイルの文字コード)
       #
       def read(file_path, enc)
-
         # try {
         @character_encoding = enc
         # open file (ファイルのオープン)
@@ -253,13 +252,11 @@ module Meteor
             if @elm_
               @element_cache.store(@elm_.object_id, @elm_)
             end
-
           when TWO
             element_4(elm.to_s, attrs.to_s, args[0].to_s, args[1])
             if @elm_
               @element_cache.store(@elm_.object_id, @elm_)
             end
-
           when THREE
             element_5(elm.to_s, attrs.to_s, args[0], args[1].to_s, args[2])
             if @elm_
@@ -578,8 +575,8 @@ module Meteor
         # document (全体)
         @elm_.document = @res[0]
         # pattern (空要素検索用パターン)
-        @pattern_cc = String.new("") << "<" << @_name << "(\\s[^<>]*" << @_attr_name << "=\"" << @_attr_value << closer
-        # @pattern_cc = "<#{@_name}\\s[^<>]*#{@_attr_name}=\"#{@_attr_value}#{closer}"
+        # @pattern_cc = String.new("") << "<" << @_name << "(\\s[^<>]*" << @_attr_name << "=\"" << @_attr_value << closer
+        @pattern_cc = "<#{@_name}(\\s[^<>]*#{@_attr_name}=\"#{@_attr_value}#{closer}"
         @elm_.pattern = @pattern_cc
         @elm_.parser = self
 
@@ -825,7 +822,6 @@ module Meteor
       # @return [Meteor::Element] element (要素)
       #
       def element_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}>"
@@ -959,7 +955,6 @@ module Meteor
       private :element_with_5_1
 
       def element_with_5_2
-
         element_pattern_with_5_2
 
         if @sbuf.length == ZERO || @cnt != ZERO
@@ -1088,7 +1083,6 @@ module Meteor
       private :quote_element_4
 
       def element_pattern_4
-
         # @pattern_cc = String.new('') << '<([^<>"]*)\\s([^<>]*(' << @_attr_name1 << '="'
         # @pattern_cc << @_attr_value1 << '"[^<>]*' << @_attr_name2 << '="'
         # @pattern_cc << @_attr_value2 << '"|' << @_attr_name2 << '="'
@@ -1458,7 +1452,6 @@ module Meteor
               nil
             end
           end
-
         when 2
           if selector[0] == "["
             if @res = @@pattern_find_4.match(selector)
@@ -1509,7 +1502,6 @@ module Meteor
               remove_attr(elm, attr.to_s)
             end
           end
-
         elsif attr.kind_of?(Hash) && attr.size == 1
           if attr.values[0] != nil
             elm.document_sync = true
@@ -1547,7 +1539,6 @@ module Meteor
       private :set_attribute_3
 
       def edit_attrs_(elm, attr_name, attr_value)
-
         # attribute search (属性検索)
         # @res = @pattern.match(elm.attributes)
 
@@ -1591,7 +1582,6 @@ module Meteor
       private :get_attr_value
 
       def get_attr_value_(elm, attr_name)
-
         # attribute search pattern (属性検索用パターン)
         @pattern = Meteor::Core::Util::PatternCache.get(String.new("") << attr_name << "=\"([^\"]*)\"")
         # @pattern = Meteor::Core::Util::PatternCache.get("#{attr_name}=\"([^\"]*)\"")
@@ -1888,7 +1878,6 @@ module Meteor
           if @elm_
             @element_cache.store(@elm_.object_id, @elm_)
           end
-
         when TWO
           cxtag_2(args[0].to_s, args[1].to_s)
           if @elm_
@@ -1951,7 +1940,6 @@ module Meteor
       # @return [Meteor::Element] element (要素)
       #
       def cxtag_1(id)
-
         @_id = Regexp.quote(id)
 
         @pattern_cc = String.new("") << "<!--\\s@([^<>]*)\\s[^<>]*id=\"" << @_id << "\""
@@ -2020,7 +2008,6 @@ module Meteor
       private :edit_document_1
 
       def edit_document_2(elm, closer)
-
         # replace tag (タグ置換)
         @pattern = Meteor::Core::Util::PatternCache.get(elm.pattern)
         @root.document.sub!(@pattern, elm.document)
@@ -2032,7 +2019,6 @@ module Meteor
       # reflect (反映する)
       #
       def flash
-
         if self.element_hook
           if self.element_hook.origin.mono
             if self.element_hook.origin.cx

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

@@ -23,7 +23,7 @@ module Meteor
         #  @return [Regexp] pattern (パターン)
         # @overload get(regex,option)
         #  @param [String] regex regular expression (正規表現)
-        #  @param [Fixnum] option option of Regex (オプション)
+        #  @param [Integer] option option of Regex (オプション)
         #  @return [Regexp] pattern (パターン)
         #
         def self.get(*args)
@@ -78,7 +78,7 @@ module Meteor
         ##
         ## パターンを取得する
         ## @param [String] regex 正規表現
-        ## @param [Fixnum] option オプション
+        ## @param [Integer] option オプション
         ## @return [Regexp] パターン
         ##
         # def self.get_2(regex, option)

data/lib/meteor/element.rb

@@ -76,7 +76,6 @@ module Meteor
         else
           raise ArgumentError
         end
-
       when Meteor::TWO
         @name = args[0].name
         @attributes = String.new(args[0].attributes)
@@ -214,7 +213,6 @@ module Meteor
               # @document = "<#{@name}#{@attributes}>"
             end
           end
-
         when Parser::XHTML, Parser::XHTML4, Parser::XML
           if @cx
             # @pattern_cc = String.new('') << '<!-- @' << elm.name << ' ' << elm.attributes << '-->' << elm.mixed_content << '<!-- /@' << elm.name << ' -->'

data/lib/meteor/elements.rb

@@ -25,13 +25,13 @@ module Meteor
     #
     #@overload add(type,relative_path,enc)
     # generate parser (パーサを作成する)
-    # @param [Fixnum] type type of parser (パーサ・タイプ)
+    # @param [Integer] type type of parser (パーサ・タイプ)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @param [String] enc character encoding (エンコーディング)
     # @return [Meteor::Parser] parser (パーサ)
     #@overload add(type,relative_path)
     # generate parser (パーサを作成する)
-    # @param [Fixnum] type type of parser (パーサ・タイプ)
+    # @param [Integer] type type of parser (パーサ・タイプ)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @return [Meteor::Parser] parser (パーサ)
     #
@@ -42,7 +42,7 @@ module Meteor
     #
     # @overload add_str(type, relative_url, doc)
     #  generate parser (パーサを作成する)
-    #  @param [Fixnum] type type of parser (パーサ・タイプ)
+    #  @param [Integer] type type of parser (パーサ・タイプ)
     #  @param [String] relative_url relative URL (相対URL)
     #  @param [String] doc document (ドキュメント)
     #  @return [Meteor::Parser] parser (パーサ)

data/lib/meteor/parsers.rb

@@ -148,13 +148,13 @@ module Meteor
     # @return [Meteor::Parser] parser (パーサ)
     #@overload add(type,relative_path,enc)
     # generate parser (パーサを作成する)
-    # @param [Fixnum,Symbol] type type of parser (パーサ・タイプ)
+    # @param [Integer,Symbol] type type of parser (パーサ・タイプ)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @param [String] enc character encoding (文字エンコーディング)
     # @return [Meteor::Parser] parser (パーサ)
     #@overload add(type,relative_path)
     # generate parser (パーサを作成する)
-    # @param [Fixnum,Symbol] type type of parser (パーサ・タイプ)
+    # @param [Integer,Symbol] type type of parser (パーサ・タイプ)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @return [Meteor::Parser] parser (パーサ)
     #
@@ -163,7 +163,7 @@ module Meteor
       when 1
         add_1(args[0])
       when 2
-        if args[0].kind_of?(Fixnum) || args[0].kind_of?(Symbol)
+        if args[0].kind_of?(Integer) || args[0].kind_of?(Symbol)
           add_2_n(args[0], args[1])
         elsif args[0].kind_of?(String)
           add_2_s(args[0], args[1])
@@ -205,7 +205,7 @@ module Meteor
 
     #
     # generate parser (パーサを作成する)
-    # @param [Fixnum,Symbol] type type of parser (パーサ・タイプ)
+    # @param [Integer,Symbol] type type of parser (パーサ・タイプ)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @param [String] enc character encoding (文字エンコーディング)
     # @return [Meteor::Parser] parser(パーサ)
@@ -222,7 +222,7 @@ module Meteor
 
     #
     # generate parser (パーサを作成する)
-    # @param [Fixnum,Symbol] type type of parser(パーサ・タイプ)
+    # @param [Integer,Symbol] type type of parser(パーサ・タイプ)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @return [Meteor::Parser] parser (パーサ)
     #
@@ -262,14 +262,14 @@ module Meteor
     # @return [Meteor::Parser] parser (パーサ)
     #@overload parser(type,relative_path,enc)
     # generate parser (パーサを作成する)
-    # @param [Fixnum] type type of parser (パーサ・タイプ)
+    # @param [Integer] type type of parser (パーサ・タイプ)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @param [String] enc character encoding (エンコーディング)
     # @return [Meteor::Parser] parser (パーサ)
     # @deprecated
     #@overload parser(type,relative_path)
     # generate parser (パーサを作成する)
-    # @param [Fixnum] type type of parser (パーサ・タイプ)
+    # @param [Integer] type type of parser (パーサ・タイプ)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @return [Meteor::Parser] parser (パーサ)
     # @deprecated
@@ -318,7 +318,7 @@ module Meteor
     #
     # @overload add_str(type, relative_url, doc)
     #  generate parser (パーサを作成する)
-    #  @param [Fixnum] type type of parser (パーサ・タイプ)
+    #  @param [Integer] type type of parser (パーサ・タイプ)
     #  @param [String] relative_url relative URL (相対URL)
     #  @param [String] doc document (ドキュメント)
     #  @return [Meteor::Parser] parser (パーサ)
@@ -341,7 +341,7 @@ module Meteor
 
     #
     # generate parser (パーサを作成する)
-    # @param [Fixnum,Symbol] type type of parser (パーサ・タイプ)
+    # @param [Integer,Symbol] type type of parser (パーサ・タイプ)
     # @param [String] relative_url relative URL (相対URL)
     # @param [String] doc document (ドキュメント)
     # @return [Meteor::Parser] parser (パーサ)

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.17
+# @version 0.9.18
 #
 
 module Meteor
-  VERSION = "0.9.17"
+  VERSION = "0.9.18"
 
   # require 'fileutils'
 

metadata

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