slimmer 1.1.24 → 1.1.25

data/lib/slimmer/app.rb

@@ -54,6 +54,12 @@ module Slimmer
       body.each {|a| b << a }
       b
     end
+    
+    def content_length(rewritten_body)
+      size = 0
+      rewritten_body.each { |part| size += part.bytesize }
+      size.to_s
+    end
 
     def rewrite_response(env, response_to_skin)
       status, headers, app_body = response_to_skin
@@ -93,7 +99,7 @@ module Slimmer
       end
       rewritten_body = [rewritten_body] unless rewritten_body.respond_to?(:each)
 
-      headers['Content-Length'] = rewritten_body.join("").bytesize.to_s
+      headers['Content-Length'] = content_length(rewritten_body)
 
       logger.debug "Slimmer: Returning final status, headers and body"
       [status, headers, rewritten_body]

data/lib/slimmer/related_items_inserter.rb

@@ -20,8 +20,12 @@ class RelatedItemsInserter
     end
   end
   
+  def under_test?
+    ENV['RACK_ENV'] == 'test'
+  end
+  
   def metadata_from_panopticon
-    fetch_artefact(slug: requested_slug)
+    under_test? ? {} : fetch_artefact(slug: requested_slug)
   end
   
   def related_item_block

data/lib/slimmer/skin.rb

@@ -15,6 +15,9 @@ module Slimmer
     attr_accessor :logger
     private :logger=, :logger
 
+    attr_accessor :strict
+    private :strict=, :strict
+
     # TODO: Extract the cache to something we can pass in instead of using
     # true/false and an in-memory cache.
     def initialize asset_host, use_cache = false, prefix = nil, options = {}
@@ -23,6 +26,7 @@ module Slimmer
       self.prefix = prefix
       self.use_cache = use_cache
       self.logger = options[:logger] || NullLogger.instance
+      self.strict = options[:strict] || (ENV['RACK_ENV'] == 'development')
     end
 
     def template(template_name)
@@ -84,11 +88,44 @@ module Slimmer
       ]
       process(processors, body, template(template_name))
     end
+    
+    def report_parse_errors_if_strict!(nokogiri_doc, description_for_error_message)
+      nokogiri_doc
+    end
+    
+    def parse_html(html, description_for_error_message)
+      doc = Nokogiri::HTML.parse(html)
+      if strict
+        errors = doc.errors.select {|e| e.error?}.reject {|e| ignorable?(e)}
+        if errors.size > 0
+          error = errors.first
+          raise "In #{description_for_error_message}: '#{error.message}' at line #{error.line} col #{error.column} (code #{error.code}).\n" +
+            context(html, error)
+        end
+      end
+      doc
+    end
+    
+    def context(html, error)
+      context_size = 5
+      lines = [""] + html.split("\n")
+      from = [1, error.line - context_size].max
+      to = [lines.size - 1, error.line + context_size].min
+      context = (from..to).zip(lines[from..to]).map {|lineno, line| "%4d: %s" % [lineno, line] }
+      marker = " " * (error.column - 1) + "-----v"
+      context.insert(context_size, marker)
+      context.join("\n")
+    end
+    
+    def ignorable?(error)
+      ignorable_codes = [801]
+      ignorable_codes.include?(error.code)
+    end
 
     def process(processors,body,template)
       logger.debug "Slimmer: starting skinning process"
-      src = Nokogiri::HTML.parse(body.to_s)
-      dest = Nokogiri::HTML.parse(template)
+      src = parse_html(body.to_s, "backend response")
+      dest = parse_html(template, "template")
 
       start_time = Time.now
       logger.debug "Slimmer: Start time = #{start_time}"

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = '1.1.24'
+  VERSION = '1.1.25'
 end

metadata

@@ -2,7 +2,7 @@
 name: slimmer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.24
+  version: 1.1.25
 platform: ruby
 authors: 
 - Ben Griffiths
@@ -193,7 +193,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 877888990853693161
+      hash: 3024315122856974273
       segments: 
       - 0
       version: "0"
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 877888990853693161
+      hash: 3024315122856974273
       segments: 
       - 0
       version: "0"