meteor 0.9.30 → 0.9.32

data/lib/meteor/parsers.rb

@@ -13,19 +13,17 @@ module Meteor
   #  @return [String] default character encoding (デフォルトエンコーディング)
   #
   class Parsers
-    attr_accessor :type
-    attr_accessor :root
-    attr_accessor :enc
+    attr_accessor :type, :root, :enc
 
-    alias_method :base_type, :type
-    alias_method :base_type=, :type=
-    alias_method :base_dir, :root
-    alias_method :base_dir=, :root=
-    alias_method :base_enc, :enc
-    alias_method :base_enc=, :enc=
+    alias base_type type
+    alias base_type= type=
+    alias base_dir root
+    alias base_dir= root=
+    alias base_enc enc
+    alias base_enc= enc=
 
-    alias_method :base_encoding, :enc
-    alias_method :base_encoding=, :enc=
+    alias base_encoding enc
+    alias base_encoding= enc=
 
     #
     # initializer (イニシャライザ)
@@ -43,13 +41,13 @@ module Meteor
     def initialize(*args)
       case args.length
       when 0
-        initialize_0
+        initialize_zero
       when 1
-        initialize_1(args[0])
+        initialize_one(args[0])
       when 2
-        initialize_2(args[0], args[1])
+        initialize_two(args[0], args[1])
       when 3
-        initialize_3(args[0], args[1], args[2])
+        initialize_three(args[0], args[1], args[2])
       else
         raise ArgumentError
       end
@@ -58,34 +56,34 @@ module Meteor
     #
     # initializer (イニシャライザ)
     #
-    def initialize_0
-      initialize_2
+    def initialize_zero
+      initialize_two
     end
 
-    private :initialize_0
+    private :initialize_zero
 
     #
     # initializer (イニシャライザ)
     # @param [String] root root directory (基準ディレクトリ)
     #
-    def initialize_1(root)
-      initialize_2(root)
+    def initialize_one(root)
+      initialize_two(root)
     end
 
-    private :initialize_1
+    private :initialize_one
 
     #
     # initializer (イニシャライザ)
     # @param [String] root root directory (基準ディレクトリ)
     # @param [String] enc default character encoding (デフォルト文字エンコーディング)
     #
-    def initialize_2(root = ".", enc = "UTF-8")
-      @cache = Hash.new
+    def initialize_two(root = '.', enc = 'UTF-8')
+      @cache = {}
       @root = root
       @enc = enc
     end
 
-    private :initialize_2
+    private :initialize_two
 
     #
     # initializer (イニシャライザ)
@@ -93,14 +91,14 @@ module Meteor
     # @param [String] root root directory (基準ディレクトリ)
     # @param [String] enc default character encoding (デフォルト文字エンコーディング)
     #
-    def initialize_3(type, root=".", enc = "UTF-8")
-      @cache = Hash.new
+    def initialize_three(type, root = '.', enc = 'UTF-8')
+      @cache = {}
       @type = type
       @root = root
       @enc = enc
     end
 
-    private :initialize_3
+    private :initialize_three
 
     #
     # set options (オプションをセットする)
@@ -113,46 +111,44 @@ module Meteor
     # @option @deprecated opts [Integer | Symbol] :base_type default type of parser (デフォルトのパーサ・タイプ)
     #
     def options=(opts)
-      if opts.kind_of?(Hash)
-        if opts.include?(:root)
-          @root = opts[:root]
-        elsif opts.include?(:base_dir)
-          @root = opts[:base_dir]
-        end
+      raise ArgumentError unless opts.is_a?(Hash)
 
-        if opts.include?(:enc)
-          @enc = opts[:enc]
-        elsif opts.include?(:base_enc)
-          @enc = opts[:base_enc]
-        end
+      if opts.include?(:root)
+        @root = opts[:root]
+      elsif opts.include?(:base_dir)
+        @root = opts[:base_dir]
+      end
 
-        if opts.include?(:type)
-          @type = opts[:type]
-        elsif opts.include?(:base_type)
-          @type = opts[:base_type]
-        end
-      else
-        raise ArgumentError
+      if opts.include?(:enc)
+        @enc = opts[:enc]
+      elsif opts.include?(:base_enc)
+        @enc = opts[:base_enc]
+      end
+
+      if opts.include?(:type)
+        @type = opts[:type]
+      elsif opts.include?(:base_type)
+        @type = opts[:base_type]
       end
     end
 
     #
-    #@overload add(relative_path,enc)
+    # @overload add(relative_path,enc)
     # add parser (パーサを追加する)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @param [String] enc character encoding (文字エンコーディング)
     # @return [Meteor::Parser] parser (パーサ)
-    #@overload add(relative_path)
+    # @overload add(relative_path)
     # add parser (パーサを追加する)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @return [Meteor::Parser] parser (パーサ)
-    #@overload add(type,relative_path,enc)
+    # @overload add(type,relative_path,enc)
     # add 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)
+    # @overload add(type,relative_path)
     # add parser (パーサを追加する)
     # @param [Integer,Symbol] type type of parser (パーサ・タイプ)
     # @param [String] relative_path relative file path (相対ファイルパス)
@@ -161,23 +157,23 @@ module Meteor
     def add(*args)
       case args.length
       when 1
-        add_file_1(args[0])
+        add_file_one(args[0])
       when 2
-        if args[0].kind_of?(Integer) || args[0].kind_of?(Symbol)
-          add_file_2_n(args[0], args[1])
-        elsif args[0].kind_of?(String)
-          add_file_2_s(args[0], args[1])
+        if args[0].is_a?(Integer) || args[0].is_a?(Symbol)
+          add_file_two_n(args[0], args[1])
+        elsif args[0].is_a?(String)
+          add_file_two_s(args[0], args[1])
         else
           raise ArgumentError
         end
       when 3
-        add_file_3(args[0], args[1], args[2])
+        add_file_three(args[0], args[1], args[2])
       else
         raise ArgumentError
       end
     end
 
-    alias_method :link, :add
+    alias link add
 
     #
     # change relative path to relative url (相対パスを相対URLにする)
@@ -188,16 +184,14 @@ module Meteor
       paths = File.split(path)
 
       if paths.length == 1
-        return File.basename(paths[0], ".*")
+        File.basename(paths[0], '.*')
+      elsif paths[0] == '.'
+        paths.delete_at(0)
+        paths[paths.length - 1] = File.basename(paths[paths.length - 1], '.*')
+        String.new('') << '/' << paths.join('/')
       else
-        if paths[0] == "."
-          paths.delete_at(0)
-          paths[paths.length - 1] = File.basename(paths[paths.length - 1], ".*")
-          return String.new("") << "/" << paths.join("/")
-        else
-          paths[paths.length - 1] = File.basename(paths[paths.length - 1], ".*")
-          return String.new("") << "/" << paths.join("/")
-        end
+        paths[paths.length - 1] = File.basename(paths[paths.length - 1], '.*')
+        String.new('') << '/' << paths.join('/')
       end
     end
 
@@ -210,15 +204,14 @@ module Meteor
     # @param [String] enc character encoding (文字エンコーディング)
     # @return [Meteor::Parser] parser(パーサ)
     #
-    def add_file_3(type, relative_path, enc = "UTF-8")
-      ps = new_parser(type)
-      ps.read(File.expand_path(relative_path, @root), enc)
-
+    def add_file_three(type, relative_path, enc = 'UTF-8')
       relative_url = path_to_url(relative_path)
-      @cache[relative_url] = ps
+
+      add_template_three(type, relative_url,
+                         Meteor::Core::Util::FileReader.read(File.expand_path(relative_path, @root), enc))
     end
 
-    private :add_file_3
+    private :add_file_three
 
     #
     # add parser (パーサを追加する)
@@ -226,11 +219,11 @@ module Meteor
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @return [Meteor::Parser] parser (パーサ)
     #
-    def add_file_2_n(type, relative_path)
-      add_file_3(type, relative_path, @enc)
+    def add_file_two_n(type, relative_path)
+      add_file_three(type, relative_path, @enc)
     end
 
-    private :add_file_2_n
+    private :add_file_two_n
 
     #
     # add parser (パーサを追加する)
@@ -238,22 +231,22 @@ module Meteor
     # @param [String] enc character encoding (文字エンコーディング)
     # @return [Meteor::Parser] parser (パーサ)
     #
-    def add_file_2_s(relative_path, enc)
-      add_file_3(@type, relative_path, enc)
+    def add_file_two_s(relative_path, enc)
+      add_file_three(@type, relative_path, enc)
     end
 
-    private :add_file_2_s
+    private :add_file_two_s
 
     #
     # add parser (パーサを追加する)
     # @param [String] relative_path relative file path (相対ファイルパス)
     # @return [Meteor::Parser] parser (パーサ)
     #
-    def add_file_1(relative_path)
-      add_file_3(@type, relative_path, @enc)
+    def add_file_one(relative_path)
+      add_file_three(@type, relative_path, @enc)
     end
 
-    private :add_file_1
+    private :add_file_one
 
     #
     # @overload add_template(type, relative_url, doc)
@@ -271,9 +264,9 @@ module Meteor
     def add_template(*args)
       case args.length
       when 2
-        add_template_2(args[0], args[1])
+        add_template_two(args[0], args[1])
       when 3
-        add_template_3(args[0], args[1], args[2])
+        add_template_three(args[0], args[1], args[2])
       else
         raise ArgumentError
       end
@@ -286,15 +279,14 @@ module Meteor
     # @param [String] doc document (ドキュメント)
     # @return [Meteor::Parser] parser (パーサ)
     #
-    def add_template_3(type, relative_url, doc)
+    def add_template_three(type, relative_url, doc)
       ps = new_parser(type)
       ps.document = doc
-      ps.parse
 
       @cache[relative_url] = ps
     end
 
-    private :add_template_3
+    private :add_template_three
 
     #
     # add parser (パーサを追加する)
@@ -302,29 +294,29 @@ module Meteor
     # @param [String] doc document (ドキュメント)
     # @return [Meteor::Parser] parser (パーサ)
     #
-    def add_template_2(relative_url, doc)
-      add_template_3(@type, relative_url, doc)
+    def add_template_two(relative_url, doc)
+      add_template_three(@type, relative_url, doc)
     end
 
-    private :add_template_2
+    private :add_template_two
 
-    alias_method :link_str, :add_template
-    alias_method :add_str, :add_template
-    alias_method :parser_str, :add_template
+    alias link_str add_template
+    alias add_str add_template
+    alias parser_str add_template
 
     #
-    #@overload parser(key)
+    # @overload parser(key)
     # get parser (パーサを取得する)
     # @param [String,Symbol] key identifier (キー)
     # @return [Meteor::Parser] parser (パーサ)
-    #@overload parser(type,relative_path,enc)
+    # @overload parser(type,relative_path,enc)
     # add 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)
+    # @overload parser(type,relative_path)
     # add parser (パーサを追加する)
     # @param [Integer] type type of parser (パーサ・タイプ)
     # @param [String] relative_path relative file path (相対ファイルパス)
@@ -333,11 +325,11 @@ module Meteor
     def parser(*args)
       case args.length
       when 1
-        parser_1(args[0])
+        parser_one(args[0])
       when 2, 3
         add(args)
       end
-      # parser_1(key)
+      # parser_one(key)
     end
 
     #
@@ -345,7 +337,7 @@ module Meteor
     # @param [String] key identifier (キー)
     # @return [Meteor::Parser] parser (パーサ)
     #
-    def parser_1(key)
+    def parser_one(key)
       @pif = @cache[key.to_s]
       case @pif.doc_type
       when Meteor::Parser::HTML
@@ -361,7 +353,7 @@ module Meteor
       end
     end
 
-    private :parser_1
+    private :parser_one
 
     #
     # get root element (ルート要素を取得する)
@@ -369,7 +361,7 @@ module Meteor
     # @return [Meteor::RootElement] root element (ルート要素)
     #
     def element(key)
-      parser_1(key).root_element
+      parser_one(key).root_element
     end
 
     def new_parser(type)
@@ -406,7 +398,7 @@ module Meteor
     # @return [Meteor::Parser] parser (パーサ)
     #
     def [](key)
-      self.parser(key)
+      parser(key)
     end
   end
 

data/lib/meteor/root_element.rb

@@ -15,16 +15,13 @@ module Meteor
   #  @return [String] character encoding (文字エンコーディング)
   #
   class RootElement < Element
-    attr_accessor :content_type
-    attr_accessor :newline
-    attr_accessor :charset
-    attr_accessor :enc
+    attr_accessor :content_type, :newline, :charset, :enc
     # attr_accessor :document #[String] document (ドキュメント)
 
-    alias_method :character_encoding, :enc
-    alias_method :character_encoding=, :enc=
+    alias character_encoding enc
+    alias character_encoding= enc=
 
-    alias_method :kaigyo_code, :newline
-    alias_method :kaigyo_code=, :newline=
+    alias kaigyo_code newline
+    alias kaigyo_code= newline=
   end
 end

data/lib/meteor.rb

@@ -1,61 +1,62 @@
-# -* coding: UTF-8 -*-
-# frozen_string_literal: true
-
-require "meteor/element"
-require "meteor/root_element"
-require "meteor/attribute"
-require "meteor/attribute_map"
-require "meteor/parser"
-require "meteor/parsers"
-require "meteor/elements"
-require "meteor/exception/no_such_element_exception"
-require "meteor/core/kernel"
-require "meteor/core/util/pattern_cache"
-require "meteor/ml/html4/parser_impl"
-require "meteor/ml/html/parser_impl"
-require "meteor/ml/xhtml4/parser_impl"
-require "meteor/ml/xhtml/parser_impl"
-require "meteor/ml/xml/parser_impl"
-
-# Meteor -  A lightweight (X)HTML(5) & XML parser
-#
-# Copyright (C) 2008-present Yasumasa Ashida.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#
-# @author Yasumasa Ashida
-# @version 0.9.30
-#
-
-module Meteor
-  VERSION = "0.9.30"
-
-  # require 'fileutils'
-
-  ZERO = 0
-  ONE = 1
-  TWO = 2
-  THREE = 3
-  FOUR = 4
-  FIVE = 5
-  SIX = 6
-  SEVEN = 7
-
-  HTML = ZERO
-  XHTML = ONE
-  HTML4 = TWO
-  XHTML4 = THREE
-  XML = FOUR
-end
+# -* coding: UTF-8 -*-
+# frozen_string_literal: true
+
+require 'meteor/element'
+require 'meteor/root_element'
+require 'meteor/attribute'
+require 'meteor/attribute_map'
+require 'meteor/parser'
+require 'meteor/parsers'
+require 'meteor/elements'
+require 'meteor/exception/no_such_element_exception'
+require 'meteor/core/kernel'
+require 'meteor/core/util/file_reader'
+require 'meteor/core/util/pattern_cache'
+require 'meteor/ml/html4/parser_impl'
+require 'meteor/ml/html/parser_impl'
+require 'meteor/ml/xhtml4/parser_impl'
+require 'meteor/ml/xhtml/parser_impl'
+require 'meteor/ml/xml/parser_impl'
+
+# Meteor -  A lightweight (X)HTML(5) & XML parser
+#
+# Copyright (C) 2008-present Yasumasa Ashida.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# @author Yasumasa Ashida
+# @version 0.9.32
+#
+
+module Meteor
+  VERSION = '0.9.32'
+
+  # require 'fileutils'
+
+  ZERO = 0
+  ONE = 1
+  TWO = 2
+  THREE = 3
+  FOUR = 4
+  FIVE = 5
+  SIX = 6
+  SEVEN = 7
+
+  HTML = ZERO
+  XHTML = ONE
+  HTML4 = TWO
+  XHTML4 = THREE
+  XML = FOUR
+end

data/meteor.gemspec

@@ -1,26 +1,27 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+require 'English'
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'meteor'
 
 Gem::Specification.new do |spec|
-  spec.name = %q{meteor}
+  spec.name = 'meteor'
   spec.version = Meteor::VERSION
-  spec.authors = ["Yasumasa Ashida"]
-  spec.email = %q{ys.ashida@gmail.com}
-  spec.description = %q{A lightweight (X)HTML & XML parser}
-  spec.summary = %q{A lightweight (X)HTML & XML parser}
-  spec.homepage = %q{https://github.com/asip/meteor}
+  spec.authors = ['Yasumasa Ashida']
+  spec.email = 'ys.ashida@gmail.com'
+  spec.description = 'A lightweight (X)HTML & XML parser'
+  spec.summary = 'A lightweight (X)HTML & XML parser'
+  spec.homepage = 'https://github.com/asip/meteor'
   spec.license = 'LGPL-2.1-only'
 
-  spec.required_ruby_version = ">=3.0"
+  spec.required_ruby_version = '>=3.0'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features|demo)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 4.0.11"
+  spec.add_development_dependency 'bundler', '~> 4.0.13'
   # spec.add_development_dependency "rake"
-
 end

data/test/meteor_test.rb

@@ -1,5 +1,7 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+# frozen_string_literal: true
 
-require "test/unit"
+require "#{File.dirname(__FILE__)}/test_helper.rb"
+
+require 'test/unit'
 class MeteorTest < Test::Unit::TestCase
 end

data/test/test_helper.rb

@@ -1,3 +1,4 @@
-require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/meteor'
+# frozen_string_literal: true
 
+require 'test/unit'
+require "#{File.dirname(__FILE__)}/../lib/meteor"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meteor
 version: !ruby/object:Gem::Version
-  version: 0.9.30
+  version: 0.9.32
 platform: ruby
 authors:
 - Yasumasa Ashida
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.11
+        version: 4.0.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.11
+        version: 4.0.13
 description: A lightweight (X)HTML & XML parser
 email: ys.ashida@gmail.com
 executables: []
@@ -34,7 +34,6 @@ files:
 - Gemfile
 - Gemfile.lock
 - README.md
-- Rakefile
 - demo/html.rb
 - demo/html4.rb
 - demo/ml/sample.xml
@@ -49,6 +48,7 @@ files:
 - lib/meteor/attribute.rb
 - lib/meteor/attribute_map.rb
 - lib/meteor/core/kernel.rb
+- lib/meteor/core/util/file_reader.rb
 - lib/meteor/core/util/pattern_cache.rb
 - lib/meteor/element.rb
 - lib/meteor/elements.rb