aaf-lipstick 4.0.1 → 4.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 65aef4573165da6a1a62d6d8c0d02206773bddad
-  data.tar.gz: a87b1cf25fcf9e62ed61894c2b535613a24b72aa
+SHA256:
+  metadata.gz: f2caf959c20a2e01119e0d94f22871de8e26be71c025ca7a0ffcc82bae4498fc
+  data.tar.gz: e3ff033e8e9bc31807628156a184f513dde949e13e2b219ad193f9865466684b
 SHA512:
-  metadata.gz: 763245f839f4896d8f5377603f82e98442e2ef7fdb79b19b21158d1e739be16649121c6957c4730842f69efba1284d08b983bb6d346df505540707c6fd442f1e
-  data.tar.gz: f5744d6bf50bed44643ab136c3bdf77cbd0c8df8122773582523c31bf6357c21ee1f9f8689665b6730dfd54144386599f0653b4f836a0302e23fba9691e5b3ba
+  metadata.gz: ec124d3dea3ef4a4b0781df1b44a3da910aa18ecc6ddf4e4857914b89eee4febc662b14d5472c00979926ff5c42a5ae3f1dc065cd7acc1f0d7436fad17ac88b3
+  data.tar.gz: a1d805be84d463fcfe5a788f992ca8e390fbda488b5ea975de7954e50a699fb57b659679d7be20f998a5d33f6dc8e846c61238c93aa5704df224c9652c8affd6

data/app/views/layouts/email_branding.html.erb

@@ -216,7 +216,7 @@
                       </td>
                       <td valign="top" width="190">
                         <div >
-                          Do you need help?<br /><a href="http://support.aaf.edu.au" target="_blank">Access the AAF Support service</a>.
+                          Do you need help?<br /><a href="https://support.aaf.edu.au" target="_blank">Access the AAF Support service</a>.
                         </div>
                       </td>
                     </tr>
@@ -267,7 +267,7 @@
                           <tr>
                             <td colspan="2" valign="middle" id="social" style="background-color:#f5f5f5; border:0; padding: 8px 15px; border-radius: 4px;">
                               <div style="text-align:center;">
-                                &nbsp;<a href="http://twitter.com/ausaccessfed" style="color:#08c;">Follow on Twitter</a> | <a href="http://www.facebook.com/ausaccessfed" style="color:#08c;">Friend on Facebook</a> | <a href="https://support.aaf.edu.au" style="color:#08c;">Get AAF Support</a>&nbsp;
+                                &nbsp;<a href="https://twitter.com/ausaccessfed" style="color:#08c;">Follow on Twitter</a> | <a href="https://support.aaf.edu.au" style="color:#08c;">Get AAF Support</a>&nbsp;
                               </div>
                             </td>
                           </tr>

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

@@ -122,7 +122,7 @@ module Lipstick
         li_opts[:class] = 'active' if page == current
 
         url_opts = template.params.permit(
-          :page, :per_page, :filter, :direction, :sort_by
+          :page, :per_page, :filter, :direction, :sort_by, :state_filter
         ).merge(page: page)
         opts = opts.merge(href: template.url_for(url_opts))
 

data/lib/lipstick/helpers/sortable_helper.rb

@@ -14,22 +14,24 @@ module Lipstick
         if params[:sort_by] == param_name
           sortable_active_link(name, param_name, direction, opposite_direction)
         else
-          link_to name, sort_by: param_name, direction: direction
+          link_to name, request.query_parameters
+                               .merge(sort_by: param_name, direction: direction)
         end
       end
 
       private
 
       def sortable_active_link(name, param_name, direction, opposite_direction)
-        link_to sort_by: param_name, direction: opposite_direction do
+        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.rb

@@ -6,4 +6,5 @@ module Lipstick
 end
 
 require 'lipstick/images/email_banner'
+require 'lipstick/images/logo_only_email_banner'
 require 'lipstick/images/processor'

data/lib/lipstick/images/email_banner.rb

@@ -28,17 +28,22 @@ module Lipstick
     #
     # For image compositing, (x, y) is the position of the top-left corner.
     class EmailBanner
-      def initialize(image:, title:, environment:)
+      def initialize(image:, title:, environment:,
+                     background_color:, resize_to:)
         @title = title
         @environment = environment
         @image = image
+        @background_color = background_color
+        @resize_to = resize_to
       end
 
       def to_png
+        bgcolor = @background_color
+
         canvas = Magick::ImageList.new
         canvas.new_image(WIDTH, HEIGHT) do |f|
           f.format = 'PNG'
-          f.background_color = '#2A3685'
+          f.background_color = bgcolor
         end
 
         annotate_title(canvas)
@@ -90,7 +95,7 @@ module Lipstick
 
       def logo
         @logo ||= Magick::Image.read(@image.pathname.to_s).first
-                               .resize_to_fill(78, 78)
+                               .resize_to_fill(@resize_to[0], @resize_to[1])
       end
 
       def gap

data/lib/lipstick/images/logo_only_email_banner.rb

@@ -0,0 +1,130 @@
+# frozen_string_literal: true
+
+require 'rmagick'
+
+module Lipstick
+  module Images
+    # Creates a logo-only email banner, with two elements.
+    #
+    # 1. Logo, centered vertically and horizontally within the image.
+    # 2. Environment string, stamped across the logo.
+    #
+    # The math here seemed like it would be a lot simpler than the EmailBanner
+    # class, but then I went and made it all confusing by bringing trigonometry
+    # into it. I promise there was a good reason for doing it.
+    class LogoOnlyEmailBanner
+      def initialize(image:, environment:, background_color:)
+        @environment = environment.upcase
+        @image = image
+        @background_color = background_color
+      end
+
+      def to_png
+        bgcolor = @background_color
+
+        canvas = Magick::ImageList.new
+        canvas.new_image(WIDTH, HEIGHT) do |f|
+          f.format = 'PNG'
+          f.background_color = bgcolor
+        end
+
+        canvas.composite!(logo, logo_x, logo_y, Magick::SrcOverCompositeOp)
+
+        annotate_environment(canvas)
+
+        canvas.to_blob
+      end
+
+      private
+
+      WIDTH = 600
+      HEIGHT = 150
+      MID_Y = HEIGHT / 2
+      ANGLE_DEGREES = 10
+      ANGLE_RADIANS = Math::PI * ANGLE_DEGREES / 180
+      private_constant :WIDTH, :HEIGHT, :MID_Y, :ANGLE_DEGREES, :ANGLE_RADIANS
+
+      def environment_format
+        @environment_format ||= Magick::Draw.new do |title|
+          title.font_family = 'ArialB'
+          title.font_weight = 900
+          title.pointsize = 36
+          title.gravity = Magick::ForgetGravity
+          title.fill = '#bc2028'
+          title.rotation = -1 * ANGLE_DEGREES
+        end
+      end
+
+      def blank_environment?
+        !@environment&.present?
+      end
+
+      def annotate_environment(canvas)
+        return if blank_environment?
+
+        environment_format.annotate(canvas, 0, 0, env_x, env_y, @environment)
+      end
+
+      def logo
+        @logo ||= Magick::Image.read(@image.pathname.to_s).first
+      end
+
+      def gap
+        @gap ||= environment_format.get_type_metrics('AAF').width
+      end
+
+      def logo_w
+        logo.bounding_box.width
+      end
+
+      # x position to vertically center logo
+      def logo_x
+        ((WIDTH - logo.bounding_box.width) / 2).round
+      end
+
+      # y position to vertically center logo
+      def logo_y
+        ((HEIGHT - logo.bounding_box.height) / 2).round
+      end
+
+      def env_metrics
+        return OpenStruct.new(width: 0, height: 0) if blank_environment?
+
+        environment_format.get_type_metrics(@environment)
+      end
+
+      def env_x
+        m = env_metrics
+
+        # The horizontal width of the environment text is found by:
+        # w cos(0) + h sin(0)
+        #
+        # w = text width
+        # h = text ascent
+        # 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
+        # descent.
+        w = Math.cos(ANGLE_RADIANS) * m.width +
+            Math.sin(ANGLE_RADIANS) * m.ascent
+
+        # We center that the same as for `logo_x`
+        ((WIDTH - w) / 2).round
+      end
+
+      def env_y
+        m = env_metrics
+
+        # The horizontal width of the environment text is found by:
+        # w sin(0) + h cos(0)
+        h = Math.sin(ANGLE_RADIANS) * m.width +
+            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.
+        ((HEIGHT + h) / 2).round
+      end
+    end
+  end
+end

data/lib/lipstick/images/processor.rb

@@ -16,11 +16,28 @@ module Lipstick
         end
         # rubocop:enable Security/Eval
 
-        def email_banner(image: 'logo.png', title:, environment:)
+        def email_banner(title:, environment:, image: 'logo.png', **kwargs)
           @context.depend_on_asset(image)
           asset = @context.environment.find_asset(image)
-          EmailBanner.new(image: asset, title: title, environment: environment)
-                     .to_png
+
+          EmailBanner.new(
+            image: asset,
+            title: title,
+            environment: environment,
+            background_color: kwargs[:background_color] || '#2A3685',
+            resize_to: kwargs[:resize_to] || [78, 78]
+          ).to_png
+        end
+
+        def logo_only_email_banner(environment:, image: 'logo.png', **kwargs)
+          @context.depend_on_asset(image)
+          asset = @context.environment.find_asset(image)
+
+          LogoOnlyEmailBanner.new(
+            image: asset,
+            environment: environment,
+            background_color: kwargs[:background_color] || '#2A3685'
+          ).to_png
         end
       end
 

data/lib/lipstick/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aaf-lipstick
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.5.1
 platform: ruby
 authors:
 - Shaun Mangelsdorf
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-20 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: []
@@ -324,6 +318,7 @@ files:
 - lib/lipstick/helpers/sortable_helper.rb
 - lib/lipstick/images.rb
 - lib/lipstick/images/email_banner.rb
+- lib/lipstick/images/logo_only_email_banner.rb
 - lib/lipstick/images/processor.rb
 - lib/lipstick/sortable.rb
 - lib/lipstick/version.rb
@@ -331,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
@@ -339,16 +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: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: A gem for applying AAF branding to our services
 test_files: []