decko 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6d4b5cc0477c68446976ca04a09700a6b4660cf
-  data.tar.gz: a97b8e3f1cca8cec30ea112bc57ec7a3aacdaa28
+  metadata.gz: 9c7470e38fb2ea83657b0a479d24ea5c682f357c
+  data.tar.gz: 981f6171d85c98551cbc02b3df6f65941eb9c785
 SHA512:
-  metadata.gz: 5b28f42af4aba65c07171a69064b8627c253b0a569f31ac30774986c800cf9972fbdededfa0ce88788c746c9026a958cffc74a28bfcf99669c28f213a75d06cf
-  data.tar.gz: de20f2db80df6223c6efe1c313a7305b81ecb2ca2e8f6cef6b5bc4465203ceadf0e19909d06d2066e61571aa9b7ee6cf15b1fb0a2348242d70d2dc7405db83a2
+  metadata.gz: febc67212bd21e942d57aaa635c4c270d2a2635b43f448138daf9b2cb31312cf7eda6f0ab7e28520227d57e5835aae760e8055909af0130f6574c56e1d390c61
+  data.tar.gz: 61bd7956343a66cc2f14fee2232aefb6eb2b99de31e6bba70a5607f7eb7f1e609bb946588958f8b157362e926ac391030962816253f3eafaea61b2deeb7e0d9f

data/lib/decko/response.rb

@@ -65,10 +65,14 @@ module Decko
     # Both this file and that would make sense as submodules of CardController
 
     def load_format
-      request.format = :html if Card::Env.ajax? && !params[:format]
+      request.format = :html if implicit_html?
       card.format format_name_from_params
     end
 
+    def implicit_html?
+      (Card::Env.ajax? && !params[:format]) || request.format.to_s == "*/*"
+    end
+
     def format_name_from_params
       explicit_file_format? ? :file : request.format.to_sym
     end

data/rails/controllers/card_controller.rb

@@ -121,13 +121,20 @@ class CardController < ActionController::Base
     end
   end
 
-  unless Rails.env.development?
-    rescue_from StandardError do |exception|
-      @card ||= Card.new
-      Card::Error.current = exception
-      error = Card::Error.cardify_exception exception, card
-      error.report
-      show error.class.view, error.class.status_code
+  def handle_exception exception
+    @card ||= Card.new
+    Card::Error.current = exception
+    error = Card::Error.cardify_exception exception, card
+    error.report
+    show error.class.view, error.class.status_code
+  end
+
+  class << self
+    def rescue_from_class klass
+      rescue_from(klass) { |exception| handle_exception exception }
     end
   end
+
+  rescue_from_class ActiveRecord::RecordInvalid
+  rescue_from_class(Rails.env.development? ? Card::Error::UserError : StandardError)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decko
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-25 00:00:00.000000000 Z
+date: 2018-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.96.5
+        version: 1.96.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.96.5
+        version: 1.96.6
 description: a wiki approach to stuctured data, dynamic interaction,  and web design
 email:
 - info@decko.org