aaf-lipstick 3.0.2 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 73475c22c3b328a642b1fdd3cf889c682f62918c
-  data.tar.gz: 8b3e39a8b60cee2d5954f4994ac3b48500f13530
+SHA256:
+  metadata.gz: 8309d32d19af7aae228523c7bb0a08a67504367c18bb98ba00fd7ca8e9c2bfb8
+  data.tar.gz: cf88c9a55218f2abae34f59c1f37ee9f6c64064b17fd220752f5bb63b789beda
 SHA512:
-  metadata.gz: 8ce4cb91e05fc58113f78f78275b292a2a6b5a526d51f06f1002162d905847d5ea185a63d65ed9b7633a052459bd519d046370339d6663ef2295245ea55a3f98
-  data.tar.gz: 9be0635840910a82587058bca5db88e80bf2074d347b29273db05c2970f32039df13890963c44ca0ae0aeeee977cd0ff38fd8057c42c7854d530f235238da394
+  metadata.gz: 920421d4d590fefe053d5301dd160cdf6a1df7bd13496733b3d18c385698cc0e2228c0653c779d1b8a04c0269d371a33d90836eb338433588163b2568ccde61e
+  data.tar.gz: 634a50fb305d9159669860b66626ee37478736797ccf0a5fa2cdd028855ae96c86132746dc14e77ccbc5c09d4d731f831bfd2d90bd116f2221fc79e3ab231e2f

data/Rakefile

@@ -7,4 +7,4 @@ require 'rubocop/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
 
-task default: %i(spec rubocop)
+task default: %i[spec rubocop]

data/lib/lipstick/filterable.rb

@@ -17,9 +17,9 @@ module Lipstick
 
     module VisitCollatedArelAttribute
       # rubocop:disable Style/MethodName
-      def visit_Lipstick_Filterable_CollatedArelAttribute(o, collector)
-        visit(o.attribute, collector)
-        collector << ' COLLATE ' << o.collation
+      def visit_Lipstick_Filterable_CollatedArelAttribute(object, collector)
+        visit(object.attribute, collector)
+        collector << ' COLLATE ' << object.collation
       end
       # rubocop:enable Style/MethodName
     end

data/lib/lipstick/helpers/bootstrap_form_builder.rb

@@ -62,3 +62,5 @@ class BootstrapFormBuilder < ActionView::Helpers::FormBuilder
     opts[:class] = "#{opts[:class]} #{class_name}".strip
   end
 end
+
+# rubocop:enable Metrics/ParameterLists

data/lib/lipstick/helpers/form_helper.rb

@@ -108,7 +108,7 @@ module Lipstick
       end
 
       def delete_button_tag(url, text: true, **opts)
-        action = text && 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))

data/lib/lipstick/helpers/layout_helper.rb

@@ -3,10 +3,10 @@
 module Lipstick
   module Helpers
     module LayoutHelper
-      def aaf_header(title:, environment: nil, auth: nil, &bl)
+      def aaf_header(title:, environment: nil, auth: nil, &blk)
         content_tag('div', class: 'aaf-header') do
           concat(aaf_banner(title, environment, auth))
-          concat(capture(&bl))
+          concat(capture(&blk))
         end
       end
 
@@ -90,19 +90,19 @@ module Lipstick
         end
       end
 
-      def will_paginate(_ = nil, options = {})
+      def will_paginate(_type = nil, options = {})
         options[:renderer] ||= Lipstick::Helpers::PaginationLinkRenderer
         super
       end
 
-      DISABLE_ANIMATIONS_CSS = <<-EOF
+      DISABLE_ANIMATIONS_CSS = <<-CSS
         .ui, .ui * {
           -webkit-animation-duration: 0ms !important;
           -moz-animation-duration: 0ms !important;
           -ms-animation-duration: 0ms !important;
           animation-duration: 0ms !important;
         }
-      EOF
+      CSS
       private_constant :DISABLE_ANIMATIONS_CSS
 
       def disable_animations

data/lib/lipstick/helpers/pagination_link_renderer.rb

@@ -116,7 +116,7 @@ module Lipstick
         li_opts = {}
         li_opts[:class] = 'active' if page == current
 
-        url_opts = template.params.merge(page: page)
+        url_opts = template.params.permit(:page, :per_page).merge(page: page)
         opts = opts.merge(href: template.url_for(url_opts))
 
         template.content_tag('li', li_opts) do

data/lib/lipstick/images/processor.rb

@@ -10,9 +10,11 @@ module Lipstick
           @context = context
         end
 
+        # rubocop:disable Security/Eval
         def run(data)
           binding.eval(data)
         end
+        # rubocop:enable Security/Eval
 
         def email_banner(image: 'logo.png', title:, environment:)
           @context.depend_on_asset(image)

data/lib/lipstick/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aaf-lipstick
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.4
 platform: ruby
 authors:
 - Shaun Mangelsdorf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2018-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rails
+  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: rmagick
   requirement: !ruby/object:Gem::Requirement
@@ -95,27 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -129,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faker
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -157,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tilt
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -171,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -185,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -199,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -213,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -227,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -241,7 +235,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -255,7 +249,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rubocop
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -269,7 +263,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-bundler
+  name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -345,7 +339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A gem for applying AAF branding to our services