slimmer 5.1.0 → 6.0.0

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 6.0.0
+
+* Change ComponentResolver to use a bespoke tag - `test-govuk-component` - when
+  running in a test, rather than `script`. Use `data-template` rather than
+  `class` to identify which template was used.
+* Fix bug where Slimmer::TestHelpers::SharedTemplates#shared_component_selector
+  returned the wrong selector.
+
 # 5.1.0
 
 * `ComponentResolver#test_body` returns a JSON blob of the components keys and values instead of just the values.

data/lib/slimmer/component_resolver.rb

@@ -3,6 +3,8 @@ require 'active_support/core_ext/string/inflections'
 
 module Slimmer
   class ComponentResolver < ::ActionView::Resolver
+    TEST_TAG_NAME = 'test-govuk-component'
+
     def self.caching
       # this turns off the default ActionView::Resolver caching which caches
       # all templates for the duration of the current process in production
@@ -62,7 +64,7 @@ module Slimmer
     end
 
     def test_body(path)
-      %Q{<script type="text/component-source" class="#{path.parameterize}"><%= JSON.dump(local_assigns) %></script>}
+      %Q{<#{TEST_TAG_NAME} data-template="#{path.parameterize}"><%= JSON.dump(local_assigns) %></#{TEST_TAG_NAME}>}
     end
   end
 end

data/lib/slimmer/test_helpers/shared_templates.rb

@@ -2,7 +2,7 @@ module Slimmer
   module TestHelpers
     module SharedTemplates
       def shared_component_selector(name)
-        "div[class='govuk_component-#{name}']"
+        "#{Slimmer::ComponentResolver::TEST_TAG_NAME}[data-template='govuk_component-#{name}']"
       end
     end
   end

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = '5.1.0'
+  VERSION = '6.0.0'
 end

data/test/component_resolver_test.rb

@@ -23,7 +23,7 @@ describe Slimmer::ComponentResolver do
       @resolver.expects(:test?).returns(true)
 
       templates = @resolver.find_templates('name', 'govuk_component', false, {})
-      assert_match /<script type="text\/component-source" class="govuk_component-name">/, templates.first.args[0]
+      assert_match /<test-govuk-component data-template="govuk_component-name">/, templates.first.args[0]
     end
   end
 end

data/test/test_helpers/shared_templates_test.rb

@@ -0,0 +1,19 @@
+require_relative "../test_helper"
+require_relative "../../lib/slimmer/test_helpers/shared_templates"
+
+describe Slimmer::TestHelpers::SharedTemplates do
+
+  let(:subject) {
+    class Dummy
+      include Slimmer::TestHelpers::SharedTemplates
+    end
+    }
+
+  describe 'shared_component_selector' do
+    it 'should generate a selector for components' do
+      outcome = subject.new.shared_component_selector('flux_capacitor')
+      expected = "test-govuk-component[data-template='govuk_component-flux_capacitor']"
+      assert_equal expected, outcome
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slimmer
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 6.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &12214100 !ruby/object:Gem::Requirement
+  requirement: &19898920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *12214100
+  version_requirements: *19898920
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &12241700 !ruby/object:Gem::Requirement
+  requirement: &19914280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 1.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *12241700
+  version_requirements: *19914280
 - !ruby/object:Gem::Dependency
   name: plek
-  requirement: &12239840 !ruby/object:Gem::Requirement
+  requirement: &19912620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *12239840
+  version_requirements: *19912620
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &12239120 !ruby/object:Gem::Requirement
+  requirement: &19911480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12239120
+  version_requirements: *19911480
 - !ruby/object:Gem::Dependency
   name: null_logger
-  requirement: &12237920 !ruby/object:Gem::Requirement
+  requirement: &19910020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12237920
+  version_requirements: *19910020
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &12236540 !ruby/object:Gem::Requirement
+  requirement: &19908180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12236540
+  version_requirements: *19908180
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &12235640 !ruby/object:Gem::Requirement
+  requirement: &19907040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12235640
+  version_requirements: *19907040
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &12247000 !ruby/object:Gem::Requirement
+  requirement: &19931140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: '5.4'
   type: :development
   prerelease: false
-  version_requirements: *12247000
+  version_requirements: *19931140
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &12245280 !ruby/object:Gem::Requirement
+  requirement: &19954060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *12245280
+  version_requirements: *19954060
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &12243820 !ruby/object:Gem::Requirement
+  requirement: &19952100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *12243820
+  version_requirements: *19952100
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &12243140 !ruby/object:Gem::Requirement
+  requirement: &19950820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *12243140
+  version_requirements: *19950820
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &12270980 !ruby/object:Gem::Requirement
+  requirement: &19949700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -143,10 +143,10 @@ dependencies:
         version: 1.18.0
   type: :development
   prerelease: false
-  version_requirements: *12270980
+  version_requirements: *19949700
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &12268780 !ruby/object:Gem::Requirement
+  requirement: &19972060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -154,10 +154,10 @@ dependencies:
         version: 0.10.2
   type: :development
   prerelease: false
-  version_requirements: *12268780
+  version_requirements: *19972060
 - !ruby/object:Gem::Dependency
   name: gem_publisher
-  requirement: &12266940 !ruby/object:Gem::Requirement
+  requirement: &19970640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,10 +165,10 @@ dependencies:
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *12266940
+  version_requirements: *19970640
 - !ruby/object:Gem::Dependency
   name: gds-api-adapters
-  requirement: &12265940 !ruby/object:Gem::Requirement
+  requirement: &19969780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -176,10 +176,10 @@ dependencies:
         version: 2.7.1
   type: :development
   prerelease: false
-  version_requirements: *12265940
+  version_requirements: *19969780
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &12264600 !ruby/object:Gem::Requirement
+  requirement: &19968420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -187,7 +187,7 @@ dependencies:
         version: 0.5.1
   type: :development
   prerelease: false
-  version_requirements: *12264600
+  version_requirements: *19968420
 description: Rack middleware for skinning pages using a specific template
 email:
 - bengriffiths@gmail.com
@@ -199,6 +199,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - CHANGELOG.md
+- lib/slimmer/i18n_backend.rb
 - lib/slimmer/railtie.rb
 - lib/slimmer/headers.rb
 - lib/slimmer/skin.rb
@@ -215,7 +216,6 @@ files:
 - lib/slimmer/shared_templates.rb
 - lib/slimmer/govuk_request_id.rb
 - lib/slimmer/template.rb
-- lib/slimmer/component_i18n_backend.rb
 - lib/slimmer/component_resolver.rb
 - lib/slimmer/cache.rb
 - lib/slimmer/processors/header_context_inserter.rb
@@ -242,6 +242,7 @@ files:
 - Rakefile
 - test/component_resolver_test.rb
 - test/changelog_test.rb
+- test/test_helpers/shared_templates_test.rb
 - test/typical_usage_test.rb
 - test/skin_test.rb
 - test/deprecated_usage_test.rb
@@ -289,7 +290,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3888968595251477904
+      hash: -1405185890624183511
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -298,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3888968595251477904
+      hash: -1405185890624183511
 requirements: []
 rubyforge_project: slimmer
 rubygems_version: 1.8.11
@@ -308,6 +309,7 @@ summary: Thinner than the skinner
 test_files:
 - test/component_resolver_test.rb
 - test/changelog_test.rb
+- test/test_helpers/shared_templates_test.rb
 - test/typical_usage_test.rb
 - test/skin_test.rb
 - test/deprecated_usage_test.rb