openstax_rescue_from 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 670397a8a7c60263a07415f40b98bcf9b48f9eb3
-  data.tar.gz: 444ac6579b7266f8a56a7fb7e28d3ec9639122f0
+  metadata.gz: 8d74e037eddc6542ef9b523001d60775c21c17f2
+  data.tar.gz: 0687bd2b44e7bdc12892305047dc49f6addaa7f0
 SHA512:
-  metadata.gz: 96fd235c11fe50267f9bf53e949630e48ccc3ccbb5df5d574085892e651f4b1c23736d47d8a1f0b82844ce4a4d046da657635e8e0ae6ec7d787bf02aa5b539a5
-  data.tar.gz: 3b28b27ecca76ed10cffb9ed2fd9dfb8bf7b34ef007119df96cef51cbc13cc7171621c50679558640761fc5940ab56c9c2a8effdb190e7fc48719ec26deadf4b
+  metadata.gz: 93b966cb0ca0df03e8bd8a8db2bbadffeca993b2f8c69fffc5992ca1aff57c3eed7433519fa6122b7422717540970e008b5db8fc92993325f79673cb984b1150
+  data.tar.gz: 2862293642d457822bf177b7542165a93d90b53c60ef54bd07e97197cd205209b7609405cac7c47a6fc2973e10e24acc3b46c2647ba54d7e6e565707ad681041

data/.travis.yml

@@ -9,7 +9,7 @@ script:
 notifications:
   email: false
 addons:
-   postgresql: "9.3"
+   postgresql: "9.5"
 before_install:
   - gem install bundler
 before_script:

data/app/views/errors/any.html.erb

@@ -1,4 +1,5 @@
 <h3 class='rescue-from'><%= @message %></h3>
 
-<p class='rescue-from'>We're sorry this <%= @code %> error occurred. If you need help, please contact <%= openstax_rescue_from_contact_info %><%= " and reference error #{@error_id}" if @error_id && @did_notify %>.</p>
-
+<% if @sorry %>
+  <p class='rescue-from'>We're sorry this <%= @code %> error occurred. If you need help, please contact <%= openstax_rescue_from_contact_info %><%= " and reference error #{@error_id}" if @error_id && @did_notify %>.</p>
+<% end %>

data/lib/openstax/rescue_from/controller.rb

@@ -17,6 +17,7 @@ module OpenStax
         @message = proxy.friendly_message
         @code = proxy.status_code
         @error_id = proxy.error_id
+        @sorry = proxy.sorry
         @did_notify = did_notify
 
         respond_to do |f|

data/lib/openstax/rescue_from/exception_options.rb

@@ -1,18 +1,20 @@
 module OpenStax
   module RescueFrom
     class ExceptionOptions
-      attr_accessor :notify, :status_code, :message, :extras
+      attr_accessor :notify, :status_code, :message, :sorry, :extras
 
       def initialize(options = {})
         options.stringify_keys!
         options = { 'notify' => true,
                     'status' => :internal_server_error,
                     'message' => nil,
+                    'sorry' => true,
                     'extras' => ->(exception) { {} } }.merge(options)
 
         @notify = options['notify']
         @status_code = options['status']
         @message = options['message']
+        @sorry = options['sorry']
         @extras = options['extras']
       end
 

data/lib/openstax/rescue_from/exception_proxy.rb

@@ -50,6 +50,12 @@ module OpenStax
       def status_code
         @status_code ||= RescueFrom.http_code(status)
       end
+
+      def sorry
+        return @sorry unless @sorry.nil?
+
+        @sorry = RescueFrom.sorry(name)
+      end
     end
   end
 end

data/lib/openstax/rescue_from/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module RescueFrom
-    VERSION = "1.8.0"
+    VERSION = "1.9.0"
   end
 end

data/lib/openstax/rescue_from.rb

@@ -78,6 +78,10 @@ module OpenStax
         @@registered_exceptions[exception_name].status_code
       end
 
+      def sorry(exception_name)
+        @@registered_exceptions[exception_name].sorry
+      end
+
       def http_code(status)
         Rack::Utils.status_code(status)
       end

data/openstax_rescue_from.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '~> 2.0'
 
-  spec.add_dependency "rails", '>= 3.1', '< 5.0'
+  spec.add_dependency "rails", '>= 3.1', '< 6.0'
   spec.add_dependency "exception_notification", '>= 4.1', '< 5.0'
 
   spec.add_development_dependency "sqlite3", '~> 1.3.10'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstax_rescue_from
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - JP Slavinsky
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -20,7 +20,7 @@ dependencies:
         version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '3.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: exception_notification
   requirement: !ruby/object:Gem::Requirement