govuk_publishing_components 3.3.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6824adb0ac3f33d0beeb80f026ac1e5e7f28d38b
-  data.tar.gz: af7894128522651abec009b43e12e37387f86a5a
+  metadata.gz: 4c38b0e49071df40f8893de2a2927317e4f916c7
+  data.tar.gz: 9fab2d961d4cd328f53a9ee6ef2b62cf45869de4
 SHA512:
-  metadata.gz: 9689fcdadf63203859864c6453bb7bbd81b831fcf831479863fa602b7de507d64c03b68f2c5e16c923e476ebb6af0f2dc0fe47318ed07f1ce399ecfd5966284e
-  data.tar.gz: 76617b5ebc0eeaa676c84bf6f58723fc02f943c64fd9cccfbe4e74a0415522c2c345c827f88b3124f3bf1c1e457f1626786eed39c3bcf56ad876e18ab62a9861
+  metadata.gz: d8c6ba39ba1908980d9bdd30689d06f3977e523ee51c6fffdd27e16aeda26774bf2a7051ffd29edc551834be2939be4ee4030353fa724c8105985521f1cec59d
+  data.tar.gz: b1cf174f0f98ff9e3c8fe21a31d5454a5d77fdb28d1de71deaddaf21a7d03417edd812ce6409d7d59bf35fdc3023d666249d99a30b994d754ed57aa3401c1e8a

data/README.md

@@ -40,27 +40,6 @@ And then execute:
 $ bundle
 ```
 
-### Running as a standalone app
-
-If you want to work on this gem directly, without having to add it to another
-application, you can run it in the development vm:
-
-```
-$ cd /var/govuk/govuk-puppet/development-vm
-$ bowl publishing-components
-```
-
-Then visit [publishing-components.dev.gov.uk/component-guide](http://publishing-components.dev.gov.uk/component-guide).
-
-If you don't want to run it in the development vm, you can start the app with:
-
-```
-$ gem install foreman
-$ PLEK_SERVICE_STATIC_URI=assets.publishing.service.gov.uk foreman start
-```
-
-Then visit [localhost:5000/component-guide](http://localhost:5000/component-guide).
-
 #### Integration with Heroku
 
 To make the best use of the component guide we use Heroku to serve the current `master` build and whenever a [pull request is added](https://devcenter.heroku.com/articles/github-integration-review-apps)
@@ -116,6 +95,48 @@ if defined?(GovukPublishingComponents)
 end
 ```
 
+### Running the gem as a standalone app
+
+If you want to work on this gem directly, without having to add it to another
+application, you can run it in the development vm:
+
+```
+./startup.sh
+```
+
+The app should start on http://localhost:3212 or http://publishing-components.dev.gov.uk/component-guide on GOV.UK development machines.
+
+```
+./startup.sh --live
+```
+
+This will run the app and point it at the production `static` instance.
+
+#### Running with bowl on the VM
+
+```
+$ cd /var/govuk/govuk_publishing_components
+$ bundle
+
+$ cd /var/govuk/govuk-puppet/development-vm
+$ bowl publishing-components
+```
+
+Then visit [publishing-components.dev.gov.uk/component-guide](http://publishing-components.dev.gov.uk/component-guide).
+
+#### Running locally
+
+If you don't want to run it in the development vm, you can start the app with:
+
+```
+$ cd /var/govuk/govuk_publishing_components
+$ bundle
+
+$ PLEK_SERVICE_STATIC_URI=assets.publishing.service.gov.uk bundle exec foreman start
+```
+
+Then visit [localhost:5000/component-guide](http://localhost:5000/component-guide).
+
 ### Test the component guide
 
 The gem [includes integration tests](lib/govuk_publishing_components/minitest/component_guide_test.rb) to check that your component guide and examples are error free and that they meet basic accessibility needs.

data/app/assets/javascripts/govuk_publishing_components/application.js

@@ -13,6 +13,6 @@
 //= require govuk/modules
 //= require ../history-support
 //= require ../current-location
-//= require ../components/task-list
+//= require_tree ./components
 //= require_tree ./vendor
 //= require_tree .

data/app/assets/stylesheets/govuk_publishing_components/application.scss

@@ -4,13 +4,13 @@
 @import "typography";
 @import "colours";
 
-@import "../components/back-link";
-@import "../components/fieldset";
-@import "../components/label";
-@import "../components/radio";
-@import "../components/task-list";
-@import "../components/task-list-header";
-@import "../components/task-list-related";
+@import "components/back-link";
+@import "components/fieldset";
+@import "components/label";
+@import "components/radio";
+@import "components/task-list";
+@import "components/task-list-header";
+@import "components/task-list-related";
 
 $border-color: #ccc;
 

data/app/assets/stylesheets/{components → govuk_publishing_components/components}/_task-list.scss

@@ -1,3 +1,6 @@
+// govuk_frontend_toolkit
+@import 'css3';
+
 $stroke-width: 2px;
 $stroke-width-large: 3px;
 $number-circle-size: 26px;

data/app/assets/stylesheets/govuk_publishing_components/print.scss

@@ -1,4 +1,3 @@
 @import "typography";
-
-@import "../components/task-list-print";
-@import "../components/task-list-header-print";
+@import "components/print/task-list";
+@import "components/print/task-list-header";

data/app/models/govuk_publishing_components/component_doc.rb

@@ -47,7 +47,7 @@ module GovukPublishingComponents
 
     def partial_path
       if source == 'gem'
-        "components/#{id}"
+        "govuk_publishing_components/components/#{id}"
       else
         "#{GovukPublishingComponents::Config.component_directory_name}/#{id}"
       end

data/app/models/govuk_publishing_components/component_doc_resolver.rb

@@ -68,7 +68,7 @@ module GovukPublishingComponents
     end
 
     def gem_documentation_directory
-      Pathname.new(GovukPublishingComponents::Config.gem_directory).join("app", "views", "components", "docs")
+      Pathname.new(GovukPublishingComponents::Config.gem_directory).join("app", "views", "govuk_publishing_components", "components", "docs")
     end
   end
 end

data/app/views/{components → govuk_publishing_components/components}/_radio.html.erb

@@ -30,7 +30,7 @@
           aria-describedby="<%= label_hint_id %>"
         <% end %>
       >
-      <%= render "components/label", {
+      <%= render "govuk_publishing_components/components/label", {
         hint_id: label_hint_id,
         html_for: label_id,
         classes: 'gem-c-radio__label',

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '3.3.0'.freeze
+  VERSION = '4.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 4.0.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-05 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -192,6 +192,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: foreman
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.64'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.64'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -218,27 +232,27 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/govuk_publishing_components_manifest.js
-- app/assets/javascripts/components/task-list.js
 - app/assets/javascripts/current-location.js
 - app/assets/javascripts/govuk_publishing_components/accessibility-test.js
 - app/assets/javascripts/govuk_publishing_components/application.js
+- app/assets/javascripts/govuk_publishing_components/components/task-list.js
 - app/assets/javascripts/govuk_publishing_components/vendor/axe.min.js
 - app/assets/javascripts/govuk_publishing_components/vendor/matches-polyfill.min.js
 - app/assets/javascripts/govuk_publishing_components/visual-regression.js
 - app/assets/javascripts/history-support.js
-- app/assets/stylesheets/components/_back-link.scss
-- app/assets/stylesheets/components/_fieldset.scss
-- app/assets/stylesheets/components/_label.scss
-- app/assets/stylesheets/components/_radio.scss
-- app/assets/stylesheets/components/_task-list-header-print.scss
-- app/assets/stylesheets/components/_task-list-header.scss
-- app/assets/stylesheets/components/_task-list-print.scss
-- app/assets/stylesheets/components/_task-list-related.scss
-- app/assets/stylesheets/components/_task-list.scss
-- app/assets/stylesheets/components/helpers/_clearfix.scss
-- app/assets/stylesheets/components/helpers/_px-to-em.scss
-- app/assets/stylesheets/components/helpers/_variables.scss
 - app/assets/stylesheets/govuk_publishing_components/application.scss
+- app/assets/stylesheets/govuk_publishing_components/components/_back-link.scss
+- app/assets/stylesheets/govuk_publishing_components/components/_fieldset.scss
+- app/assets/stylesheets/govuk_publishing_components/components/_label.scss
+- app/assets/stylesheets/govuk_publishing_components/components/_radio.scss
+- app/assets/stylesheets/govuk_publishing_components/components/_task-list-header.scss
+- app/assets/stylesheets/govuk_publishing_components/components/_task-list-related.scss
+- app/assets/stylesheets/govuk_publishing_components/components/_task-list.scss
+- app/assets/stylesheets/govuk_publishing_components/components/helpers/_clearfix.scss
+- app/assets/stylesheets/govuk_publishing_components/components/helpers/_px-to-em.scss
+- app/assets/stylesheets/govuk_publishing_components/components/helpers/_variables.scss
+- app/assets/stylesheets/govuk_publishing_components/components/print/_task-list-header.scss
+- app/assets/stylesheets/govuk_publishing_components/components/print/_task-list.scss
 - app/assets/stylesheets/govuk_publishing_components/print.scss
 - app/controllers/govuk_publishing_components/application_controller.rb
 - app/controllers/govuk_publishing_components/component_guide_controller.rb
@@ -247,20 +261,6 @@ files:
 - app/models/govuk_publishing_components/component_doc_resolver.rb
 - app/models/govuk_publishing_components/component_example.rb
 - app/models/govuk_publishing_components/shared_accessibility_criteria.rb
-- app/views/components/_back_link.html.erb
-- app/views/components/_fieldset.html.erb
-- app/views/components/_label.html.erb
-- app/views/components/_radio.html.erb
-- app/views/components/_task_list.html.erb
-- app/views/components/_task_list_header.html.erb
-- app/views/components/_task_list_related.html.erb
-- app/views/components/docs/back_link.yml
-- app/views/components/docs/fieldset.yml
-- app/views/components/docs/label.yml
-- app/views/components/docs/radio.yml
-- app/views/components/docs/task_list.yml
-- app/views/components/docs/task_list_header.yml
-- app/views/components/docs/task_list_related.yml
 - app/views/govuk_publishing_components/component_guide/component_doc/_call.html.erb
 - app/views/govuk_publishing_components/component_guide/component_doc/_component.html.erb
 - app/views/govuk_publishing_components/component_guide/component_doc/_preview.html.erb
@@ -268,6 +268,20 @@ files:
 - app/views/govuk_publishing_components/component_guide/index.html.erb
 - app/views/govuk_publishing_components/component_guide/preview.html.erb
 - app/views/govuk_publishing_components/component_guide/show.html.erb
+- app/views/govuk_publishing_components/components/_back_link.html.erb
+- app/views/govuk_publishing_components/components/_fieldset.html.erb
+- app/views/govuk_publishing_components/components/_label.html.erb
+- app/views/govuk_publishing_components/components/_radio.html.erb
+- app/views/govuk_publishing_components/components/_task_list.html.erb
+- app/views/govuk_publishing_components/components/_task_list_header.html.erb
+- app/views/govuk_publishing_components/components/_task_list_related.html.erb
+- app/views/govuk_publishing_components/components/docs/back_link.yml
+- app/views/govuk_publishing_components/components/docs/fieldset.yml
+- app/views/govuk_publishing_components/components/docs/label.yml
+- app/views/govuk_publishing_components/components/docs/radio.yml
+- app/views/govuk_publishing_components/components/docs/task_list.yml
+- app/views/govuk_publishing_components/components/docs/task_list_header.yml
+- app/views/govuk_publishing_components/components/docs/task_list_related.yml
 - app/views/layouts/govuk_publishing_components/application.html.erb
 - config/initializers/assets.rb
 - config/locales/cy.yml