meteor 0.9.13 → 0.9.14

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

@@ -11,40 +11,44 @@ module Meteor
 
         # KAIGYO_CODE = "\r?\n|\r"
         KAIGYO_CODE = ["\r\n", "\n", "\r"]
-        BR = '<br/>'
+        BR = "<br/>"
 
         # @@match_tag_2 = "textarea|option|pre"
-        @@match_tag_2 = ['textarea', 'option', 'pre'] #[Array] 改行を<br/>に変換する必要のない要素
+        #[Array] 改行を<br/>に変換する必要のない要素
+        @@match_tag_2 = ["textarea", "option", "pre"]
 
-        @@attr_logic = ['disabled', 'readonly', 'checked', 'selected', 'multiple'] #[Array] 論理値で指定する属性
+        #[Array] 論理値で指定する属性
+        @@attr_logic = ["disabled", "readonly", "checked", "selected", "multiple"]
 
         # DISABLE_ELEMENT = "input|textarea|select|optgroup"
-        DISABLE_ELEMENT = ['input', 'textarea', 'select', 'optgroup'] #[Array] element with disablled attribute (disabled属性のある要素)
+        #[Array] element with disablled attribute (disabled属性のある要素)
+        DISABLE_ELEMENT = ["input", "textarea", "select", "optgroup"]
         # READONLY_TYPE = "text|password"
-        READONLY_TYPE = ['text', 'password'] #[Array] readonly属性のあるinput要素のタイプ
-
-        SELECTED_M = '\\sselected="[^"]*"\\s|\\sselected="[^"]*"$'
-        SELECTED_M1 = '\\sselected="([^"]*)"\\s|\\sselected="([^"]*)"$'
-        SELECTED_R = 'selected="[^"]*"'
-        SELECTED_U = 'selected="selected"'
-        CHECKED_M = '\\schecked="[^"]*"\\s|\\schecked="[^"]*"$'
-        CHECKED_M1 = '\\schecked="([^"]*)"\\s|\\schecked="([^"]*)"$'
-        CHECKED_R = 'checked="[^"]*"'
-        CHECKED_U = 'checked="checked"'
-        DISABLED_M = '\\sdisabled="[^"]*"\\s|\\sdisabled="[^"]*"$'
-        DISABLED_M1 = '\\sdisabled="([^"]*)"\\s|\\sdisabled="([^"]*)"$'
-        DISABLED_R = 'disabled="[^"]*"'
-        DISABLED_U = 'disabled="disabled"'
-        READONLY_M = '\\sreadonly="[^"]*"\\s|\\sreadonly="[^"]*"$'
-        READONLY_M1 = '\\sreadonly="([^"]*)"\\s|\\sreadonly="([^"]*)"$'
-        READONLY_R = 'readonly="[^"]*"'
-        READONLY_U = 'readonly="readonly"'
-        MULTIPLE_M = '\\smultiple="[^"]*"\\s|\\smultiple="[^"]*"$'
-        MULTIPLE_M1 = '\\smultiple="([^"]*)"\\s|\\smultiple="([^"]*)"$'
-        MULTIPLE_R = 'multiple="[^"]*"'
-        MULTIPLE_U = 'multiple="multiple"'
-
-        PATTERN_UNESCAPE = '&(amp|quot|apos|gt|lt|nbsp);'
+        #[Array] readonly属性のあるinput要素のタイプ
+        READONLY_TYPE = ["text", "password"]
+
+        SELECTED_M = "\\sselected=\"[^\"]*\"\\s|\\sselected=\"[^\"]*\"$"
+        SELECTED_M1 = "\\sselected=\"([^\"]*)\"\\s|\\sselected=\"([^\"]*)\"$"
+        SELECTED_R = "selected=\"[^\"]*\""
+        SELECTED_U = "selected=\"selected\""
+        CHECKED_M = "\\schecked=\"[^\"]*\"\\s|\\schecked=\"[^\"]*\"$"
+        CHECKED_M1 = "\\schecked=\"([^\"]*)\"\\s|\\schecked=\"([^\"]*)\"$"
+        CHECKED_R = "checked=\"[^\"]*\""
+        CHECKED_U = "checked=\"checked\""
+        DISABLED_M = "\\sdisabled=\"[^\"]*\"\\s|\\sdisabled=\"[^\"]*\"$"
+        DISABLED_M1 = "\\sdisabled=\"([^\"]*)\"\\s|\\sdisabled=\"([^\"]*)\"$"
+        DISABLED_R = "disabled=\"[^\"]*\""
+        DISABLED_U = "disabled=\"disabled\""
+        READONLY_M = "\\sreadonly=\"[^\"]*\"\\s|\\sreadonly=\"[^\"]*\"$"
+        READONLY_M1 = "\\sreadonly=\"([^\"]*)\"\\s|\\sreadonly=\"([^\"]*)\"$"
+        READONLY_R = "readonly=\"[^\"]*\""
+        READONLY_U = "readonly=\"readonly\""
+        MULTIPLE_M = "\\smultiple=\"[^\"]*\"\\s|\\smultiple=\"[^\"]*\"$"
+        MULTIPLE_M1 = "\\smultiple=\"([^\"]*)\"\\s|\\smultiple=\"([^\"]*)\"$"
+        MULTIPLE_R = "multiple=\"[^\"]*\""
+        MULTIPLE_U = "multiple=\"multiple\""
+
+        PATTERN_UNESCAPE = "&(amp|quot|apos|gt|lt|nbsp);"
 
         @@pattern_selected_m = Regexp.new(SELECTED_M)
         @@pattern_selected_m1 = Regexp.new(SELECTED_M1)
@@ -64,34 +68,34 @@ module Meteor
 
         @@pattern_unescape = Regexp.new(PATTERN_UNESCAPE)
 
-        @@pattern_br_2 = Regexp.new('<br\\/>')
+        @@pattern_br_2 = Regexp.new("<br\\/>")
 
         # @@pattern_match_tag = Regexp.new(@@match_tag)
         # @@pattern_match_tag2 = Regexp.new(@@match_tag_2)
 
         TABLE_FOR_ESCAPE_ = {
-          '&' => '&amp;',
-          '"' => '&quot;',
-          '\'' => '&apos;',
-          '<' => '&lt;',
-          '>' => '&gt;',
-          ' ' => '&nbsp;',
+          "&" => "&amp;",
+          "\"" => "&quot;",
+          "'" => "&apos;",
+          "<" => "&lt;",
+          ">" => "&gt;",
+          " " => "&nbsp;"
         }
 
         TABLE_FOR_ESCAPE_CONTENT_ = {
-          '&' => '&amp;',
-          '"' => '&quot;',
-          '\'' => '&apos;',
-          '<' => '&lt;',
-          '>' => '&gt;',
-          ' ' => '&nbsp;',
-          "\r\n" => '<br/>',
-          "\r" => '<br/>',
-          "\n" => '<br/>',
+          "&" => "&amp;",
+          "\"" => "&quot;",
+          "'" => "&apos;",
+          "<" => "&lt;",
+          ">" => "&gt;",
+          " " => "&nbsp;",
+          "\r\n" => "<br/>",
+          "\r" => "<br/>",
+          "\n" => "<br/>"
         }
 
-        PATTERN_ESCAPE = '[&"\'<> ]'
-        PATTERN_ESCAPE_CONTENT = '[&"\'<> \\n]'
+        PATTERN_ESCAPE = "[&\"'<> ]"
+        PATTERN_ESCAPE_CONTENT = "[&\"'<> \\n]"
         @@pattern_escape = Regexp.new(PATTERN_ESCAPE)
         @@pattern_escape_content = Regexp.new(PATTERN_ESCAPE_CONTENT)
 
@@ -105,12 +109,12 @@ module Meteor
           super()
           @doc_type = Parser::XHTML4
           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
 
@@ -168,21 +172,21 @@ module Meteor
         def analyze_content_type
           @error_check = false
 
-          element_3('meta', 'http-equiv', 'Content-Type')
+          element_3("meta", "http-equiv", "Content-Type")
 
           if !@elm_
-            element_3('meta', 'http-equiv', 'Content-Type')
+            element_3("meta", "http-equiv", "Content-Type")
           end
 
           @error_check = true
 
           if @elm_
-            content = @elm_.attr('content')
-            content_arr = content&.split(';')
-            @root.content_type = content_arr&.at(0) || ''
-            @root.charset = content_arr&.at(1)&.split('=')&.at(1) || ''
+            content = @elm_.attr("content")
+            content_arr = content&.split(";")
+            @root.content_type = content_arr&.at(0) || ""
+            @root.charset = content_arr&.at(1)&.split("=")&.at(1) || ""
           else
-            @root.content_type = ''
+            @root.content_type = ""
           end
         end
 
@@ -202,20 +206,20 @@ module Meteor
         private :analyze_kaigyo_code
 
         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_value, @@pattern_selected_m, @@pattern_selected_r, SELECTED_U)
-          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_value, @@pattern_multiple_m, @@pattern_multiple_r, MULTIPLE_U)
-          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_value, @@pattern_disabled_m, @@pattern_disabled_r, DISABLED_U)
-          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_value, @@pattern_checked_m, @@pattern_checked_r, CHECKED_U)
-          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_value, @@pattern_readonly_m, @@pattern_readonly_r, READONLY_U)
           else
             super(elm, attr_name, attr_value)
           end
-
         end
 
         private :edit_attrs_
@@ -228,11 +232,12 @@ module Meteor
 
             if !@res
               # add and attribute to attributes (属性文字列の最後に新規の属性を追加する)
-              if elm.attributes != ''
-                elm.attributes = String.new('') << ' ' << elm.attributes.strip
+              if elm.attributes != ""
+                elm.attributes = String.new("") << " " << elm.attributes.strip
                 # else
               end
-              elm.attributes << ' ' << replace_update
+
+              elm.attributes << " " << replace_update
             else
               # reolace attribute (属性の置換)
               elm.attributes.gsub!(replace_regex, replace_update)
@@ -240,22 +245,23 @@ module Meteor
           elsif false.equal?(attr_value) || is_match("false", attr_value)
             # delete if attribute_name attrubute exeists (attr_name属性が存在するなら削除)
             # reolace attribute (属性の置換)
-            elm.attributes.gsub!(replace_regex, '')
+            elm.attributes.gsub!(replace_regex, "")
           end
         end
 
         private :edit_attrs_5
 
         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, attr_name, @@pattern_selected_m1)
-          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, attr_name, @@pattern_multiple_m1)
-          elsif is_match('diabled', attr_name) && is_match(DISABLE_ELEMENT, elm.name)
+          elsif is_match("diabled", attr_name) && is_match(DISABLE_ELEMENT, elm.name)
             get_attr_value_r(elm, attr_name, @@pattern_disabled_m1)
-          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, attr_name, @@pattern_checked_m1)
-          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, attr_name, @@pattern_readonly_m1)
           else
             super(elm, attr_name)
@@ -266,11 +272,12 @@ module Meteor
 
         def get_type(elm)
           if !elm.type_value
-            elm.type_value = get_attr_value(elm, 'type')
+            elm.type_value = get_attr_value(elm, "type")
             if !elm.type_value
               elm.type_value = get_attr_value(elm, "TYPE")
             end
           end
+
           elm.type_value
         end
 
@@ -321,12 +328,13 @@ module Meteor
           attrs = Meteor::AttributeMap.new
 
           elm.attributes.scan(@@pattern_get_attrs_map) do |a, b|
-            if is_match(@@attr_logic, a) && a==b
+            if is_match(@@attr_logic, a) && a == b
               attrs.store(a, "true")
             else
               attrs.store(a, unescape(b))
             end
           end
+
           attrs.recordable = true
 
           attrs
@@ -360,18 +368,18 @@ module Meteor
           # 「&」<-「&amp;」
           content.gsub(@@pattern_unescape) do
             case $1
-              when 'amp'
-                '&'
-              when 'quot'
-                '"'
-              when 'apos'
-                "'"
-              when 'gt'
-                '>'
-              when 'lt'
-                '<'
-              when 'nbsp'
-                ' '
+            when "amp"
+              "&"
+            when "quot"
+              "\""
+            when "apos"
+              "'"
+            when "gt"
+              ">"
+            when "lt"
+              "<"
+            when "nbsp"
+              " "
             end
           end
 
@@ -384,8 +392,8 @@ module Meteor
           content_ = unescape(content)
 
           if (elm.cx || !is_match(@@match_tag_2, elm.name)) && content.include?(BR)
-              # 「<br>」->「¥r?¥n」
-              content_.gsub!(@@pattern_br_2, @root.kaigyo_code)
+            # 「<br>」->「¥r?¥n」
+            content_.gsub!(@@pattern_br_2, @root.kaigyo_code)
           end
 
           content_

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

@@ -11,18 +11,18 @@ module Meteor
         # KAIGYO_CODE = "\r?\n|\r"
         KAIGYO_CODE = ["\r\n", "\n", "\r"]
 
-        PATTERN_UNESCAPE = '&(amp|quot|apos|gt|lt);'
+        PATTERN_UNESCAPE = "&(amp|quot|apos|gt|lt);"
 
         @@pattern_unescape = Regexp.new(PATTERN_UNESCAPE)
 
         TABLE_FOR_ESCAPE_ = {
-            '&' => '&',
-            '"' => '"',
-            '\'' => ''',
-            '<' => '&lt;',
-            '>' => '&gt;',
+          "&" => "&amp;",
+          "\"" => "&quot;",
+          "'" => "&apos;",
+          "<" => "&lt;",
+          ">" => "&gt;"
         }
-        PATTERN_ESCAPE = '[&\"\'<>]'
+        PATTERN_ESCAPE = "[&\\\"'<>]"
         @@pattern_escape = Regexp.new(PATTERN_ESCAPE)
 
         #
@@ -35,12 +35,12 @@ module Meteor
           super()
           @doc_type = Parser::XML
           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
 
@@ -61,11 +61,12 @@ module Meteor
         def initialize_1(ps)
           @root.document = String.new(ps.document)
           ps.document_hook = String.new(ps.document_hook)
+          @root.content_type = String.new(ps.root_element.content_type)
+          @root.kaigyo_code = ps.root_element.kaigyo_code
         end
 
         private :initialize_1
 
-
         #
         # parse document (ドキュメントを解析する)
         #
@@ -78,6 +79,7 @@ module Meteor
         #
         def analyze_ml
           analyze_kaigyo_code
+          analyze_content_type
 
           @res = nil
         end
@@ -102,11 +104,19 @@ module Meteor
               # puts "kaigyo:" << @root.kaigyo_code
             end
           end
-
         end
 
         private :analyze_kaigyo_code
 
+         #
+        # analyze document , set content type (ドキュメントをパースし、コンテントタイプをセットする)
+        #
+        def analyze_content_type
+          @root.content_type = "text/xml"
+        end
+
+        private :analyze_content_type
+
         def escape(content)
           # replace special character (特殊文字の置換)
           content = content.gsub(@@pattern_escape, TABLE_FOR_ESCAPE_)
@@ -131,16 +141,16 @@ module Meteor
           # 「&」<-「&amp;」
           content.gsub(@@pattern_unescape) do
             case $1
-              when 'amp'
-                '&'
-              when 'quot'
-                '"'
-              when 'apos'
-                "'"
-              when 'gt'
-                '>'
-              when 'lt'
-                '<'
+            when "amp"
+              "&"
+            when "quot"
+              "\""
+            when "apos"
+              "'"
+            when "gt"
+              ">"
+            when "lt"
+              "<"
             end
           end