lib/onebox/preview.rb in onebox-1.7.7 vs lib/onebox/preview.rb in onebox-1.7.8

@@ -3,78 +3,75 @@
 
 module Onebox
   class Preview
     attr_reader :cache
 
+    WEB_EXCEPTIONS ||= [Net::HTTPServerException, OpenURI::HTTPError, Timeout::Error, Net::HTTPError, Errno::ECONNREFUSED]
+
     def initialize(link, parameters = Onebox.options)
       @url = link
       @options = parameters
       @cache = options.cache
       @engine_class = Matcher.new(@url).oneboxed
     end
 
     def to_s
       return "" unless engine
       sanitize process_html engine_html
-    rescue *Onebox::Preview.web_exceptions
+    rescue *WEB_EXCEPTIONS
       ""
     end
 
     def placeholder_html
       return "" unless engine
       sanitize process_html engine.placeholder_html
-    rescue *Onebox::Preview.web_exceptions
+    rescue *WEB_EXCEPTIONS
       ""
     end
 
     def options
       OpenStruct.new(@options)
     end
 
-    def self.web_exceptions
-     [Net::HTTPServerException, OpenURI::HTTPError, Timeout::Error, Net::HTTPError, Errno::ECONNREFUSED]
-    end
-
     private
 
-    def engine_html
-      engine.to_html
-    end
+      def engine_html
+        engine.to_html
+      end
 
-    def process_html(html)
-      return "" unless html
+      def process_html(html)
+        return "" unless html
 
-      if @options[:max_width]
-        doc = Nokogiri::HTML::fragment(html)
-        if doc
-          doc.css('[width]').each do |e|
-            width = e['width'].to_i
+        if @options[:max_width]
+          doc = Nokogiri::HTML::fragment(html)
+          if doc
+            doc.css('[width]').each do |e|
+              width = e['width'].to_i
 
-            if width > @options[:max_width]
-              height = e['height'].to_i
-              if (height > 0)
-                ratio = (height.to_f / width.to_f)
-                e['height'] = (@options[:max_width] * ratio).floor
+              if width > @options[:max_width]
+                height = e['height'].to_i
+                if (height > 0)
+                  ratio = (height.to_f / width.to_f)
+                  e['height'] = (@options[:max_width] * ratio).floor
+                end
+                e['width'] = @options[:max_width]
               end
-              e['width'] = @options[:max_width]
             end
+            return doc.to_html
           end
-          return doc.to_html
         end
+
+        html
       end
 
-      html
-    end
+      def sanitize(html)
+        Sanitize.fragment(html, Sanitize::Config::ONEBOX)
+      end
 
-    def sanitize(html)
-      Sanitize.fragment(html, Sanitize::Config::ONEBOX)
-    end
+      def engine
+        return nil unless @engine_class
+        @engine ||= @engine_class.new(@url, cache)
+      end
 
-    def engine
-      return nil unless @engine_class
-      @engine ||= @engine_class.new(@url, cache)
-    end
-
-    class InvalidURI < StandardError
-    end
+      class InvalidURI < StandardError; end
   end
 end