aaf-lipstick 1.1.0 → 2.0.0

data/lib/lipstick/images.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Lipstick
   module Images
   end

data/lib/lipstick/images/email_banner.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rmagick'
 
 module Lipstick
@@ -36,7 +37,7 @@ module Lipstick
         canvas = Magick::ImageList.new
         canvas.new_image(WIDTH, HEIGHT) do |f|
           f.format = 'PNG'
-          f.background_color = '#495666'
+          f.background_color = '#2A3685'
         end
 
         annotate_title(canvas)
@@ -72,18 +73,22 @@ module Lipstick
         end
       end
 
+      def blank_environment?
+        !@environment&.present?
+      end
+
       def annotate_title(canvas)
         title_format.annotate(canvas, 0, 0, title_x, title_y, @title)
       end
 
       def annotate_environment(canvas)
+        return if blank_environment?
         environment_format.annotate(canvas, 0, 0, env_x, env_y, @environment)
       end
 
       def logo
-        asset = Rails.application.assets.find_asset(@image)
-        @logo ||= Magick::Image.read(asset.pathname.to_s).first
-                  .resize_to_fill(150, 80)
+        @logo ||= Magick::Image.read(@image.pathname.to_s).first
+                               .resize_to_fill(78, 78)
       end
 
       def gap
@@ -108,6 +113,7 @@ module Lipstick
       end
 
       def env_metrics
+        return OpenStruct.new(width: 0, height: 0) if blank_environment?
         environment_format.get_type_metrics(@environment)
       end
 

data/lib/lipstick/images/processor.rb

@@ -1,8 +1,10 @@
-require 'sprockets/processor'
+# frozen_string_literal: true
+
+require 'tilt'
 
 module Lipstick
   module Images
-    class Processor < Sprockets::Processor
+    class Processor < ::Tilt::Template
       class DSL
         def initialize(context)
           @context = context
@@ -14,11 +16,15 @@ module Lipstick
 
         def email_banner(image: 'logo.png', title:, environment:)
           @context.depend_on_asset(image)
-          EmailBanner.new(image: image, title: title, environment: environment)
-            .to_png
+          asset = @context.environment.find_asset(image)
+          EmailBanner.new(image: asset, title: title, environment: environment)
+                     .to_png
         end
       end
 
+      def prepare
+      end
+
       def evaluate(context, _locals)
         DSL.new(context).run(data)
       end

data/lib/lipstick/sprockets_asset_data_url_helper.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+require 'sass'
+
+module Lipstick
+  module SprocketsAssetDataURL
+    def asset_data_url(path)
+      ::Sass::Script::String.new(
+        "url(#{sprockets_context.asset_data_uri(path.value)})"
+      )
+    end
+  end
+
+  ::Sass::Script::Functions.send(:include, SprocketsAssetDataURL)
+end

data/lib/lipstick/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Lipstick
-  VERSION = '1.1.0'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: aaf-lipstick
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Shaun Mangelsdorf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-15 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: actionview
+  name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: will_paginate
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  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'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +206,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  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'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -228,25 +284,30 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Rakefile
+- app/assets/images/aaf-icon.png
 - app/assets/images/favicon.png
 - app/assets/images/logo.png
-- app/assets/javascripts/aaf-layout.js
-- app/assets/stylesheets/aaf-layout.css.scss
+- app/assets/javascripts/aaf-lipstick.js
+- app/assets/stylesheets/aaf-lipstick.css.scss
 - app/views/layouts/email_branding.html.erb
 - lib/aaf-lipstick.rb
 - lib/lipstick.rb
-- lib/lipstick/action_view_tilt_template.rb
 - lib/lipstick/auto_validation.rb
 - lib/lipstick/email_message.rb
 - lib/lipstick/engine.rb
+- lib/lipstick/filterable.rb
 - lib/lipstick/helpers.rb
+- lib/lipstick/helpers/bootstrap_form_builder.rb
+- lib/lipstick/helpers/compatibility_hacks.rb
 - lib/lipstick/helpers/form_helper.rb
+- lib/lipstick/helpers/form_validation_builder.rb
 - lib/lipstick/helpers/layout_helper.rb
 - lib/lipstick/helpers/nav_helper.rb
-- lib/lipstick/helpers/semantic_form_builder.rb
+- lib/lipstick/helpers/pagination_link_renderer.rb
 - lib/lipstick/images.rb
 - lib/lipstick/images/email_banner.rb
 - lib/lipstick/images/processor.rb
+- lib/lipstick/sprockets_asset_data_url_helper.rb
 - lib/lipstick/version.rb
 homepage: https://github.com/ausaccessfed/aaf-lipstick
 licenses:
@@ -268,7 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A gem for applying AAF branding to our services

data/app/assets/javascripts/aaf-layout.js

@@ -1,35 +0,0 @@
-jQuery(function($) {
-  $('.nav.collapsing.button .open.button').click(function() {
-    $(this).parents('.collapsing.nav.parent').toggleClass('expanded');
-    return false;
-  });
-
-  $('.field-help-text').popup({
-    "inline": true,
-    "position": "right center"
-  });
-
-  $('.ui.dropdown:not(.simple)').dropdown();
-
-  /* Our nav menu has a layout bug; the same as reported at:
-   * https://github.com/Semantic-Org/Semantic-UI/issues/839
-   *
-   * The suggested fix on that issue did not correct it.
-   *
-   * We can detect the bug when the window.load event fires, by checking the
-   * relative positioning of the right menu. Using a hide/show forces the
-   * browser to recalculate, which corrects the layout.
-   */
-  $('.aaf-header nav > .ui.menu').each(function() {
-    var e = this;
-    $(window).load(function() {
-      var bar_pos = $(e).position();
-      var right_menu_pos = $(e).find('.right.menu').position();
-
-      if (bar_pos.top < right_menu_pos.top) {
-        $(e).attr('style', 'display: none !important');
-        setTimeout(function() { $(e).attr('style', 'display: block'); }, 0);
-      }
-    });
-  });
-});

data/app/assets/stylesheets/aaf-layout.css.scss

@@ -1,204 +0,0 @@
-@mixin no-header-margins() {
-  h1, h2, h3, h4, h5, h6 {
-    margin: 0px;
-  }
-}
-
-@mixin responsive-min-gutter($width, $gutter) {
-  @media only screen and (max-width: $width) {
-    padding-left: $gutter;
-    padding-right: $gutter;
-  }
-}
-
-@mixin responsive-gutter($width, $gutter) {
-  @media only screen and (min-width: $width) {
-    padding-left: $gutter;
-    padding-right: $gutter;
-  }
-}
-
-@mixin responsive-fixed($screen, $content) {
-  @media only screen and (min-width: $screen) {
-    width: $content;
-    margin-left: auto;
-    margin-right: auto;
-  }
-}
-
-@mixin responsive-width {
-  @include responsive-min-gutter(959px, 5px);
-  @include responsive-gutter(960px, 50px);
-  @include responsive-gutter(1280px, 100px);
-  @include responsive-fixed(1560px, 1360px);
-}
-
-body {
-  margin: 0px;
-  padding: 0px;
-
-  font-size: 14px;
-  font-family: "Open Sans", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
-  color: black;
-  background: white;
-}
-
-section.content {
-  @include responsive-width;
-}
-
-main {
-  margin-top: 1em;
-
-  a {
-    text-decoration: none;
-    color: #08c;
-  }
-
-  a:hover {
-    text-decoration: underline;
-  }
-
-  table {
-    text-align: left;
-  }
-
-  .ui.error.message ul.list li {
-    list-style-type: circle;
-  }
-}
-
-footer {
-  @include responsive-width;
-
-  font-size: 12px;
-  color: #aaaaaa;
-  line-height: 1.6em;
-
-  a {
-    text-decoration: none;
-    color: inherit;
-  }
-
-  a:hover {
-    color: initial;
-  }
-}
-
-.aaf-header {
-  $background: #495666;
-
-  background-color: $background;
-  min-height: 80px;
-  letter-spacing: 0.5px;
-
-  .ui.header {
-    font-weight: normal;
-
-    img {
-      width: 138px;
-      height: 80px;
-    }
-  }
-
-  nav {
-    @include responsive-width;
-
-    .ui.menu {
-      background-color: darken($background, 7%);
-
-      a.item:hover, div.dropdown.item:hover {
-        background-color: rgba(0, 0, 0, .15);
-      }
-
-      .dropdown.item .menu {
-        background-color: $background;
-
-        .item {
-          color: white !important;
-        }
-
-        .item:hover {
-          background-color: rgba(0, 0, 0, .15);
-        }
-      }
-    }
-
-    .collapsing.nav.button .open.button {
-      display: none;
-    }
-
-    @media only screen and (max-width: 560px) {
-      .ui.menu .item {
-        display: block;
-      }
-
-      .collapsing.nav.button .open.button {
-        display: block;
-        float: right;
-        margin: 5px;
-        position: relative;
-        z-index: 5;
-      }
-
-      .collapsing.nav.content {
-        display: none;
-      }
-
-      .collapsing.nav.parent.expanded .collapsing.nav.content {
-        display: block;
-
-        .item { display: block; }
-        .ui.simple.dropdown {
-          .menu {
-            position: relative;
-            top: 0.6em !important;
-            height: auto;
-            opacity: inherit;
-          }
-        }
-        .menu.right { float: none; }
-      }
-    }
-  }
-
-  .banner {
-    @include no-header-margins;
-    @include responsive-width;
-
-    .content, .environment {
-      height: 80px;
-      line-height: 80px;
-      vertical-align: middle;
-    }
-
-    .environment {
-      float: right;
-      font-size: 130%;
-      color: #dd7727;
-      margin-right: 5px;
-    }
-
-    @media only screen and (max-width: 560px) {
-      .environment {
-        float: none;
-        text-align: right;
-        line-height: 1em;
-        position: absolute;
-        right: 5px;
-        top: 5px;
-      }
-    }
-
-    .logo {
-      float: left;
-      margin-right: 28px;
-    }
-  }
-}
-
-.clearfix:after {
-  content: "";
-  display: table;
-  clear: both;
-}