aaf-lipstick 4.4.0 → 4.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5363261834c54bd4fbb319de946010a977697f6f65fa76d2b946d9d918a9e26
-  data.tar.gz: '082da376d1711c5919bea6e743efca5754c2f924050e9064815f06e1edfe80f7'
+  metadata.gz: f2caf959c20a2e01119e0d94f22871de8e26be71c025ca7a0ffcc82bae4498fc
+  data.tar.gz: e3ff033e8e9bc31807628156a184f513dde949e13e2b219ad193f9865466684b
 SHA512:
-  metadata.gz: 54bbf507c582831bd47dff9672148956c1e3c249af95dca0e341ea836d00f674f2e2dc5ed086fd58433e1ae5c437126731ca60231c5f89cfbf078947ca41c2b0
-  data.tar.gz: 4bb678a77f00d82db4fcdb0c55d1fb63388aea5548ed970900d429de6a7fcad022b7c4260108b08a3f358b5a5bce2ae96cfd7a862994bfdff7f679f238bbd50c
+  metadata.gz: ec124d3dea3ef4a4b0781df1b44a3da910aa18ecc6ddf4e4857914b89eee4febc662b14d5472c00979926ff5c42a5ae3f1dc065cd7acc1f0d7436fad17ac88b3
+  data.tar.gz: a1d805be84d463fcfe5a788f992ca8e390fbda488b5ea975de7954e50a699fb57b659679d7be20f998a5d33f6dc8e846c61238c93aa5704df224c9652c8affd6

data/lib/lipstick/filterable.rb

@@ -10,6 +10,7 @@ module Lipstick
       attr_reader :attribute, :collation
 
       def initialize(attribute, collation)
+        super()
         @attribute = attribute
         @collation = collation
       end

data/lib/lipstick/helpers/bootstrap_form_builder.rb

@@ -27,20 +27,20 @@ class BootstrapFormBuilder < ActionView::Helpers::FormBuilder
     super
   end
 
-  def check_box(*)
+  def check_box(*, &block)
     template.content_tag('div', class: 'checkbox') do
       template.content_tag('label') do
         template.concat(super)
-        template.concat(template.capture { yield })
+        template.concat(template.capture(&block))
       end
     end
   end
 
-  def radio_button(*)
+  def radio_button(*, &block)
     template.content_tag('div', class: 'radio') do
       template.content_tag('label') do
         template.concat(super)
-        template.concat(template.capture { yield })
+        template.concat(template.capture(&block))
       end
     end
   end

data/lib/lipstick/helpers/form_helper.rb

@@ -5,34 +5,36 @@ module Lipstick
     module FormHelper
       include ActionView::Helpers::FormTagHelper
 
-      def field_block(html_opts = {})
+      def field_block(html_opts = {}, &block)
         add_css_class(html_opts, 'form-group')
-        content_tag('div', html_opts) { yield }
+        content_tag('div', html_opts, &block)
       end
 
-      def radio_button_tag(name, value, checked = false, options = {})
+      # rubocop:disable Style/OptionalBooleanParameter
+      def radio_button_tag(name, value, checked = false, options = {}, &block)
         content_tag('div', class: 'radio') do
           content_tag('label') do
             concat(super)
-            concat(capture { yield })
+            concat(capture(&block))
           end
         end
       end
+      # rubocop:enable Style/OptionalBooleanParameter
 
-      def check_box_tag(*)
+      def check_box_tag(*, &block)
         content_tag('div', class: 'checkbox') do
           content_tag('label') do
             concat(super)
-            concat(capture { yield })
+            concat(capture(&block))
           end
         end
       end
 
       alias orig_form_tag form_tag
 
-      def inline_form_tag(url_for_options = {}, options = {})
+      def inline_form_tag(url_for_options = {}, options = {}, &block)
         add_css_class(options, 'form-inline')
-        form_tag(url_for_options, options) { yield }
+        form_tag(url_for_options, options, &block)
       end
 
       def search_form_tag(filter, url: nil,
@@ -111,7 +113,7 @@ module Lipstick
       end
 
       def delete_button_tag(url, text: true, **opts)
-        action = text&.is_a?(String) ? text : 'Delete'
+        action = text.is_a?(String) ? text : 'Delete'
 
         content_tag('div', class: 'btn-group') do
           concat(delete_dropdown_opener(text && action, opts))
@@ -135,7 +137,7 @@ module Lipstick
       #     v.validate_field(:name, ...) # Validate the test_object[name] field
       #   end
       # %>
-      def validate_form(selector, sym = nil)
+      def validate_form(selector, sym = nil, &block)
         opts = {
           type: 'application/vnd.aaf.lipstick.validations+json',
           'data-target': selector,
@@ -143,7 +145,7 @@ module Lipstick
         }
 
         content_tag('script', opts) do
-          validation_json(sym) { |v| yield v }.html_safe
+          validation_json(sym, &block).html_safe
         end
       end
 

data/lib/lipstick/helpers/form_validation_builder.rb

@@ -42,9 +42,7 @@ module Lipstick
 
         return validate_with_param(target, validation, true) if opts.empty?
 
-        if opts.keys == [:param]
-          return validate_with_param(target, validation, opts[:param])
-        end
+        return validate_with_param(target, validation, opts[:param]) if opts.keys == [:param]
 
         add_rule(target, validation, opts)
       end

data/lib/lipstick/helpers/layout_helper.rb

@@ -10,11 +10,11 @@ module Lipstick
         end
       end
 
-      def aaf_footer
+      def aaf_footer(&block)
         content_tag('footer') do
           content_tag('div', class: 'footer-content') do
             concat(aaf_logo)
-            concat(capture { yield })
+            concat(capture(&block))
           end
         end
       end

data/lib/lipstick/helpers/nav_helper.rb

@@ -3,8 +3,8 @@
 module Lipstick
   module Helpers
     module NavHelper
-      def nav_bar
-        content_tag('nav', class: 'navbar shrink') { yield }
+      def nav_bar(&block)
+        content_tag('nav', class: 'navbar shrink', &block)
       end
 
       def nav_first_item(text, url)
@@ -14,10 +14,10 @@ module Lipstick
         end
       end
 
-      def nav_collapsing_items
+      def nav_collapsing_items(&block)
         attrs = { class: 'collapse navbar-collapse', id: 'aaf-nav-collapse' }
         content_tag('div', attrs) do
-          content_tag('ul', class: 'nav navbar-nav') { yield }
+          content_tag('ul', class: 'nav navbar-nav', &block)
         end
       end
 

data/lib/lipstick/helpers/sortable_helper.rb

@@ -25,13 +25,13 @@ module Lipstick
         link_to request.query_parameters.merge(sort_by: param_name,
                                                direction: opposite_direction) do
           concat("#{name} ")
-          concat(
-            content_tag('div', class: 'glyphicon') do
-              content_tag('div',
-                          class: "glyphicon-chevron-#{icon(direction)}") do
-              end
-            end
-          )
+          concat(glyphicon(direction))
+        end
+      end
+
+      def glyphicon(direction)
+        content_tag('div', class: 'glyphicon') do
+          content_tag('div', nil, class: "glyphicon-chevron-#{icon(direction)}")
         end
       end
 

data/lib/lipstick/images/logo_only_email_banner.rb

@@ -51,7 +51,7 @@ module Lipstick
           title.pointsize = 36
           title.gravity = Magick::ForgetGravity
           title.fill = '#bc2028'
-          title.rotation = (-1) * ANGLE_DEGREES
+          title.rotation = -1 * ANGLE_DEGREES
         end
       end
 
@@ -97,11 +97,11 @@ module Lipstick
         m = env_metrics
 
         # The horizontal width of the environment text is found by:
-        # w cos(Θ) + h sin(Θ)
+        # w cos(0) + h sin(0)
         #
         # w = text width
         # h = text ascent
-        # Θ = angle of text rotation
+        # 0 = angle of text rotation
         #
         # Contrary to the description in `EmailBanner`, since we're upper
         # casing the environment string here, we don't need to worry about text
@@ -117,9 +117,9 @@ module Lipstick
         m = env_metrics
 
         # The horizontal width of the environment text is found by:
-        # w sin(Θ) + h cos(Θ)
+        # w sin(0) + h cos(0)
         h = Math.sin(ANGLE_RADIANS) * m.width +
-          Math.cos(ANGLE_RADIANS) * m.ascent
+            Math.cos(ANGLE_RADIANS) * m.ascent
 
         # We use addition here instead of the usual subtraction, as the text
         # moves in the upward direction from the position we set.

data/lib/lipstick/images/processor.rb

@@ -16,7 +16,7 @@ module Lipstick
         end
         # rubocop:enable Security/Eval
 
-        def email_banner(image: 'logo.png', title:, environment:, **kwargs)
+        def email_banner(title:, environment:, image: 'logo.png', **kwargs)
           @context.depend_on_asset(image)
           asset = @context.environment.find_asset(image)
 
@@ -29,7 +29,7 @@ module Lipstick
           ).to_png
         end
 
-        def logo_only_email_banner(image: 'logo.png', environment:, **kwargs)
+        def logo_only_email_banner(environment:, image: 'logo.png', **kwargs)
           @context.depend_on_asset(image)
           asset = @context.environment.find_asset(image)
 

data/lib/lipstick/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lipstick
-  VERSION = '4.4.0'
+  VERSION = '4.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aaf-lipstick
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.5.1
 platform: ruby
 authors:
 - Shaun Mangelsdorf
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -28,16 +28,16 @@ dependencies:
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -252,22 +252,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -282,7 +276,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - s.mangelsdorf@gmail.com
 executables: []
@@ -332,7 +326,7 @@ homepage: https://github.com/ausaccessfed/aaf-lipstick
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -340,15 +334,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: A gem for applying AAF branding to our services
 test_files: []