Ticket #7707: mime_constants.patch

lib/action_controller/request.rb

@@ -64 +64 @@
-      @content_type ||=
-        begin
-          content_type = @env['CONTENT_TYPE'].to_s.downcase
-
+
-          if x_post_format = @env['HTTP_X_POST_DATA_FORMAT']
-            case x_post_format.to_s.downcase
-            when 'yaml'
-'application/x-yaml'
+Mime::YAML.to_s
-            when 'xml'
-'application/xml'
+Mime::XML.to_s
-            end
-          end
-
+
-          Mime::Type.lookup(content_type)
-        end
-    end

lib/action_controller/test_process.rb

@@ -325 +325 @@
-  class TestUploadedFile
-    # The filename, *not* including the path, of the "uploaded" file
-    attr_reader :original_filename
-
+
-    # The content type of the "uploaded" file
-    attr_reader :content_type
-
-'text/plain'
+
+Mime::TEXT
-      raise "#{path} file does not exist" unless File.exist?(path)
-      @content_type = content_type
-      @original_filename = path.sub(/^.*#{File::SEPARATOR}([^#{File::SEPARATOR}]+)$/) { $1 }
-      @tempfile = Tempfile.new(@original_filename)
-      FileUtils.copy_file(path, @tempfile.path)
-    end
-
+
-    def path #:nodoc:
-      @tempfile.path
-    end
-
+
-    alias local_path path
-
+
-    def method_missing(method_name, *args, &block) #:nodoc:
-      @tempfile.send(method_name, *args, &block)
-    end
-  end
-
+
-  module TestProcess
-    def self.included(base)
-      # execute the request simulating a specific http method and set/volley the response

lib/action_controller/mime_type.rb

@@ -24 +24 @@
-      def initialize(order, name, q=nil)
-        @order = order
-        @name = name.strip
-"*/*" # default "*/*"
+Mime::ALL # default wilcard match
-        @q = ((q || 1.0).to_f * 100).to_i
-      end
-
@@ -70 +70 @@
-
-        # Take care of the broken text/xml entry by renaming or deleting it
-        text_xml = list.index("text/xml")
-"application/xml"
+Mime::XML.to_s
-
-        if text_xml && app_xml
-          # set the q value to the max of the two
@@ -84 +84 @@
-
-          # delete text_xml from the list
-          list.delete_at(text_xml)
-
+
-        elsif text_xml
-"application/xml"
+Mime::XML.to_s
-        end
-
-        # Look for more specific xml-based types and sort them ahead of app/xml

lib/action_controller/deprecated_request_methods.rb

@@ -6 +6 @@
-    # For backward compatibility, the post format is extracted from the
-    # X-Post-Data-Format HTTP header if present.
-    def post_format
-.to_s
-'application/xml'
+
+Mime::XML
-        :xml
-'application/x-yaml'
+Mime::YAML
-        :yaml
-      else
-        :url_encoded

lib/action_controller/response.rb

@@ -20 +20 @@
-    end
-    
-    def charset=(encoding)
-"text/html"
+Mime::HTML
-    end
-    
-    def charset

lib/action_view/helpers/url_helper.rb

@@ -295 +295 @@
-          for i in 0...tmp.length
-            string << sprintf("%%%x",tmp[i])
-          end
-text/javascript
+#{Mime::JS}
-        elsif encode == "hex"
-          email_address_encoded = ''
-          email_address_obfuscated.each_byte do |c|

lib/action_view/helpers/javascript_helper.rb

@@ -132 +132 @@
-      # public/javascripts/ directory, and use +javascript_include_tag+ to 
-      # create remote <script> links.
-      def define_javascript_functions
-'<script type="text/javascript">'
+"<script type=\"#{Mime::JS}\">"
-        
-        # load prototype.js and its extensions first 
-        prototype_libs = Dir.glob(File.join(JAVASCRIPT_PATH, 'prototype*')).sort.reverse
@@ -166 +166 @@
-      # +html_options+ may be a hash of attributes for the <script> tag. Example:
-      #   javascript_tag "alert('All is good')", :defer => 'true' # => <script defer="true" type="text/javascript">alert('All is good')</script>
-      def javascript_tag(content, html_options = {})
-"text/javascript"
+Mime::JS
-      end
-
-      def javascript_cdata_section(content) #:nodoc:

lib/action_view/helpers/java_script_macros_helper.rb

@@ -198 +198 @@
-        content_tag("div", "", :id => "#{object}_#{method}_auto_complete", :class => "auto_complete") +
-        auto_complete_field("#{object}_#{method}", { :url => { :action => "auto_complete_for_#{object}_#{method}" } }.update(completion_options))
-      end
-
+
-      private
-        def auto_complete_stylesheet
-'text/css'
+Mime::CSS
-            div.auto_complete {
-              width: 350px;
-              background: #fff;
@@ -217 +217 @@
-              margin:0;
-              padding:3px;
-            }
- 
- 
+
+
-            }
- 
+
-              color: #800; 
-              margin:0;
-              padding:0;
-            }
-          EOT
-        end
-
+
-    end
-  end
-end

lib/action_view/helpers/asset_tag_helper.rb

@@ -149 +149 @@
-          if !File.exists?(joined_javascript_path)
-            File.open(joined_javascript_path, "w+") do |cache|
-              javascript_paths = expand_javascript_sources(sources).collect do |source|
- 
+
-              end
-
-              cache.write(join_asset_file_contents(javascript_paths))
-            end
-          end
-
- 
-"text/javascript"
+
+Mime::JS
-          }.merge(options))
-        else
-          expand_javascript_sources(sources).collect do |source|
-"text/javascript"
+Mime::JS
-          end.join("\n")
-        end
-      end
@@ -252 +252 @@
-          end
-
-          tag("link", {
-"text/css"
+Mime::CSS
-            "href" => stylesheet_path(joined_stylesheet_name)
-          }.merge(options))
-        else
-          options.delete("cache")
-
-          expand_stylesheet_sources(sources).collect do |source|
- 
-"text/css"
+
+Mime::CSS
-            }.merge(options))
-          end.join("\n")
-        end

lib/action_view/base.rb

@@ -470 +470 @@
-        if template_requires_setup?(extension)
-          body = case extension.to_sym
-            when :rxml, :builder
-'application/xml'
+Mime::XML
-              "xml = Builder::XmlMarkup.new(:indent => 2)\n" +
-              template
-            when :rjs
-'text/javascript'
+Mime::JS
-              "update_page do |page|\n#{template}\nend"
-          end
-        else