meteor 0.9.29 → 0.9.31

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Meteor
+  module Core
+    module Util
+      #
+      # FileReader Class (ファイル・リーダー クラス)
+      #
+      class FileReader
+        #
+        # read file (ファイルを読み込む)
+        # @param [String] file_path absolute path of input file (入力ファイルの絶対パス)
+        # @param [String] enc character encoding of input file (入力ファイルの文字コード)
+        #
+        def self.read(file_path, enc)
+          mode = if enc == 'UTF-8'
+                   # String.new("") << "r:" << enc
+                   'r:UTF-8'
+                 else
+                   String.new('') << 'r:' << enc << ':utf-8'
+                 end
+
+          # open file (ファイルのオープン)
+          io = File.open(file_path, mode)
+
+          # load (読込)
+          data = io.read
+
+          # close file (ファイルのクローズ)
+          io.close
+
+          data
+        end
+      end
+    end
+  end
+end

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

@@ -8,7 +8,7 @@ module Meteor
       # Pattern Cache Class (パターン・キャッシュ クラス)
       #
       class PatternCache
-        @@regex_cache = Hash.new
+        @@regex_cache = {}
 
         ##
         ## intializer (イニシャライザ)
@@ -29,79 +29,45 @@ module Meteor
         def self.get(*args)
           case args.length
           when ONE
-            # get_1(args[0])
-            if @@regex_cache[args[0].to_sym]
-              @@regex_cache[args[0].to_sym]
-            else
-              @@regex_cache[args[0].to_sym] = Regexp.new(args[0], Regexp::MULTILINE)
-            end
-
+            get_1(args[0])
           when TWO
-            # get_2(args[0], args[1])
-            if @@regex_cache[args[0].to_sym]
-              @@regex_cache[args[0].to_sym]
-            else
-              @@regex_cache[args[0].to_sym] = Regexp.new(args[0], args[1])
-            end
+            get_2(args[0], args[1])
           else
             raise ArgumentError
           end
         end
 
-        ##
-        ## get pattern (パターンを取得する)
-        ## @param [String] regex regular expression (正規表現)
-        ## @return [Regexp] pattern (パターン)
-        ##
-        # def self.get_1(regex)
-        #  ## pattern = @@regex_cache[regex]
-        #  ##
-        #  ## if pattern == nil
-        #  # if regex.kind_of?(String)
-        #  if !@@regex_cache[regex.to_sym]
-        #    # pattern = Regexp.new(regex)
-        #    # @@regex_cache[regex] = pattern
-        #    @@regex_cache[regex.to_sym] = Regexp.new(regex, Regexp::MULTILINE)
-        #  end
         #
-        #  # return pattern
-        #  @@regex_cache[regex.to_sym]
-        #  ## elsif regex.kind_of?(Symbol)
-        #  ##  if !@@regex_cache[regex]
-        #  ##    @@regex_cache[regex.object_id] = Regexp.new(regex.to_s, Regexp::MULTILINE)
-        #  ##  end
-        #  ##
-        #  ##  @@regex_cache[regex]
-        #  # end
-        # end
+        # get pattern (パターンを取得する)
+        # @param [String] regex regular expression (正規表現)
+        # @return [Regexp] pattern (パターン)
+        #
+        def self.get_1(regex)
+          if @@regex_cache[regex.to_sym]
+            @@regex_cache[regex.to_sym]
+          else
+            @@regex_cache[regex.to_sym] = Regexp.new(regex, Regexp::MULTILINE)
+          end
+        end
 
-        ##
-        ## get pattern (パターンを取得する)
-        ## @param [String] regex (正規表現)
-        ## @param [Integer] option (オプション)
-        ## @return [Regexp] psttern (パターン)
-        ##
-        # def self.get_2(regex, option)
-        #  ## pattern = @@regex_cache[regex]
-        #  ##
-        #  ## if pattern == nil
-        #  # if regex.kind_of?(String)
-        #  if !@@regex_cache[regex.to_sym]
-        #    # pattern = Regexp.new(regex)
-        #    # @@regex_cache[regex] = pattern
-        #    @@regex_cache[regex.to_sym] = Regexp.new(regex, option,"UTF-8")
-        #  end
         #
-        #  # return pattern
-        #  @@regex_cache[regex.to_sym]
-        #  ## elsif regex.kind_of?(Symbol)
-        #  ##  if !@@regex_cache[regex]
-        #  ##    @@regex_cache[regex] = Regexp.new(regex.to_s, option,"UTF-8")
-        #  ##  end
-        #  ##
-        #  ##  @@regex_cache[regex]
-        #  # end
-        # end
+        # get pattern (パターンを取得する)
+        # @param [String] regex (正規表現)
+        # @param [Integer] option (オプション)
+        # @return [Regexp] psttern (パターン)
+        #
+        def self.get_2(regex, option)
+          if @@regex_cache[regex.to_sym]
+            @@regex_cache[regex.to_sym]
+          else
+            @@regex_cache[regex.to_sym] = Regexp.new(regex, option)
+          end
+        end
+
+        class << self
+          private :get_1
+          private :get_2
+        end
       end
     end
   end

data/lib/meteor/element.rb

@@ -37,27 +37,14 @@ module Meteor
   #  @return [true,false] deletion flag (削除フラグ)
   #
   class Element
-    attr_accessor :name
-    attr_accessor :attributes
-    attr_accessor :mixed_content
-    attr_accessor :raw_content
-    attr_accessor :pattern
-    attr_accessor :document_sync
-    attr_accessor :normal
-    attr_accessor :cx
-    attr_accessor :mono
-    attr_accessor :parser
-    attr_accessor :type_value
-    attr_accessor :usable
-    attr_accessor :origin
-    attr_accessor :copy
-    attr_accessor :removed
-
-    alias_method :tag, :name
-    alias_method :tag=, :name=
-
-    alias_method :empty, :normal
-    alias_method :empty=, :normal=
+    attr_accessor :name, :attributes, :mixed_content, :raw_content, :pattern, :document_sync, :normal, :cx, :mono,
+                  :parser, :type_value, :usable, :origin, :copy, :removed
+
+    alias tag name
+    alias tag= name=
+
+    alias empty normal
+    alias empty= normal=
 
     #
     # initializer (イニシャライザ)
@@ -72,9 +59,9 @@ module Meteor
     def initialize(*args)
       case args.length
       when Meteor::ONE
-        if args[0].kind_of?(String)
+        if args[0].is_a?(String)
           initialize_s(args[0])
-        elsif args[0].kind_of?(Meteor::Element)
+        elsif args[0].is_a?(Meteor::Element)
           initialize_e(args[0])
         else
           raise ArgumentError
@@ -120,7 +107,7 @@ module Meteor
 
     def initialize_2(elm, ps)
       @parser = ps
-      if self.normal
+      if normal
         ps.element(elm)
       else
         @name = elm.name
@@ -162,19 +149,18 @@ module Meteor
     # @return [Meteor::Element] element (要素)
     #
     def clone_0
-      obj = self.parser.element_cache[self.object_id]
+      obj = parser.element_cache[object_id]
       if obj
-        obj.attributes = String.new(self.attributes)
-        obj.mixed_content = String.new(self.mixed_content)
+        obj.attributes = String.new(attributes)
+        obj.mixed_content = String.new(mixed_content)
         # obj.pattern = String.new(self.pattern)
-        obj.document = String.new(self.document)
+        obj.document = String.new(document)
         obj.usable = true
-        obj
       else
         obj = self.class.new(self)
-        self.parser.element_cache[self.object_id] = obj
-        obj
+        parser.element_cache[object_id] = obj
       end
+      obj
     end
 
     private :clone_0
@@ -187,16 +173,15 @@ module Meteor
     def clone_1(ps)
       obj = ps.element_hook
       if obj
-        obj.attributes = String.new(self.attributes)
-        obj.mixed_content = String.new(self.mixed_content)
+        obj.attributes = String.new(attributes)
+        obj.mixed_content = String.new(mixed_content)
         # obj.pattern = String.new(self.pattern)
-        obj.document = String.new(self.document)
-        obj
+        obj.document = String.new(document)
       else
         obj = self.class.new(self, ps)
         ps.element_hook = obj
-        obj
       end
+      obj
     end
 
     private :clone_1
@@ -222,27 +207,23 @@ module Meteor
           if @cx
             # @pattern_cc = String.new('') << '<!-- @' << elm.name << ' ' << elm.attributes << '-->' << elm.mixed_content << '<!-- /@' << elm.name << ' -->'
             @document = "<!-- @#{@name} #{@attributes} -->#{@mixed_content}<!-- /@#{@name} -->"
+          elsif @normal
+            # @pattern_cc = String.new('') << "<" << elm.name << elm.attributes << '>' << elm.mixed_content << '</' << elm.name << '>'
+            @document = "<#{@name}#{@attributes}>#{@mixed_content}</#{@name}>"
           else
-            if @normal
-              # @pattern_cc = String.new('') << "<" << elm.name << elm.attributes << '>' << elm.mixed_content << '</' << elm.name << '>'
-              @document = "<#{@name}#{@attributes}>#{@mixed_content}</#{@name}>"
-            else
-              @document = String.new("") << "<" << @name << @attributes << ">"
-              # @document = "<#{@name}#{@attributes}>"
-            end
+            @document = String.new('') << '<' << @name << @attributes << '>'
+            # @document = "<#{@name}#{@attributes}>"
           end
         when Parser::XHTML, Parser::XHTML4, Parser::XML
           if @cx
             # @pattern_cc = String.new('') << '<!-- @' << elm.name << ' ' << elm.attributes << '-->' << elm.mixed_content << '<!-- /@' << elm.name << ' -->'
             @document = "<!-- @#{@name} #{@attributes} -->#{@mixed_content}<!-- /@#{@name} -->"
+          elsif @normal
+            # @pattern_cc = String.new('') << "<" << elm.name << elm.attributes << '>' << elm.mixed_content << '</' << elm.name << '>'
+            @document = "<#{@name}#{@attributes}>#{@mixed_content}</#{@name}>"
           else
-            if @normal
-              # @pattern_cc = String.new('') << "<" << elm.name << elm.attributes << '>' << elm.mixed_content << '</' << elm.name << '>'
-              @document = "<#{@name}#{@attributes}>#{@mixed_content}</#{@name}>"
-            else
-              @document = String.new("") << "<" << @name << @attributes << "/>"
-              # @document = "<#{@name}#{@attributes}/>"
-            end
+            @document = String.new('') << '<' << @name << @attributes << '/>'
+            # @document = "<#{@name}#{@attributes}/>"
           end
         end
       else
@@ -309,7 +290,7 @@ module Meteor
       end
     end
 
-    alias_method :child, :element
+    alias child element
 
     #
     # get elements (要素を取得する)
@@ -367,7 +348,7 @@ module Meteor
       @parser.find(selector)
     end
 
-    alias_method :css, :find
+    alias css find
 
     #
     # get cx(comment extension) tag (CX(コメント拡張)タグを取得する)
@@ -473,7 +454,7 @@ module Meteor
       @parser.content(self, *args)
     end
 
-    alias_method :text, :content
+    alias text content
 
     #
     # set content of element (要素の内容をセットする)
@@ -484,7 +465,7 @@ module Meteor
       @parser.content(self, value)
     end
 
-    alias_method :text=, :content=
+    alias text= content=
 
     #
     # set content of element (要素の内容をセットする)
@@ -495,7 +476,7 @@ module Meteor
       @parser.content(self, value, false)
     end
 
-    alias_method :unsafe_text=, :unsafe_content=
+    alias unsafe_text= unsafe_content=
 
     #
     # set attribute (属性をセットする)
@@ -504,7 +485,7 @@ module Meteor
     # @return [Meteor::Element] element (要素)
     #
     def []=(name, value)
-      if value != nil
+      if !value.nil?
         @parser.attr(self, name, value)
       else
         @parser.remove_attr(self, name)
@@ -543,7 +524,7 @@ module Meteor
       @parser.flash
     end
 
-    alias_method :flush, :flash
+    alias flush flash
 
     #
     # @overload execute(hook)

data/lib/meteor/elements.rb

@@ -23,13 +23,13 @@ module Meteor
     end
 
     #
-    #@overload add(type,relative_path,enc)
+    # @overload add(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 (パーサ)
-    #@overload add(type,relative_path)
+    # @overload add(type,relative_path)
     # add parser (パーサを追加する)
     # @param [Integer] type type of parser (パーサ・タイプ)
     # @param [String] relative_path relative file path (相対ファイルパス)
@@ -57,9 +57,9 @@ module Meteor
     end
 
     class << self
-      alias_method :link, :add
-      alias_method :add_str, :add_template
-      alias_method :link_str, :add_template
+      alias link add
+      alias add_str add_template
+      alias link_str add_template
     end
 
     #
@@ -72,7 +72,7 @@ module Meteor
     end
 
     class << self
-      alias_method :element, :get
+      alias element get
     end
   end
 

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

@@ -8,42 +8,42 @@ module Meteor
       # HTML parser (HTMLパーサ)
       #
       class ParserImpl < Meteor::Ml::Html4::ParserImpl
-        #[Array] void elements (空要素)
-        MATCH_TAG = ["br", "hr", "img", "input", "meta", "base", "embed", "command", "keygen"]
-
-        #[Array] non-nestable elements (入れ子にできない要素)
-        MATCH_TAG_NNE = [
-          "texarea",
-          "select",
-          "option",
-          "form",
-          "fieldset",
-          "figure",
-          "figcaption",
-          "video",
-          "audio",
-          "progress",
-          "meter",
-          "time",
-          "ruby",
-          "rt",
-          "rp",
-          "datalist",
-          "output"
-        ]
-
-        #[Array] boolean attributes (論理値で指定する属性)
-        ATTR_BOOL = ["disabled", "readonly", "checked", "selected", "multiple", "required"]
-
-        #[Array] elements with the disabled attribute (disabled属性のある要素)
-        DISABLE_ELEMENT = ["input", "textarea", "select", "optgroup", "fieldset"]
-
-        #[Array] elements with the required attribute (required属性のある要素)
-        REQUIRE_ELEMENT = ["input", "textarea"]
-
-        REQUIRED_M = "\\srequired\\s|\\srequired$|\\sREQUIRED\\s|\\sREQUIRED$"
+        # [Array] void elements (空要素)
+        MATCH_TAG = %w[br hr img input meta base embed command keygen].freeze
+
+        # [Array] non-nestable elements (入れ子にできない要素)
+        MATCH_TAG_NNE = %w[
+          texarea
+          select
+          option
+          form
+          fieldset
+          figure
+          figcaption
+          video
+          audio
+          progress
+          meter
+          time
+          ruby
+          rt
+          rp
+          datalist
+          output
+        ].freeze
+
+        # [Array] boolean attributes (論理値で指定する属性)
+        ATTR_BOOL = %w[disabled readonly checked selected multiple required].freeze
+
+        # [Array] elements with the disabled attribute (disabled属性のある要素)
+        DISABLE_ELEMENT = %w[input textarea select optgroup fieldset].freeze
+
+        # [Array] elements with the required attribute (required属性のある要素)
+        REQUIRE_ELEMENT = %w[input textarea].freeze
+
+        REQUIRED_M = '\\srequired\\s|\\srequired$|\\sREQUIRED\\s|\\sREQUIRED$'
         # REQUIRED_M = [' required ',' required',' REQUIRED ',' REQUIRED']
-        REQUIRED_R = "required\\s|required$|REQUIRED\\s|REQUIRED$"
+        REQUIRED_R = 'required\\s|required$|REQUIRED\\s|REQUIRED$'
 
         @@pattern_required_m = Regexp.new(REQUIRED_M)
         @@pattern_required_r = Regexp.new(REQUIRED_R)
@@ -98,41 +98,38 @@ module Meteor
         def analyze_content_type
           @error_check = false
 
-          element_3("meta", "charset", "[a-zA-Z-]+", false)
+          element_3('meta', 'charset', '[a-zA-Z-]+', false)
 
-          if !@elm_
-            element_3("meta", "charset", "[a-zA-Z-]+", false)
-          end
+          element_3('meta', 'charset', '[a-zA-Z-]+', false) unless @elm_
 
           @error_check = true
 
           if @elm_
-            @root.charset = @elm_.attr("charset")
-            if !@root.charset
-              @root.charset = "utf-8"
-            end
+            @root.charset = @elm_.attr('charset')
+            @root.charset = 'utf-8' unless @root.charset
           else
-            @root.charset = "utf-8"
+            @root.charset = 'utf-8'
           end
 
-          @root.content_type = "text/html"
+          @root.content_type = 'text/html'
         end
 
         private :analyze_content_type
 
         def edit_attrs_(elm, attr_name, attr_value)
-          if is_match("selected", attr_name) && is_match("option", elm.name)
+          if is_match('selected', attr_name) && is_match('option', elm.name)
             edit_attrs_5(elm, attr_name, attr_value, @@pattern_selected_m, @@pattern_selected_r)
-          elsif is_match("multiple", attr_name) && is_match("select", elm.name)
+          elsif is_match('multiple', attr_name) && is_match('select', elm.name)
             edit_attrs_5(elm, attr_name, attr_value, @@pattern_multiple_m, @@pattern_multiple_r)
-          elsif is_match("disabled", attr_name) && is_match(DISABLE_ELEMENT, elm.name)
+          elsif is_match('disabled', attr_name) && is_match(DISABLE_ELEMENT, elm.name)
             edit_attrs_5(elm, attr_name, attr_value, @@pattern_disabled_m, @@pattern_disabled_r)
-          elsif is_match("checked", attr_name) && is_match("input", elm.name) && is_match("radio", get_type(elm))
+          elsif is_match('checked', attr_name) && is_match('input', elm.name) && is_match('radio', get_type(elm))
             edit_attrs_5(elm, attr_name, attr_value, @@pattern_checked_m, @@pattern_checked_r)
-          elsif is_match("readonly", attr_name) &&
-              (is_match("textarea", elm.name) || (is_match("input", elm.name) && is_match(READONLY_TYPE, get_type(elm))))
+          elsif is_match('readonly', attr_name) &&
+                (is_match('textarea',
+                          elm.name) || (is_match('input', elm.name) && is_match(READONLY_TYPE, get_type(elm))))
             edit_attrs_5(elm, attr_name, attr_value, @@pattern_readonly_m, @@pattern_readonly_r)
-          elsif is_match("required", attr_name) && is_match(REQUIRE_ELEMENT, elm.name)
+          elsif is_match('required', attr_name) && is_match(REQUIRE_ELEMENT, elm.name)
             edit_attrs_5(elm, attr_name, attr_value, @@pattern_required_m, @@pattern_required_r)
           else
             super(elm, attr_name, attr_value)
@@ -142,18 +139,19 @@ module Meteor
         private :edit_attrs_
 
         def get_attr_value_(elm, attr_name)
-          if is_match("selected", attr_name) && is_match("option", elm.name)
+          if is_match('selected', attr_name) && is_match('option', elm.name)
             get_attr_value_r(elm, @@pattern_selected_m)
-          elsif is_match("multiple", attr_name) && is_match("select", elm.name)
+          elsif is_match('multiple', attr_name) && is_match('select', elm.name)
             get_attr_value_r(elm, @@pattern_multiple_m)
-          elsif is_match("disabled", attr_name) && is_match(DISABLE_ELEMENT, elm.name)
+          elsif is_match('disabled', attr_name) && is_match(DISABLE_ELEMENT, elm.name)
             get_attr_value_r(elm, @@pattern_disabled_m)
-          elsif is_match("checked", attr_name) && is_match("input", elm.name) && is_match("radio", get_type(elm))
+          elsif is_match('checked', attr_name) && is_match('input', elm.name) && is_match('radio', get_type(elm))
             get_attr_value_r(elm, @@pattern_checked_m)
-          elsif is_match("readonly", attr_name) &&
-              (is_match("textarea", elm.name) || (is_match("input", elm.name) && is_match(READONLY_TYPE, get_type(elm))))
+          elsif is_match('readonly', attr_name) &&
+                (is_match('textarea',
+                          elm.name) || (is_match('input', elm.name) && is_match(READONLY_TYPE, get_type(elm))))
             get_attr_value_r(elm, @@pattern_readonly_m)
-          elsif is_match("required", attr_name) && is_match(REQUIRE_ELEMENT, elm.name)
+          elsif is_match('required', attr_name) && is_match(REQUIRE_ELEMENT, elm.name)
             get_attr_value_r(elm, @@pattern_required_m)
           else
             super(elm, attr_name)