slimmer 12.0.0 → 12.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55f0a341bbb309da449a52a668b281087674586c
-  data.tar.gz: e090f9302dfd9dea5d91184a50942bfe9751bd02
+  metadata.gz: 4fe9e4eda5103f993a3fa049fe354360ee1d61ea
+  data.tar.gz: b674f301bcc0452d3ce81634a4ab280625b6d69d
 SHA512:
-  metadata.gz: 464f4d805159cd667d1cdc3478fba42e18741e4f7d3978c717b608098099fb3b87f56b83c9b31f61ee8bd2fa1acaf7778ab62be006d363365bd673162b2d18ad
-  data.tar.gz: 7aa2bb20cb3c5a3151949436d6e2d36cae311ee31552ef17cb7e254f2a2569c93205dec13b0e5baf6e155c862714af4a1ec6379165cd23275929ffcec2bec1b7
+  metadata.gz: 130dff1f1186dce4297636f1bdb037f0a1d6448f61cd14a28bda29447ca41d310a92e9afa1952d1dc43adbe651d15645ee8434756fa65d0933009f4591f5b4b1
+  data.tar.gz: bddee67fbe4cef3c30bbc058c7bdec7cecd0d2974d802877190bba9131c3ce1051311fa8dfdcb72cd6723b519d898f95bf79127cb9b30fdd0730de6cda6cdb80

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 12.1.0
+
+* Make sure that the metatags defined in the application are inserted at the
+  top of the page. This means that third parties will see the custom metatags
+  like `og:image` first, and template tags like the default sharing image second (#218)
+
 # 12.0.0
 
 * Remove the "report a problem" feature. This is now being covered by the

data/lib/slimmer/processors/tag_mover.rb

@@ -1,10 +1,10 @@
 module Slimmer::Processors
   class TagMover
-    def filter(src,dest)
-      move_tags(src, dest, 'script', :dest_node => 'body', :keys => ['src', 'inner_html'])
-      move_tags(src, dest, 'link',   :must_have => ['href'])
-      move_tags(src, dest, 'meta',   :must_have => ['name', 'content'], :keys => ['name', 'content', 'http-equiv'])
-      move_tags(src, dest, 'meta',   :must_have => ['property', 'content'], :keys => ['property', 'content'])
+    def filter(src, dest)
+      move_tags(src, dest, 'script', dest_node: 'body', keys: %w(src inner_html))
+      move_tags(src, dest, 'link',   must_have: ['href'])
+      move_tags(src, dest, 'meta',   must_have: %w(name content), keys: ['name', 'content', 'http-equiv'], insertion_location: :top)
+      move_tags(src, dest, 'meta',   must_have: %w(property content), keys: %w(property content), insertion_location: :top)
     end
 
     def include_tag?(node, min_attrs)
@@ -22,7 +22,7 @@ module Slimmer::Processors
     end
 
     def wrap_node(src, node)
-      if node.previous_sibling.to_s =~ /<!--\[if[^\]]+\]><!-->/ and node.next_sibling.to_s == '<!--<![endif]-->'
+      if node.previous_sibling.to_s =~ /<!--\[if[^\]]+\]><!-->/ && node.next_sibling.to_s == '<!--<![endif]-->'
         node = Nokogiri::XML::NodeSet.new(src, [node.previous_sibling, node, node.next_sibling])
       end
       node
@@ -40,7 +40,12 @@ module Slimmer::Processors
         if include_tag?(node, min_attrs) && !already_there.include?(tag_fingerprint(node, comparison_attrs))
           node = wrap_node(src, node)
           node.remove
-          dest.at_xpath("/html/#{dest_node}") << node
+
+          if opts[:insertion_location] == :top
+            dest.at_xpath("/html/#{dest_node}").prepend_child(node)
+          else
+            dest.at_xpath("/html/#{dest_node}") << node
+          end
         end
       end
     end

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = '12.0.0'
+  VERSION = '12.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slimmer
 version: !ruby/object:Gem::Version
-  version: 12.0.0
+  version: 12.1.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri