RubyGems - slimmer - Versions diffs - 3.21.0 → 3.22.0 - Mend

slimmer 3.21.0 → 3.22.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

data/lib/slimmer/processors/tag_mover.rb +7 -3
data/lib/slimmer/version.rb +1 -1
data/test/processors/tag_mover_test.rb +79 -0
data/test/test_helper.rb +7 -5
metadata +6 -4

data/lib/slimmer/processors/tag_mover.rb CHANGED

@@ -1,7 +1,7 @@
 module Slimmer::Processors
   class TagMover
     def filter(src,dest)
-      move_tags(src, dest, 'script', :dest_node => 'body', :must_have => ['src'])
+      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'])
     end
@@ -12,7 +12,11 @@ module Slimmer::Processors
     def tag_fingerprint(node, attrs)
       attrs.collect do |attr_name|
-        node.has_attribute?(attr_name) ? node.attr(attr_name) : nil
+        if attr_name == 'inner_html'
+          node.content
+        else
+          node.has_attribute?(attr_name) ? node.attr(attr_name) : nil
+        end
       end.compact.sort
     end
@@ -25,7 +29,7 @@ module Slimmer::Processors
     def move_tags(src, dest, type, opts)
       comparison_attrs = opts[:keys] || opts[:must_have]
-      min_attrs = opts[:must_have]
+      min_attrs = opts[:must_have] || []
       already_there = dest.css(type).map { |node|
         tag_fingerprint(node, comparison_attrs)
       }.compact

data/lib/slimmer/version.rb CHANGED

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = '3.21.0'
+  VERSION = '3.22.0'
 end

data/test/processors/tag_mover_test.rb ADDED

@@ -0,0 +1,79 @@
+require_relative "../test_helper"
+class TagMoverTest < MiniTest::Unit::TestCase
+  def setup
+    super
+    @source = as_nokogiri %{
+      <html>
+        <head>
+          <link rel="stylesheet" href="http://www.example.com/foo.css" />
+          <link rel="hrefless_link" />
+          <link rel="stylesheet" href="http://www.example.com/duplicate.css" />
+          <meta name="foo" content="bar" />
+          <meta name="no_content" />
+          <meta content="no_name" />
+          <meta name="duplicate" content="name and content" />
+        </head>
+        <body class="mainstream">
+          <div id="wrapper"></div>
+          <script src="http://www.example.com/foo.js"></script>
+          <script src="http://www.example.com/duplicate.js"></script>
+        </body>
+      </html>
+    }
+    @template = as_nokogiri %{
+      <html>
+        <head>
+          <link rel="stylesheet" href="http://www.example.com/duplicate.css" />
+          <meta name="duplicate" content="name and content" />
+        </head>
+        <body class="mainstream">
+          <div id="wrapper"></div>
+          <div id="related-items"></div>
+          <script src="http://www.example.com/duplicate.js"></script>
+          <script src="http://www.example.com/existing.js"></script>
+        </body>
+      </html>
+    }
+    Slimmer::Processors::TagMover.new.filter(@source, @template)
+  end
+  def test_should_move_script_tags_into_the_body
+    assert_in @template, "script[src='http://www.example.com/foo.js']", nil, "Should have moved the script tag with src 'http://www.example.com/foo.js'"
+  end
+  def test_should_ignore_script_tags_already_in_the_destination_with_the_same_src_and_content
+    assert @template.css("script[src='http://www.example.com/duplicate.js']").length == 1, "Expected there to only be one script tag with src 'http://www.example.com/duplicate.js'"
+  end
+  def test_should_place_source_script_tags_after_template_ones
+    assert @template.to_s.index("foo.js") > @template.to_s.index("existing.js"), "Expected foo.js to be after existing.js"
+  end
+  def test_should_move_link_tags_into_the_head
+    assert_in @template, "link[href='http://www.example.com/foo.css']", nil, "Should have moved the link tag with href 'http://www.example.com/foo.css'"
+  end
+  def test_should_ignore_link_tags_with_no_href
+    assert_not_in @template, "link[rel='hrefless_link']"
+  end
+  def test_should_ignore_link_tags_already_in_the_destination_with_the_same_href
+    assert @template.css("link[href='http://www.example.com/duplicate.css']").length == 1, "Expected there to only be one link tag with href 'http://www.example.com/duplicate.css'"
+  end
+  def test_should_move_meta_tags_into_the_head
+    assert_in @template, "meta[name='foo'][content='bar']", nil, "Should have moved the foo=bar meta tag"
+  end
+  def test_should_ignore_meta_tags_with_no_name_or_content
+    assert_not_in @template, "meta[name='no_content']"
+    assert_not_in @template, "meta[content='no_name']"
+  end
+  def test_should_ignore_meta_tags_already_in_the_destination_with_the_same_name_and_content
+    assert @template.css("meta[name='duplicate'][content='name and content']").length == 1, "Expected there to only be one duplicate=name and content meta tag."
+  end
+end

data/test/test_helper.rb CHANGED

@@ -107,15 +107,17 @@ class SlimmerIntegrationTest < MiniTest::Unit::TestCase
         message = "Expected to find #{selector.inspect} in the output template"
       end
     end
-    element = Nokogiri::HTML.parse(last_response.body).at_css(selector)
-    assert element, message + ", but selector not found."
+    matched_elements = Nokogiri::HTML.parse(last_response.body).css(selector)
+    assert matched_elements.length > 0, message + ", but selector not found."
     if content
-      message << ". But found #{element.inner_html.to_s}"
       if content.is_a?(Regexp)
-        assert_match content, element.inner_html.to_s, message
+        found_match = matched_elements.inject(false) { |had_match, element| had_match || element.inner_html.match(content) }
       else
-        assert_equal content, element.inner_html.to_s, message
+        found_match = matched_elements.inject(false) { |had_match, element| had_match || element.inner_html == content }
       end
+      assert found_match, message + ". The selector was found but not with \"#{content}\"."
     end
   end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slimmer
 version: !ruby/object:Gem::Version
-  version: 3.21.0
+  version: 3.22.0
   prerelease:
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2013-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -305,6 +305,7 @@ files:
 - test/processors/campaign_notification_inserter_test.rb
 - test/processors/section_inserter_test.rb
 - test/processors/report_a_problem_inserter_test.rb
+- test/processors/tag_mover_test.rb
 - test/processors/logo_class_inserter_test.rb
 - bin/render_slimmer_error
 homepage: http://github.com/alphagov/slimmer
@@ -321,7 +322,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1806523750546367185
+      hash: -1973635234500395245
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -330,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1806523750546367185
+      hash: -1973635234500395245
 requirements: []
 rubyforge_project: slimmer
 rubygems_version: 1.8.23
@@ -363,4 +364,5 @@ test_files:
 - test/processors/campaign_notification_inserter_test.rb
 - test/processors/section_inserter_test.rb
 - test/processors/report_a_problem_inserter_test.rb
+- test/processors/tag_mover_test.rb
 - test/processors/logo_class_inserter_test.rb