meteor 0.9.13 → 0.9.14

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

@@ -28,22 +28,23 @@ 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
-            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
+          when ONE
+            # get_1(args[0])
+            if @@regex_cache[args[0].to_sym]
+              @@regex_cache[args[0].to_sym]
             else
-              raise ArgumentError
+              @@regex_cache[args[0].to_sym] = Regexp.new(args[0], Regexp::MULTILINE)
+            end
+
+          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
+          else
+            raise ArgumentError
           end
         end
 

data/lib/meteor/element.rb

@@ -68,31 +68,32 @@ module Meteor
     #
     def initialize(*args)
       case args.length
-        when Meteor::ONE
-          if args[0].kind_of?(String)
-            initialize_s(args[0])
-          elsif args[0].kind_of?(Meteor::Element)
-            initialize_e(args[0])
-          else
-            raise ArgumentError
-          end
-        when Meteor::TWO
-          @name = args[0].name
-          @attributes = String.new(args[0].attributes)
-          @mixed_content = String.new(args[0].mixed_content)
-          # @pattern = String.new(args[0].pattern)
-          @pattern = args[0].pattern
-          @document = String.new(args[0].document)
-          @empty = args[0].empty
-          @cx = args[0].cx
-          @mono = args[0].mono
-          @parser = args[1]
-          # @usable = false
-          @origin = args[0]
-          args[0].copy = self
-        when Meteor::ZERO
+      when Meteor::ONE
+        if args[0].kind_of?(String)
+          initialize_s(args[0])
+        elsif args[0].kind_of?(Meteor::Element)
+          initialize_e(args[0])
         else
           raise ArgumentError
+        end
+
+      when Meteor::TWO
+        @name = args[0].name
+        @attributes = String.new(args[0].attributes)
+        @mixed_content = String.new(args[0].mixed_content)
+        # @pattern = String.new(args[0].pattern)
+        @pattern = args[0].pattern
+        @document = String.new(args[0].document)
+        @empty = args[0].empty
+        @cx = args[0].cx
+        @mono = args[0].mono
+        @parser = args[1]
+        # @usable = false
+        @origin = args[0]
+        args[0].copy = self
+      when Meteor::ZERO
+      else
+        raise ArgumentError
       end
     end
 
@@ -145,21 +146,21 @@ module Meteor
     #
     def self.new!(*args)
       case args.length
-        when Meteor::TWO
-          @obj = args[1].element_hook
-          if @obj
-            @obj.attributes = String.new(args[0].attributes)
-            @obj.mixed_content = String.new(args[0].mixed_content)
-            # @obj.pattern = String.new(args[0].pattern)
-            @obj.document = String.new(args[0].document)
-            @obj
-          else
-            @obj = self.new(args[0], args[1])
-            args[1].element_hook = @obj
-            @obj
-          end
+      when Meteor::TWO
+        @obj = args[1].element_hook
+        if @obj
+          @obj.attributes = String.new(args[0].attributes)
+          @obj.mixed_content = String.new(args[0].mixed_content)
+          # @obj.pattern = String.new(args[0].pattern)
+          @obj.document = String.new(args[0].document)
+          @obj
         else
-          raise ArgumentError
+          @obj = self.new(args[0], args[1])
+          args[1].element_hook = @obj
+          @obj
+        end
+      else
+        raise ArgumentError
       end
     end
 
@@ -200,32 +201,33 @@ module Meteor
       if @document_sync
         @document_sync = false
         case @parser.doc_type
-          when Parser::HTML, Parser::HTML4
-            if @cx
-              # @pattern_cc = String.new('') << '<!-- @' << elm.name << ' ' << elm.attributes << '-->' << elm.mixed_content << '<!-- /@' << elm.name << ' -->'
-              @document = "<!-- @#{@name} #{@attributes} -->#{@mixed_content}<!-- /@#{@name} -->"
+        when Parser::HTML, Parser::HTML4
+          if @cx
+            # @pattern_cc = String.new('') << '<!-- @' << elm.name << ' ' << elm.attributes << '-->' << elm.mixed_content << '<!-- /@' << elm.name << ' -->'
+            @document = "<!-- @#{@name} #{@attributes} -->#{@mixed_content}<!-- /@#{@name} -->"
+          else
+            if @empty
+              # @pattern_cc = String.new('') << "<" << elm.name << elm.attributes << '>' << elm.mixed_content << '</' << elm.name << '>'
+              @document = "<#{@name}#{@attributes}>#{@mixed_content}</#{@name}>"
             else
-              if @empty
-                # @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} -->"
+          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} -->"
+          else
+            if @empty
+              # @pattern_cc = String.new('') << "<" << elm.name << elm.attributes << '>' << elm.mixed_content << '</' << elm.name << '>'
+              @document = "<#{@name}#{@attributes}>#{@mixed_content}</#{@name}>"
             else
-              if @empty
-                # @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
         end
       else
         @document
@@ -281,7 +283,7 @@ module Meteor
     #  @param [Meteor::Element] elm element(要素)
     #  @return [Meteor::Element] element(要素)
     #
-    def element(elm = nil, attrs = nil,*args)
+    def element(elm = nil, attrs = nil, *args)
       # case args.length
       # when ZERO
       if !elm && !attrs
@@ -383,8 +385,8 @@ module Meteor
     #  @param [String,Symbol] attr_name attribute name (属性名)
     #  @return [String] attribute value (属性値)
     #
-    def attr(attrs,*args)
-      @parser.attr(self, attrs,*args)
+    def attr(attrs, *args)
+      @parser.attr(self, attrs, *args)
     end
 
     #
@@ -393,7 +395,7 @@ module Meteor
     # @return [Meteor::Element] element (要素)
     #
     def attr=(attr)
-      @parser.attr(self,attr)
+      @parser.attr(self, attr)
     end
 
     #

data/lib/meteor/exception/no_such_element_exception.rb

@@ -37,45 +37,45 @@ module Meteor
       #
       def initialize(*args)
         case args.length
-          when ONE
-            initialize_1(args[0])
-          when TWO
-            initialize_2(args[0], args[1])
-          when THREE
-            initialize_3(args[0], args[1], args[2])
-          when FOUR
-            initialize_4(args[0], args[1], args[2], args[3])
-          when FIVE
-            initialize_5(args[0], args[1], args[2], args[3], args[4])
+        when ONE
+          initialize_1(args[0])
+        when TWO
+          initialize_2(args[0], args[1])
+        when THREE
+          initialize_3(args[0], args[1], args[2])
+        when FOUR
+          initialize_4(args[0], args[1], args[2], args[3])
+        when FIVE
+          initialize_5(args[0], args[1], args[2], args[3], args[4])
         end
       end
 
       def initialize_1(name)
-        self.message="element not found : #{name}"
+        self.message = "element not found : #{name}"
       end
 
       private :initialize_1
 
       def initialize_2(attr_name, attr_value)
-        self.message="element not found : [#{attr_name}=#{attr_value}]"
+        self.message = "element not found : [#{attr_name}=#{attr_value}]"
       end
 
       private :initialize_2
 
       def initialize_3(name, attr_name, attr_value)
-        self.message="element not found : #{name}[#{attr_name}=#{attr_value}]"
+        self.message = "element not found : #{name}[#{attr_name}=#{attr_value}]"
       end
 
       private :initialize_3
 
       def initialize_4(attr_name1, attr_value1, attr_name2, attr_value2)
-        self.message="element not found : [#{attr_name1}=#{attr_value1}][#{attr_name2}=#{attr_value2}]"
+        self.message = "element not found : [#{attr_name1}=#{attr_value1}][#{attr_name2}=#{attr_value2}]"
       end
 
       private :initialize_4
 
       def initialize_5(name, attr_name1, attr_value1, attr_name2, attr_value2)
-        self.message="element not found : #{name}[#{attr_name1}=#{attr_value1}][#{attr_name2}=#{attr_value2}]"
+        self.message = "element not found : #{name}[#{attr_name1}=#{attr_value1}][#{attr_name2}=#{attr_value2}]"
       end
 
       private :initialize_5

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

@@ -8,19 +8,42 @@ module Meteor
       # HTML parser (HTMLパーサ)
       #
       class ParserImpl < Meteor::Ml::Html4::ParserImpl
-        MATCH_TAG = ['br', 'hr', 'img', 'input', 'meta', 'base', 'embed', 'command', 'keygen'] #[Array] void elements (空要素)
-
-        MATCH_TAG_SNG = ['texarea', 'select', 'option', 'form', 'fieldset', 'figure', 'figcaption', 'video', 'audio', 'progress', 'meter', 'time', 'ruby', 'rt', 'rp', 'datalist', 'output'] #[Array] non-nestable elements (入れ子にできない要素)
-
-        ATTR_LOGIC = ['disabled', 'readonly', 'checked', 'selected', 'multiple', 'required'] #[Array] boolean attributes (論理値で指定する属性)
-
-        DISABLE_ELEMENT = ['input', 'textarea', 'select', 'optgroup', 'fieldset'] #[Array] elements with the disabled attribute (disabled属性のある要素)
-
-        REQUIRE_ELEMENT = ['input', 'textarea'] #[Array] elements with the required attribute (required属性のある要素)
-
-        REQUIRED_M = '\\srequired\\s|\\srequired$|\\sREQUIRED\\s|\\sREQUIRED$'
+        #[Array] void elements (空要素)
+        MATCH_TAG = ["br", "hr", "img", "input", "meta", "base", "embed", "command", "keygen"]
+
+        #[Array] non-nestable elements (入れ子にできない要素)
+        MATCH_TAG_SNG = [
+          "texarea",
+          "select",
+          "option",
+          "form",
+          "fieldset",
+          "figure",
+          "figcaption",
+          "video",
+          "audio",
+          "progress",
+          "meter",
+          "time",
+          "ruby",
+          "rt",
+          "rp",
+          "datalist",
+          "output"
+        ]
+
+        #[Array] boolean attributes (論理値で指定する属性)
+        ATTR_LOGIC = ["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$"
         # 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)
@@ -38,12 +61,12 @@ module Meteor
           @@attr_logic = ATTR_LOGIC
           @doc_type = Parser::HTML
           case args.length
-            when ZERO
-              # initialize_0
-            when ONE
-              initialize_1(args[0])
-            else
-              raise ArgumentError
+          when ZERO
+            # initialize_0
+          when ONE
+            initialize_1(args[0])
+          else
+            raise ArgumentError
           end
         end
 
@@ -75,10 +98,10 @@ 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)
+            element_3("meta", "charset", "[a-zA-Z-]+", false)
           end
 
           @error_check = true
@@ -92,23 +115,24 @@ module Meteor
             @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)
@@ -118,17 +142,18 @@ 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)