slimmer 3.13.1 → 3.14.0

data/lib/slimmer/processors/tag_mover.rb

@@ -1,7 +1,7 @@
 module Slimmer::Processors
   class TagMover
     def filter(src,dest)
-      move_tags(src, dest, 'script', :must_have => ['src'])
+      move_tags(src, dest, 'script', :dest_node => 'body', :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
@@ -29,12 +29,13 @@ module Slimmer::Processors
       already_there = dest.css(type).map { |node|
         tag_fingerprint(node, comparison_attrs)
       }.compact
+      dest_node = opts[:dest_node] || 'head'
 
       src.css(type).each do |node|
         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/head') << node
+          dest.at_xpath("/html/#{dest_node}") << node
         end
       end
     end

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = '3.13.1'
+  VERSION = '3.14.0'
 end

data/test/typical_usage_test.rb

@@ -113,8 +113,8 @@ module TypicalUsage
       assert_rendered_in_template "head title", "The title of the page"
     end
 
-    def test_should_move_script_tags_into_the_head
-      assert_rendered_in_template "head script[src='blah.js']"
+    def test_should_move_script_tags_into_the_body
+      assert_rendered_in_template "body script[src='blah.js']"
     end
 
     def test_should_move_meta_tags_into_the_head

metadata

@@ -2,7 +2,7 @@
 name: slimmer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.13.1
+  version: 3.14.0
 platform: ruby
 authors: 
 - Ben Griffiths
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-04 00:00:00 Z
+date: 2013-03-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -180,57 +180,57 @@ extra_rdoc_files: []
 files: 
 - README.md
 - CHANGELOG.md
-- lib/slimmer.rb
-- lib/slimmer/app.rb
-- lib/slimmer/test_template.rb
+- lib/tasks/slimmer.rake
 - lib/slimmer/version.rb
-- lib/slimmer/railtie.rb
-- lib/slimmer/processors/tag_mover.rb
 - lib/slimmer/processors/body_class_copier.rb
+- lib/slimmer/processors/google_analytics_configurator.rb
+- lib/slimmer/processors/related_items_inserter.rb
+- lib/slimmer/processors/body_inserter.rb
 - lib/slimmer/processors/logo_class_inserter.rb
-- lib/slimmer/processors/beta_notice_inserter.rb
-- lib/slimmer/processors/header_context_inserter.rb
-- lib/slimmer/processors/meta_viewport_remover.rb
-- lib/slimmer/processors/search_index_setter.rb
 - lib/slimmer/processors/report_a_problem_inserter.rb
-- lib/slimmer/processors/campaign_notification_inserter.rb
 - lib/slimmer/processors/footer_remover.rb
-- lib/slimmer/processors/google_analytics_configurator.rb
-- lib/slimmer/processors/title_inserter.rb
-- lib/slimmer/processors/related_items_inserter.rb
-- lib/slimmer/processors/section_inserter.rb
+- lib/slimmer/processors/campaign_notification_inserter.rb
 - lib/slimmer/processors/conditional_comment_mover.rb
-- lib/slimmer/processors/body_inserter.rb
+- lib/slimmer/processors/beta_notice_inserter.rb
+- lib/slimmer/processors/section_inserter.rb
+- lib/slimmer/processors/tag_mover.rb
+- lib/slimmer/processors/title_inserter.rb
+- lib/slimmer/processors/search_index_setter.rb
+- lib/slimmer/processors/header_context_inserter.rb
+- lib/slimmer/processors/meta_viewport_remover.rb
+- lib/slimmer/template.rb
+- lib/slimmer/railtie.rb
+- lib/slimmer/test.rb
 - lib/slimmer/artefact.rb
 - lib/slimmer/skin.rb
+- lib/slimmer/app.rb
 - lib/slimmer/headers.rb
-- lib/slimmer/template.rb
-- lib/slimmer/test.rb
-- lib/tasks/slimmer.rake
+- lib/slimmer/test_template.rb
+- lib/slimmer.rb
 - Rakefile
-- test/processors/header_context_inserter_test.rb
-- test/processors/google_analytics_test.rb
-- test/processors/body_inserter_test.rb
-- test/processors/search_index_setter_test.rb
 - test/processors/meta_viewport_remover_test.rb
+- test/processors/related_items_inserter_test.rb
 - test/processors/report_a_problem_inserter_test.rb
 - test/processors/section_inserter_test.rb
-- test/processors/campaign_notification_inserter_test.rb
-- test/processors/related_items_inserter_test.rb
+- test/processors/google_analytics_test.rb
+- test/processors/search_index_setter_test.rb
+- test/processors/header_context_inserter_test.rb
+- test/processors/body_inserter_test.rb
 - test/processors/logo_class_inserter_test.rb
-- test/test_template_dependency_on_static_test.rb
-- test/headers_test.rb
-- test/test_helper.rb
-- test/typical_usage_test.rb
+- test/processors/campaign_notification_inserter_test.rb
 - test/artefact_test.rb
 - test/skin_test.rb
-- test/fixtures/campaign.html.erb
+- test/headers_test.rb
+- test/test_template_dependency_on_static_test.rb
+- test/typical_usage_test.rb
+- test/fixtures/500.html.erb
 - test/fixtures/404.html.erb
 - test/fixtures/beta_notice.html.erb
-- test/fixtures/500.html.erb
-- test/fixtures/wrapper.html.erb
-- test/fixtures/related.raw.html.erb
 - test/fixtures/report_a_problem.raw.html.erb
+- test/fixtures/campaign.html.erb
+- test/fixtures/related.raw.html.erb
+- test/fixtures/wrapper.html.erb
+- test/test_helper.rb
 - bin/render_slimmer_error
 homepage: http://github.com/alphagov/slimmer
 licenses: []
@@ -245,7 +245,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2221718135592804125
+      hash: -2990153906158645098
       segments: 
       - 0
       version: "0"
@@ -254,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2221718135592804125
+      hash: -2990153906158645098
       segments: 
       - 0
       version: "0"
@@ -266,26 +266,26 @@ signing_key:
 specification_version: 3
 summary: Thinner than the skinner
 test_files: 
-- test/processors/header_context_inserter_test.rb
-- test/processors/google_analytics_test.rb
-- test/processors/body_inserter_test.rb
-- test/processors/search_index_setter_test.rb
 - test/processors/meta_viewport_remover_test.rb
+- test/processors/related_items_inserter_test.rb
 - test/processors/report_a_problem_inserter_test.rb
 - test/processors/section_inserter_test.rb
-- test/processors/campaign_notification_inserter_test.rb
-- test/processors/related_items_inserter_test.rb
+- test/processors/google_analytics_test.rb
+- test/processors/search_index_setter_test.rb
+- test/processors/header_context_inserter_test.rb
+- test/processors/body_inserter_test.rb
 - test/processors/logo_class_inserter_test.rb
-- test/test_template_dependency_on_static_test.rb
-- test/headers_test.rb
-- test/test_helper.rb
-- test/typical_usage_test.rb
+- test/processors/campaign_notification_inserter_test.rb
 - test/artefact_test.rb
 - test/skin_test.rb
-- test/fixtures/campaign.html.erb
+- test/headers_test.rb
+- test/test_template_dependency_on_static_test.rb
+- test/typical_usage_test.rb
+- test/fixtures/500.html.erb
 - test/fixtures/404.html.erb
 - test/fixtures/beta_notice.html.erb
-- test/fixtures/500.html.erb
-- test/fixtures/wrapper.html.erb
-- test/fixtures/related.raw.html.erb
 - test/fixtures/report_a_problem.raw.html.erb
+- test/fixtures/campaign.html.erb
+- test/fixtures/related.raw.html.erb
+- test/fixtures/wrapper.html.erb
+- test/test_helper.rb