lib/gravatarify/utils.rb in gravatarify-2.0.3 vs lib/gravatarify/utils.rb in gravatarify-2.0.4

@@ -1,44 +1,31 @@
-begin; require 'rack/utils'; rescue LoadError; require 'cgi' end
-
-module Gravatarify
-  module Utils #:nodoc:          
-    # Helper method to URI escape a string using either <tt>Rack::Utils#escape</tt> if available or else
-    # fallback to <tt>CGI#escape</tt>.
-    def self.escape(str)
-      str = str.to_s
-      defined?(Rack::Utils) ? Rack::Utils.escape(str) : CGI.escape(str)
-    end
-    
-    # Escape HTML entities in string, basically falls back to either <tt>RackUtils#escape_html</tt>
-    # or <tt>CGI#escapeHTML</tt>.
-    def self.escape_html(str)
-      str = str.to_s
-      defined?(Rack::Utils) ? Rack::Utils.escape_html(str) : CGI.escapeHTML(str)
-    end
-    
+module Gravatarify  
+  # Set of common utility methods to e.g. deep merge options etc.
+  module Utils #:nodoc:
     # Merge supplied list of +params+ with the globally defined default options and
     # any params. Then merge remaining params as hash.
-    # 
     def self.merge_gravatar_options(*params)
       return (params[1] || {}) if params.first == false
       options = Gravatarify.options.dup
       deep_merge_html!(options, Gravatarify.styles[params.shift] || {}) unless params.first.is_a?(Hash)
       deep_merge_html!(options, params.first) unless params.empty?
       options
     end
     
+    # Deeply merge the <tt>:html</tt> attribute.
     def self.deep_merge_html!(hash, to_merge)
       html = (hash[:html] || {}).merge(to_merge[:html] || {})
       hash.merge!(to_merge)
       hash[:html] = html unless html.empty?
     end
   
     # Tries first to call +email+, then +mail+ then +to_s+ on supplied
-    # object.
+    # object, also strips leading/trailing whitespace and downcases string
+    # (as specified by gravatar.com).
     def self.smart_email(obj)
-      str = (obj.respond_to?(:email) ? obj.send(:email) : (obj.respond_to?(:mail) ? obj.send(:mail) : obj)).to_s
-      str = str.sub(/\A.*?<(.+?)>.*\z/, '\1') if str =~ /<.+>/
-      str.strip.downcase
+      (obj.respond_to?(:email) ? obj.send(:email) : (obj.respond_to?(:mail) ? obj.send(:mail) : obj)).to_s.strip.downcase
     end
+    
+    # Returns +true+ when those XSS methods are available, else +false+ is returned.
+    def self.with_xss?; "".respond_to?(:html_safe!) end
   end
 end
\ No newline at end of file