RubyGems - slimmer - Versions diffs - 3.1.0 → 3.1.1 - Mend

slimmer 3.1.0 → 3.1.1

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 (7) hide show

data/CHANGELOG.md +1 -2
data/lib/slimmer/processors/section_inserter.rb +0 -8
data/lib/slimmer/version.rb +1 -1
data/test/fixtures/related.raw.html.erb +1 -1
data/test/processors/section_inserter_test.rb +4 -45
data/test/typical_usage_test.rb +0 -1
metadata +3 -3

data/CHANGELOG.md CHANGED Viewed

@@ -1,7 +1,6 @@
 # 3.1.0
-* 'Breadcrumb' trail is now populated from the artefact data. It adds the section.
-subsection, and title.
+* 'Breadcrumb' trail is now populated from the artefact data. It adds the section and subsection.
 # 3.0.0

data/lib/slimmer/processors/section_inserter.rb CHANGED Viewed

@@ -10,7 +10,6 @@ module Slimmer::Processors
           append_tag(list, section["parent"]) if section["parent"]
           append_tag(list, section)
         end
-        append_text(list, @artefact.title) if @artefact.title and @artefact.title !~ /\A\s*\z/
       end
     end
@@ -26,12 +25,5 @@ module Slimmer::Processors
       list.add_child(list_item)
     end
-    def append_text(list, text)
-      list_item = Nokogiri::XML::Node.new('li', list)
-      list_item.content = text
-      list.add_child(list_item)
-    end
   end
 end

data/lib/slimmer/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = '3.1.0'
+  VERSION = '3.1.1'
 end

data/test/fixtures/related.raw.html.erb CHANGED Viewed

@@ -17,7 +17,7 @@
                   <a href="<%= h item.web_url %>"><%= h item.title %></a>
                 </li>
               <% end %>
-              <% if root_section = artefact.root_primary_section %>
+              <% if root_section = artefact.primary_root_section %>
                 <li class="related-topic"><a href="<%= h root_section["content_with_tag"]["web_url"] %>"
                   >More from the <span><%= h root_section["title"] %></span> category</a></li>
               <% end %>

data/test/processors/section_inserter_test.rb CHANGED Viewed

@@ -19,8 +19,7 @@ class SectionInserterTest < MiniTest::Unit::TestCase
   def test_should_add_section_link_and_title_to_breadcrumb
     artefact = create_artefact("something",
-                               "section_slug" => "business",
-                               "title" => "Something gooey")
+                               "section_slug" => "business")
     template = as_nokogiri %{
       <html>
@@ -40,14 +39,12 @@ class SectionInserterTest < MiniTest::Unit::TestCase
     list = template.at_css(".header-context nav[role=navigation] ol")
     assert_in list, "li:nth-child(1)", %{<a href="/">Home</a>}
     assert_in list, "li:nth-child(2)", %{<a href="https://www.test.gov.uk/browse/business">Business</a>}
-    assert_in list, "li:nth-child(3)", %{Something gooey}
   end
   def test_should_add_section_link_subsection_link_and_title_to_breadcrumb
     artefact = create_artefact("something",
                                "section_slug" => "business",
-                               "subsection_slug" => "employing-people",
-                               "title" => "Something gooey")
+                               "subsection_slug" => "employing-people")
     template = as_nokogiri %{
       <html>
@@ -66,47 +63,12 @@ class SectionInserterTest < MiniTest::Unit::TestCase
     assert_in list, "li:nth-child(1)", %{<a href="/">Home</a>}
     assert_in list, "li:nth-child(2)", %{<a href="https://www.test.gov.uk/browse/business">Business</a>}
     assert_in list, "li:nth-child(3)", %{<a href="https://www.test.gov.uk/browse/business/employing-people">Employing people</a>}
-    assert_in list, "li:nth-child(4)", %{Something gooey}
-  end
-  def test_should_not_append_title_if_its_blank
-    artefact = create_artefact("something",
-                               "section_slug" => "business",
-                               "subsection_slug" => "employing-people",
-                               "title" => nil)
-    template = as_nokogiri %{
-      <html>
-        <body>
-          <div class="header-context">
-            <nav role="navigation">
-              <ol class="group"><li><a href="/">Home</a></li></ol>
-            </nav>
-          </div>
-        </body>
-      </html>
-    }
-    t = template.dup
-    Slimmer::Processors::SectionInserter.new(artefact).filter(:any_source, t)
-    list = t.at_css(".header-context nav[role=navigation] ol")
-    assert_not_in list, "li:nth-child(4)"
-    artefact = create_artefact("something",
-                               "section_slug" => "business",
-                               "subsection_slug" => "employing-people",
-                               "title" => "")
-    Slimmer::Processors::SectionInserter.new(artefact).filter(:any_source, template)
-    list = template.at_css(".header-context nav[role=navigation] ol")
-    assert_not_in list, "li:nth-child(4)"
   end
   def test_should_add_links_after_last_item_in_breadcrumb
     artefact = create_artefact("something",
                                "section_slug" => "business",
-                               "subsection_slug" => "employing-people",
-                               "title" => "Something gooey")
+                               "subsection_slug" => "employing-people")
     template = as_nokogiri %{
       <html>
@@ -129,7 +91,6 @@ class SectionInserterTest < MiniTest::Unit::TestCase
     assert_in list, "li:nth-child(2)", %{<a href="/browse">All Sections</a>}
     assert_in list, "li:nth-child(3)", %{<a href="https://www.test.gov.uk/browse/business">Business</a>}
     assert_in list, "li:nth-child(4)", %{<a href="https://www.test.gov.uk/browse/business/employing-people">Employing people</a>}
-    assert_in list, "li:nth-child(5)", %{Something gooey}
   end
   def test_should_do_nothing_if_navigation_not_in_template
@@ -165,8 +126,7 @@ class SectionInserterTest < MiniTest::Unit::TestCase
   end
   def test_should_not_fail_with_no_sections
-    artefact = create_artefact("something",
-                               "title" => "Something gooey")
+    artefact = create_artefact("something")
     template = as_nokogiri %{
       <html>
@@ -185,6 +145,5 @@ class SectionInserterTest < MiniTest::Unit::TestCase
     Slimmer::Processors::SectionInserter.new(artefact).filter(:any_source, template)
     list = template.at_css(".header-context nav[role=navigation] ol")
     assert_in list, "li:nth-child(1)", %{<a href="/">Home</a>}
-    assert_in list, "li:nth-child(2)", %{Something gooey}
   end
 end

data/test/typical_usage_test.rb CHANGED Viewed

@@ -112,7 +112,6 @@ module TypicalUsage
     def test_should_insert_section_links_into_the_navigation
       assert_rendered_in_template "nav[role=navigation] li a[href='https://www.test.gov.uk/browse/this-section']", "This section"
-      assert_rendered_in_template "nav[role=navigation] li:last-child", "Some article"
     end
     def test_should_add_logo_classes_to_wrapper

metadata CHANGED Viewed

@@ -2,7 +2,7 @@
 name: slimmer
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Ben Griffiths
@@ -217,7 +217,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      hash: 2041451578136689132
+      hash: -2539638205319737760
       segments:
       - 0
       version: "0"
@@ -226,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      hash: 2041451578136689132
+      hash: -2539638205319737760
       segments:
       - 0
       version: "0"