From 1af0d5bbbb0ea63027b0c1f4c6870c23df2ba2d1 Mon Sep 17 00:00:00 2001 From: David Singleton Date: Mon, 8 Aug 2016 17:26:21 +0100 Subject: [PATCH 1/3] Move long README sections to docs/ directory The README has grown a lot over time, making it harder to read. And as a single page adding additional doc only adds to the problem. Split specific doc sections out into their own directory, for clarity. This is a convention used on GOV.UK projects and encouraged in the README styleguide: https://github.com/alphagov/styleguides/blob/master/use-of-READMEs.md I've done this now because I want to add more detailed documentation on the publishing process, and document how to fix missing published packages, which is likely to be super long. Hopefully this will encourage more detailed documentation on the repo in general. --- README.md | 151 ++------------------------------------------ docs/development.md | 34 ++++++++++ docs/packaging.md | 64 +++++++++++++++++++ docs/publishing.md | 8 +++ docs/usage.md | 37 +++++++++++ 5 files changed, 149 insertions(+), 145 deletions(-) create mode 100644 docs/development.md create mode 100644 docs/packaging.md create mode 100644 docs/publishing.md create mode 100644 docs/usage.md diff --git a/README.md b/README.md index d6e1afab..37b123a8 100644 --- a/README.md +++ b/README.md @@ -12,155 +12,16 @@ You can [view a collection of auto-generated examples](http://alphagov.github.io The Ruby language (1.9.3+), the build tool [Rake](http://rake.rubyforge.org/) & the dependancy management tool [Bundler](http://bundler.io/) -## Packaging +## Detailed Docs -At present this generates 9 output formats: - -1. a gem containing a Rails engine -2. a tarball containing Play Framework templates -3. a folder containing Mustache templates -4. a tarball containing Liquid templates -5. a tarball containing Mustache Inheritance templates -6. a tarball containing Jinja templates -7. a tarball containing plain HTML and assets -8. a tarball containing EJS (Embedded JavaScript) templates -9. a JAR file containing assets (but no templates) structured as per [WebJars](http://www.webjars.org/) -10. a tarball containing Django templates - -### Gem version - -This is available on rubygems.org. To use it, add this line to your application's Gemfile: - - gem 'govuk_template' - -And then execute: - - $ bundle - -You can then use the `govuk_template` layout in your app. If you need to extend the layout you can use [nested layouts](http://guides.rubyonrails.org/layouts_and_rendering.html#using-nested-layouts). - -### Play version - -To generate the tarball of Play Framework templates run `bundle exec rake build:play`. This will produce a tarball in the `pkg` directory. - -### Mustache version - -To generate the folder of Mustache templates run `bundle exec rake build:mustache`. This will produce a folder in the `pkg` directory. - -### Liquid version - -To generate the folder of Liquid templates run `bundle exec rake build:liquid`. This will produce a tarball in the `pkg` directory. - -### Mustache Inheritance version - -There is a [proposal for Mustache to support template inheritance](https://github.com/mustache/spec/issues/38) this is supported in both the `mustache.java` and the `hogan.js` implementations of Mustache. - -To generate the tarball of the Mustache Inheritance templates run the `build:mustache_inheritance` rake task. This will produce a tarball in the `pkg` directory. - -### Jinja version - -To generate the folder of Jinja templates run `bundle exec rake build:jinja`. This will produce a tarball in the `pkg` directory. - -### Tarball version - -To generate the tarball, run the `bundle exec rake build:tar`. This will produce a tarball in the `pkg` directory. - -### Embedded JavaScript version - -To generate the folder of Embedded JavaScript templates run `bundle exec rake build:ejs`. This will produce a tarball in the `pkg` directory. - -### WebJar version - -To generate a JAR file of assets in WebJar format run `bundle exec rake build:webjar`. This will produce a JAR file in the `pkg` directory. - -### Django version - -To generate the folder of Django templates run `bundle exec rake build:django`. This will produce a tarball in the `pkg` directory. - -## Publishing - -Accepted contributions (pull requests merged into master) will run builds for the Gem, Play and Mustache versions. These will then update the following: - -* The [ruby gems package](https://rubygems.org/gems/govuk_template) -* [alphagov/govuk_template_play](https://github.com/alphagov/govuk_template_play) -* [alphagov/govuk_template_mustache](https://github.com/alphagov/govuk_template_mustache) which updates the [npm package](https://npmjs.org/package/govuk_template_mustache) -* [alphagov/govuk_template_ejs](https://github.com/alphagov/govuk_template_ejs) which updates the [npm package](https://npmjs.org/package/govuk_template_ejs) -* [alphagov/govuk_template_jinja](https://github.com/alphagov/govuk_template_jinja) which updates the [npm package](https://npmjs.org/package/govuk_template_jinja) - - -## Development - -The source files are in the `/source` directory. The `compile` rake task builds the `/app` contents from these sources. This process involves the following: - -* compiling all stylesheets referenced in `/manifests.yml` to plain CSS (actually css.erb, so the Rails asset pipeline can work in the gem). -* combining all JavaScript files referenced in `/manifests.yml` (using Sprockets) -* copying the images across (including any needed images from the toolkit) - -This resulting app directory is included in the gem and hooked in as a Rails engine - -### Extra details for the tarball build - -The tarball build process takes the compiled template and assets from the `/app` directory, and performs some extra processing: - -* it compiles the `*.css.erb` files to plain CSS, replacing all calls to `asset_path` with the relative path to the asset. - For this reason, all assets referenced in the stylesheets must be stored relative to the stylesheet. -* it compiles the erb layout to plain html. - * All `asset_path` calls are replaced by the the path to the assets, assuming the assets folder is served from /assets - * Any `content_for?` calls are assumed to return false - * yields in the template are removed except for the main layout one which is replaced with an HTML comment. - -See the `TemplateProcessor` class for details of this implementation. - - -### Testing - -Run the tests with: - - bundle exec rake - -The integration tests are run separately with: - - bundle exec rake integration_tests - -For more details, see [integration_tests/README.md](integration_tests/README.md). +* [Development](docs/development.md) +* [Packaging](docs/packaging.md) +* [Publishing](docs/publishing.md) ## Usage -### Skip link - -The [govuk_template sets a skip link](https://github.com/alphagov/govuk_template/blob/master/source/views/layouts/govuk_template.html.erb#L64-L68) to `#content`, but doesn't provide an element with `id="content"`. You'll need to add `id="content"` to your main content area, to ensure the skip link will work. - -### Propositional title and navigation - -You can get a propositional title and navigation by setting the content for `header_class` to `with-proposition` and `proposition_header` in the form: - -
-
- Menu - -
-
- -This will then create a navigation block which is shown on desktop sized devices but collapsed down on smaller screens. - -For menus with only one item, the collapsible functionality is not necessary, it is recommended that you use the following markup - -
-
- -
-
+* [Setting a Skip link](docs/usage.md#skip-link) +* [Propositional title and navigation](docs/usage.md#propositional-title-and-navigation) ## Contributing diff --git a/docs/development.md b/docs/development.md new file mode 100644 index 00000000..82cfa28e --- /dev/null +++ b/docs/development.md @@ -0,0 +1,34 @@ +# Development + +The source files are in the `/source` directory. The `compile` rake task builds the `/app` contents from these sources. This process involves the following: + +* compiling all stylesheets referenced in `/manifests.yml` to plain CSS (actually css.erb, so the Rails asset pipeline can work in the gem). +* combining all JavaScript files referenced in `/manifests.yml` (using Sprockets) +* copying the images across (including any needed images from the toolkit) + +This resulting app directory is included in the gem and hooked in as a Rails engine + +## Extra details for the tarball build + +The tarball build process takes the compiled template and assets from the `/app` directory, and performs some extra processing: + +* it compiles the `*.css.erb` files to plain CSS, replacing all calls to `asset_path` with the relative path to the asset. + For this reason, all assets referenced in the stylesheets must be stored relative to the stylesheet. +* it compiles the erb layout to plain html. + * All `asset_path` calls are replaced by the the path to the assets, assuming the assets folder is served from /assets + * Any `content_for?` calls are assumed to return false + * yields in the template are removed except for the main layout one which is replaced with an HTML comment. + +See the `TemplateProcessor` class for details of this implementation. + +### Testing + +Run the tests with: + + bundle exec rake + +The integration tests are run separately with: + + bundle exec rake integration_tests + +For more details, see [integration_tests/README.md](integration_tests/README.md). diff --git a/docs/packaging.md b/docs/packaging.md new file mode 100644 index 00000000..0e35df3d --- /dev/null +++ b/docs/packaging.md @@ -0,0 +1,64 @@ +# Packaging + +At present this generates 9 output formats: + +1. a gem containing a Rails engine +2. a tarball containing Play Framework templates +3. a folder containing Mustache templates +4. a tarball containing Liquid templates +5. a tarball containing Mustache Inheritance templates +6. a tarball containing Jinja templates +7. a tarball containing plain HTML and assets +8. a tarball containing EJS (Embedded JavaScript) templates +9. a JAR file containing assets (but no templates) structured as per [WebJars](http://www.webjars.org/) +10. a tarball containing Django templates + +## Gem version + +This is available on rubygems.org. To use it, add this line to your application's Gemfile: + + gem 'govuk_template' + +And then execute: + + $ bundle + +You can then use the `govuk_template` layout in your app. If you need to extend the layout you can use [nested layouts](http://guides.rubyonrails.org/layouts_and_rendering.html#using-nested-layouts). + +## Play version + +To generate the tarball of Play Framework templates run `bundle exec rake build:play`. This will produce a tarball in the `pkg` directory. + +## Mustache version + +To generate the folder of Mustache templates run `bundle exec rake build:mustache`. This will produce a folder in the `pkg` directory. + +## Liquid version + +To generate the folder of Liquid templates run `bundle exec rake build:liquid`. This will produce a tarball in the `pkg` directory. + +## Mustache Inheritance version + +There is a [proposal for Mustache to support template inheritance](https://github.com/mustache/spec/issues/38) this is supported in both the `mustache.java` and the `hogan.js` implementations of Mustache. + +To generate the tarball of the Mustache Inheritance templates run the `build:mustache_inheritance` rake task. This will produce a tarball in the `pkg` directory. + +## Jinja version + +To generate the folder of Jinja templates run `bundle exec rake build:jinja`. This will produce a tarball in the `pkg` directory. + +## Tarball version + +To generate the tarball, run the `bundle exec rake build:tar`. This will produce a tarball in the `pkg` directory. + +## Embedded JavaScript version + +To generate the folder of Embedded JavaScript templates run `bundle exec rake build:ejs`. This will produce a tarball in the `pkg` directory. + +## WebJar version + +To generate a JAR file of assets in WebJar format run `bundle exec rake build:webjar`. This will produce a JAR file in the `pkg` directory. + +## Django version + +To generate the folder of Django templates run `bundle exec rake build:django`. This will produce a tarball in the `pkg` directory. diff --git a/docs/publishing.md b/docs/publishing.md new file mode 100644 index 00000000..37a7609b --- /dev/null +++ b/docs/publishing.md @@ -0,0 +1,8 @@ +# Publishing + +Accepted contributions (pull requests merged into master) will run builds for the Gem, Play and Mustache versions. These will then update the following: + +* The [ruby gems package](https://rubygems.org/gems/govuk_template) +* [alphagov/govuk_template_mustache](https://github.com/alphagov/govuk_template_mustache) which updates the [npm package](https://npmjs.org/package/govuk_template_mustache) +* [alphagov/govuk_template_ejs](https://github.com/alphagov/govuk_template_ejs) which updates the [npm package](https://npmjs.org/package/govuk_template_ejs) +* [alphagov/govuk_template_jinja](https://github.com/alphagov/govuk_template_jinja) diff --git a/docs/usage.md b/docs/usage.md new file mode 100644 index 00000000..1b649da0 --- /dev/null +++ b/docs/usage.md @@ -0,0 +1,37 @@ +# Usage + +## Skip link + +The [govuk_template sets a skip link](https://github.com/alphagov/govuk_template/blob/master/source/views/layouts/govuk_template.html.erb#L64-L68) to `#content`, but doesn't provide an element with `id="content"`. You'll need to add `id="content"` to your main content area, to ensure the skip link will work. + +## Propositional title and navigation + +You can get a propositional title and navigation by setting the content for `header_class` to `with-proposition` and `proposition_header` in the form: + +
+
+ Menu + +
+
+ +This will then create a navigation block which is shown on desktop sized devices but collapsed down on smaller screens. + +For menus with only one item, the collapsible functionality is not necessary, it is recommended that you use the following markup + +
+
+ +
+
From dabbdb1266e4a19db77ad386068538663e82c7fa Mon Sep 17 00:00:00 2001 From: David Singleton Date: Mon, 8 Aug 2016 17:52:00 +0100 Subject: [PATCH 2/3] Cleanup CONTRIBUTING - Provide more detail on how to run tests, so hopefully people do - Update the inaccurate versioning advice and describe how we do version bumps now. It could still be improved a bit, but it's an improvement over what we had before. - Fix some types/copy-paste-errors. --- CONTRIBUTING.md | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f7f1c0ed..97198731 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,10 +1,10 @@ # Contribution Guidelines -We welcome patches to the toolkit, as long as you follow these guidelines: +We welcome patches as long as you follow these guidelines: ## Git workflow ## -- Pull requests must contain a succint, clear summary of what the user need is driving this feature change. +- Pull requests must contain a succinct, clear summary of what the user need is driving this feature change. - Follow our [Git styleguide](https://github.com/alphagov/styleguides/blob/master/git.md) - Make a feature branch - Ensure your branch contains logical atomic commits before sending a pull request - follow our [Git styleguide](https://github.com/alphagov/styleguides/blob/master/git.md) @@ -23,9 +23,20 @@ We welcome patches to the toolkit, as long as you follow these guidelines: ## Testing ## -Write tests. +Write tests when adding or changing functionality. + +Run the tests with: + +```bash +bundle exec rake spec integration_tests +``` ## Versioning ## -We use [Semantic Versioning](http://semver.org/), and bump the version -on master only. Please don't submit your own proposed version numbers. +We use [Semantic Versioning](http://semver.org/). + +### Releasing a new version ### + +1. Create a branch that proposes a new [version number](/lib/govuk_template/version.rb#L2), and [`CHANGELOG`](CHANGELOG.md) +2. Open a Pull Request - here is a [good example](https://github.com/alphagov/govuk_template/pull/204/) +3. Once merged into master a new version will be built and [published](docs/publishing.md) From 24c3732eb9c07ece828f0a082b3aecd60bc524ff Mon Sep 17 00:00:00 2001 From: David Singleton Date: Mon, 8 Aug 2016 20:06:15 +0100 Subject: [PATCH 3/3] Update README to link to commonly used packages Moving packaging and publishing documentation to `docs` made it less clear how to consume `govuk_template`. Add links to the common ways to consume it. It's still not super clear, but I don't think the original was either. Ideally we should re-write the README/docs based on user needs of people using the packages, based on research --- README.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 37b123a8..8525f541 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,11 @@ -# GovukTemplate +# GOV.UK Template -This provides a template containing the GOV.UK header and footer, and associated assets. +This provides a template containing the GOV.UK header and footer, and associated assets. It provides a consistent GOV.UK brand experience across `www.gov.uk` and all services running under the `service.gov.uk` domain. + +The template is built from [`source`](source/) files, and multiple packages are generated to support different languages and frameworks. + +Packages are available for [RubyGems](https://rubygems.org/gems/govuk_template), NPM ([mustache](https://npmjs.org/package/govuk_template_mustache), [ejs](https://npmjs.org/package/govuk_template_ejs), [jinja](https://npmjs.org/package/govuk_template_jinja)), and other [templating languages](docs/packaging.md). -This is versioned following [Semantic Versioning](http://semver.org). ## Previewing the template @@ -26,3 +29,5 @@ The Ruby language (1.9.3+), the build tool [Rake](http://rake.rubyforge.org/) & ## Contributing Please follow the [contribution guidelines](https://github.com/alphagov/govuk_template/blob/master/CONTRIBUTING.md). + +This is versioned following [Semantic Versioning](http://semver.org).