slimmer 1.1.3 → 1.1.4beta2

data/lib/slimmer.rb

@@ -1,346 +1,25 @@
-require 'slimmer/template'
-require 'slimmer/railtie' if defined?(Rails)
-
 require 'nokogiri'
 require 'erb'
 require 'open-uri'
 require 'plek'
 
 module Slimmer
-
   TEMPLATE_HEADER = 'X-Slimmer-Template'
   SKIP_HEADER = 'X-Slimmer-Skip'
 
-  class App
-    def initialize(app, *args, &block)
-      options = args.first || {}
-      @app = app
-
-      if options.key? :template_path
-        raise "Template path should not be used. Use asset_host instead."
-      end
-
-      unless options[:asset_host]
-        options[:asset_host] = Plek.current.find("assets")
-      end
-
-      @skin = Skin.new options[:asset_host], options[:cache_templates]
-    end
-
-    def call(env)
-      response_array = @app.call(env)
-      if response_array[1][SKIP_HEADER]
-        response_array
-      else
-        rewrite_response(env, response_array)
-      end
-    end
-
-    def on_success(request,body)
-      @skin.success(request, body)
-    end
-
-    def admin(request,body)
-      @skin.admin(request,body)
-    end
-
-    def on_error(request, status, body)
-      @skin.error(request, '500', body)
-    end
-
-    def on_404(request,body)
-      @skin.error(request, '404', body)
-    end
-
-    def s(body)
-      return body.to_s unless body.respond_to?(:each)
-      b = ""
-      body.each {|a| b << a }
-      b
-    end
-
-    def rewrite_response(env,triplet)
-      status, headers, app_body = triplet
-      source_request = Rack::Request.new(env)
-      request = Rack::Request.new(headers)
-      if headers['Content-Type'] =~ /text\/html/ || headers['content-type'] =~ /text\/html/
-        case status.to_i
-        when 200
-          if headers[TEMPLATE_HEADER] == 'admin' || source_request.path =~ /^\/admin(\/|$)/
-            rewritten_body = admin(request,s(app_body))
-          else
-            rewritten_body = on_success(request,s(app_body))
-          end
-        when 301, 302, 304
-          rewritten_body = app_body
-        when 404
-          rewritten_body = on_404(request,s(app_body))
-        else
-          rewritten_body = on_error(request,status,s(app_body))
-        end
-      else
-        rewritten_body = app_body
-      end
-      rewritten_body = [rewritten_body] unless rewritten_body.respond_to?(:each)
-      [status, filter_headers(headers), rewritten_body]
-    end
-
-    def filter_headers(header_hash)
-      valid_keys = ['vary', 'set-cookie', 'location', 'content-type', 'expires', 'cache-control']
-      header_hash.keys.each do |key|
-        header_hash.delete(key) unless valid_keys.include?(key.downcase)
-      end
-      header_hash
-    end
-  end
-
-  class UrlRewriter
-
-    def initialize(request)
-      @request = request
-    end
-
-    def filter(src,dest)
-      rewrite_document src
-    end
-
-    def rewrite_document(doc)
-      rewrite_nodes doc.css('body img'),'src'
-      rewrite_nodes doc.css('script'),'src'
-      rewrite_nodes doc.css('link'),'href'
-    end
-
-    def rewrite_nodes(nodes,attr)
-      nodes.each do |node|
-        next unless node.attr(attr)
-        node_uri = URI.parse(node.attr(attr))
-        node.attribute(attr).value = rewrite_url(node_uri).to_s
-      end
-    end
-
-    def rewrite_url(uri)
-      unless uri.absolute?
-        uri.scheme = @request.scheme
-        if @request.host =~ /:/
-          host,port = @request.host.split(":")
-          uri.host = host
-          uri.port = port
-        else
-          uri.host =   @request.host
-          uri.port =   @request.port
-        end
-      end
-      uri
-    end
-  end
-
-  class TitleInserter
-    def filter(src,dest)
-      title = src.at_css('head title')
-      head  = dest.at_xpath('/html/head')
-      if head && title
-        insert_title(title,head)
-      end
-    end
-
-    def insert_title(title, head)
-      if head.at_css('title').nil?
-        head.first_element_child.nil? ? head << title : head.first_element_child.before(title)
-      else
-        head.at_css('title').replace(title)
-      end
-    end
-  end
-
-  class SectionInserter
-    def filter(src,dest)
-      meta_name = dest.at_css('meta[name="x-section-name"]')
-      meta_link = dest.at_css('meta[name="x-section-link"]')
-      list = dest.at_css('nav[role=navigation] ol')
-
-      # FIXME: Presumably this is meant to stop us adding a 'current section'
-      # link if we're missing navigation, or x-section-* meta tags.
-      # It doesn't work: #at_css will return a truthy object in any case.
-      if meta_name && meta_link && list
-        link_node = Nokogiri::XML::Node.new('a', dest)
-        link_node['href'] = meta_link['content']
-        link_node.content = meta_name['content']
-
-        list_item = Nokogiri::XML::Node.new('li', dest)
-        list_item.add_child(link_node)
-
-        list.first_element_child.after(list_item)
-      end
-    end
-  end
-
-  class TagMover
-    def filter(src,dest)
-      move_tags(src, dest, 'script', :must_have => ['src'])
-      move_tags(src, dest, 'link',   :must_have => ['href'])
-      move_tags(src, dest, 'meta',   :must_have => ['name', 'content'], :keys => ['name', 'content', 'http-equiv'])
-    end
-
-    def include_tag?(node, min_attrs)
-      min_attrs.inject(true) { |all_okay, attr_name| all_okay && node.has_attribute?(attr_name) }
-    end
-
-    def tag_fingerprint(node, attrs)
-      attrs.collect do |attr_name|
-        node.has_attribute?(attr_name) ? node.attr(attr_name) : nil
-      end.compact.sort
-    end
-
-    def move_tags(src, dest, type, opts)
-      comparison_attrs = opts[:keys] || opts[:must_have]
-      min_attrs = opts[:must_have]
-      already_there = dest.css(type).map { |node|
-        tag_fingerprint(node, comparison_attrs)
-      }.compact
-
-      src.css(type).each do |node|
-        if include_tag?(node, min_attrs) && !already_there.include?(tag_fingerprint(node, comparison_attrs))
-          node.remove
-          dest.at_xpath('/html/head') << node
-        end
-      end
-    end
-  end
-
-  class BodyInserter
-    def initialize(path='#wrapper')
-      @path = path
-    end
-
-    def filter(src,dest)
-      body = src.fragment(src.at_css(@path))
-      dest.at_css(@path).replace(body)
-    end
-  end
-
-  class BodyClassCopier
-    def filter(src, dest)
-      src_body_tag = src.at_css("body")
-      dest_body_tag = dest.at_css('body')
-      if src_body_tag.has_attribute?("class")
-        combinded_classes = dest_body_tag.attr('class').to_s.split(/ +/)
-        combinded_classes << src_body_tag.attr('class').to_s.split(/ +/)
-        dest_body_tag.set_attribute("class", combinded_classes.join(' '))
-      end
-    end
-  end
-
-  class AdminTitleInserter
-    def filter(src,dest)
-      title = src.at_css('#site-title')
-      head  = dest.at_css('.gds-header h2')
-      if head && title
-        head.content = title.content
-        title.remove
-      end
-    end
-  end
-
-  class FooterRemover
-    def filter(src,dest)
-      footer = src.at_css("#footer")
-      footer.remove if footer
-    end
-  end
-
-  class Skin
-    attr_accessor :use_cache
-    private :use_cache=, :use_cache
-
-    attr_accessor :templated_cache
-    private :templated_cache=, :templated_cache
-
-    attr_accessor :asset_host
-    private :asset_host=, :asset_host
-
-    # 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
-      self.asset_host = asset_host
-      self.templated_cache = {}
-      self.use_cache = false
-    end
-
-    def template(template_name)
-      return cached_template(template_name) if template_cached? template_name
-      load_template template_name
-    end
-
-    def template_cached? name
-      !cached_template(name).nil?
-    end
-
-    def cached_template name
-      templated_cache[name]
-    end
-
-    def cache name, template
-      return unless use_cache
-      templated_cache[name] = template
-    end
-
-    def load_template template_name
-      url = template_url template_name
-      source = open(url, "r:UTF-8").read
-      template = ERB.new(source).result binding
-      cache template_name, template
-      template
-    end
-
-    def template_url template_name
-      host = asset_host.dup
-      host += '/' unless host =~ /\/$/
-      "#{host}templates/#{template_name}.html.erb"
-    end
-
-    def error(request, template_name, body)
-      processors = [
-        TitleInserter.new()
-      ]
-      process(processors, body, template(template_name))
-    end
-
-    def process(processors,body,template)
-      src = Nokogiri::HTML.parse(body.to_s)
-      dest = Nokogiri::HTML.parse(template)
-
-      processors.each do |p|
-        p.filter(src,dest)
-      end
-
-      return dest.to_html
-    end
-
-    def admin(request,body)
-      processors = [
-        TitleInserter.new(),
-        TagMover.new(),
-        AdminTitleInserter.new,
-        FooterRemover.new,
-        BodyInserter.new(),
-        BodyClassCopier.new
-      ]
-      process(processors,body,template('admin'))
-    end
-
-    def success(request,body)
-      processors = [
-        TitleInserter.new(),
-        TagMover.new(),
-        BodyInserter.new(),
-        BodyClassCopier.new,
-        SectionInserter.new()
-      ]
-
-      template_name = request.env.has_key?(TEMPLATE_HEADER) ? request.env[TEMPLATE_HEADER] : 'wrapper'
-      process(processors,body,template(template_name))
-    end
-  end
-
-
+  autoload :Version, 'slimmer/version'
+  autoload :Railtie, 'slimmer/railtie'
+  autoload :Skin, 'slimmer/skin'
+
+  autoload :Template, 'slimmer/template'
+  autoload :App, 'slimmer/app'
+  autoload :TitleInserter, 'slimmer/title_inserter'
+  autoload :AdminTitleInserter, 'slimmer/admin_title_inserter'
+  autoload :SectionInserter, 'slimmer/section_inserter'
+  autoload :TagMover, 'slimmer/tag_mover'
+  autoload :FooterRemover, 'slimmer/footer_remover'
+  autoload :BodyInserter, 'slimmer/body_inserter'
+  autoload :BodyClassCopier, 'slimmer/body_class_copier'
+  autoload :UrlRewriter, 'slimmer/url_rewriter'
+  autoload :HeaderContextInserter, 'slimmer/header_context_inserter'
 end

data/lib/slimmer/admin_title_inserter.rb

@@ -0,0 +1,12 @@
+module Slimmer
+  class AdminTitleInserter
+    def filter(src,dest)
+      title = src.at_css('#site-title')
+      head  = dest.at_css('.gds-header h2')
+      if head && title
+        head.content = title.content
+        title.remove
+      end
+    end
+  end
+end

data/lib/slimmer/app.rb

@@ -0,0 +1,84 @@
+module Slimmer
+  class App
+    def initialize(app, *args, &block)
+      options = args.first || {}
+      @app = app
+
+      if options.key? :template_path
+        raise "Template path should not be used. Use asset_host instead."
+      end
+
+      unless options[:asset_host]
+        options[:asset_host] = Plek.current.find("assets")
+      end
+
+      @skin = Skin.new options[:asset_host], options[:cache_templates]
+    end
+
+    def call(env)
+      response_array = @app.call(env)
+      if response_array[1][SKIP_HEADER]
+        response_array
+      else
+        rewrite_response(env, response_array)
+      end
+    end
+
+    def on_success(request,body)
+      @skin.success(request, body)
+    end
+
+    def admin(request,body)
+      @skin.admin(request,body)
+    end
+
+    def on_error(request, status, body)
+      @skin.error(request, '500', body)
+    end
+
+    def on_404(request,body)
+      @skin.error(request, '404', body)
+    end
+
+    def s(body)
+      return body.to_s unless body.respond_to?(:each)
+      b = ""
+      body.each {|a| b << a }
+      b
+    end
+
+    def rewrite_response(env,triplet)
+      status, headers, app_body = triplet
+      source_request = Rack::Request.new(env)
+      request = Rack::Request.new(headers)
+      if headers['Content-Type'] =~ /text\/html/ || headers['content-type'] =~ /text\/html/
+        case status.to_i
+        when 200
+          if headers[TEMPLATE_HEADER] == 'admin' || source_request.path =~ /^\/admin(\/|$)/
+            rewritten_body = admin(request,s(app_body))
+          else
+            rewritten_body = on_success(request,s(app_body))
+          end
+        when 301, 302, 304
+          rewritten_body = app_body
+        when 404
+          rewritten_body = on_404(request,s(app_body))
+        else
+          rewritten_body = on_error(request,status,s(app_body))
+        end
+      else
+        rewritten_body = app_body
+      end
+      rewritten_body = [rewritten_body] unless rewritten_body.respond_to?(:each)
+      [status, filter_headers(headers), rewritten_body]
+    end
+
+    def filter_headers(header_hash)
+      valid_keys = ['vary', 'set-cookie', 'location', 'content-type', 'expires', 'cache-control']
+      header_hash.keys.each do |key|
+        header_hash.delete(key) unless valid_keys.include?(key.downcase)
+      end
+      header_hash
+    end
+  end
+end

data/lib/slimmer/body_class_copier.rb

@@ -0,0 +1,13 @@
+module Slimmer
+  class BodyClassCopier
+    def filter(src, dest)
+      src_body_tag = src.at_css("body")
+      dest_body_tag = dest.at_css('body')
+      if src_body_tag.has_attribute?("class")
+        combinded_classes = dest_body_tag.attr('class').to_s.split(/ +/)
+        combinded_classes << src_body_tag.attr('class').to_s.split(/ +/)
+        dest_body_tag.set_attribute("class", combinded_classes.join(' '))
+      end
+    end
+  end
+end

data/lib/slimmer/body_inserter.rb

@@ -0,0 +1,12 @@
+module Slimmer
+  class BodyInserter
+    def initialize(path='#wrapper')
+      @path = path
+    end
+
+    def filter(src,dest)
+      body = src.fragment(src.at_css(@path))
+      dest.at_css(@path).replace(body)
+    end
+  end
+end

data/lib/slimmer/footer_remover.rb

@@ -0,0 +1,8 @@
+module Slimmer
+  class FooterRemover
+    def filter(src,dest)
+      footer = src.at_css("#footer")
+      footer.remove if footer
+    end
+  end
+end

data/lib/slimmer/header_context_inserter.rb

@@ -0,0 +1,14 @@
+module Slimmer
+  class HeaderContextInserter
+    def initialize(path='.header-context')
+      @path = path
+    end
+
+    def filter(src,dest)
+      if dest.at_css(@path) && replacement = src.at_css(@path)
+        header_context = src.fragment(replacement)
+        dest.at_css(@path).replace(header_context)
+      end
+    end
+  end
+end

data/lib/slimmer/section_inserter.rb

@@ -0,0 +1,23 @@
+module Slimmer
+  class SectionInserter
+    def filter(src,dest)
+      meta_name = dest.at_css('meta[name="x-section-name"]')
+      meta_link = dest.at_css('meta[name="x-section-link"]')
+      list = dest.at_css('nav[role=navigation] ol')
+
+      # FIXME: Presumably this is meant to stop us adding a 'current section'
+      # link if we're missing navigation, or x-section-* meta tags.
+      # It doesn't work: #at_css will return a truthy object in any case.
+      if meta_name && meta_link && list
+        link_node = Nokogiri::XML::Node.new('a', dest)
+        link_node['href'] = meta_link['content']
+        link_node.content = meta_name['content']
+
+        list_item = Nokogiri::XML::Node.new('li', dest)
+        list_item.add_child(link_node)
+
+        list.first_element_child.after(list_item)
+      end
+    end
+  end
+end

data/lib/slimmer/skin.rb

@@ -0,0 +1,96 @@
+module Slimmer
+  class Skin
+    attr_accessor :use_cache
+    private :use_cache=, :use_cache
+
+    attr_accessor :templated_cache
+    private :templated_cache=, :templated_cache
+
+    attr_accessor :asset_host
+    private :asset_host=, :asset_host
+
+    # 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
+      self.asset_host = asset_host
+      self.templated_cache = {}
+      self.use_cache = false
+    end
+
+    def template(template_name)
+      return cached_template(template_name) if template_cached? template_name
+      load_template template_name
+    end
+
+    def template_cached? name
+      !cached_template(name).nil?
+    end
+
+    def cached_template name
+      templated_cache[name]
+    end
+
+    def cache name, template
+      return unless use_cache
+      templated_cache[name] = template
+    end
+
+    def load_template template_name
+      url = template_url template_name
+      source = open(url, "r:UTF-8").read
+      template = ERB.new(source).result binding
+      cache template_name, template
+      template
+    end
+
+    def template_url template_name
+      host = asset_host.dup
+      host += '/' unless host =~ /\/$/
+      "#{host}templates/#{template_name}.html.erb"
+    end
+
+    def error(request, template_name, body)
+      processors = [
+        TitleInserter.new()
+      ]
+      process(processors, body, template(template_name))
+    end
+
+    def process(processors,body,template)
+      src = Nokogiri::HTML.parse(body.to_s)
+      dest = Nokogiri::HTML.parse(template)
+
+      processors.each do |p|
+        p.filter(src,dest)
+      end
+
+      return dest.to_html
+    end
+
+    def admin(request,body)
+      processors = [
+        TitleInserter.new(),
+        TagMover.new(),
+        AdminTitleInserter.new,
+        FooterRemover.new,
+        BodyInserter.new(),
+        BodyClassCopier.new
+      ]
+      process(processors,body,template('admin'))
+    end
+
+    def success(request,body)
+      processors = [
+        TitleInserter.new(),
+        TagMover.new(),
+        BodyInserter.new(),
+        BodyClassCopier.new,
+        HeaderContextInserter.new(),
+        SectionInserter.new()
+      ]
+
+      template_name = request.env.has_key?(TEMPLATE_HEADER) ? request.env[TEMPLATE_HEADER] : 'wrapper'
+      process(processors,body,template(template_name))
+    end
+  end
+end

data/lib/slimmer/tag_mover.rb

@@ -0,0 +1,34 @@
+module Slimmer
+  class TagMover
+    def filter(src,dest)
+      move_tags(src, dest, 'script', :must_have => ['src'])
+      move_tags(src, dest, 'link',   :must_have => ['href'])
+      move_tags(src, dest, 'meta',   :must_have => ['name', 'content'], :keys => ['name', 'content', 'http-equiv'])
+    end
+
+    def include_tag?(node, min_attrs)
+      min_attrs.inject(true) { |all_okay, attr_name| all_okay && node.has_attribute?(attr_name) }
+    end
+
+    def tag_fingerprint(node, attrs)
+      attrs.collect do |attr_name|
+        node.has_attribute?(attr_name) ? node.attr(attr_name) : nil
+      end.compact.sort
+    end
+
+    def move_tags(src, dest, type, opts)
+      comparison_attrs = opts[:keys] || opts[:must_have]
+      min_attrs = opts[:must_have]
+      already_there = dest.css(type).map { |node|
+        tag_fingerprint(node, comparison_attrs)
+      }.compact
+
+      src.css(type).each do |node|
+        if include_tag?(node, min_attrs) && !already_there.include?(tag_fingerprint(node, comparison_attrs))
+          node.remove
+          dest.at_xpath('/html/head') << node
+        end
+      end
+    end
+  end
+end

data/lib/slimmer/test.rb

@@ -0,0 +1,22 @@
+module Slimmer
+  class Skin
+    def load_template name
+      %q{
+        <html>
+          <head>
+            <title>Test Template</title>
+            <script src="http://static.dev.alphagov.co.uk/javascripts/libs/jquery/jquery-1.6.2.min.js"></script><!-- no defer on jquery -->
+            <script src="http://static.dev.alphagov.co.uk/javascripts/libs/jquery/jquery-ui-1.8.16.custom.min.js" defer></script>
+            <script src="http://static.dev.alphagov.co.uk/javascripts/libs/jquery/plugins/jquery.base64.js" defer></script>
+            <script src="http://static.dev.alphagov.co.uk/javascripts/search.js" defer></script>
+            <script src="http://static.dev.alphagov.co.uk/javascripts/devolution.js" defer></script>
+            <script src="http://static.dev.alphagov.co.uk/javascripts/popup.js" defer></script>
+            <script src="http://static.dev.alphagov.co.uk/javascripts/feedback.js" defer></script>
+            <script src="http://static.dev.alphagov.co.uk/javascripts/customisation-settings.js" defer></script>
+          </head>
+          <body></body>
+        </html>
+      }
+    end
+  end
+end

data/lib/slimmer/title_inserter.rb

@@ -0,0 +1,19 @@
+module Slimmer
+  class TitleInserter
+    def filter(src,dest)
+      title = src.at_css('head title')
+      head  = dest.at_xpath('/html/head')
+      if head && title
+        insert_title(title,head)
+      end
+    end
+
+    def insert_title(title, head)
+      if head.at_css('title').nil?
+        head.first_element_child.nil? ? head << title : head.first_element_child.before(title)
+      else
+        head.at_css('title').replace(title)
+      end
+    end
+  end
+end

data/lib/slimmer/url_rewriter.rb

@@ -0,0 +1,40 @@
+module Slimmer
+  class UrlRewriter
+    def initialize(request)
+      @request = request
+    end
+
+    def filter(src,dest)
+      rewrite_document src
+    end
+
+    def rewrite_document(doc)
+      rewrite_nodes doc.css('body img'),'src'
+      rewrite_nodes doc.css('script'),'src'
+      rewrite_nodes doc.css('link'),'href'
+    end
+
+    def rewrite_nodes(nodes,attr)
+      nodes.each do |node|
+        next unless node.attr(attr)
+        node_uri = URI.parse(node.attr(attr))
+        node.attribute(attr).value = rewrite_url(node_uri).to_s
+      end
+    end
+
+    def rewrite_url(uri)
+      unless uri.absolute?
+        uri.scheme = @request.scheme
+        if @request.host =~ /:/
+          host,port = @request.host.split(":")
+          uri.host = host
+          uri.port = port
+        else
+          uri.host =   @request.host
+          uri.port =   @request.port
+        end
+      end
+      uri
+    end
+  end
+end

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = '1.1.3'
+  VERSION = '1.1.4beta2'
 end

data/test/fixtures/wrapper.html.erb

@@ -6,7 +6,9 @@
   <body>
     <div class="content">
       <header><h1>I AM A TITLE</h1></header>
-      <nav role="navigation"><ol><li>MySite</li></ol></nav>
+      <div class="header-context">
+        <nav role="navigation"><ol><li>MySite</li></ol></nav>
+      </div>
       <div id="wrapper" class="group">
       </div>
     </div>

data/test/processors/header_context_inserter_test.rb

@@ -0,0 +1,51 @@
+require "test_helper"
+
+class HeaderContextInserterTest < MiniTest::Unit::TestCase
+  def test_should_replace_contents_of_header_context_in_template
+    template = as_nokogiri %{
+      <html><body><div><div class="header-context"></div></div></body></html>
+    }
+    source = as_nokogiri %{
+      <html><body><nav></nav><div class="header-context"><p>this should be moved</p></div></body></html>
+    }
+
+    Slimmer::HeaderContextInserter.new.filter(source, template)
+    assert_in template, ".header-context", %{<p>this should be moved</p>}
+  end
+
+  def test_should_replace_classes_of_header_context_in_template
+    template = as_nokogiri %{
+      <html><body><div><div class="header-context template-class"></div></div></body></html>
+    }
+    source = as_nokogiri %{
+      <html><body><nav></nav><div class="header-context app-class"><p>this should be moved</p></div></body></html>
+    }
+
+    Slimmer::HeaderContextInserter.new.filter(source, template)
+    assert_in template, ".header-context.app-class", %{<p>this should be moved</p>}
+    assert_not_in template, ".header-context.template-class"
+  end
+
+  def test_should_do_nothing_if_no_header_context_was_provided
+    template = as_nokogiri %{
+      <html><body><div><div class="header-context">should not be removed</div></div></body></html>
+    }
+    source = as_nokogiri %{
+      <html><body><nav></nav></body></html>
+    }
+
+    Slimmer::HeaderContextInserter.new.filter(source, template)
+    assert_in template, ".header-context", %{should not be removed}
+  end
+
+  def test_should_do_nothing_if_no_header_context_was_present_in_the_template
+    template = as_nokogiri %{
+      <html><body><div></div></body></html>
+    }
+    source = as_nokogiri %{
+      <html><body><div><div class="header-context">should be ignored</div></div></body></html>
+    }
+
+    Slimmer::HeaderContextInserter.new.filter(source, template) # should not raise
+  end
+end

data/test/test_helper.rb

@@ -13,6 +13,10 @@ class MiniTest::Unit::TestCase
   def assert_in(template, selector, content, message=nil)
     assert_equal content, template.at_css(selector).inner_html.to_s, message
   end
+
+  def assert_not_in(template, selector, message="didn't exist to find #{selector}")
+    refute template.at_css(selector), message
+  end
 end
 
 class SlimmerIntegrationTest < MiniTest::Unit::TestCase

data/test/typical_usage_test.rb

@@ -11,7 +11,6 @@ module TypicalUsage
   end
 
   class NormalResponseTest < SlimmerIntegrationTest
-
     given_response 200, %{
       <html>
       <head><title>The title of the page</title>
@@ -56,6 +55,28 @@ module TypicalUsage
     end
   end
 
+  class HeaderContextResponseTest < SlimmerIntegrationTest
+    given_response 200, %{
+      <html>
+      <head><title>The title of the page</title>
+      <meta name="something" content="yes">
+      <meta name="x-section-name" content="This section">
+      <meta name="x-section-link" content="/this_section">
+      <script src="blah.js"></script>
+      <link href="app.css" rel="stylesheet" type="text/css">
+      </head>
+      <body class="body_class">
+      <div class="header-context custom-class">app-specific header context</div>
+      <div id="wrapper">The body of the page</div>
+      </body>
+      </html>
+    }
+
+    def test_should_replace_the_header_context_using_the_app_response
+      assert_rendered_in_template ".header-context.custom-class", "app-specific header context"
+    end
+  end
+
   class Error500ResponseTest < SlimmerIntegrationTest
     include Rack::Test::Methods
 

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: slimmer
 version: !ruby/object:Gem::Version
-  version: 1.1.3
-  prerelease: 
+  version: 1.1.4beta2
+  prerelease: 5
 platform: ruby
 authors:
 - Ben Griffiths
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-24 00:00:00.000000000Z
+date: 2011-11-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70200486758560 !ruby/object:Gem::Requirement
+  requirement: &70348230280000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70200486758560
+  version_requirements: *70348230280000
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70200486758020 !ruby/object:Gem::Requirement
+  requirement: &70348230276740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70200486758020
+  version_requirements: *70348230276740
 - !ruby/object:Gem::Dependency
   name: plek
-  requirement: &70200486757440 !ruby/object:Gem::Requirement
+  requirement: &70348230274580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.1.8
   type: :runtime
   prerelease: false
-  version_requirements: *70200486757440
+  version_requirements: *70348230274580
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70200486756460 !ruby/object:Gem::Requirement
+  requirement: &70348230264040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70200486756460
+  version_requirements: *70348230264040
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70200486755740 !ruby/object:Gem::Requirement
+  requirement: &70348230253520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *70200486755740
+  version_requirements: *70348230253520
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70200486755240 !ruby/object:Gem::Requirement
+  requirement: &70348230212940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *70200486755240
+  version_requirements: *70348230212940
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70200486754780 !ruby/object:Gem::Requirement
+  requirement: &70348230198760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,7 +88,7 @@ dependencies:
         version: '1.7'
   type: :development
   prerelease: false
-  version_requirements: *70200486754780
+  version_requirements: *70348230198760
 description: Rack middleware for skinning pages using a specific template
 email:
 - bengriffiths@gmail.com
@@ -99,8 +99,20 @@ extra_rdoc_files: []
 files:
 - README.md
 - CHANGELOG.md
+- lib/slimmer/admin_title_inserter.rb
+- lib/slimmer/app.rb
+- lib/slimmer/body_class_copier.rb
+- lib/slimmer/body_inserter.rb
+- lib/slimmer/footer_remover.rb
+- lib/slimmer/header_context_inserter.rb
 - lib/slimmer/railtie.rb
+- lib/slimmer/section_inserter.rb
+- lib/slimmer/skin.rb
+- lib/slimmer/tag_mover.rb
 - lib/slimmer/template.rb
+- lib/slimmer/test.rb
+- lib/slimmer/title_inserter.rb
+- lib/slimmer/url_rewriter.rb
 - lib/slimmer/version.rb
 - lib/slimmer.rb
 - lib/tasks/slimmer.rake
@@ -109,6 +121,7 @@ files:
 - test/fixtures/500.html.erb
 - test/fixtures/wrapper.html.erb
 - test/processors/body_inserter_test.rb
+- test/processors/header_context_inserter_test.rb
 - test/slimmer_test.rb
 - test/test_helper.rb
 - test/typical_usage_test.rb
@@ -127,9 +140,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: slimmer
 rubygems_version: 1.8.10
@@ -141,6 +154,7 @@ test_files:
 - test/fixtures/500.html.erb
 - test/fixtures/wrapper.html.erb
 - test/processors/body_inserter_test.rb
+- test/processors/header_context_inserter_test.rb
 - test/slimmer_test.rb
 - test/test_helper.rb
 - test/typical_usage_test.rb