ndr_ui 2.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6f096a99d6497432a68a4d9f0b8b136e18b032d4492a9db7f68b6f599e23659
-  data.tar.gz: afa294bc04877c1e805baf95a04fae23107c07c33fe2015302d2004264d47735
+  metadata.gz: 948171552053d8201249a7ad4d0b1aff5743a844c01339dfac66f7458307e03f
+  data.tar.gz: 27d8fa3cc83c56584f3c5a2caf786216143794b3632d867f1cb8fd25412b76fc
 SHA512:
-  metadata.gz: 76bf0eec7211d4c0aa55321495cdb54fa19897e1cdcfd7194c2acbd87afccbf6c0b2bd31abf1199e4791083d11e41eef35dd60cebbc16430f851ddea321da328
-  data.tar.gz: 4cd0dcd9fb8b8bca3035c8a52956a49bf3ed4a29212e2169ca2b29f7bc7b9d1ec7776c75ecdefbf69df062beddb1a6cdf19fd270e987acbfb06f9d75f9f020d4
+  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/assets/javascripts/ndr_ui/datepicker.js

@@ -1 +1 @@
-//= require bootstrap-datepicker-1.6.0-dist/js/bootstrap-datepicker
+//= require js/bootstrap-datepicker

data/app/assets/javascripts/ndr_ui/timeago.js

@@ -1,4 +1,4 @@
-//= require jquery-timeago-1.5.3/jquery.timeago.js
+//= require jquery.timeago.js
 
 jQuery(document).ready(function() {
   jQuery("time.timeago,abbr.timeago").timeago();

data/app/assets/stylesheets/ndr_ui/datepicker.scss

@@ -1,4 +1,4 @@
-@import "bootstrap-datepicker.scss";
+@import 'bootstrap-datepicker-scss-fix.scss';
 
 // Ensure date picker renders over the static nav
 .datepicker {

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/bootstrap_helper.rb

@@ -227,9 +227,15 @@ module NdrUi
       if horizontal = options.delete(:horizontal)
         # set the form html class for horizontal bootstrap forms
         options[:html][:class] ||= ''
-        options[:html][:class] = (options[:html][:class].split(' ') << 'form-horizontal').uniq.join(' ')
+        classes = (options[:html][:class].split(' ') << 'form-horizontal').uniq.join(' ')
+        options[:html][:class] = classes
       end
 
+      # stimuls controller, default `form_controller`
+      options[:html][:'data-controller'] ||= ''
+      controllers = (options[:html][:'data-controller'].split(' ') << 'form').uniq.join(' ')
+      options[:html][:'data-controller'] = controllers
+
       # We switch autocomplete off by default
       raise 'autocomplete should be defined an html option' if options[:autocomplete]
       options[:html][:autocomplete] ||= 'off'
@@ -258,6 +264,11 @@ module NdrUi
         options[:html][:class] = classes
       end
 
+      # stimuls controller, default `form_controller`
+      options[:html][:'data-controller'] ||= ''
+      controllers = (options[:html][:'data-controller'].split(' ') << 'form').uniq.join(' ')
+      options[:html][:'data-controller'] = controllers
+
       # We switch autocomplete off by default
       raise 'autocomplete should be defined an html option' if options[:autocomplete]
       options[:html][:autocomplete] ||= 'off'
@@ -434,6 +445,36 @@ module NdrUi
       content_tag(:div, capture(&block), class: 'btn-group')
     end
 
+    # Creates a Boostrap 'New' link.
+    #
+    # ==== Signatures
+    #
+    #   new_link(path, options = {})
+    #
+    # ==== Examples
+    #
+    #   <%= new_link('#') %>
+    #   # => <a title="New" class="btn btn-primary btn-xs" href="#">
+    #          <span class="glyphicon glyphicon-plus-sign"></span>
+    #        </a>
+    #
+    #   <%= new_link(Post.new) %>
+    #   # => <a title="New" class="btn btn-primary btn-xs" href="/posts/new">
+    #          <span class="glyphicon glyphicon-plus-sign"></span>
+    #        </a>
+    #
+    def new_link(path, options = {})
+      return unless options.delete(:skip_authorization) || ndr_can?(:new, path)
+
+      path = new_polymorphic_path(path) if can_generate_polymorphic_path?(path)
+
+      defaults = {
+        icon: 'plus-sign', title: 'New', path: path, class: 'btn btn-primary btn-xs'
+      }
+
+      link_to_with_icon(defaults.merge(options))
+    end
+
     # Creates a Boostrap 'Details' link.
     #
     # ==== Signatures
@@ -448,7 +489,7 @@ module NdrUi
     #        </a>
     #
     def details_link(path, options = {})
-      return unless ndr_can?(:read, path)
+      return unless options.delete(:skip_authorization) || ndr_can?(:read, path)
 
       link_to_with_icon({ icon: 'share-alt', title: 'Details', path: path }.merge(options))
     end
@@ -467,7 +508,7 @@ module NdrUi
     #        </a>
     #
     def edit_link(path, options = {})
-      return unless ndr_can?(:edit, path)
+      return unless options.delete(:skip_authorization) || ndr_can?(:edit, path)
 
       path = edit_polymorphic_path(path) if path.is_a?(ActiveRecord::Base)
 
@@ -488,7 +529,7 @@ module NdrUi
     #          <span class="glyphicon glyphicon-trash icon-white"></span>
     #        </a>'
     def delete_link(path, options = {})
-      return unless ndr_can?(:delete, path)
+      return unless options.delete(:skip_authorization) || ndr_can?(:delete, path)
 
       defaults = {
         icon: 'trash icon-white', title: 'Delete', path: path,
@@ -563,5 +604,12 @@ module NdrUi
 
       can?(action, subject, *extra_args)
     end
+
+    def can_generate_polymorphic_path?(path)
+      case path
+      when Array, ActiveRecord::Base then true
+      else false
+      end
+    end
   end
 end

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/config/routes.rb

@@ -1,2 +1,5 @@
 Rails.application.routes.draw do
+  resources :posts do
+    resources :comments
+  end
 end

data/lib/ndr_ui/engine.rb

@@ -6,7 +6,13 @@ module NdrUi
   class Engine < ::Rails::Engine
     isolate_namespace NdrUi
 
-    config.assets.paths << File.expand_path('../../../vendor/assets', __FILE__)
+    # Hook into host app's asset pipeline, allowing all the gem's assets
+    # to be complied alongside. This allows the gem's assets to be referenced
+    # directly by templates without issue, rather than needing to go via
+    # an asset manifest in the host.
+    initializer 'ndr_ui.assets.precompile' do |app|
+      app.config.assets.precompile += %w(*.scss *.js *.gif)
+    end
 
     # We configure the generator of the host app
     config.app_generators do |g|

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 = '2.1.1'.freeze
+  VERSION = '3.2.0'.freeze
 end

data/vendor/assets/datepicker-scss-fix/bootstrap-datepicker-scss-fix.scss

@@ -0,0 +1 @@
+./../bootstrap-datepicker-1.6.0-dist/css/bootstrap-datepicker3.css

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_ui
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - NDR Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-16 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,33 +31,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '7.0'
 - !ruby/object:Gem::Dependency
-  name: bootstrap-sass
+  name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.4.1
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -118,22 +118,16 @@ dependencies:
   name: ndr_dev_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 5.10.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 5.10.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -162,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: []
@@ -287,7 +295,7 @@ files:
 - vendor/assets/bootstrap-datepicker-1.6.0-dist/locales/bootstrap-datepicker.vi.min.js
 - vendor/assets/bootstrap-datepicker-1.6.0-dist/locales/bootstrap-datepicker.zh-CN.min.js
 - vendor/assets/bootstrap-datepicker-1.6.0-dist/locales/bootstrap-datepicker.zh-TW.min.js
-- vendor/assets/bootstrap-datepicker.scss
+- vendor/assets/datepicker-scss-fix/bootstrap-datepicker-scss-fix.scss
 - vendor/assets/jquery-timeago-1.5.3/jquery.timeago.js
 - vendor/assets/jquery-timeago-1.5.3/locales/README.md
 - vendor/assets/jquery-timeago-1.5.3/locales/jquery.timeago.af.js
@@ -367,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

data/vendor/assets/bootstrap-datepicker.scss

@@ -1 +0,0 @@
-./bootstrap-datepicker-1.6.0-dist/css/bootstrap-datepicker3.css