govuk_admin_template 1.1.3 → 1.1.4

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.1.4
+
+* Fix missing assets in production Rails 4 apps, both our own (header-crown.png)
+  and Bootstrap's glyphicon font-using bits
+
 # 1.1.3
 
 * Fix GillSans font stack for IE and Chrome on Windows

data/app/assets/stylesheets/govuk_admin_template.scss

@@ -1,4 +1,5 @@
 @import 'govuk_admin_template/bootstrap_colour_overrides'; //Needs to be set before Bootstrap import
+@import 'bootstrap-sprockets';
 @import 'bootstrap';
 @import 'govuk_admin_template/theme';
 @import 'govuk_admin_template/mixins';

data/app/assets/stylesheets/govuk_admin_template/_navbar.css.scss

@@ -4,7 +4,7 @@
 
 .navbar .container .navbar-brand,
 .navbar .container-fluid .navbar-brand {
-  background: url("/assets/govuk_admin_template/header-crown.png") 0 0.67em no-repeat;
+  background: image-url("/assets/govuk_admin_template/header-crown.png") 0 0.67em no-repeat;
   color: #fff;
   font-family: $font-family-gill-sans;
   font-size: 20px;

data/lib/govuk_admin_template/version.rb

@@ -1,3 +1,3 @@
 module GovukAdminTemplate
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

data/lib/tasks/publish_gem.rake

@@ -0,0 +1,7 @@
+require "gem_publisher"
+
+desc "Publish gem to RubyGems.org"
+task :publish_gem do |t|
+  gem = GemPublisher.publish_if_updated("govuk_admin_template.gemspec", :rubygems)
+  puts "Published #{gem}" if gem
+end

data/lib/tasks/sass/check.rake

@@ -0,0 +1,32 @@
+UNGUARDED_URL_USAGE = /\surl\(/
+
+namespace :sass do
+  desc 'Check all SCSS for unguarded url() usages'
+  task :check do
+    scss_files = File.expand_path(
+        '../../../../app/assets/stylesheets/**/*.scss', __FILE__)
+
+    matching_lines = Dir[scss_files].inject([]) do |matching, scss_file|
+      File.readlines(scss_file).each_with_index do |line, number|
+        matching << "#{scss_file}:#{number + 1}" if line =~ UNGUARDED_URL_USAGE
+      end
+      matching
+    end
+
+    if matching_lines.any?
+      raise <<-MSG
+
+Do not use instances of url(...) to refer to images within this gem.
+Prefer the SASS function image-url. Unguarded url references won't work in
+Rails 4 and up due to MD5 hashes in asset filenames. Your asset will 404 in
+production Rails 4 apps.
+
+Lines that use url(...) to refer to images within this gem:
+
+      #{matching_lines.join("\n  ")}
+
+      MSG
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_admin_template
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -32,23 +32,23 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0.0
+        version: 3.2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0.0
+        version: 3.2.0.2
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.1
   type: :runtime
@@ -56,25 +56,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.1
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.18
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.18
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +183,8 @@ files:
 - config/routes.rb
 - lib/govuk_admin_template/engine.rb
 - lib/govuk_admin_template/version.rb
+- lib/tasks/sass/check.rake
+- lib/tasks/publish_gem.rake
 - lib/govuk_admin_template.rb
 - JAVASCRIPT.md
 - CSS.md
@@ -216,10 +202,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 1831054243054669970
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -228,10 +211,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1831054243054669970
+      hash: 4404839665835030650
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: Styles, scripts and templates for GOV.UK admin applications