ndr_ui 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3584658f79ff90044cc3e87c60a194ca964d7c59fb257784d90db46b3f7f87c1
-  data.tar.gz: 607c2995d427226512cbce4eddb889f809edaa11fb6707656bf25b9484921571
+  metadata.gz: 948171552053d8201249a7ad4d0b1aff5743a844c01339dfac66f7458307e03f
+  data.tar.gz: 27d8fa3cc83c56584f3c5a2caf786216143794b3632d867f1cb8fd25412b76fc
 SHA512:
-  metadata.gz: 5bf345b17539ac9d694ba9bb1ffc8a02b4e87effda793384be7e02f672d28fda2ef158d5c1857b8298488a43a46f08be873352972148a04596d11d8e7e980b81
-  data.tar.gz: 338e557549e9cd6dd5c0d249ff36e316b892830a2662371d557a2b824b8be65f1992b80d2e272d6db16b642a88e2fd7788ae3c50d26ea5e3e576688ea0382fd6
+  metadata.gz: d3c9dd26dc4dec27e06208b20f8c606466dd0fff4570e32874b76fd44a9a9b65eba252449f66aeb322f0cb6f00584dd4b7650f8780897b157c2c809a95131c7f
+  data.tar.gz: 32d327a35c5656866922cdcf7c0f2a9badcfa47ca53f5a064b85eed5f507ec6c3b76ae1a247072cea612dcc5c2695480130d4ad27a7ffa2cb511e368c13eaaa0

data/README.md

@@ -1,4 +1,4 @@
-# NdrUi [![Build Status](https://travis-ci.org/PublicHealthEngland/ndr_ui.svg)](https://travis-ci.org/PublicHealthEngland/ndr_ui) [![Gem Version](https://badge.fury.io/rb/ndr_ui.svg)](https://badge.fury.io/rb/ndr_ui) [![Documentation](https://img.shields.io/badge/ndr_ui-docs-blue.svg)](https://www.rubydoc.info/gems/ndr_ui)
+# NdrUi [![Build Status](https://github.com/publichealthengland/ndr_ui/workflows/Test/badge.svg)](https://github.com/publichealthengland/ndr_ui/actions?query=workflow%3Atest) [![Gem Version](https://badge.fury.io/rb/ndr_ui.svg)](https://rubygems.org/gems/ndr_ui) [![Documentation](https://img.shields.io/badge/ndr_ui-docs-blue.svg)](https://www.rubydoc.info/gems/ndr_ui)
 
 This is the Public Health England (PHE) National Disease Registration (NDR) User Interface rubygem,
 providing a set of core features:

data/app/builders/ndr_ui/bootstrap/label_tooltips.rb

@@ -13,7 +13,17 @@ module NdrUi
       # See the source code for ActionView::Helpers::Tags::Label for more.
       #
       # QUESTION: Parameterise the tooltip so we're not just bound to a question_tooltip ?
-      def label(method, text = nil, **options, &block)
+      def label(method, content_or_options = nil, options = nil, &block)
+        options ||= {}
+
+        content_is_options = content_or_options.is_a?(Hash)
+        if content_is_options
+          options.merge! content_or_options
+          text = nil
+        else
+          text = content_or_options
+        end
+
         tooltip_text = options.delete(:tooltip)
 
         super(method, text, options) do |builder|

data/app/helpers/ndr_ui/css_helper.rb

@@ -3,7 +3,7 @@ module NdrUi
   module CssHelper
     # This method merges the specified css_classes into the options hash
     def css_class_options_merge(options, css_classes = [], &block)
-      options.symbolize_keys!
+      options = options.symbolize_keys
       css_classes += options[:class].split(' ') if options.include?(:class)
       yield(css_classes) if block_given?
       options[:class] = css_classes.join(' ') unless css_classes.empty?

data/lib/ndr_ui/version.rb

@@ -2,5 +2,5 @@
 
 # This stores the current version of the NdrUi gem. Use semantic versioning http://semver.org
 module NdrUi
-  VERSION = '3.1.0'.freeze
+  VERSION = '3.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_ui
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - NDR Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-04 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,19 +31,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '7.0'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -120,14 +120,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.5
+        version: 5.10.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.5
+        version: 5.10.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -156,6 +156,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides Rails applications with additional support for the Twitter Bootstrap
   UI framework
 email: []
@@ -361,14 +375,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: NDR UI Rails Engine