aaf-lipstick 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93e1198bdc898a7e82d6f144f47d501f8eb9eb33
-  data.tar.gz: 5fc825d84d6047fcf8e974eaac6cc8c3a860b780
+  metadata.gz: bfcd45c6c601b809340890852d183333006b2175
+  data.tar.gz: 01e01466e571f79b72e0cdc985a419e4f1ebc58f
 SHA512:
-  metadata.gz: 2c7ed8998b9808a710d860f2fce5a480ccc388c40cec99afd5b426752834af7f00da476c2f38bf557d1a3e68de176910591a66e400ea85a25f20046a3ca32f19
-  data.tar.gz: f086c71a83158f0b9f468c59c33e13909b6ed2039abfd17dcf12d01d0e5623390eea63d60a889f8bf397cb900d0eb1695811f0eaa7306e2f391ed4ea9dbb6267
+  metadata.gz: 90c8dc5b4cad84050c8e884b6d6ece9ce23fe54a1a76bd30d2a5576e7355bc94ad0e8e4e9119cd7676fb1a12a369a5d374a97bf6ac768e35b003dbd5d7ca95cb
+  data.tar.gz: 26acd5ddf6a344004116fd9aaf6b46135c2e6a6869d716e1a2b8396c64709147dadbd804441a65a5c24e553b940cf47e8f6cb0db8978a63af209c4e3a860ecfc

data/lib/lipstick/errors/dynamic_errors.rb

@@ -7,22 +7,23 @@ module Lipstick
   module DynamicErrors
     Forbidden = Class.new(StandardError)
     private_constant :Forbidden
-    ::ActionController::Base.rescue_from Forbidden, with: :forbidden
 
     Unauthorized = Class.new(StandardError)
     private_constant :Unauthorized
-    ::ActionController::Base.rescue_from Unauthorized, with: :unauthorized
 
     BadRequest = Class.new(StandardError)
     private_constant :BadRequest
-    ::ActionController::Base.rescue_from BadRequest, with: :bad_request
 
     NotFound = Class.new(StandardError)
     private_constant :NotFound
-    ::ActionController::Base.rescue_from NotFound, with: :not_found
-    ::ActionController::Base.rescue_from(
-      ::ActiveRecord::RecordNotFound, with: :not_found
-    )
+
+    def self.included(base)
+      base.rescue_from Forbidden, with: :forbidden
+      base.rescue_from Unauthorized, with: :unauthorized
+      base.rescue_from BadRequest, with: :bad_request
+      base.rescue_from NotFound, with: :not_found
+      base.rescue_from(::ActiveRecord::RecordNotFound, with: :not_found)
+    end
 
     private
 

data/lib/lipstick/helpers/layout_helper.rb

@@ -23,7 +23,7 @@ module Lipstick
         content_tag('p') do
           concat('Logged in as: ')
           concat(content_tag('strong', user.name))
-          concat(" (#{user.targeted_id})")
+          concat(" (#{user.targeted_id})") if user.targeted_id
         end
       end
 

data/lib/lipstick/images/processor.rb

@@ -22,8 +22,7 @@ module Lipstick
         end
       end
 
-      def prepare
-      end
+      def prepare; end
 
       def evaluate(context, _locals)
         DSL.new(context).run(data)

data/lib/lipstick/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Lipstick
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aaf-lipstick
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Shaun Mangelsdorf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2017-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -345,7 +345,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A gem for applying AAF branding to our services