Changeset 1173

Timestamp:

01/05/08 16:55:05 (11 months ago)

Author:

e.@brainspl.at

Message:

fix doc error in mailer.rb, make escape and unescape not dependandt on mongrel.

Files:

• trunk/lib/merb/mailer.rb (modified) (1 diff)
• trunk/lib/merb/mixins/general_controller.rb (modified) (2 diffs)
• trunk/lib/merb/request.rb (modified) (2 diffs)

trunk/lib/merb/mailer.rb

@@ -26 +26 @@
-        #   or 
-        # 
-)
+}
-  #   Merb::Mailer.delivery_method = :sendmail
-  #

trunk/lib/merb/mixins/general_controller.rb

@@ -226 +226 @@
-    alias html_escape escape_xml
-  
-    # Escapes +s+ for use in a URL.
-    #
-    # ==== Parameter
-    #
-    # +s+ - String to URL escape.
-    #
-    def escape(s)
-
-
-
-
-
+
+
+
-    # Unescapes a string (i.e., reverse URL escaping).
-    #
@@ -245 +237 @@
-    #
-    def unescape(s)
-
-
-
-
+
+
+
-    
-    private

trunk/lib/merb/request.rb

@@ -329 +329 @@
-    
-    class << self
+      # Escapes +s+ for use in a URL.
+      #
+      # ==== Parameter
+      #
+      # +s+ - String to URL escape.
+      #
+      def escape(s)
+        s.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/n) {
+          '%'+$1.unpack('H2'*$1.size).join('%').upcase
+        }.tr(' ', '+')
+      end
+
+      # Unescapes a string (i.e., reverse URL escaping).
+      #
+      # ==== Parameter 
+      #
+      # +s+ - String to unescape.
+      #
+      def unescape(s)
+        s.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n){
+          [$1.delete('%')].pack('H*')
+        }
+      end
+      
-      # parses a query string or the payload of a POST
-      # request into the params hash. So for example:
@@ -336 +360 @@
-      def query_parse(qs, d = '&;')
-        (qs||'').split(/[#{d}] */n).inject({}) { |h,p| 
-Mongrel::HttpRequest.
+
-        }.to_mash
-      end